Add validation for paymaster sign accountOp

src/controllers/signAccountOp/signAccountOp.ts

@@ -1,5 +1,6 @@
 import { ethers, JsonRpcProvider } from 'ethers'
 
+import { schemas } from '../../libs/schemaValidation/validateScehmas'
 import AmbireAccount from '../../../contracts/compiled/AmbireAccount.json'
 import EntryPointAbi from '../../../contracts/compiled/EntryPoint.json'
 import ERC20 from '../../../contracts/compiled/IERC20.json'
@@ -651,6 +652,15 @@ export class SignAccountOpController extends EventEmitter {
             }
           )
           if (response.success) {
+            const isValid = schemas.RelayerResponsePaymasterSign(response.data)
+            if (!isValid) {
+              this.emitError({
+                level: 'minor',
+                message: 'Error submit signature to paymaster/sign. Please contact support.',
+                error: new Error(schemas.RelayerResponsePaymasterSign.errors)
+              })
+              return null
+            }
             userOperation.paymasterAndData = response.data.paymasterAndData
 
             // after getting the paymaster data, if we're in the edge case,

src/interfaces/accountOp.ts

@@ -0,0 +1,4 @@
+export interface RelayerResponsePaymasterSign {
+  data: { paymasterAndData: any }
+  errorState: any[]
+}

src/libs/schemaValidation/generateSchemas.ts

@@ -16,7 +16,8 @@ const source = TJS.getProgramFromFiles(
   [
     resolve('src', 'interfaces', 'emailVault.ts'),
     resolve('src', 'interfaces', 'account.ts'),
-    resolve('src', 'interfaces', 'portfolio.ts')
+    resolve('src', 'interfaces', 'portfolio.ts'),
+    resolve('src', 'interfaces', 'accountOp.ts')
   ],
   COMPILER_OPTIONS,
   __dirname
@@ -30,7 +31,8 @@ const allInterfaces = [
   'RecoveryKey',
   'EmailVaultData',
   'RelayerResponseLinkedAccount',
-  'RelayerReponsePortfolioAdditional'
+  'RelayerReponsePortfolioAdditional',
+  'RelayerResponsePaymasterSign'
 ]
 
 allInterfaces.forEach((interfaceName) => {

src/libs/schemaValidation/schemas/RelayerResponsePaymasterSign.json

@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "data": {
+            "type": "object",
+            "properties": {
+                "paymasterAndData": {}
+            },
+            "required": [
+                "paymasterAndData"
+            ]
+        },
+        "errorState": {
+            "type": "array",
+            "items": {}
+        }
+    },
+    "required": [
+        "data",
+        "errorState"
+    ],
+    "$schema": "http://json-schema.org/draft-07/schema#"
+}

src/libs/schemaValidation/validateScehmas.ts

@@ -10,5 +10,6 @@ export const schemas: any = {
   RelayerResponseLinkedAccount: ajv.compile(require('./schemas/RelayerResponseLinkedAccount.json')),
   RelayerReponsePortfolioAdditional: ajv.compile(
     require('./schemas/RelayerReponsePortfolioAdditional.json')
-  )
+  ),
+  RelayerResponsePaymasterSign: ajv.compile(require('./schemas/RelayerResponsePaymasterSign.json'))
 }

src/libs/schemaValidation/validation.test.ts

@@ -33,6 +33,9 @@ const data = {
         errors: [new Error('asd')]
       }
     ]
+  },
+  RelayerResponsePaymasterSign: {
+    correct: [{ data: { paymasterAndData: 'paymasterAndData' }, errorState: [] }]
   }
 }
 
@@ -42,4 +45,9 @@ describe('Describe', () => {
     expect(res).toBeTruthy()
     expect(schemas.EmailVaultData.errors).toBeNull()
   })
+  test('RelayerResponsePaymasterSign', () => {
+    const res = schemas.RelayerResponsePaymasterSign(data.RelayerResponsePaymasterSign.correct[0])
+    expect(res).toBeTruthy()
+    expect(schemas.RelayerResponsePaymasterSign.errors).toBeNull()
+  })
 })