@metamask-previews/user-operation-controller 41.2.7-preview-064aea96d → 41.2.7-preview-ec4680201

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/CHANGELOG.md +1 -0
  2. package/dist/UserOperationController-method-action-types.cjs.map +1 -1
  3. package/dist/UserOperationController-method-action-types.d.cts.map +1 -1
  4. package/dist/UserOperationController-method-action-types.d.mts.map +1 -1
  5. package/dist/UserOperationController-method-action-types.mjs.map +1 -1
  6. package/dist/UserOperationController.cjs +68 -68
  7. package/dist/UserOperationController.cjs.map +1 -1
  8. package/dist/UserOperationController.d.cts +1 -1
  9. package/dist/UserOperationController.d.cts.map +1 -1
  10. package/dist/UserOperationController.d.mts +1 -1
  11. package/dist/UserOperationController.d.mts.map +1 -1
  12. package/dist/UserOperationController.mjs +1 -1
  13. package/dist/UserOperationController.mjs.map +1 -1
  14. package/dist/helpers/Bundler.cjs +2 -2
  15. package/dist/helpers/Bundler.cjs.map +1 -1
  16. package/dist/helpers/Bundler.d.cts.map +1 -1
  17. package/dist/helpers/Bundler.d.mts.map +1 -1
  18. package/dist/helpers/Bundler.mjs.map +1 -1
  19. package/dist/helpers/PendingUserOperationTracker.cjs +8 -8
  20. package/dist/helpers/PendingUserOperationTracker.cjs.map +1 -1
  21. package/dist/helpers/PendingUserOperationTracker.d.cts +1 -1
  22. package/dist/helpers/PendingUserOperationTracker.d.cts.map +1 -1
  23. package/dist/helpers/PendingUserOperationTracker.d.mts +1 -1
  24. package/dist/helpers/PendingUserOperationTracker.d.mts.map +1 -1
  25. package/dist/helpers/PendingUserOperationTracker.mjs.map +1 -1
  26. package/dist/helpers/SnapSmartContractAccount.cjs +9 -9
  27. package/dist/helpers/SnapSmartContractAccount.cjs.map +1 -1
  28. package/dist/helpers/SnapSmartContractAccount.d.cts.map +1 -1
  29. package/dist/helpers/SnapSmartContractAccount.d.mts.map +1 -1
  30. package/dist/helpers/SnapSmartContractAccount.mjs.map +1 -1
  31. package/dist/index.cjs.map +1 -1
  32. package/dist/index.d.cts.map +1 -1
  33. package/dist/index.d.mts.map +1 -1
  34. package/dist/index.mjs.map +1 -1
  35. package/dist/utils/gas-fees.cjs +4 -4
  36. package/dist/utils/gas-fees.cjs.map +1 -1
  37. package/dist/utils/gas-fees.d.cts.map +1 -1
  38. package/dist/utils/gas-fees.d.mts.map +1 -1
  39. package/dist/utils/gas-fees.mjs.map +1 -1
  40. package/dist/utils/gas.cjs +9 -9
  41. package/dist/utils/gas.cjs.map +1 -1
  42. package/dist/utils/gas.d.cts.map +1 -1
  43. package/dist/utils/gas.d.mts.map +1 -1
  44. package/dist/utils/gas.mjs.map +1 -1
  45. package/dist/utils/transaction.cjs +12 -12
  46. package/dist/utils/transaction.cjs.map +1 -1
  47. package/dist/utils/transaction.d.cts.map +1 -1
  48. package/dist/utils/transaction.d.mts.map +1 -1
  49. package/dist/utils/transaction.mjs.map +1 -1
  50. package/dist/utils/validation.cjs +3 -3
  51. package/dist/utils/validation.cjs.map +1 -1
  52. package/dist/utils/validation.d.cts.map +1 -1
  53. package/dist/utils/validation.d.mts.map +1 -1
  54. package/dist/utils/validation.mjs.map +1 -1
  55. package/package.json +4 -4
@@ -1 +1 @@
1
- {"version":3,"file":"validation.cjs","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Struct, StructError } from '@metamask/superstruct';\nimport {\n assert,\n boolean,\n define,\n enums,\n func,\n number,\n object,\n optional,\n refine,\n string,\n} from '@metamask/superstruct';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport { EMPTY_BYTES } from '../constants';\nimport type {\n PrepareUserOperationResponse,\n SignUserOperationResponse,\n UpdateUserOperationResponse,\n} from '../types';\nimport type {\n AddUserOperationOptions,\n AddUserOperationRequest,\n} from '../UserOperationController';\n\n/**\n * Validate a request to add a user operation.\n *\n * @param request - The request to validate.\n */\nexport function validateAddUserOperationRequest(\n request: AddUserOperationRequest,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidRequest = object({\n data: optional(HexOrEmptyBytes),\n from: Hex,\n maxFeePerGas: optional(Hex),\n maxPriorityFeePerGas: optional(Hex),\n to: optional(Hex),\n value: optional(Hex),\n });\n\n validate(request, ValidRequest, 'Invalid request to add user operation');\n}\n\n/**\n * Validate the options when adding a user operation.\n *\n * @param options - The options to validate.\n */\nexport function validateAddUserOperationOptions(\n options: AddUserOperationOptions,\n) {\n const ValidOptions = object({\n networkClientId: string(),\n origin: string(),\n requireApproval: optional(boolean()),\n smartContractAccount: optional(\n object({\n prepareUserOperation: func(),\n updateUserOperation: func(),\n signUserOperation: func(),\n }),\n ),\n swaps: optional(\n object({\n approvalTxId: optional(string()),\n destinationTokenAddress: optional(string()),\n destinationTokenDecimals: optional(number()),\n destinationTokenSymbol: optional(string()),\n estimatedBaseFee: optional(string()),\n sourceTokenSymbol: optional(string()),\n swapMetaData: optional(object()),\n swapTokenValue: optional(string()),\n destinationTokenAmount: optional(string()),\n sourceTokenAddress: optional(string()),\n sourceTokenAmount: optional(string()),\n sourceTokenDecimals: optional(number()),\n swapAndSendRecipient: optional(string()),\n }),\n ),\n type: optional(enums(Object.values(TransactionType))),\n });\n\n validate(options, ValidOptions, 'Invalid options to add user operation');\n}\n\n/**\n * Validate the response from a smart contract account when preparing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validatePrepareUserOperationResponse(\n response: PrepareUserOperationResponse,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidResponse = refine(\n object({\n bundler: string(),\n callData: Hex,\n dummyPaymasterAndData: optional(HexOrEmptyBytes),\n dummySignature: optional(HexOrEmptyBytes),\n gas: optional(\n object({\n callGasLimit: Hex,\n preVerificationGas: Hex,\n verificationGasLimit: Hex,\n }),\n ),\n initCode: optional(HexOrEmptyBytes),\n nonce: Hex,\n sender: Hex,\n }),\n 'ValidPrepareUserOperationResponse',\n ({ gas, dummySignature }) => {\n if (!gas && (!dummySignature || dummySignature === EMPTY_BYTES)) {\n return 'Must specify dummySignature if not specifying gas';\n }\n\n /* istanbul ignore next */\n return true;\n },\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when preparing user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when updating the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateUpdateUserOperationResponse(\n response: UpdateUserOperationResponse,\n) {\n const ValidResponse = optional(\n object({\n paymasterAndData: optional(defineHexOrEmptyBytes()),\n callGasLimit: optional(defineHexOrEmptyBytes()),\n preVerificationGas: optional(defineHexOrEmptyBytes()),\n verificationGasLimit: optional(defineHexOrEmptyBytes()),\n }),\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when updating user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when signing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateSignUserOperationResponse(\n response: SignUserOperationResponse,\n) {\n const Hex = defineHex();\n\n const ValidResponse = object({\n signature: Hex,\n });\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when signing user operation',\n );\n}\n\n/**\n * Validate data against a struct.\n *\n * @param data - The data to validate.\n * @param struct - The struct to validate against.\n * @param message - The message to throw if validation fails.\n */\nfunction validate<T>(data: unknown, struct: Struct<T>, message: string) {\n try {\n assert(data, struct, message);\n } catch (error) {\n const causes = (error as StructError)\n .failures()\n .map((failure) => {\n if (!failure.path.length) {\n return failure.message;\n }\n\n return `${failure.path.join('.')} - ${failure.message}`;\n })\n .join('\\n');\n\n const finalMessage = `${message}\\n${causes}`;\n\n throw new Error(finalMessage);\n }\n}\n\n/**\n * Define the Hex type used by superstruct.\n *\n * @returns The Hex superstruct type.\n */\nfunction defineHex() {\n return define<string>('Hexadecimal String', (value) =>\n isStrictHexString(value),\n );\n}\n\n/**\n * Define the HexOrEmptyBytes type used by superstruct.\n *\n * @returns The HexOrEmptyBytes superstruct type.\n */\nfunction defineHexOrEmptyBytes() {\n return define<string>(\n 'Hexadecimal String or 0x',\n (value) => isStrictHexString(value) || value === EMPTY_BYTES,\n );\n}\n"]}
1
+ {"version":3,"file":"validation.cjs","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Struct, StructError } from '@metamask/superstruct';\nimport {\n assert,\n boolean,\n define,\n enums,\n func,\n number,\n object,\n optional,\n refine,\n string,\n} from '@metamask/superstruct';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport { EMPTY_BYTES } from '../constants.js';\nimport type {\n PrepareUserOperationResponse,\n SignUserOperationResponse,\n UpdateUserOperationResponse,\n} from '../types.js';\nimport type {\n AddUserOperationOptions,\n AddUserOperationRequest,\n} from '../UserOperationController.js';\n\n/**\n * Validate a request to add a user operation.\n *\n * @param request - The request to validate.\n */\nexport function validateAddUserOperationRequest(\n request: AddUserOperationRequest,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidRequest = object({\n data: optional(HexOrEmptyBytes),\n from: Hex,\n maxFeePerGas: optional(Hex),\n maxPriorityFeePerGas: optional(Hex),\n to: optional(Hex),\n value: optional(Hex),\n });\n\n validate(request, ValidRequest, 'Invalid request to add user operation');\n}\n\n/**\n * Validate the options when adding a user operation.\n *\n * @param options - The options to validate.\n */\nexport function validateAddUserOperationOptions(\n options: AddUserOperationOptions,\n) {\n const ValidOptions = object({\n networkClientId: string(),\n origin: string(),\n requireApproval: optional(boolean()),\n smartContractAccount: optional(\n object({\n prepareUserOperation: func(),\n updateUserOperation: func(),\n signUserOperation: func(),\n }),\n ),\n swaps: optional(\n object({\n approvalTxId: optional(string()),\n destinationTokenAddress: optional(string()),\n destinationTokenDecimals: optional(number()),\n destinationTokenSymbol: optional(string()),\n estimatedBaseFee: optional(string()),\n sourceTokenSymbol: optional(string()),\n swapMetaData: optional(object()),\n swapTokenValue: optional(string()),\n destinationTokenAmount: optional(string()),\n sourceTokenAddress: optional(string()),\n sourceTokenAmount: optional(string()),\n sourceTokenDecimals: optional(number()),\n swapAndSendRecipient: optional(string()),\n }),\n ),\n type: optional(enums(Object.values(TransactionType))),\n });\n\n validate(options, ValidOptions, 'Invalid options to add user operation');\n}\n\n/**\n * Validate the response from a smart contract account when preparing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validatePrepareUserOperationResponse(\n response: PrepareUserOperationResponse,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidResponse = refine(\n object({\n bundler: string(),\n callData: Hex,\n dummyPaymasterAndData: optional(HexOrEmptyBytes),\n dummySignature: optional(HexOrEmptyBytes),\n gas: optional(\n object({\n callGasLimit: Hex,\n preVerificationGas: Hex,\n verificationGasLimit: Hex,\n }),\n ),\n initCode: optional(HexOrEmptyBytes),\n nonce: Hex,\n sender: Hex,\n }),\n 'ValidPrepareUserOperationResponse',\n ({ gas, dummySignature }) => {\n if (!gas && (!dummySignature || dummySignature === EMPTY_BYTES)) {\n return 'Must specify dummySignature if not specifying gas';\n }\n\n /* istanbul ignore next */\n return true;\n },\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when preparing user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when updating the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateUpdateUserOperationResponse(\n response: UpdateUserOperationResponse,\n) {\n const ValidResponse = optional(\n object({\n paymasterAndData: optional(defineHexOrEmptyBytes()),\n callGasLimit: optional(defineHexOrEmptyBytes()),\n preVerificationGas: optional(defineHexOrEmptyBytes()),\n verificationGasLimit: optional(defineHexOrEmptyBytes()),\n }),\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when updating user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when signing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateSignUserOperationResponse(\n response: SignUserOperationResponse,\n) {\n const Hex = defineHex();\n\n const ValidResponse = object({\n signature: Hex,\n });\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when signing user operation',\n );\n}\n\n/**\n * Validate data against a struct.\n *\n * @param data - The data to validate.\n * @param struct - The struct to validate against.\n * @param message - The message to throw if validation fails.\n */\nfunction validate<T>(data: unknown, struct: Struct<T>, message: string) {\n try {\n assert(data, struct, message);\n } catch (error) {\n const causes = (error as StructError)\n .failures()\n .map((failure) => {\n if (!failure.path.length) {\n return failure.message;\n }\n\n return `${failure.path.join('.')} - ${failure.message}`;\n })\n .join('\\n');\n\n const finalMessage = `${message}\\n${causes}`;\n\n throw new Error(finalMessage);\n }\n}\n\n/**\n * Define the Hex type used by superstruct.\n *\n * @returns The Hex superstruct type.\n */\nfunction defineHex() {\n return define<string>('Hexadecimal String', (value) =>\n isStrictHexString(value),\n );\n}\n\n/**\n * Define the HexOrEmptyBytes type used by superstruct.\n *\n * @returns The HexOrEmptyBytes superstruct type.\n */\nfunction defineHexOrEmptyBytes() {\n return define<string>(\n 'Hexadecimal String or 0x',\n (value) => isStrictHexString(value) || value === EMPTY_BYTES,\n );\n}\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"validation.d.cts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC5B,qBAAiB;AAClB,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,uCAAmC;AAEpC;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAejC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAkCjC;AAED;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,4BAA4B,QAsCvC;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,2BAA2B,QAgBtC;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,QAapC"}
1
+ {"version":3,"file":"validation.d.cts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC5B,qBAAoB;AACrB,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,uCAAsC;AAEvC;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAejC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAkCjC;AAED;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,4BAA4B,QAsCvC;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,2BAA2B,QAgBtC;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,QAapC"}
@@ -1 +1 @@
1
- {"version":3,"file":"validation.d.mts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC5B,qBAAiB;AAClB,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,uCAAmC;AAEpC;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAejC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAkCjC;AAED;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,4BAA4B,QAsCvC;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,2BAA2B,QAgBtC;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,QAapC"}
1
+ {"version":3,"file":"validation.d.mts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC5B,qBAAoB;AACrB,OAAO,KAAK,EACV,uBAAuB,EACvB,uBAAuB,EACxB,uCAAsC;AAEvC;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAejC;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,QAkCjC;AAED;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,4BAA4B,QAsCvC;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,2BAA2B,QAgBtC;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,QAapC"}
@@ -1 +1 @@
1
- {"version":3,"file":"validation.mjs","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Struct, StructError } from '@metamask/superstruct';\nimport {\n assert,\n boolean,\n define,\n enums,\n func,\n number,\n object,\n optional,\n refine,\n string,\n} from '@metamask/superstruct';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport { EMPTY_BYTES } from '../constants';\nimport type {\n PrepareUserOperationResponse,\n SignUserOperationResponse,\n UpdateUserOperationResponse,\n} from '../types';\nimport type {\n AddUserOperationOptions,\n AddUserOperationRequest,\n} from '../UserOperationController';\n\n/**\n * Validate a request to add a user operation.\n *\n * @param request - The request to validate.\n */\nexport function validateAddUserOperationRequest(\n request: AddUserOperationRequest,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidRequest = object({\n data: optional(HexOrEmptyBytes),\n from: Hex,\n maxFeePerGas: optional(Hex),\n maxPriorityFeePerGas: optional(Hex),\n to: optional(Hex),\n value: optional(Hex),\n });\n\n validate(request, ValidRequest, 'Invalid request to add user operation');\n}\n\n/**\n * Validate the options when adding a user operation.\n *\n * @param options - The options to validate.\n */\nexport function validateAddUserOperationOptions(\n options: AddUserOperationOptions,\n) {\n const ValidOptions = object({\n networkClientId: string(),\n origin: string(),\n requireApproval: optional(boolean()),\n smartContractAccount: optional(\n object({\n prepareUserOperation: func(),\n updateUserOperation: func(),\n signUserOperation: func(),\n }),\n ),\n swaps: optional(\n object({\n approvalTxId: optional(string()),\n destinationTokenAddress: optional(string()),\n destinationTokenDecimals: optional(number()),\n destinationTokenSymbol: optional(string()),\n estimatedBaseFee: optional(string()),\n sourceTokenSymbol: optional(string()),\n swapMetaData: optional(object()),\n swapTokenValue: optional(string()),\n destinationTokenAmount: optional(string()),\n sourceTokenAddress: optional(string()),\n sourceTokenAmount: optional(string()),\n sourceTokenDecimals: optional(number()),\n swapAndSendRecipient: optional(string()),\n }),\n ),\n type: optional(enums(Object.values(TransactionType))),\n });\n\n validate(options, ValidOptions, 'Invalid options to add user operation');\n}\n\n/**\n * Validate the response from a smart contract account when preparing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validatePrepareUserOperationResponse(\n response: PrepareUserOperationResponse,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidResponse = refine(\n object({\n bundler: string(),\n callData: Hex,\n dummyPaymasterAndData: optional(HexOrEmptyBytes),\n dummySignature: optional(HexOrEmptyBytes),\n gas: optional(\n object({\n callGasLimit: Hex,\n preVerificationGas: Hex,\n verificationGasLimit: Hex,\n }),\n ),\n initCode: optional(HexOrEmptyBytes),\n nonce: Hex,\n sender: Hex,\n }),\n 'ValidPrepareUserOperationResponse',\n ({ gas, dummySignature }) => {\n if (!gas && (!dummySignature || dummySignature === EMPTY_BYTES)) {\n return 'Must specify dummySignature if not specifying gas';\n }\n\n /* istanbul ignore next */\n return true;\n },\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when preparing user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when updating the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateUpdateUserOperationResponse(\n response: UpdateUserOperationResponse,\n) {\n const ValidResponse = optional(\n object({\n paymasterAndData: optional(defineHexOrEmptyBytes()),\n callGasLimit: optional(defineHexOrEmptyBytes()),\n preVerificationGas: optional(defineHexOrEmptyBytes()),\n verificationGasLimit: optional(defineHexOrEmptyBytes()),\n }),\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when updating user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when signing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateSignUserOperationResponse(\n response: SignUserOperationResponse,\n) {\n const Hex = defineHex();\n\n const ValidResponse = object({\n signature: Hex,\n });\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when signing user operation',\n );\n}\n\n/**\n * Validate data against a struct.\n *\n * @param data - The data to validate.\n * @param struct - The struct to validate against.\n * @param message - The message to throw if validation fails.\n */\nfunction validate<T>(data: unknown, struct: Struct<T>, message: string) {\n try {\n assert(data, struct, message);\n } catch (error) {\n const causes = (error as StructError)\n .failures()\n .map((failure) => {\n if (!failure.path.length) {\n return failure.message;\n }\n\n return `${failure.path.join('.')} - ${failure.message}`;\n })\n .join('\\n');\n\n const finalMessage = `${message}\\n${causes}`;\n\n throw new Error(finalMessage);\n }\n}\n\n/**\n * Define the Hex type used by superstruct.\n *\n * @returns The Hex superstruct type.\n */\nfunction defineHex() {\n return define<string>('Hexadecimal String', (value) =>\n isStrictHexString(value),\n );\n}\n\n/**\n * Define the HexOrEmptyBytes type used by superstruct.\n *\n * @returns The HexOrEmptyBytes superstruct type.\n */\nfunction defineHexOrEmptyBytes() {\n return define<string>(\n 'Hexadecimal String or 0x',\n (value) => isStrictHexString(value) || value === EMPTY_BYTES,\n );\n}\n"]}
1
+ {"version":3,"file":"validation.mjs","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,OAAO,EACP,MAAM,EACN,KAAK,EACL,IAAI,EACJ,MAAM,EACN,MAAM,EACN,QAAQ,EACR,MAAM,EACN,MAAM,EACP,8BAA8B;AAC/B,OAAO,EAAE,eAAe,EAAE,yCAAyC;AACnE,OAAO,EAAE,iBAAiB,EAAE,wBAAwB;AAEpD,OAAO,EAAE,WAAW,EAAE,yBAAwB;AAW9C;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,OAAgC;IAEhC,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;IACxB,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAEhD,MAAM,YAAY,GAAG,MAAM,CAAC;QAC1B,IAAI,EAAE,QAAQ,CAAC,eAAe,CAAC;QAC/B,IAAI,EAAE,GAAG;QACT,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC;QAC3B,oBAAoB,EAAE,QAAQ,CAAC,GAAG,CAAC;QACnC,EAAE,EAAE,QAAQ,CAAC,GAAG,CAAC;QACjB,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;KACrB,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,uCAAuC,CAAC,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,OAAgC;IAEhC,MAAM,YAAY,GAAG,MAAM,CAAC;QAC1B,eAAe,EAAE,MAAM,EAAE;QACzB,MAAM,EAAE,MAAM,EAAE;QAChB,eAAe,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;QACpC,oBAAoB,EAAE,QAAQ,CAC5B,MAAM,CAAC;YACL,oBAAoB,EAAE,IAAI,EAAE;YAC5B,mBAAmB,EAAE,IAAI,EAAE;YAC3B,iBAAiB,EAAE,IAAI,EAAE;SAC1B,CAAC,CACH;QACD,KAAK,EAAE,QAAQ,CACb,MAAM,CAAC;YACL,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAChC,uBAAuB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3C,wBAAwB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC5C,sBAAsB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1C,gBAAgB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACpC,iBAAiB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,YAAY,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAChC,cAAc,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClC,sBAAsB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1C,kBAAkB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACtC,iBAAiB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,mBAAmB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvC,oBAAoB,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;SACzC,CAAC,CACH;QACD,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;KACtD,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,uCAAuC,CAAC,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oCAAoC,CAClD,QAAsC;IAEtC,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;IACxB,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAEhD,MAAM,aAAa,GAAG,MAAM,CAC1B,MAAM,CAAC;QACL,OAAO,EAAE,MAAM,EAAE;QACjB,QAAQ,EAAE,GAAG;QACb,qBAAqB,EAAE,QAAQ,CAAC,eAAe,CAAC;QAChD,cAAc,EAAE,QAAQ,CAAC,eAAe,CAAC;QACzC,GAAG,EAAE,QAAQ,CACX,MAAM,CAAC;YACL,YAAY,EAAE,GAAG;YACjB,kBAAkB,EAAE,GAAG;YACvB,oBAAoB,EAAE,GAAG;SAC1B,CAAC,CACH;QACD,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAAC;QACnC,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,GAAG;KACZ,CAAC,EACF,mCAAmC,EACnC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE;QAC1B,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,cAAc,IAAI,cAAc,KAAK,WAAW,CAAC,EAAE,CAAC;YAChE,OAAO,mDAAmD,CAAC;QAC7D,CAAC;QAED,0BAA0B;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;IAEF,QAAQ,CACN,QAAQ,EACR,aAAa,EACb,gDAAgD,CACjD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mCAAmC,CACjD,QAAqC;IAErC,MAAM,aAAa,GAAG,QAAQ,CAC5B,MAAM,CAAC;QACL,gBAAgB,EAAE,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QACnD,YAAY,EAAE,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QAC/C,kBAAkB,EAAE,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QACrD,oBAAoB,EAAE,QAAQ,CAAC,qBAAqB,EAAE,CAAC;KACxD,CAAC,CACH,CAAC;IAEF,QAAQ,CACN,QAAQ,EACR,aAAa,EACb,+CAA+C,CAChD,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iCAAiC,CAC/C,QAAmC;IAEnC,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;IAExB,MAAM,aAAa,GAAG,MAAM,CAAC;QAC3B,SAAS,EAAE,GAAG;KACf,CAAC,CAAC;IAEH,QAAQ,CACN,QAAQ,EACR,aAAa,EACb,8CAA8C,CAC/C,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,QAAQ,CAAI,IAAa,EAAE,MAAiB,EAAE,OAAe;IACpE,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAI,KAAqB;aAClC,QAAQ,EAAE;aACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,OAAO,OAAO,CAAC,OAAO,CAAC;YACzB,CAAC;YAED,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1D,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,MAAM,YAAY,GAAG,GAAG,OAAO,KAAK,MAAM,EAAE,CAAC;QAE7C,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,SAAS;IAChB,OAAO,MAAM,CAAS,oBAAoB,EAAE,CAAC,KAAK,EAAE,EAAE,CACpD,iBAAiB,CAAC,KAAK,CAAC,CACzB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,qBAAqB;IAC5B,OAAO,MAAM,CACX,0BAA0B,EAC1B,CAAC,KAAK,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,WAAW,CAC7D,CAAC;AACJ,CAAC","sourcesContent":["import type { Struct, StructError } from '@metamask/superstruct';\nimport {\n assert,\n boolean,\n define,\n enums,\n func,\n number,\n object,\n optional,\n refine,\n string,\n} from '@metamask/superstruct';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport { isStrictHexString } from '@metamask/utils';\n\nimport { EMPTY_BYTES } from '../constants.js';\nimport type {\n PrepareUserOperationResponse,\n SignUserOperationResponse,\n UpdateUserOperationResponse,\n} from '../types.js';\nimport type {\n AddUserOperationOptions,\n AddUserOperationRequest,\n} from '../UserOperationController.js';\n\n/**\n * Validate a request to add a user operation.\n *\n * @param request - The request to validate.\n */\nexport function validateAddUserOperationRequest(\n request: AddUserOperationRequest,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidRequest = object({\n data: optional(HexOrEmptyBytes),\n from: Hex,\n maxFeePerGas: optional(Hex),\n maxPriorityFeePerGas: optional(Hex),\n to: optional(Hex),\n value: optional(Hex),\n });\n\n validate(request, ValidRequest, 'Invalid request to add user operation');\n}\n\n/**\n * Validate the options when adding a user operation.\n *\n * @param options - The options to validate.\n */\nexport function validateAddUserOperationOptions(\n options: AddUserOperationOptions,\n) {\n const ValidOptions = object({\n networkClientId: string(),\n origin: string(),\n requireApproval: optional(boolean()),\n smartContractAccount: optional(\n object({\n prepareUserOperation: func(),\n updateUserOperation: func(),\n signUserOperation: func(),\n }),\n ),\n swaps: optional(\n object({\n approvalTxId: optional(string()),\n destinationTokenAddress: optional(string()),\n destinationTokenDecimals: optional(number()),\n destinationTokenSymbol: optional(string()),\n estimatedBaseFee: optional(string()),\n sourceTokenSymbol: optional(string()),\n swapMetaData: optional(object()),\n swapTokenValue: optional(string()),\n destinationTokenAmount: optional(string()),\n sourceTokenAddress: optional(string()),\n sourceTokenAmount: optional(string()),\n sourceTokenDecimals: optional(number()),\n swapAndSendRecipient: optional(string()),\n }),\n ),\n type: optional(enums(Object.values(TransactionType))),\n });\n\n validate(options, ValidOptions, 'Invalid options to add user operation');\n}\n\n/**\n * Validate the response from a smart contract account when preparing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validatePrepareUserOperationResponse(\n response: PrepareUserOperationResponse,\n) {\n const Hex = defineHex();\n const HexOrEmptyBytes = defineHexOrEmptyBytes();\n\n const ValidResponse = refine(\n object({\n bundler: string(),\n callData: Hex,\n dummyPaymasterAndData: optional(HexOrEmptyBytes),\n dummySignature: optional(HexOrEmptyBytes),\n gas: optional(\n object({\n callGasLimit: Hex,\n preVerificationGas: Hex,\n verificationGasLimit: Hex,\n }),\n ),\n initCode: optional(HexOrEmptyBytes),\n nonce: Hex,\n sender: Hex,\n }),\n 'ValidPrepareUserOperationResponse',\n ({ gas, dummySignature }) => {\n if (!gas && (!dummySignature || dummySignature === EMPTY_BYTES)) {\n return 'Must specify dummySignature if not specifying gas';\n }\n\n /* istanbul ignore next */\n return true;\n },\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when preparing user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when updating the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateUpdateUserOperationResponse(\n response: UpdateUserOperationResponse,\n) {\n const ValidResponse = optional(\n object({\n paymasterAndData: optional(defineHexOrEmptyBytes()),\n callGasLimit: optional(defineHexOrEmptyBytes()),\n preVerificationGas: optional(defineHexOrEmptyBytes()),\n verificationGasLimit: optional(defineHexOrEmptyBytes()),\n }),\n );\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when updating user operation',\n );\n}\n\n/**\n * Validate the response from a smart contract account when signing the user operation.\n *\n * @param response - The response to validate.\n */\nexport function validateSignUserOperationResponse(\n response: SignUserOperationResponse,\n) {\n const Hex = defineHex();\n\n const ValidResponse = object({\n signature: Hex,\n });\n\n validate(\n response,\n ValidResponse,\n 'Invalid response when signing user operation',\n );\n}\n\n/**\n * Validate data against a struct.\n *\n * @param data - The data to validate.\n * @param struct - The struct to validate against.\n * @param message - The message to throw if validation fails.\n */\nfunction validate<T>(data: unknown, struct: Struct<T>, message: string) {\n try {\n assert(data, struct, message);\n } catch (error) {\n const causes = (error as StructError)\n .failures()\n .map((failure) => {\n if (!failure.path.length) {\n return failure.message;\n }\n\n return `${failure.path.join('.')} - ${failure.message}`;\n })\n .join('\\n');\n\n const finalMessage = `${message}\\n${causes}`;\n\n throw new Error(finalMessage);\n }\n}\n\n/**\n * Define the Hex type used by superstruct.\n *\n * @returns The Hex superstruct type.\n */\nfunction defineHex() {\n return define<string>('Hexadecimal String', (value) =>\n isStrictHexString(value),\n );\n}\n\n/**\n * Define the HexOrEmptyBytes type used by superstruct.\n *\n * @returns The HexOrEmptyBytes superstruct type.\n */\nfunction defineHexOrEmptyBytes() {\n return define<string>(\n 'Hexadecimal String or 0x',\n (value) => isStrictHexString(value) || value === EMPTY_BYTES,\n );\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@metamask-previews/user-operation-controller",
3
- "version": "41.2.7-preview-064aea96d",
3
+ "version": "41.2.7-preview-ec4680201",
4
4
  "description": "Creates user operations and manages their life cycle",
5
5
  "keywords": [
6
6
  "Ethereum",
@@ -46,8 +46,8 @@
46
46
  "changelog:validate": "../../scripts/validate-changelog.sh @metamask/user-operation-controller",
47
47
  "lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
48
48
  "lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
49
- "messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
50
- "messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
49
+ "messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
50
+ "messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
51
51
  "prepare-manifest:preview": "../../scripts/prepare-preview-manifest.sh",
52
52
  "since-latest-release": "../../scripts/since-latest-release.sh",
53
53
  "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
@@ -60,7 +60,7 @@
60
60
  "@metamask/base-controller": "^9.1.0",
61
61
  "@metamask/controller-utils": "^12.3.0",
62
62
  "@metamask/eth-query": "^4.0.0",
63
- "@metamask/gas-fee-controller": "^26.2.4",
63
+ "@metamask/gas-fee-controller": "^26.3.0",
64
64
  "@metamask/keyring-controller": "^27.1.0",
65
65
  "@metamask/messenger": "^2.0.0",
66
66
  "@metamask/network-controller": "^34.0.0",