fix: pin earlier version of thirdweb-dev/wallets (#452)

Author: arcoraven

package.json

@@ -45,7 +45,7 @@
     "@thirdweb-dev/chains": "^0.1.77",
     "@thirdweb-dev/sdk": "^4.0.46-nightly-3e7f9cb94-20240314012159",
     "@thirdweb-dev/service-utils": "0.4.17",
-    "@thirdweb-dev/wallets": "^2.4.21",
+    "@thirdweb-dev/wallets": "2.4.17",
     "@types/base-64": "^1.0.2",
     "base-64": "^1.0.0",
     "body-parser": "^1.20.2",

src/worker/tasks/processTx.ts

@@ -379,22 +379,26 @@ export const processTx = async () => {
         // 5. Send all user operations in parallel.
         const sentUserOps = userOpsToSend.map(async (tx) => {
           try {
-            const signer = (
-              await getSdk({
-                pgtx,
-                chainId: parseInt(tx.chainId!),
-                walletAddress: tx.signerAddress!,
-                accountAddress: tx.accountAddress!,
-              })
-            ).getSigner() as ERC4337EthersSigner;
+            const sdk = await getSdk({
+              pgtx,
+              chainId: parseInt(tx.chainId!),
+              walletAddress: tx.signerAddress!,
+              accountAddress: tx.accountAddress!,
+            });
+            const signer = sdk.getSigner() as ERC4337EthersSigner;
 
             const nonce = randomNonce();
-            const userOp = await signer.smartAccountAPI.createSignedUserOp({
-              target: tx.target || "",
-              data: tx.data || "0x",
-              value: tx.value ? BigNumber.from(tx.value) : undefined,
-              nonce,
-            });
+            const unsignedOp =
+              await signer.smartAccountAPI.createUnsignedUserOp(
+                signer.httpRpcClient,
+                {
+                  target: tx.target || "",
+                  data: tx.data || "0x",
+                  value: tx.value ? BigNumber.from(tx.value) : undefined,
+                  nonce,
+                },
+              );
+            const userOp = await signer.smartAccountAPI.signUserOp(unsignedOp);
             const userOpHash = await signer.smartAccountAPI.getUserOpHash(
               userOp,
             );

src/worker/tasks/updateMinedUserOps.ts

@@ -34,7 +34,6 @@ export const updateMinedUserOps = async () => {
                 walletAddress: userOp.signerAddress!,
                 accountAddress: userOp.accountAddress!,
               });
-
               const signer = sdk.getSigner() as ERC4337EthersSigner;
 
               const txHash = await signer.smartAccountAPI.getUserOpReceipt(

yarn.lock

@@ -1079,7 +1079,7 @@
     ethers "^5.7.2"
     node-fetch "^2.6.7"
 
-"@eth-optimism/sdk@3.2.2":
+"@eth-optimism/sdk@3.2.2", "@eth-optimism/sdk@^3.2.1":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@eth-optimism/sdk/-/sdk-3.2.2.tgz#732c2d6fde96a25303b3c5b39b3b3ed1f913d9aa"
   integrity sha512-P8YXAlh2lun0KZlwrw4FqmK4kNIoOOzI816XXhfkW3nMVADGRAru3TKSM74MgmEuyGiHrA9EoPRq1WLqUX4B0w==
@@ -3997,10 +3997,10 @@
   resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.67.tgz#e34a684c47f71187225e92beaf27d2477e3880bf"
   integrity sha512-mQ4P737lXNopB/WQgKq+t6LbsmxhKNNLgtPAiP9z3EoUlBTgDHWYRHi7DWNGqKhImV6ARr37pyp00ROe6TeEMg==
 
-"@thirdweb-dev/chains@0.1.79":
-  version "0.1.79"
-  resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.79.tgz#37708a9d870422812240221d9745b80febf6bab2"
-  integrity sha512-ue3Z1OhFgXD6uPdH1R5FAc5WUkIiYYOrUdnv3DIt6Nb3AL0e54OvQ29hxR6L108XRBZjcWpBE++02dnWUxKYBg==
+"@thirdweb-dev/chains@0.1.78":
+  version "0.1.78"
+  resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.78.tgz#480e61bfb3822c1d73702385dd9bfd9c2d95faa8"
+  integrity sha512-zXP+pymo1squvHyvwjtOlHYXDiaEBic0RIrfy/d6oP8Rhy4GIAG79knHD3hvvMDDIA48XkoGl3xyGMTan3skOw==
 
 "@thirdweb-dev/chains@0.1.79-nightly-3e7f9cb94-20240314012159":
   version "0.1.79-nightly-3e7f9cb94-20240314012159"
@@ -4099,13 +4099,13 @@
     yaml "^2.3.1"
     zod "^3.22.3"
 
-"@thirdweb-dev/sdk@4.0.46":
-  version "4.0.46"
-  resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-4.0.46.tgz#967de8bb01a72c0a356aea35ee029a5a9eb0dd2d"
-  integrity sha512-6GekTyR5fbOW6HT/atr0F7xEqceealUG8YmpbPGUsyAuBUObiWgNIv4w+KC74hFi111GQxLxuIjn8rYWd0XCPw==
+"@thirdweb-dev/sdk@4.0.42":
+  version "4.0.42"
+  resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-4.0.42.tgz#55d9968351c341fa710478add91b0a6f1b2e1672"
+  integrity sha512-LoJyM4iUbasWCC5C7XtHYqdr1GkqQJap0jgmf9IrPhHPZqZnWc209/TXtmL4FA1mBgPXSvLJpjimoJxsle9oog==
   dependencies:
-    "@eth-optimism/sdk" "3.2.2"
-    "@thirdweb-dev/chains" "0.1.79"
+    "@eth-optimism/sdk" "^3.2.1"
+    "@thirdweb-dev/chains" "0.1.78"
     "@thirdweb-dev/contracts-js" "1.3.16"
     "@thirdweb-dev/crypto" "0.2.1"
     "@thirdweb-dev/generated-abis" "0.0.1"
@@ -4175,10 +4175,10 @@
     form-data "^4.0.0"
     uuid "^9.0.1"
 
-"@thirdweb-dev/wallets@2.4.5":
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-2.4.5.tgz#b61f29ff5015192d11614facf00c58a86fb917e2"
-  integrity sha512-eSAvnFeuARnOcSwaqhfcuzAShfWHMmBukZWE/1766h0LB640RjLkzntnITOnEhg+z3zhCsC9zDq4w/wgra+Erw==
+"@thirdweb-dev/wallets@2.4.17":
+  version "2.4.17"
+  resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-2.4.17.tgz#f96fe5650269d11332d12eeb5372a6bd0c60905a"
+  integrity sha512-Cz8DkcXt+2Xh1b6IpqvZiykeIMHKJ7WUwfXu+vL2M8Ue2bJ334eshmTuZClJinf9jZ7ZLSbZaPuPR+Rf8ZlK4A==
   dependencies:
     "@account-abstraction/contracts" "^0.5.0"
     "@blocto/sdk" "^0.5.4"
@@ -4190,12 +4190,13 @@
     "@metamask/eth-sig-util" "^4.0.0"
     "@paperxyz/embedded-wallet-service-sdk" "^1.2.5"
     "@paperxyz/sdk-common-utilities" "^0.1.0"
-    "@safe-global/protocol-kit" "1.3.0"
+    "@safe-global/safe-core-sdk" "^3.3.4"
     "@safe-global/safe-ethers-adapters" "0.1.0-alpha.17"
-    "@thirdweb-dev/chains" "0.1.67"
+    "@safe-global/safe-ethers-lib" "^1.9.4"
+    "@thirdweb-dev/chains" "0.1.78"
     "@thirdweb-dev/contracts-js" "1.3.16"
-    "@thirdweb-dev/crypto" "0.2.0"
-    "@thirdweb-dev/sdk" "4.0.30"
+    "@thirdweb-dev/crypto" "0.2.1"
+    "@thirdweb-dev/sdk" "4.0.42"
     "@walletconnect/core" "^2.9.1"
     "@walletconnect/ethereum-provider" "^2.9.1"
     "@walletconnect/jsonrpc-utils" "^1.0.8"
@@ -4213,10 +4214,10 @@
     magic-sdk "^13.6.2"
     web3-core "1.5.2"
 
-"@thirdweb-dev/wallets@^2.4.21":
-  version "2.4.21"
-  resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-2.4.21.tgz#3a076687b209a10be732dc5518b9dbd104519adb"
-  integrity sha512-fUEBnia3JQ/apfLMUZuyjKKOZW7yEYuGv4mZvW4epd4pj48Orj2saZNcq1vyIHbJE1jgCYHWBM+MomG5ggBLGg==
+"@thirdweb-dev/wallets@2.4.5":
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/@thirdweb-dev/wallets/-/wallets-2.4.5.tgz#b61f29ff5015192d11614facf00c58a86fb917e2"
+  integrity sha512-eSAvnFeuARnOcSwaqhfcuzAShfWHMmBukZWE/1766h0LB640RjLkzntnITOnEhg+z3zhCsC9zDq4w/wgra+Erw==
   dependencies:
     "@account-abstraction/contracts" "^0.5.0"
     "@blocto/sdk" "^0.5.4"
@@ -4228,13 +4229,12 @@
     "@metamask/eth-sig-util" "^4.0.0"
     "@paperxyz/embedded-wallet-service-sdk" "^1.2.5"
     "@paperxyz/sdk-common-utilities" "^0.1.0"
-    "@safe-global/safe-core-sdk" "^3.3.4"
+    "@safe-global/protocol-kit" "1.3.0"
     "@safe-global/safe-ethers-adapters" "0.1.0-alpha.17"
-    "@safe-global/safe-ethers-lib" "^1.9.4"
-    "@thirdweb-dev/chains" "0.1.79"
+    "@thirdweb-dev/chains" "0.1.67"
     "@thirdweb-dev/contracts-js" "1.3.16"
-    "@thirdweb-dev/crypto" "0.2.1"
-    "@thirdweb-dev/sdk" "4.0.46"
+    "@thirdweb-dev/crypto" "0.2.0"
+    "@thirdweb-dev/sdk" "4.0.30"
     "@walletconnect/core" "^2.9.1"
     "@walletconnect/ethereum-provider" "^2.9.1"
     "@walletconnect/jsonrpc-utils" "^1.0.8"