Add support for ApprovalRevocationEnforcer

packages/7715-permission-types/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- New permission type `token-approval-revocation` ([#232](https://github.com/MetaMask/smart-accounts-kit/pull/232))
+
+### Deprecated
+
+- Deprecated `erc20-token-revocation` in favor of `token-approval-revocation`.
+
 ## [0.6.0]
 
 ### Added

packages/7715-permission-types/src/index.ts

@@ -10,6 +10,7 @@ export type {
   Erc20TokenPeriodicPermission,
   Erc20TokenAllowancePermission,
   Erc20TokenRevocationPermission,
+  TokenApprovalRevocationPermission,
   Rule,
   PermissionRequest,
   PermissionResponse,

packages/7715-permission-types/src/types.ts

@@ -171,12 +171,32 @@ export type Erc20TokenAllowancePermission = BasePermission & {
 
 /**
  * A permission to revoke an ERC20 token allowance.
+ *
+ * @deprecated Use {@link TokenApprovalRevocationPermission} instead.
  */
 export type Erc20TokenRevocationPermission = BasePermission & {
+  /**
+   * @deprecated Use `token-approval-revocation` instead.
+   */
   type: 'erc20-token-revocation';
   data: MetaMaskBasePermissionData;
 };
 
+/**
+ * A permission to revoke token approvals.
+ */
+export type TokenApprovalRevocationPermission = BasePermission & {
+  type: 'token-approval-revocation';
+  data: MetaMaskBasePermissionData & {
+    erc20Approve: boolean;
+    erc721Approve: boolean;
+    erc721SetApprovalForAll: boolean;
+    permit2ApproveZero: boolean;
+    permit2Lockdown: boolean;
+    permit2InvalidateNonces: boolean;
+  };
+};
+
 /**
  * A custom permission.
  *
@@ -198,7 +218,8 @@ export type PermissionTypes =
   | Erc20TokenStreamPermission
   | Erc20TokenPeriodicPermission
   | Erc20TokenAllowancePermission
-  | Erc20TokenRevocationPermission;
+  | Erc20TokenRevocationPermission
+  | TokenApprovalRevocationPermission;
 
 // //////////////////////////////////////////////////
 // Permission Requests

packages/delegation-abis/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Abis for `ApprovalRevocationEnforcer` ([#226](https://github.com/metamask/smart-accounts-kit/pull/226))
+
 ## [1.0.0]
 
 ### Changed

packages/delegation-abis/src/abis/ApprovalRevocationEnforcer.ts

@@ -0,0 +1,174 @@
+export const abi = [
+  {
+    "type": "function",
+    "name": "afterAllHook",
+    "inputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "ModeCode"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
+  {
+    "type": "function",
+    "name": "afterHook",
+    "inputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "ModeCode"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
+  {
+    "type": "function",
+    "name": "beforeAllHook",
+    "inputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "ModeCode"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
+  {
+    "type": "function",
+    "name": "beforeHook",
+    "inputs": [
+      {
+        "name": "_terms",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "_mode",
+        "type": "bytes32",
+        "internalType": "ModeCode"
+      },
+      {
+        "name": "_executionCallData",
+        "type": "bytes",
+        "internalType": "bytes"
+      },
+      {
+        "name": "",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      },
+      {
+        "name": "_delegator",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "view"
+  }
+] as const;

packages/delegation-abis/src/bytecode.ts

@@ -2,6 +2,7 @@ export { bytecode as Address } from './bytecode/Address';
 export { bytecode as AllowedCalldataEnforcer } from './bytecode/AllowedCalldataEnforcer';
 export { bytecode as AllowedMethodsEnforcer } from './bytecode/AllowedMethodsEnforcer';
 export { bytecode as AllowedTargetsEnforcer } from './bytecode/AllowedTargetsEnforcer';
+export { bytecode as ApprovalRevocationEnforcer } from './bytecode/ApprovalRevocationEnforcer';
 export { bytecode as ArgsEqualityCheckEnforcer } from './bytecode/ArgsEqualityCheckEnforcer';
 export { bytecode as Base64 } from './bytecode/Base64';
 export { bytecode as Base64URL } from './bytecode/Base64URL';

packages/delegation-abis/src/bytecode/ApprovalRevocationEnforcer.ts

@@ -0,0 +1 @@
+export const bytecode = '0x608060405234801561001057600080fd5b50610f82806100206000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c8063414c3e3314610051578063a145832a1461006d578063d3eddcc514610051578063ed46336714610051575b600080fd5b61006b61005f366004610bff565b50505050505050505050565b005b61006b61007b366004610bff565b85610087816000610617565b6100d85760405162461bcd60e51b815260206004820181905260248201527f436176656174456e666f726365723a696e76616c69642d63616c6c2d7479706560448201526064015b60405180910390fd5b86600881901b6100e9816000610617565b6101435760405162461bcd60e51b815260206004820152602560248201527f436176656174456e666f726365723a696e76616c69642d657865637574696f6e6044820152642d7479706560d81b60648201526084016100cf565b5060006101508d8d61062e565b90506000803660006101628c8c61075b565b9350935093509350826000146101b95760405162461bcd60e51b81526020600482015260286024820152600080516020610f2d83398151915260448201526769642d76616c756560c01b60648201526084016100cf565b60048110156101da5760405162461bcd60e51b81526004016100cf90610cd2565b60006101e96004828486610d13565b6101f291610d3d565b90506378ae83bb60e01b6001600160e01b0319821601610282576008861660000361026c5760405162461bcd60e51b81526020600482015260366024820152600080516020610f0d8339815191526044820152751d0c8b585c1c1c9bdd994b5b9bdd0b585b1b1bddd95960521b60648201526084016100cf565b6102778584846107ac565b505050505050610609565b6333acd78160e01b6001600160e01b031982160161033857601086166000036103015760405162461bcd60e51b81526020600482015260376024820152600080516020610f0d83398151915260448201527f74322d6c6f636b646f776e2d6e6f742d616c6c6f77656400000000000000000060648201526084016100cf565b6001600160a01b0385166e22d473030f116ddee9f6b43ac78ba3146102775760405162461bcd60e51b81526004016100cf90610d6d565b632689a37160e21b6001600160e01b03198216016103b95760208616600003610301576040805162461bcd60e51b8152602060048201526024810191909152600080516020610f0d83398151915260448201527f74322d696e76616c69646174652d6e6f6e6365732d6e6f742d616c6c6f77656460648201526084016100cf565b604482146103d95760405162461bcd60e51b81526004016100cf90610cd2565b635dd34b9b60e01b6001600160e01b0319821601610476576004861660000361046a5760405162461bcd60e51b815260206004820152603860248201527f417070726f76616c5265766f636174696f6e456e666f726365723a736574417060448201527f70726f76616c466f72416c6c2d6e6f742d616c6c6f776564000000000000000060648201526084016100cf565b6102778584848d6108fb565b63f6a1584d60e01b6001600160e01b03198216016105c157600061049e602460048587610d13565b6104a791610dac565b90506001600160a01b03811661053857600287166000036105285760405162461bcd60e51b815260206004820152603560248201527f417070726f76616c5265766f636174696f6e456e666f726365723a65726337326044820152740c4b585c1c1c9bdd994b5b9bdd0b585b1b1bddd959605a1b60648201526084016100cf565b610533868585610a25565b6105b5565b600187166000036105a85760405162461bcd60e51b815260206004820152603460248201527f417070726f76616c5265766f636174696f6e456e666f726365723a65726332306044820152730b585c1c1c9bdd994b5b9bdd0b585b1b1bddd95960621b60648201526084016100cf565b6105b58685858e85610ad9565b50505050505050610609565b60405162461bcd60e51b81526020600482015260296024820152600080516020610f2d8339815191526044820152681a590b5b595d1a1bd960ba1b60648201526084016100cf565b505050505050505050505050565b6001600160f81b0319828116908216145b92915050565b6000600182146106865760405162461bcd60e51b815260206004820152602f6024820152600080516020610f2d83398151915260448201526e0d2c85ae8cae4dae65ad8cadccee8d608b1b60648201526084016100cf565b8282600081811061069957610699610dca565b919091013560f81c915050600081900361070b5760405162461bcd60e51b815260206004820152602d60248201527f417070726f76616c5265766f636174696f6e456e666f726365723a6e6f2d6d6560448201526c1d1a1bd91ccb585b1b1bddd959609a1b60648201526084016100cf565b60c08116156106285760405162461bcd60e51b81526020600482015260286024820152600080516020610f2d83398151915260448201526769642d7465726d7360c01b60648201526084016100cf565b600080368161076d6014828789610d13565b61077691610de0565b60601c9350610789603460148789610d13565b61079291610dac565b92506107a18560348189610d13565b949793965094505050565b6001600160a01b0383166e22d473030f116ddee9f6b43ac78ba3146107e35760405162461bcd60e51b81526004016100cf90610d6d565b608481146108475760405162461bcd60e51b815260206004820152603b6024820152600080516020610f0d83398151915260448201527f74322d696e76616c69642d657865637574696f6e2d6c656e677468000000000060648201526084016100cf565b610855606460448385610d13565b61085e91610dac565b1561087b5760405162461bcd60e51b81526004016100cf90610e13565b610889608460648385610d13565b61089291610dac565b156108f65760405162461bcd60e51b815260206004820152602e60248201527f417070726f76616c5265766f636174696f6e456e666f726365723a6e6f6e2d7a60448201526d32b93796b2bc3834b930ba34b7b760911b60648201526084016100cf565b505050565b610909604460248486610d13565b61091291610dac565b156109735760405162461bcd60e51b815260206004820152602b60248201527f417070726f76616c5265766f636174696f6e456e666f726365723a6e6f742d6160448201526a16b932bb37b1b0ba34b7b760a91b60648201526084016100cf565b6000610983602460048587610d13565b61098c91610dac565b60405163e985e9c560e01b81526001600160a01b03848116600483015280831660248301529192509086169063e985e9c590604401602060405180830381865afa1580156109de573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a029190610e5d565b610a1e5760405162461bcd60e51b81526004016100cf90610e86565b5050505050565b6000610a35604460248486610d13565b610a3e91610dac565b60405163020604bf60e21b8152600481018290529091506000906001600160a01b0386169063081812fc90602401602060405180830381865afa158015610a89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aad9190610ed6565b6001600160a01b031603610ad35760405162461bcd60e51b81526004016100cf90610e86565b50505050565b610ae7604460248587610d13565b610af091610dac565b15610b0d5760405162461bcd60e51b81526004016100cf90610e13565b604051636eb1769f60e11b81526001600160a01b038381166004830152828116602483015286169063dd62ed3e90604401602060405180830381865afa158015610b5b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b7f9190610ef3565b600003610a1e5760405162461bcd60e51b81526004016100cf90610e86565b60008083601f840112610bb057600080fd5b50813567ffffffffffffffff811115610bc857600080fd5b602083019150836020828501011115610be057600080fd5b9250929050565b6001600160a01b0381168114610bfc57600080fd5b50565b60008060008060008060008060008060e08b8d031215610c1e57600080fd5b8a3567ffffffffffffffff80821115610c3657600080fd5b610c428e838f01610b9e565b909c509a5060208d0135915080821115610c5b57600080fd5b610c678e838f01610b9e565b909a50985060408d0135975060608d0135915080821115610c8757600080fd5b50610c948d828e01610b9e565b90965094505060808b0135925060a08b0135610caf81610be7565b915060c08b0135610cbf81610be7565b809150509295989b9194979a5092959850565b6020808252603390820152600080516020610f2d8339815191526040820152720d2c85acaf0cac6eae8d2dedc5ad8cadccee8d606b1b606082015260800190565b60008085851115610d2357600080fd5b83861115610d3057600080fd5b5050820193919092039150565b6001600160e01b03198135818116916004851015610d655780818660040360031b1b83161692505b505092915050565b6020808252603190820152600080516020610f2d8339815191526040820152701a590b5c195c9b5a5d0c8b5d185c99d95d607a1b606082015260800190565b8035602083101561062857600019602084900360031b1b1692915050565b634e487b7160e01b600052603260045260246000fd5b6bffffffffffffffffffffffff198135818116916014851015610d655760149490940360031b84901b1690921692915050565b6020808252602a908201527f417070726f76616c5265766f636174696f6e456e666f726365723a6e6f6e2d7a604082015269195c9bcb585b5bdd5b9d60b21b606082015260800190565b600060208284031215610e6f57600080fd5b81518015158114610e7f57600080fd5b9392505050565b60208082526030908201527f417070726f76616c5265766f636174696f6e456e666f726365723a6e6f2d617060408201526f70726f76616c2d746f2d7265766f6b6560801b606082015260800190565b600060208284031215610ee857600080fd5b8151610e7f81610be7565b600060208284031215610f0557600080fd5b505191905056fe417070726f76616c5265766f636174696f6e456e666f726365723a7065726d69417070726f76616c5265766f636174696f6e456e666f726365723a696e76616ca26469706673582212200b9b4fc3ceb80b33a7a3836360e7e30ce648157075b95685bdfd33482dcf19f764736f6c63430008170033' as const;

packages/delegation-abis/src/index.ts

@@ -2,6 +2,7 @@ export { abi as Address } from './abis/Address';
 export { abi as AllowedCalldataEnforcer } from './abis/AllowedCalldataEnforcer';
 export { abi as AllowedMethodsEnforcer } from './abis/AllowedMethodsEnforcer';
 export { abi as AllowedTargetsEnforcer } from './abis/AllowedTargetsEnforcer';
+export { abi as ApprovalRevocationEnforcer } from './abis/ApprovalRevocationEnforcer';
 export { abi as ArgsEqualityCheckEnforcer } from './abis/ArgsEqualityCheckEnforcer';
 export { abi as Base64 } from './abis/Base64';
 export { abi as Base64URL } from './abis/Base64URL';

packages/delegation-core/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Encoding and decoding utils for `ApprovalRevocationEnforcer` enforcer args and terms ([#226](https://github.com/metamask/smart-accounts-kit/pull/226))
+
 ## [2.1.0]
 
 ### Changed