@0xsequence/account 2.2.4 → 2.2.6

package/dist/0xsequence-account.cjs.dev.js

@@ -442,13 +442,46 @@ class Account {
     return bundles;
   }
   async predecorateTransactions(txs, status, chainId) {
+    txs = Array.isArray(txs) ? txs : [txs];
     // if onchain wallet config is not up to date
     // then we should append an extra transaction that updates it
     // to the latest "lazy" state
     if (status.onChain.imageHash !== status.imageHash) {
       const wallet = this.walletForStatus(chainId, status);
       const updateConfig = await wallet.buildUpdateConfigurationTransaction(status.config);
-      return [Array.isArray(txs) ? txs : [txs], updateConfig.transactions].flat();
+      txs = [...txs, ...updateConfig.transactions];
+    }
+
+    // On immutable chains, we add the WalletProxyHook
+    const {
+      proxyImplementationHook
+    } = this.contexts[status.config.version];
+    if (proxyImplementationHook && (chainId === network.ChainId.IMMUTABLE_ZKEVM || chainId === network.ChainId.IMMUTABLE_ZKEVM_TESTNET)) {
+      const provider = this.providerFor(chainId);
+      if (provider) {
+        const hook = new ethers.ethers.Contract(this.address, abi.walletContracts.walletProxyHook.abi, provider);
+        let implementation;
+        try {
+          implementation = await hook.PROXY_getImplementation();
+        } catch (e) {
+          // Handle below
+          console.log('Error getting implementation address', e);
+        }
+        if (!implementation || implementation === ethers.ethers.ZeroAddress) {
+          console.log('Adding wallet proxy hook');
+          const hooksInterface = new ethers.ethers.Interface(abi.walletContracts.moduleHooks.abi);
+          const tx = {
+            to: this.address,
+            data: hooksInterface.encodeFunctionData(hooksInterface.getFunction('addHook'), ['0x90611127', proxyImplementationHook]),
+            gasLimit: 50000,
+            // Expected ~28k gas. Buffer added
+            delegateCall: false,
+            revertOnError: false,
+            value: 0
+          };
+          txs = [tx, ...txs];
+        }
+      }
     }
     return txs;
   }

package/dist/0xsequence-account.cjs.prod.js

@@ -442,13 +442,46 @@ class Account {
     return bundles;
   }
   async predecorateTransactions(txs, status, chainId) {
+    txs = Array.isArray(txs) ? txs : [txs];
     // if onchain wallet config is not up to date
     // then we should append an extra transaction that updates it
     // to the latest "lazy" state
     if (status.onChain.imageHash !== status.imageHash) {
       const wallet = this.walletForStatus(chainId, status);
       const updateConfig = await wallet.buildUpdateConfigurationTransaction(status.config);
-      return [Array.isArray(txs) ? txs : [txs], updateConfig.transactions].flat();
+      txs = [...txs, ...updateConfig.transactions];
+    }
+
+    // On immutable chains, we add the WalletProxyHook
+    const {
+      proxyImplementationHook
+    } = this.contexts[status.config.version];
+    if (proxyImplementationHook && (chainId === network.ChainId.IMMUTABLE_ZKEVM || chainId === network.ChainId.IMMUTABLE_ZKEVM_TESTNET)) {
+      const provider = this.providerFor(chainId);
+      if (provider) {
+        const hook = new ethers.ethers.Contract(this.address, abi.walletContracts.walletProxyHook.abi, provider);
+        let implementation;
+        try {
+          implementation = await hook.PROXY_getImplementation();
+        } catch (e) {
+          // Handle below
+          console.log('Error getting implementation address', e);
+        }
+        if (!implementation || implementation === ethers.ethers.ZeroAddress) {
+          console.log('Adding wallet proxy hook');
+          const hooksInterface = new ethers.ethers.Interface(abi.walletContracts.moduleHooks.abi);
+          const tx = {
+            to: this.address,
+            data: hooksInterface.encodeFunctionData(hooksInterface.getFunction('addHook'), ['0x90611127', proxyImplementationHook]),
+            gasLimit: 50000,
+            // Expected ~28k gas. Buffer added
+            delegateCall: false,
+            revertOnError: false,
+            value: 0
+          };
+          txs = [tx, ...txs];
+        }
+      }
     }
     return txs;
   }

package/dist/0xsequence-account.esm.js

@@ -438,13 +438,46 @@ class Account {
     return bundles;
   }
   async predecorateTransactions(txs, status, chainId) {
+    txs = Array.isArray(txs) ? txs : [txs];
     // if onchain wallet config is not up to date
     // then we should append an extra transaction that updates it
     // to the latest "lazy" state
     if (status.onChain.imageHash !== status.imageHash) {
       const wallet = this.walletForStatus(chainId, status);
       const updateConfig = await wallet.buildUpdateConfigurationTransaction(status.config);
-      return [Array.isArray(txs) ? txs : [txs], updateConfig.transactions].flat();
+      txs = [...txs, ...updateConfig.transactions];
+    }
+
+    // On immutable chains, we add the WalletProxyHook
+    const {
+      proxyImplementationHook
+    } = this.contexts[status.config.version];
+    if (proxyImplementationHook && (chainId === ChainId.IMMUTABLE_ZKEVM || chainId === ChainId.IMMUTABLE_ZKEVM_TESTNET)) {
+      const provider = this.providerFor(chainId);
+      if (provider) {
+        const hook = new ethers.Contract(this.address, walletContracts.walletProxyHook.abi, provider);
+        let implementation;
+        try {
+          implementation = await hook.PROXY_getImplementation();
+        } catch (e) {
+          // Handle below
+          console.log('Error getting implementation address', e);
+        }
+        if (!implementation || implementation === ethers.ZeroAddress) {
+          console.log('Adding wallet proxy hook');
+          const hooksInterface = new ethers.Interface(walletContracts.moduleHooks.abi);
+          const tx = {
+            to: this.address,
+            data: hooksInterface.encodeFunctionData(hooksInterface.getFunction('addHook'), ['0x90611127', proxyImplementationHook]),
+            gasLimit: 50000,
+            // Expected ~28k gas. Buffer added
+            delegateCall: false,
+            revertOnError: false,
+            value: 0
+          };
+          txs = [tx, ...txs];
+        }
+      }
     }
     return txs;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/account",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "tools for migrating sequence wallets to new versions",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/account",
   "source": "src/index.ts",
@@ -12,21 +12,21 @@
     "ethers": ">=6"
   },
   "dependencies": {
-    "@0xsequence/abi": "2.2.4",
-    "@0xsequence/core": "2.2.4",
-    "@0xsequence/migration": "2.2.4",
-    "@0xsequence/network": "2.2.4",
-    "@0xsequence/relayer": "2.2.4",
-    "@0xsequence/sessions": "2.2.4",
-    "@0xsequence/utils": "2.2.4",
-    "@0xsequence/wallet": "2.2.4"
+    "@0xsequence/core": "2.2.6",
+    "@0xsequence/relayer": "2.2.6",
+    "@0xsequence/network": "2.2.6",
+    "@0xsequence/sessions": "2.2.6",
+    "@0xsequence/migration": "2.2.6",
+    "@0xsequence/wallet": "2.2.6",
+    "@0xsequence/abi": "2.2.6",
+    "@0xsequence/utils": "2.2.6"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "ethers": "6.13.4",
     "nyc": "^15.1.0",
-    "@0xsequence/signhub": "2.2.4",
-    "@0xsequence/tests": "2.2.4"
+    "@0xsequence/tests": "2.2.6",
+    "@0xsequence/signhub": "2.2.6"
   },
   "files": [
     "src",

package/src/account.ts

@@ -402,13 +402,46 @@ export class Account {
     status: AccountStatus,
     chainId: ethers.BigNumberish
   ): Promise<commons.transaction.Transactionish> {
+    txs = Array.isArray(txs) ? txs : [txs]
     // if onchain wallet config is not up to date
     // then we should append an extra transaction that updates it
     // to the latest "lazy" state
     if (status.onChain.imageHash !== status.imageHash) {
       const wallet = this.walletForStatus(chainId, status)
       const updateConfig = await wallet.buildUpdateConfigurationTransaction(status.config)
-      return [Array.isArray(txs) ? txs : [txs], updateConfig.transactions].flat()
+      txs = [...txs, ...updateConfig.transactions]
+    }
+
+    // On immutable chains, we add the WalletProxyHook
+    const { proxyImplementationHook } = this.contexts[status.config.version]
+    if (proxyImplementationHook && (chainId === ChainId.IMMUTABLE_ZKEVM || chainId === ChainId.IMMUTABLE_ZKEVM_TESTNET)) {
+      const provider = this.providerFor(chainId)
+      if (provider) {
+        const hook = new ethers.Contract(this.address, walletContracts.walletProxyHook.abi, provider)
+        let implementation
+        try {
+          implementation = await hook.PROXY_getImplementation()
+        } catch (e) {
+          // Handle below
+          console.log('Error getting implementation address', e)
+        }
+        if (!implementation || implementation === ethers.ZeroAddress) {
+          console.log('Adding wallet proxy hook')
+          const hooksInterface = new ethers.Interface(walletContracts.moduleHooks.abi)
+          const tx: commons.transaction.Transaction = {
+            to: this.address,
+            data: hooksInterface.encodeFunctionData(hooksInterface.getFunction('addHook')!, [
+              '0x90611127',
+              proxyImplementationHook
+            ]),
+            gasLimit: 50000, // Expected ~28k gas. Buffer added
+            delegateCall: false,
+            revertOnError: false,
+            value: 0
+          }
+          txs = [tx, ...txs]
+        }
+      }
     }
 
     return txs