thirdweb 5.90.0 → 5.90.2

package/dist/types/wallets/smart/lib/userop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userop.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAI1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEd,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAkCrB,eAAO,MAAM,qBAAqB,oBAAqB,gBAAgB,SAEtE,CAAC;AAMF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,OAAO,CAAC,kBAAkB,CAAC,CAc7B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,WAAW,EAAE,mBAAmB,CAAC;IACjC,eAAe,EAAE,gBAAgB,CAAC;IAClC,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;CAC7C,GAAG,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAqF/C;AAsVD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CA0C/C;AAkDD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,gDAiBA;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,gDAqEA"}
+{"version":3,"file":"userop.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/userop.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EACL,KAAK,gBAAgB,EAEtB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAC;AAI1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEd,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAkCrB,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,gBAAgB,SAEtE,CAAC;AAMF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACA,OAAO,CAAC,kBAAkB,CAAC,CAc7B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,WAAW,EAAE,mBAAmB,CAAC;IACjC,eAAe,EAAE,gBAAgB,CAAC;IAClC,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;CAC7C,GAAG,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CAqF/C;AA0VD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,KAAK,EAAE,KAAK,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,OAAO,CAAC;CACvB,GAAG,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,CA0C/C;AAkDD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,gDAiBA;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,gDAqEA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.90.0",
+  "version": "5.90.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -218,7 +218,7 @@
     "@radix-ui/react-focus-scope": "1.1.2",
     "@radix-ui/react-icons": "1.3.2",
     "@radix-ui/react-tooltip": "1.1.8",
-    "@tanstack/react-query": "5.66.9",
+    "@tanstack/react-query": "5.67.1",
     "@walletconnect/ethereum-provider": "2.17.5",
     "@walletconnect/sign-client": "2.17.5",
     "abitype": "1.0.8",
@@ -305,19 +305,19 @@
     "@aws-sdk/client-lambda": "3.592.0",
     "@aws-sdk/credential-providers": "3.592.0",
     "@biomejs/biome": "1.9.4",
-    "@chromatic-com/storybook": "3.2.4",
+    "@chromatic-com/storybook": "3.2.5",
     "@codspeed/vitest-plugin": "4.0.0",
     "@coinbase/wallet-mobile-sdk": "1.1.2",
     "@mobile-wallet-protocol/client": "0.1.2",
     "@react-native-async-storage/async-storage": "2.1.1",
     "@size-limit/preset-big-lib": "11.2.0",
-    "@storybook/addon-essentials": "8.6.0",
-    "@storybook/addon-interactions": "8.6.0",
-    "@storybook/addon-links": "8.6.0",
-    "@storybook/addon-onboarding": "8.6.0",
-    "@storybook/react": "8.6.0",
-    "@storybook/react-vite": "8.6.0",
-    "@storybook/test": "8.6.0",
+    "@storybook/addon-essentials": "8.6.3",
+    "@storybook/addon-interactions": "8.6.3",
+    "@storybook/addon-links": "8.6.3",
+    "@storybook/addon-onboarding": "8.6.3",
+    "@storybook/react": "8.6.3",
+    "@storybook/react-vite": "8.6.3",
+    "@storybook/test": "8.6.3",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@testing-library/user-event": "^14.6.1",
@@ -346,10 +346,10 @@
     "rimraf": "6.0.1",
     "sharp": "^0.33.5",
     "size-limit": "11.2.0",
-    "storybook": "8.6.0",
+    "storybook": "8.6.3",
     "typedoc": "0.27.9",
     "typedoc-better-json": "0.9.4",
-    "typescript": "5.7.3",
+    "typescript": "5.8.2",
     "vite": "6.2.0",
     "vitest": "3.0.7"
   },

package/src/contract/deployment/zksync/implementations.ts

@@ -6,7 +6,7 @@ export const ZKSYNC_IMPLEMENTATIONS: Record<number, Record<string, string>> = {
     MarketplaceV3: "0x8b0DBCf5b7D01eBB0F24525CE8AB72F16CE4F8C8",
   },
   [324]: {
-    MarketplaceV3: "0xBc02441a36Bb4029Cd191b20243c2e41B862F118",
+    MarketplaceV3: "0x88e7F2bEf0a23073b7Cc2c79D307Dbd9138Fa79c",
   },
   [11124]: {
     MarketplaceV3: "0x2dA4Dd326A6482679547071be21f74685d730504",
@@ -18,7 +18,7 @@ export const ZKSYNC_IMPLEMENTATIONS: Record<number, Record<string, string>> = {
     MarketplaceV3: "0x9EB0830B0b10010F2a53383517A7D0B75531Bb1b",
   },
   [2741]: {
-    MarketplaceV3: "0x4027561E163a420c4e5Db46E07EBd581CAa8Bb62",
+    MarketplaceV3: "0x4b14569c7B79DBe686Ac3Ba5996131E7EDaB7a93",
   },
 };
 

package/src/extensions/erc1155/drop1155.test.ts

@@ -17,10 +17,8 @@ import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value
 import { toEther } from "../../utils/units.js";
 import { generateMerkleTreeInfoERC1155 } from "../airdrop/write/merkleInfoERC1155.js";
 import { name } from "../common/read/name.js";
-import { deployERC20Contract } from "../prebuilts/deploy-erc20.js";
 import { deployERC1155Contract } from "../prebuilts/deploy-erc1155.js";
 import { balanceOf } from "./__generated__/IERC1155/read/balanceOf.js";
-import { totalSupply } from "./__generated__/IERC1155/read/totalSupply.js";
 import { nextTokenIdToMint } from "./__generated__/IERC1155Enumerable/read/nextTokenIdToMint.js";
 import { canClaim } from "./drops/read/canClaim.js";
 import { getActiveClaimCondition } from "./drops/read/getActiveClaimCondition.js";
@@ -472,63 +470,6 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(isGetNFTsSupported(selectors)).toBe(true);
     });
 
-    /**
-     * This is to document the behavior where one can claim without paying if the claiming address
-     * is the same as the PrimaryRecipientAddress, because of this Solidity code:
-     * ```solidity
-     * // CurrencyTransferLib.sol
-     * function safeTransferERC20(address _currency, address _from, address _to, uint256 _amount) internal {
-     *   if (_from == _to) {
-     *     return;
-     *   }
-     *   ...
-     * }
-     * ```
-     */
-    it("address that is the same with PrimaryFeeRecipient can claim without paying ERC20", async () => {
-      const tokenAddress = await deployERC20Contract({
-        client: TEST_CLIENT,
-        chain: ANVIL_CHAIN,
-        account: TEST_ACCOUNT_C,
-        type: "TokenERC20",
-        params: {
-          name: "token20",
-          contractURI: TEST_CONTRACT_URI,
-        },
-      });
-      const tokenId = 5n;
-      const setClaimTx = setClaimConditions({
-        contract,
-        tokenId,
-        phases: [
-          {
-            maxClaimableSupply: 100n,
-            maxClaimablePerWallet: 100n,
-            currencyAddress: tokenAddress,
-            price: 1000,
-            startTime: new Date(),
-          },
-        ],
-      });
-      await sendAndConfirmTransaction({
-        transaction: setClaimTx,
-        account: TEST_ACCOUNT_C,
-      });
-
-      const transaction = claimTo({
-        contract,
-        tokenId,
-        quantity: 50n,
-        to: TEST_ACCOUNT_C.address,
-      });
-      await sendAndConfirmTransaction({
-        transaction,
-        account: TEST_ACCOUNT_C,
-      });
-      const supplyCount = await totalSupply({ contract, id: tokenId });
-      expect(supplyCount).toBe(50n);
-    });
-
     it("getActiveClaimCondition should work", async () => {
       // Create a public allowlist claim phase
       const snapshot = [

package/src/gas/fee-data.ts

@@ -42,6 +42,7 @@ const FORCE_GAS_PRICE_CHAIN_IDS = [
   994873017, // Lumia Mainnet
   19011, // Homeverse Mainnet
   40875, // Homeverse Testnet
+  1511670449, // GPT Mainnet
 ];
 
 /**

package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx

@@ -654,6 +654,9 @@ function SelectedTokenInfo(props: {
             onChange={(e) => {
               let value = e.target.value;
 
+              // Replace comma with period if it exists
+              value = value.replace(",", ".");
+
               if (value.startsWith(".")) {
                 value = `0${value}`;
               }

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/BuyTokenInput.tsx

@@ -73,6 +73,9 @@ export function BuyTokenInput(props: {
             onChange={(e) => {
               let value = e.target.value;
 
+              // Replace comma with period if it exists
+              value = value.replace(",", ".");
+
               if (value.startsWith(".")) {
                 value = `0${value}`;
               }

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/TransferConfirmationScreen.tsx

@@ -6,12 +6,18 @@ import type { ThirdwebClient } from "../../../../../../../client/client.js";
 import { NATIVE_TOKEN_ADDRESS } from "../../../../../../../constants/addresses.js";
 import { getContract } from "../../../../../../../contract/contract.js";
 import { allowance } from "../../../../../../../extensions/erc20/__generated__/IERC20/read/allowance.js";
+import {
+  type GetCurrencyMetadataResult,
+  getCurrencyMetadata,
+} from "../../../../../../../extensions/erc20/read/getCurrencyMetadata.js";
 import { approve } from "../../../../../../../extensions/erc20/write/approve.js";
 import { transfer } from "../../../../../../../extensions/erc20/write/transfer.js";
+import type { BuyWithCryptoStatus } from "../../../../../../../pay/buyWithCrypto/getStatus.js";
 import { getBuyWithCryptoTransfer } from "../../../../../../../pay/buyWithCrypto/getTransfer.js";
 import { sendAndConfirmTransaction } from "../../../../../../../transaction/actions/send-and-confirm-transaction.js";
 import { sendTransaction } from "../../../../../../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../../../../../../transaction/prepare-transaction.js";
+import type { TransactionReceipt } from "../../../../../../../transaction/types.js";
 import type { Address } from "../../../../../../../utils/address.js";
 import { toWei } from "../../../../../../../utils/units.js";
 import { iconSize } from "../../../../../../core/design-system/index.js";
@@ -42,6 +48,7 @@ type TransferConfirmationScreenProps = {
   tokenAmount: string;
   transactionMode?: boolean;
   payOptions?: PayUIOptions;
+  onSuccess: ((status: BuyWithCryptoStatus) => void) | undefined;
 };
 
 export function TransferConfirmationScreen(
@@ -202,10 +209,33 @@ export function TransferConfirmationScreen(
                       to: receiverAddress,
                       amount: tokenAmount,
                     });
-                await sendAndConfirmTransaction({
-                  account: props.payer.account,
-                  transaction,
-                });
+                const [txResult, tokenMetadata] = await Promise.all([
+                  sendAndConfirmTransaction({
+                    account: props.payer.account,
+                    transaction,
+                  }),
+                  getCurrencyMetadata({
+                    contract: getContract({
+                      address: isNativeToken(token)
+                        ? NATIVE_TOKEN_ADDRESS
+                        : token.address,
+                      chain: chain,
+                      client: client,
+                    }),
+                  }),
+                ]);
+                // its the last step before the transaction, so propagate onPurchaseSuccess here
+                props.onSuccess?.(
+                  transferBuyWithCryptoQuote({
+                    token,
+                    chain,
+                    tokenMetadata,
+                    tokenAmount,
+                    fromAddress: payer.account.address,
+                    toAddress: receiverAddress,
+                    transaction: txResult,
+                  }),
+                );
                 // switch to execute step
                 setStep("execute");
                 setStatus({ id: "idle" });
@@ -299,3 +329,85 @@ export function TransferConfirmationScreen(
     </Container>
   );
 }
+
+function transferBuyWithCryptoQuote(args: {
+  token: ERC20OrNativeToken;
+  chain: Chain;
+  tokenMetadata: GetCurrencyMetadataResult;
+  tokenAmount: string;
+  fromAddress: string;
+  toAddress: string;
+  transaction: TransactionReceipt;
+}): BuyWithCryptoStatus {
+  const {
+    token,
+    chain,
+    tokenMetadata,
+    tokenAmount,
+    fromAddress,
+    toAddress,
+    transaction,
+  } = args;
+  return {
+    status: "COMPLETED",
+    subStatus: "SUCCESS",
+    swapType: "TRANSFER",
+    quote: {
+      createdAt: new Date().toISOString(),
+      fromToken: {
+        chainId: chain.id,
+        tokenAddress: isNativeToken(token)
+          ? NATIVE_TOKEN_ADDRESS
+          : token.address,
+        decimals: tokenMetadata.decimals,
+        symbol: tokenMetadata.symbol,
+        name: tokenMetadata.name,
+        priceUSDCents: 0,
+      },
+      toToken: {
+        chainId: chain.id,
+        tokenAddress: isNativeToken(token)
+          ? NATIVE_TOKEN_ADDRESS
+          : token.address,
+        decimals: tokenMetadata.decimals,
+        symbol: tokenMetadata.symbol,
+        name: tokenMetadata.name,
+        priceUSDCents: 0,
+      },
+      fromAmountWei: toWei(tokenAmount).toString(),
+      fromAmount: tokenAmount,
+      toAmountWei: toWei(tokenAmount).toString(),
+      toAmount: tokenAmount,
+      toAmountMin: tokenAmount,
+      toAmountMinWei: toWei(tokenAmount).toString(),
+      estimated: {
+        feesUSDCents: 0,
+        gasCostUSDCents: 0,
+        slippageBPS: 0,
+        toAmountMinUSDCents: 0,
+        toAmountUSDCents: 0,
+        fromAmountUSDCents: 0,
+        durationSeconds: 0,
+      },
+    },
+    fromAddress,
+    toAddress,
+    source: {
+      transactionHash: transaction.transactionHash,
+      amount: tokenAmount,
+      amountWei: toWei(tokenAmount).toString(),
+      amountUSDCents: 0,
+      completedAt: new Date().toISOString(),
+      token: {
+        chainId: chain.id,
+        tokenAddress: isNativeToken(token)
+          ? NATIVE_TOKEN_ADDRESS
+          : token.address,
+        decimals: tokenMetadata.decimals,
+        symbol: tokenMetadata.symbol,
+        name: tokenMetadata.name,
+        priceUSDCents: 0,
+      },
+    },
+  };
+}

package/src/react/web/wallets/shared/OTPLoginUI.tsx

@@ -276,7 +276,7 @@ export function OTPLoginUI(props: {
 
             {!isWideModal && <Line />}
 
-            <Container p={isWideModal ? undefined : "lg"}>
+            <Container p={isWideModal ? undefined : "lg"} gap="xs">
               {accountStatus === "error" && (
                 <Text size="sm" center color="danger">
                   {locale.emailLoginScreen.failedToSendCode}
@@ -297,7 +297,7 @@ export function OTPLoginUI(props: {
                 </Container>
               )}
 
-              {accountStatus === "sent" && (
+              {accountStatus !== "sending" && (
                 <LinkButton onClick={sendEmailOrSms} type="button">
                   {locale.emailLoginScreen.resendCode}
                 </LinkButton>

package/src/transaction/actions/gasless/providers/engine.test.ts

@@ -74,16 +74,12 @@ describe.runIf(process.env.TW_SECRET_KEY)("prepareengineTransaction", () => {
     const { message, messageType, signature } = result;
 
     expect(isHex(signature)).toBe(true);
-    expect(message).toMatchInlineSnapshot(`
-        {
-          "data": "0xa9059cbb00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000056bc75e2d63100000",
-          "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-          "gas": 64340n,
-          "nonce": 0n,
-          "to": "${erc20Contract.address}",
-          "value": 0n,
-        }
-      `);
+    expect(message.data).toBe(
+      "0xa9059cbb00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000056bc75e2d63100000",
+    );
+    expect(message.from).toBe(TEST_ACCOUNT_A.address);
+    expect(message.to).toBe(erc20Contract.address);
+    expect(message.value).toBe(0n);
     expect(messageType).toMatchInlineSnapshot(`"forward"`);
   });
 

package/src/transaction/actions/gasless/providers/openzeppelin.test.ts

@@ -72,16 +72,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       const { message, messageType, signature } = result;
 
       expect(isHex(signature)).toBe(true);
-      expect(message).toMatchInlineSnapshot(`
-        {
-          "data": "0xa9059cbb00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000056bc75e2d63100000",
-          "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-          "gas": 64340n,
-          "nonce": 0n,
-          "to": "${erc20Contract.address}",
-          "value": 0n,
-        }
-      `);
+      expect(message.from).toBe(TEST_ACCOUNT_A.address);
+      expect(message.to).toBe(erc20Contract.address);
+      expect(message.value).toBe(0n);
+      expect(message.data).toBe(
+        "0xa9059cbb00000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000056bc75e2d63100000",
+      );
       expect(messageType).toMatchInlineSnapshot(`"forward"`);
     });
   },

package/src/utils/any-evm/zksync/isZkSyncChain.ts

@@ -27,7 +27,8 @@ export async function isZkSyncChain(chain: Chain) {
     chain.id === 2741 ||
     chain.id === 240 ||
     chain.id === 555271 ||
-    chain.id === 61166
+    chain.id === 61166 ||
+    chain.id === 555272
   ) {
     return true;
   }

package/src/utils/bytecode/resolveImplementation.test.ts

@@ -20,54 +20,57 @@ import { getContract } from "../../contract/contract.js";
 import { deployContract } from "../../contract/deployment/deploy-with-abi.js";
 import { resolveImplementation } from "./resolveImplementation.js";
 
-describe("Resolve implementation", async () => {
-  it("should extract implementation address for minimal proxy contract", async () => {
-    const resolved = resolveImplementation(NFT_DROP_CONTRACT);
-    expect((await resolved).address).to.equal(NFT_DROP_IMPLEMENTATION);
-  });
-
-  it("should extract implementation address for matic proxy contract", async () => {
-    const resolved = resolveImplementation(POLYGON_USDT_PROXY_CONTRACT);
-    expect((await resolved).address).to.equal(
-      POLYGON_USDT_IMPLEMENTATION.toLowerCase(),
-    );
-  });
-
-  it("should extract implementation address for base USDC proxy contract", async () => {
-    const resolved = resolveImplementation(BASE_USDC_PROXY_CONTRACT);
-    expect((await resolved).address).to.equal(
-      BASE_USDC_IMPLEMENTATION.toLowerCase(),
-    );
-  });
-
-  it("should extract implementation address for ERC1967 proxy contract", async () => {
-    const implementationAddress = await deployContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
-      bytecode: DUMMY_BYTECODE,
-      abi: [],
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "Resolve implementation",
+  async () => {
+    it("should extract implementation address for minimal proxy contract", async () => {
+      const resolved = resolveImplementation(NFT_DROP_CONTRACT);
+      expect((await resolved).address).to.equal(NFT_DROP_IMPLEMENTATION);
     });
 
-    const proxyAddress = await deployContract({
-      client: TEST_CLIENT,
-      chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
-      bytecode: ERC1967_PROXY_BYTECODE,
-      abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
-      constructorParams: {
-        logic: implementationAddress,
-        data: "0x",
-      },
+    it("should extract implementation address for matic proxy contract", async () => {
+      const resolved = resolveImplementation(POLYGON_USDT_PROXY_CONTRACT);
+      expect((await resolved).address).to.equal(
+        POLYGON_USDT_IMPLEMENTATION.toLowerCase(),
+      );
     });
 
-    const proxy = getContract({
-      chain: ANVIL_CHAIN,
-      address: proxyAddress,
-      client: TEST_CLIENT,
+    it("should extract implementation address for base USDC proxy contract", async () => {
+      const resolved = resolveImplementation(BASE_USDC_PROXY_CONTRACT);
+      expect((await resolved).address).to.equal(
+        BASE_USDC_IMPLEMENTATION.toLowerCase(),
+      );
     });
 
-    const resolved = await resolveImplementation(proxy);
-    expect(resolved.address).to.equal(implementationAddress);
-  });
-});
+    it("should extract implementation address for ERC1967 proxy contract", async () => {
+      const implementationAddress = await deployContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        bytecode: DUMMY_BYTECODE,
+        abi: [],
+      });
+
+      const proxyAddress = await deployContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        bytecode: ERC1967_PROXY_BYTECODE,
+        abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
+        constructorParams: {
+          logic: implementationAddress,
+          data: "0x",
+        },
+      });
+
+      const proxy = getContract({
+        chain: ANVIL_CHAIN,
+        address: proxyAddress,
+        client: TEST_CLIENT,
+      });
+
+      const resolved = await resolveImplementation(proxy);
+      expect(resolved.address).to.equal(implementationAddress);
+    });
+  },
+);

package/src/utils/promise/resolve-promised-value.ts

@@ -10,6 +10,7 @@
 export async function resolvePromisedValue<V>(
   value: V,
 ): Promise<V extends () => Promise<infer R> ? R : V> {
+  // @ts-expect-error - this works fine, but TS doesn't like it since 5.8
   return typeof value === "function" ? await value() : value;
 }
 

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.90.0";
+export const version = "5.90.2";

package/src/wallets/smart/lib/bundler.ts

@@ -179,6 +179,7 @@ export async function estimateUserOpGasCost(args: {
         client: args.client,
       }),
     ),
+    waitForDeployment: false,
   });
 
   let gasLimit = 0n;

package/src/wallets/smart/lib/userop.ts

@@ -321,7 +321,9 @@ async function populateUserOp_v0_7(args: {
         createAccountOverride: overrides?.createAccount,
       }),
     );
-    markAccountDeploying(accountContract);
+    if (waitForDeployment) {
+      markAccountDeploying(accountContract);
+    }
   }
 
   const partialOp: UserOperationV07 = {
@@ -481,7 +483,9 @@ async function populateUserOp_v0_6(args: {
       accountSalt: overrides?.accountSalt,
       createAccountOverride: overrides?.createAccount,
     });
-    markAccountDeploying(accountContract);
+    if (waitForDeployment) {
+      markAccountDeploying(accountContract);
+    }
   }
 
   const partialOp: UserOperationV06 = {

package/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -49,9 +49,10 @@ const contract = getContract({
   address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
 });
 
-describe.sequential(
+describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet 0.7 core tests",
   {
+    retry: 0,
     timeout: 240_000,
   },
   () => {
@@ -200,7 +201,7 @@ describe.sequential(
       });
 
       await expect(tx).rejects.toMatchInlineSnapshot(`
-        [TransactionError: Error - Not authorized
+        [TransactionError: Execution Reverted: {"code":3,"message":"execution reverted: Not authorized"}
 
         contract: ${contract.address}
         chainId: 11155111]

package/src/wallets/smart/smart-wallet-integration.test.ts

@@ -52,6 +52,7 @@ const factoryAddress = "0x564cf6453a1b0FF8DB603E92EA4BbD410dea45F3"; // pre 712
 describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet core tests",
   {
+    retry: 0,
     timeout: 240_000,
   },
   () => {

package/src/wallets/smart/smart-wallet-modular.test.ts

@@ -28,7 +28,7 @@ const client = TEST_CLIENT;
 const DEFAULT_FACTORY_ADDRESS = "0xB1846E893CA01c5Dcdaa40371C1e13f2e0Df5717";
 const DEFAULT_VALIDATOR_ADDRESS = "0x7D3631d823e0De311DC86f580946EeF2eEC81fba";
 
-describe.sequential(
+describe.runIf(process.env.TW_SECRET_KEY).sequential(
   "SmartWallet modular tests",
   {
     retry: 0,