fix(rpc): prevent opening on fail

Author: kyranjamie

src/background/messaging/messaging-utils.ts

@@ -101,6 +101,8 @@ export function encodePostConditions(postConditions: PostConditionWire[]) {
   return postConditions.map(pc => serializePostConditionWire(pc));
 }
 
+type ValidationResult = 'success' | 'failure';
+
 interface ValidateRequestParamsArgs {
   id: string;
   method: RpcMethodNames;
@@ -114,7 +116,7 @@ export function validateRequestParams({
   params,
   port,
   schema,
-}: ValidateRequestParamsArgs) {
+}: ValidateRequestParamsArgs): { status: ValidationResult } {
   if (isUndefined(params)) {
     void trackRpcRequestError({ endpoint: method, error: RpcErrorMessage.UndefinedParams });
     chrome.tabs.sendMessage(
@@ -124,7 +126,7 @@ export function validateRequestParams({
         error: { code: RpcErrorCode.INVALID_REQUEST, message: RpcErrorMessage.UndefinedParams },
       })
     );
-    return;
+    return { status: 'failure' };
   }
 
   if (!validateRpcParams(params, schema)) {
@@ -140,8 +142,9 @@ export function validateRequestParams({
         },
       })
     );
-    return;
+    return { status: 'failure' };
   }
+  return { status: 'success' };
 }
 
 type BaseStacksTransactionRpcParams = z.infer<typeof baseStacksTransactionConfigSchema>;

src/background/messaging/rpc-methods/stx-call-contract.ts

@@ -33,13 +33,14 @@ export async function rpcStxCallContract(
   port: chrome.runtime.Port
 ) {
   const { id: requestId, method, params } = message;
-  validateRequestParams({
+  const { status } = validateRequestParams({
     id: requestId,
     method,
     params,
     port,
     schema: stxCallContract.params,
   });
+  if (status === 'failure') return;
   const requestParams: RequestParams = [
     ['requestId', requestId],
     ['request', createUnsecuredToken(getMessageParamsToTransactionRequest(message.params))],

src/background/messaging/rpc-methods/stx-deploy-contract.ts

@@ -30,13 +30,14 @@ export async function rpcStxDeployContract(
   port: chrome.runtime.Port
 ) {
   const { id: requestId, method, params } = message;
-  validateRequestParams({
+  const { status } = validateRequestParams({
     id: requestId,
     method,
     params,
     port,
     schema: stxDeployContract.params,
   });
+  if (status === 'failure') return;
   const request = getMessageParamsToTransactionRequest(params);
   const requestParams: RequestParams = [
     ['requestId', requestId],

src/background/messaging/rpc-methods/stx-transfer-sip10-ft.ts

@@ -76,13 +76,15 @@ export async function rpcStxTransferSip10Ft(
   port: chrome.runtime.Port
 ) {
   const { id: requestId, method, params } = message;
-  validateRequestParams({
+
+  const { status } = validateRequestParams({
     id: requestId,
     method,
     params,
     port,
     schema: stxTransferSip10Ft.params,
   });
+  if (status === 'failure') return;
   const txRequest = await getMessageParamsToTransactionRequest(params);
   const requestParams: RequestParams = [
     ['requestId', requestId],

src/background/messaging/rpc-methods/stx-transfer-sip9-nft.ts

@@ -74,13 +74,14 @@ export async function rpcStxTransferSip9Nft(
   port: chrome.runtime.Port
 ) {
   const { id: requestId, method, params } = message;
-  validateRequestParams({
+  const { status } = validateRequestParams({
     id: requestId,
     method,
     params,
     port,
     schema: stxTransferSip9Nft.params,
   });
+  if (status === 'failure') return;
   const txRequest = await getMessageParamsToTransactionRequest(params);
   const requestParams: RequestParams = [
     ['requestId', requestId],

src/background/messaging/rpc-methods/stx-transfer-stx.ts

@@ -29,13 +29,14 @@ export async function rpcStxTransferStx(
   port: chrome.runtime.Port
 ) {
   const { id: requestId, method, params } = message;
-  validateRequestParams({
+  const { status } = validateRequestParams({
     id: requestId,
     method,
     params,
     port,
     schema: stxTransferStx.params,
   });
+  if (status === 'failure') return;
   const request = getMessageParamsToTransactionRequest(params);
   const requestParams: RequestParams = [
     ['requestId', requestId],