@safe-global/safe-modules-deployments 1.2.0 → 2.1.1

package/src/assets/safe-4337-module/{v0.1.0 → v0.3.0}/safe-4337-module.json

@@ -1,11 +1,9 @@
 {
   "released": true,
   "contractName": "Safe4337Module",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "networkAddresses": {
-    "5": "0x39E54Bb2b3Aa444b4B39DEe15De3b7809c36Fc38",
-    "137": "0x39E54Bb2b3Aa444b4B39DEe15De3b7809c36Fc38",
-    "11155111": "0x39E54Bb2b3Aa444b4B39DEe15De3b7809c36Fc38"
+    "11155111": "0x75cf11467937ce3F2f357CE24ffc3DBF8fD5c226"
   },
   "abi": [
     {
@@ -19,6 +17,37 @@
       "stateMutability": "nonpayable",
       "type": "constructor"
     },
+    {
+      "inputs": [],
+      "name": "ExecutionFailed",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "InvalidCaller",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "InvalidEntryPoint",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "UnsupportedEntryPoint",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "selector",
+          "type": "bytes4"
+        }
+      ],
+      "name": "UnsupportedExecutionFunction",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "SUPPORTED_ENTRYPOINT",
@@ -38,7 +67,7 @@
       "outputs": [
         {
           "internalType": "bytes32",
-          "name": "",
+          "name": "domainSeparatorHash",
           "type": "bytes32"
         }
       ],
@@ -184,56 +213,63 @@
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "safe",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes",
-          "name": "callData",
-          "type": "bytes"
-        },
-        {
-          "internalType": "uint256",
-          "name": "nonce",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "preVerificationGas",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "verificationGasLimit",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "callGasLimit",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "maxFeePerGas",
-          "type": "uint256"
-        },
-        {
-          "internalType": "uint256",
-          "name": "maxPriorityFeePerGas",
-          "type": "uint256"
-        },
-        {
-          "internalType": "address",
-          "name": "entryPoint",
-          "type": "address"
+          "components": [
+            {
+              "internalType": "address",
+              "name": "sender",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "nonce",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes",
+              "name": "initCode",
+              "type": "bytes"
+            },
+            {
+              "internalType": "bytes",
+              "name": "callData",
+              "type": "bytes"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "accountGasLimits",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "uint256",
+              "name": "preVerificationGas",
+              "type": "uint256"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "gasFees",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bytes",
+              "name": "paymasterAndData",
+              "type": "bytes"
+            },
+            {
+              "internalType": "bytes",
+              "name": "signature",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct PackedUserOperation",
+          "name": "userOp",
+          "type": "tuple"
         }
       ],
       "name": "getOperationHash",
       "outputs": [
         {
           "internalType": "bytes32",
-          "name": "",
+          "name": "operationHash",
           "type": "bytes32"
         }
       ],
@@ -506,14 +542,9 @@
               "type": "bytes"
             },
             {
-              "internalType": "uint256",
-              "name": "callGasLimit",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "verificationGasLimit",
-              "type": "uint256"
+              "internalType": "bytes32",
+              "name": "accountGasLimits",
+              "type": "bytes32"
             },
             {
               "internalType": "uint256",
@@ -521,14 +552,9 @@
               "type": "uint256"
             },
             {
-              "internalType": "uint256",
-              "name": "maxFeePerGas",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "maxPriorityFeePerGas",
-              "type": "uint256"
+              "internalType": "bytes32",
+              "name": "gasFees",
+              "type": "bytes32"
             },
             {
               "internalType": "bytes",
@@ -541,7 +567,7 @@
               "type": "bytes"
             }
           ],
-          "internalType": "struct UserOperation",
+          "internalType": "struct PackedUserOperation",
           "name": "userOp",
           "type": "tuple"
         },

package/src/assets/safe-4337-module/{v0.1.0/add-modules-lib.json → v0.3.0/safe-module-setup.json}

@@ -1,11 +1,9 @@
 {
   "released": true,
-  "contractName": "AddModulesLib",
-  "version": "0.1.0",
+  "contractName": "SafeModuleSetup",
+  "version": "0.3.0",
   "networkAddresses": {
-    "5": "0x191EFDC03615B575922289DC339F4c70aC5C30Af",
-    "137": "0x191EFDC03615B575922289DC339F4c70aC5C30Af",
-    "11155111": "0x191EFDC03615B575922289DC339F4c70aC5C30Af"
+    "11155111": "0x2dd68b007B46fBe91B9A7c3EDa5A7a1063cB5b47"
   },
   "abi": [
     {

package/src/safe-4337-module.ts

@@ -1,16 +1,23 @@
-import Safe4337Module010 from './assets/safe-4337-module/v0.1.0/safe-4337-module.json';
-import AddModulesLib010 from './assets/safe-4337-module/v0.1.0/add-modules-lib.json';
+import Safe4337Module030 from './assets/safe-4337-module/v0.3.0/safe-4337-module.json';
+import Safe4337Module020 from './assets/safe-4337-module/v0.2.0/safe-4337-module.json';
+import SafeModuleSetup030 from './assets/safe-4337-module/v0.3.0/safe-module-setup.json';
+import AddModulesLib020 from './assets/safe-4337-module/v0.2.0/add-modules-lib.json';
 import { DeploymentFilter, Deployment } from './types';
 import { applyFilterDefaults, findDeployment } from './utils';
 
 // The array should be sorted from the latest version to the oldest.
-const SAFE_4337_MODULE_DEPLOYMENTS: Deployment[] = [Safe4337Module010];
-const ADD_MODULES_LIB_DEPLOYMENTS: Deployment[] = [AddModulesLib010];
+const SAFE_4337_MODULE_DEPLOYMENTS: Deployment[] = [Safe4337Module030, Safe4337Module020];
+const SAFE_MODULE_SETUP_DEPLOYMENTS: Deployment[] = [SafeModuleSetup030, AddModulesLib020];
 
 export const getSafe4337ModuleDeployment = (filter?: DeploymentFilter): Deployment | undefined => {
   return findDeployment(applyFilterDefaults(filter), SAFE_4337_MODULE_DEPLOYMENTS);
 };
 
-export const getAddModulesLibDeployment = (filter?: DeploymentFilter): Deployment | undefined => {
-  return findDeployment(applyFilterDefaults(filter), ADD_MODULES_LIB_DEPLOYMENTS);
+export const getSafeModuleSetupDeployment = (filter?: DeploymentFilter): Deployment | undefined => {
+  return findDeployment(applyFilterDefaults(filter), SAFE_MODULE_SETUP_DEPLOYMENTS);
 };
+
+// From v0.2 to v0.3, the `AddModulesLib` contract was renamed to `SafeModuleSetup` while preserving
+// its interface and functionality. As such, we consider both contracts to be the same with respect
+// to deployments, and expose an alias for the `AddModulesLib` name for backwards compatibility.
+export const getAddModulesLibDeployment = getSafeModuleSetupDeployment;