thirdweb 5.89.1 → 5.90.1

package/dist/types/wallets/smart/lib/bundler.d.ts

@@ -1,7 +1,10 @@
+import type { ThirdwebClient } from "../../../client/client.js";
+import type { PreparedTransaction } from "../../../transaction/prepare-transaction.js";
 import type { SerializableTransaction } from "../../../transaction/serialize-transaction.js";
 import type { TransactionReceipt } from "../../../transaction/types.js";
 import { type Hex } from "../../../utils/encoding/hex.js";
-import { type BundlerOptions, type EstimationResult, type GasPriceResult, type PmTransactionData, type UserOperationReceipt, type UserOperationV06, type UserOperationV07 } from "../types.js";
+import type { Account } from "../../interfaces/wallet.js";
+import { type BundlerOptions, type EstimationResult, type GasPriceResult, type PmTransactionData, type SmartWalletOptions, type UserOperationReceipt, type UserOperationV06, type UserOperationV07 } from "../types.js";
 /**
  * Bundle a user operation.
  * @param args - The options for bundling a user operation.
@@ -46,6 +49,32 @@ export declare function estimateUserOpGas(args: {
         };
     };
 }): Promise<EstimationResult>;
+/**
+ * Estimate the gas cost of a user operation.
+ * @param args - The options for estimating the gas cost of a user operation.
+ * @returns The estimated gas cost of the user operation.
+ * @example
+ * ```ts
+ * import { estimateUserOpGasCost } from "thirdweb/wallets/smart";
+ *
+ * const gasCost = await estimateUserOpGasCost({
+ *  transactions,
+ *  adminAccount,
+ *  client,
+ *  smartWalletOptions,
+ * });
+ * ```
+ * @walletUtils
+ */
+export declare function estimateUserOpGasCost(args: {
+    transactions: PreparedTransaction[];
+    adminAccount: Account;
+    client: ThirdwebClient;
+    smartWalletOptions: SmartWalletOptions;
+}): Promise<{
+    ether: string;
+    wei: bigint;
+}>;
 /**
  * Get the gas fees of a user operation.
  * @param args - The options for getting the gas price of a user operation.

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

@@ -1 +1 @@
-{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,gCAAgC,CAAC;AAGvE,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAEtB,MAAM,aAAa,CAAC;AAQrB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,GAAG,CAAC,CASf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE;IACJ,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;CACzB,EACD,cAAc,CAAC,EAAE;IACf,CAAC,CAAC,EAAE,MAAM,GAAG;QACX,SAAS,EAAE;YACT,CAAC,CAAC,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAAC;SAC5B,CAAC;KACH,CAAC;CACH,GACA,OAAO,CAAC,gBAAgB,CAAC,CA6B3B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,cAAc,CAAC,CAW1B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,GACA,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA6BzC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,GACA,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAU3C;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,uBAAuB,CAAC;CACtC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAW7B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,GAAG,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,GAAG,CAAA;CAAE,CAAC,CAepC"}
+{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../../../src/wallets/smart/lib/bundler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,gCAAgC,CAAC;AAIvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAEtB,MAAM,aAAa,CAAC;AAUrB;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,GAAG,CAAC,CASf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE;IACJ,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAAC;IAC5C,OAAO,EAAE,cAAc,CAAC;CACzB,EACD,cAAc,CAAC,EAAE;IACf,CAAC,CAAC,EAAE,MAAM,GAAG;QACX,SAAS,EAAE;YACT,CAAC,CAAC,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAAC;SAC5B,CAAC;KACH,CAAC;CACH,GACA,OAAO,CAAC,gBAAgB,CAAC,CA6B3B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;;;GA6DA;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,cAAc,CAAC;CACzB,GAAG,OAAO,CAAC,cAAc,CAAC,CAW1B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,GACA,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA6BzC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,cAAc,GAAG;IACrB,UAAU,EAAE,GAAG,CAAC;CACjB,GACA,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAU3C;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,uBAAuB,CAAC;CACtC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAW7B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,GAAG,CAAC;CACxB,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,GAAG,CAAA;CAAE,CAAC,CAepC"}

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

@@ -111,4 +111,12 @@ export declare function createAndSignUserOp(options: {
     waitForDeployment?: boolean;
     isDeployedOverride?: boolean;
 }): Promise<UserOperationV06 | UserOperationV07>;
+export declare function prepareUserOp(options: {
+    transactions: PreparedTransaction[];
+    adminAccount: Account;
+    client: ThirdwebClient;
+    smartWalletOptions: SmartWalletOptions;
+    waitForDeployment?: boolean;
+    isDeployedOverride?: boolean;
+}): Promise<UserOperationV06 | UserOperationV07>;
 //# sourceMappingURL=userop.d.ts.map

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,gDAoEA"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.89.1",
+  "version": "5.90.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -228,7 +228,7 @@
     "mipd": "0.0.7",
     "ox": "0.6.9",
     "uqr": "0.1.2",
-    "viem": "2.22.17"
+    "viem": "2.23.5"
   },
   "peerDependencies": {
     "@aws-sdk/client-lambda": "^3",
@@ -332,7 +332,7 @@
     "ethers6": "npm:ethers@6",
     "expo-linking": "7.0.5",
     "expo-web-browser": "14.0.1",
-    "happy-dom": "16.8.1",
+    "happy-dom": "17.1.8",
     "knip": "5.45.0",
     "msw": "2.7.3",
     "prettier": "3.3.3",
@@ -372,10 +372,10 @@
     "clean": "rimraf dist",
     "size": "size-limit",
     "test:watch": "vitest -c ./test/vitest.config.ts dev",
-    "test": "vitest run -c ./test/vitest.config.ts --coverage",
-    "test:cov": "vitest dev -c ./test/vitest.config.ts --coverage",
-    "test:ui": "vitest dev -c ./test/vitest.config.ts --coverage --ui",
-    "test:dev": "vitest run -c ./test/vitest.config.ts",
+    "test": "NODE_OPTIONS=--max-old-space-size=8192 vitest run -c ./test/vitest.config.ts --coverage",
+    "test:cov": "NODE_OPTIONS=--max-old-space-size=8192 vitest dev -c ./test/vitest.config.ts --coverage",
+    "test:ui": "NODE_OPTIONS=--max-old-space-size=8192 vitest dev -c ./test/vitest.config.ts --coverage --ui",
+    "test:dev": "NODE_OPTIONS=--max-old-space-size=8192 vitest run -c ./test/vitest.config.ts",
     "test:react": "vitest run -c ./test/vitest.config.ts dev --ui src/react",
     "typedoc": "node scripts/typedoc.mjs && node scripts/parse.mjs",
     "update-version": "node scripts/version.mjs",

package/src/adapters/viem-legacy.test.ts

@@ -153,7 +153,7 @@ describe("walletClient.toViem", () => {
       [UnknownRpcError: An unknown RPC error occurred.
 
       Details: Can't switch chains because only an account was passed to 'viemAdapter.walletClient.toViem()', please pass a connected wallet instance instead.
-      Version: viem@2.22.17]
+      Version: viem@2.23.5]
     `);
   });
 });

package/src/auth/verify-typed-data.test.ts

@@ -26,8 +26,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     ).toBe(true);
   });
 
-  // FIXME: flaky test - needs to be fixed
-  test.skip("invalid EOA signature", async () => {
+  test("invalid EOA signature", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,
@@ -54,8 +53,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("verifyTypedData", async () => {
     ).toBe(true);
   });
 
-  // FIXME: flaky test - needs to be fixed
-  test.skip("invalid smart account signature", async () => {
+  test("invalid smart account signature", async () => {
     expect(
       await verifyTypedData({
         ...typedData.basic,

package/src/chains/constants.ts

@@ -25,6 +25,21 @@ const opChains = [
  * TODO this should be in the chain definition itself
  * @internal
  */
-export function isOpStackChain(chain: Chain) {
-  return opChains.includes(chain.id);
+export async function isOpStackChain(chain: Chain) {
+  if (chain.id === 1337 || chain.id === 31337) {
+    return false;
+  }
+
+  if (opChains.includes(chain.id)) {
+    return true;
+  }
+  // fallback to checking the stack on rpc
+  try {
+    const { getChainMetadata } = await import("./utils.js");
+    const chainMetadata = await getChainMetadata(chain);
+    return chainMetadata.stackType === "optimism_bedrock";
+  } catch {
+    // If the network check fails, assume it's not a OP chain
+    return false;
+  }
 }

package/src/contract/actions/resolve-abi.test.ts

@@ -61,7 +61,7 @@ it("should throw error if contract bytecode is 0x", async () => {
     client: TEST_CLIENT,
     chain: FORKED_ETHEREUM_CHAIN,
   });
-  await expect(() =>
-    resolveAbiFromBytecode(wrongContract),
-  ).rejects.toThrowError("Failed to load contract bytecode");
+  await expect(resolveAbiFromBytecode(wrongContract)).rejects.toThrowError(
+    "Failed to load contract bytecode",
+  );
 });

package/src/exports/wallets/smart.ts

@@ -13,6 +13,7 @@ export {
   bundleUserOp,
   getUserOpGasFees,
   estimateUserOpGas,
+  estimateUserOpGasCost,
 } from "../../wallets/smart/lib/bundler.js";
 
 export {

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

@@ -69,20 +69,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
-      await expect(
-        getNFT({ contract, tokenId: 0n }),
-      ).resolves.toMatchInlineSnapshot(`
-          {
-            "id": 0n,
-            "metadata": {
-              "name": "Test NFT",
-            },
-            "owner": null,
-            "supply": 0n,
-            "tokenURI": "ipfs://QmTo68Dm1ntSp2BHLmE9gesS6ELuXosRz5mAgFCK6tfsRk/0",
-            "type": "ERC1155",
-          }
-        `);
+      expect((await getNFT({ contract, tokenId: 0n })).metadata.name).toBe(
+        "Test NFT",
+      );
     });
 
     it("should allow to claim tokens", async () => {

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

@@ -89,20 +89,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
-      await expect(
-        getNFT({ contract, tokenId: 0n }),
-      ).resolves.toMatchInlineSnapshot(`
-        {
-          "id": 0n,
-          "metadata": {
-            "name": "Test NFT",
-          },
-          "owner": null,
-          "supply": 0n,
-          "tokenURI": "ipfs://QmTo68Dm1ntSp2BHLmE9gesS6ELuXosRz5mAgFCK6tfsRk/0",
-          "type": "ERC1155",
-        }
-      `);
+      expect((await getNFT({ contract, tokenId: 0n })).metadata.name).toBe(
+        "Test NFT",
+      );
     });
 
     it("should update metadata", async () => {

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

@@ -81,20 +81,9 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     // now 1 token minted
     await expect(nextTokenIdToMint({ contract })).resolves.toBe(1n);
     // tokenId 0 is minted
-    await expect(
-      getNFT({ contract, tokenId: 0n }),
-    ).resolves.toMatchInlineSnapshot(`
-        {
-          "id": 0n,
-          "metadata": {
-            "name": "Test NFT",
-          },
-          "owner": null,
-          "supply": 10n,
-          "tokenURI": "ipfs://QmUut8sypH8NaPUeksnirut7MgggMeQa9RvJ37sV513sw3/0",
-          "type": "ERC1155",
-        }
-      `);
+    expect((await getNFT({ contract, tokenId: 0n })).metadata.name).toBe(
+      "Test NFT",
+    );
     // account should have a balance of 10
     await expect(
       balanceOf({ contract, owner: TEST_ACCOUNT_A.address, tokenId: 0n }),
@@ -119,20 +108,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     await expect(nextTokenIdToMint({ contract })).resolves.toBe(1n);
     // tokenId 0 is minted
     // supply should be 15
-    await expect(
-      getNFT({ contract, tokenId: 0n }),
-    ).resolves.toMatchInlineSnapshot(`
-        {
-          "id": 0n,
-          "metadata": {
-            "name": "Test NFT",
-          },
-          "owner": null,
-          "supply": 15n,
-          "tokenURI": "ipfs://QmUut8sypH8NaPUeksnirut7MgggMeQa9RvJ37sV513sw3/0",
-          "type": "ERC1155",
-        }
-      `);
+    // @ts-expect-error - supply is there
+    expect((await getNFT({ contract, tokenId: 0n })).supply).toBe(15n);
     // account should have a balance of 15
     await expect(
       balanceOf({ contract, owner: TEST_ACCOUNT_A.address, tokenId: 0n }),
@@ -155,30 +132,13 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
 
     // now 2 tokens minted
     await expect(nextTokenIdToMint({ contract })).resolves.toBe(2n);
-    await expect(getNFTs({ contract })).resolves.toMatchInlineSnapshot(`
-      [
-        {
-          "id": 0n,
-          "metadata": {
-            "name": "Test NFT",
-          },
-          "owner": null,
-          "supply": 15n,
-          "tokenURI": "ipfs://QmUut8sypH8NaPUeksnirut7MgggMeQa9RvJ37sV513sw3/0",
-          "type": "ERC1155",
-        },
-        {
-          "id": 1n,
-          "metadata": {
-            "name": "Test NFT 2",
-          },
-          "owner": null,
-          "supply": 5n,
-          "tokenURI": "ipfs://QmV6gsfzdiMRtpnh8ay3CgutStVbes7qoF4DKpYE64h8hT/0",
-          "type": "ERC1155",
-        },
-      ]
-    `);
+    await expect(getNFTs({ contract })).resolves.length(2);
+    expect((await getNFT({ contract, tokenId: 0n })).metadata.name).toBe(
+      "Test NFT",
+    );
+    expect((await getNFT({ contract, tokenId: 1n })).metadata.name).toBe(
+      "Test NFT 2",
+    );
   });
 
   it("isGetNFTsSupported should work with our Edition contracts", async () => {
@@ -241,63 +201,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("TokenERC1155", () => {
     });
 
     const nfts = await getNFTs({ contract });
-    expect(nfts).toStrictEqual([
-      {
-        // Updated tokenURI from the test above
-        metadata: { name: "Test1 Updated" },
-        owner: null,
-        id: 0n,
-        tokenURI: "ipfs://QmTSyt6YgoFtH8yhWgevC22BxjyrkCKuzdk86nqQJCwrV9/0",
-        type: "ERC1155",
-        supply: 15n,
-      },
-      {
-        metadata: { name: "Test NFT 2" },
-        owner: null,
-        id: 1n,
-        tokenURI: "ipfs://QmV6gsfzdiMRtpnh8ay3CgutStVbes7qoF4DKpYE64h8hT/0",
-        type: "ERC1155",
-        supply: 5n,
-      },
-      {
-        metadata: {
-          name: "tw-contract-name",
-          symbol: "tw-contract-symbol",
-          description: "tw-contract-description",
-        },
-        owner: null,
-        id: 2n,
-        // Minted using URI from the test above
-        tokenURI:
-          "ipfs://bafybeiewg2e3vehsb5pb34xwk25eyyfwlvajzmgz3rtdrvn3upsxnsbhzi/contractUri.json",
-        type: "ERC1155",
-        supply: 1n,
-      },
-      {
-        metadata: { name: "batch token 0" },
-        owner: null,
-        id: 3n,
-        tokenURI: "ipfs://QmPSQhC2J6Wig4pH1Lt5th19FM58J5oukhfLfpc9L1i39Q/0",
-        type: "ERC1155",
-        supply: 1n,
-      },
-      {
-        metadata: { name: "batch token 1" },
-        owner: null,
-        id: 4n,
-        tokenURI: "ipfs://QmWRQwLBAeq6Wr65Yj7A4aeYqMD1C7Hs1moz15ncS6EhGu/0",
-        type: "ERC1155",
-        supply: 2n,
-      },
-      {
-        metadata: { name: "batch token 2" },
-        owner: null,
-        id: 5n,
-        tokenURI: "ipfs://QmTg1wxKGvdZR4NrdkYZGcfB5YYaBz75DH83td5RwprMRP/0",
-        type: "ERC1155",
-        supply: 3n,
-      },
-    ]);
+    const names = nfts.map((nft) => nft.metadata.name);
+    expect(names).toContain("batch token 0");
+    expect(names).toContain("batch token 1");
+    expect(names).toContain("batch token 2");
   });
 
   it("getOwnedTokenIds should work", async () => {

package/src/extensions/erc20/read/getCurrencyMetadata.test.ts

@@ -4,7 +4,7 @@ import { getCurrencyMetadata } from "./getCurrencyMetadata.js";
 
 describe("getCurrencyMetadata", () => {
   it("should throw if not a valid ERC20 contract", async () => {
-    await expect(() =>
+    await expect(
       getCurrencyMetadata({ contract: DOODLES_CONTRACT }),
     ).rejects.toThrowError("Invalid currency token");
   });

package/src/extensions/erc721/customDrop721.test.ts

@@ -65,19 +65,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
-      await expect(
-        getNFT({ contract, tokenId: 0n }),
-      ).resolves.toMatchInlineSnapshot(`
-          {
-            "id": 0n,
-            "metadata": {
-              "name": "Test NFT",
-            },
-            "owner": null,
-            "tokenURI": "ipfs://QmTo68Dm1ntSp2BHLmE9gesS6ELuXosRz5mAgFCK6tfsRk/0",
-            "type": "ERC721",
-          }
-        `);
+      expect((await getNFT({ contract, tokenId: 0n })).metadata.name).toBe(
+        "Test NFT",
+      );
     });
 
     it("should allow to claim tokens", async () => {

package/src/extensions/erc721/drop721.test.ts

@@ -96,19 +96,9 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       });
 
       await expect(nextTokenIdToMint({ contract })).resolves.toBe(10n);
-      await expect(
-        getNFT({ contract, tokenId: 0n }),
-      ).resolves.toMatchInlineSnapshot(`
-        {
-          "id": 0n,
-          "metadata": {
-            "name": "Test NFT",
-          },
-          "owner": null,
-          "tokenURI": "ipfs://QmY1Rr4C7cYVPAaXykMMxg3AVbatDZ6Rd7u3gzt79CiDSB/0",
-          "type": "ERC721",
-        }
-      `);
+      expect((await getNFT({ contract, tokenId: 0n })).metadata.name).toBe(
+        "Test NFT",
+      );
     });
 
     it("should allow to claim tokens", async () => {

package/src/extensions/erc721/read/getNFTs.test.ts

@@ -189,7 +189,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFTs", () => {
   });
 
   it("should throw error if totalSupply and nextTokenIdToMint are not supported", async () => {
-    await expect(() =>
+    await expect(
       getNFTs({ contract: UNISWAPV3_FACTORY_CONTRACT }),
     ).rejects.toThrowError(
       "Contract requires either `nextTokenIdToMint` or `totalSupply` function available to determine the next token ID to mint",

package/src/extensions/erc721/read/getOwnedTokenIds.test.ts

@@ -22,7 +22,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getOwnedTokenIds", () => {
   it("should throw if tokenOfOwnerByIndex or tokensOfOwner not supported", async () => {
     // We know current Lens contract on Polygon doesn't have this.
     const contract = UNISWAPV3_FACTORY_CONTRACT;
-    await expect(() =>
+    await expect(
       getOwnedTokenIds({ contract, owner: TEST_ACCOUNT_B.address }),
     ).rejects.toThrowError(
       `The contract at ${contract.address} on chain ${contract.chain.id} does not support the tokenOfOwnerByIndex or tokensOfOwner interface`,

package/src/extensions/lens/read/resolveAddress.test.ts

@@ -14,7 +14,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("resolve lens address", () => {
   });
 
   it("should throw if passed an invalid lens handle", async () => {
-    await expect(() =>
+    await expect(
       resolveAddress({ client: TEST_CLIENT, name: "vitalik.eth" }),
     ).rejects.toThrowError(
       "Could not fetch the wallet address for lens handle: vitalik.eth",

package/src/extensions/prebuilts/deploy-vote.test.ts

@@ -9,7 +9,7 @@ const account = TEST_ACCOUNT_B;
 
 describe.runIf(process.env.TW_SECRET_KEY)("deploy-voteERC20 contract", () => {
   it("should throw if passed an non-integer-like value to minVoteQuorumRequiredPercent", async () => {
-    await expect(() =>
+    await expect(
       deployVoteContract({
         account,
         client: TEST_CLIENT,

package/src/extensions/unstoppable-domains/read/resolveAddress.test.ts

@@ -19,7 +19,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     });
 
     it("should throw an error with a non-existent domain name", async () => {
-      await expect(() =>
+      await expect(
         resolveAddress({
           name: "thirdwebsdk.thissuredoesnotexist",
           client: TEST_CLIENT,

package/src/extensions/unstoppable-domains/read/resolveName.test.ts

@@ -18,7 +18,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
     });
 
     it("should throw error on addresses that dont own any UD", async () => {
-      await expect(() =>
+      await expect(
         resolveName({ client: TEST_CLIENT, address: TEST_ACCOUNT_D.address }),
       ).rejects.toThrowError(
         `Failed to retrieve domain for address: ${TEST_ACCOUNT_D.address}. Make sure you have set the Reverse Resolution address for your domain at https://unstoppabledomains.com/manage?page=reverseResolution&domain=your-domain`,

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/pay/convert/cryptoToFiat.test.ts

@@ -52,7 +52,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
   });
 
   it("should throw error for testnet chain (because testnets are not supported", async () => {
-    await expect(() =>
+    await expect(
       convertCryptoToFiat({
         chain: sepolia,
         fromTokenAddress: NATIVE_TOKEN_ADDRESS,
@@ -66,7 +66,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
   });
 
   it("should throw error if fromTokenAddress is set to an invalid EVM address", async () => {
-    await expect(() =>
+    await expect(
       convertCryptoToFiat({
         chain: ethereum,
         fromTokenAddress: "haha",
@@ -80,7 +80,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
   });
 
   it("should throw error if fromTokenAddress is set to a wallet address", async () => {
-    await expect(() =>
+    await expect(
       convertCryptoToFiat({
         chain: base,
         fromTokenAddress: TEST_ACCOUNT_A.address,
@@ -99,7 +99,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: crypto-to-fiat", () => {
       status: 400,
       statusText: "Bad Request",
     });
-    await expect(() =>
+    await expect(
       convertCryptoToFiat({
         chain: base,
         fromTokenAddress: NATIVE_TOKEN_ADDRESS,

package/src/pay/convert/fiatToCrypto.test.ts

@@ -53,7 +53,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
   });
 
   it("should throw error for testnet chain (because testnets are not supported", async () => {
-    await expect(() =>
+    await expect(
       convertFiatToCrypto({
         chain: sepolia,
         to: NATIVE_TOKEN_ADDRESS,
@@ -67,7 +67,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
   });
 
   it("should throw error if `to` is set to an invalid EVM address", async () => {
-    await expect(() =>
+    await expect(
       convertFiatToCrypto({
         chain: ethereum,
         to: "haha",
@@ -81,7 +81,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
   });
 
   it("should throw error if `to` is set to a wallet address", async () => {
-    await expect(() =>
+    await expect(
       convertFiatToCrypto({
         chain: base,
         to: TEST_ACCOUNT_A.address,
@@ -100,7 +100,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Pay: fiatToCrypto", () => {
       status: 400,
       statusText: "Bad Request",
     });
-    await expect(() =>
+    await expect(
       convertFiatToCrypto({
         chain: ethereum,
         to: NATIVE_TOKEN_ADDRESS,

package/src/react/core/hooks/wallets/useConnect.test.tsx

@@ -48,7 +48,7 @@ describe("useAddConnectedWallet", () => {
       },
     );
     const { result } = renderHook(() => useConnect(), { wrapper });
-    expect(statusResult.current).toEqual("disconnected");
+    expect(statusResult.current).toEqual("unknown");
     await result.current.connect(async () => wallet);
     expect(statusResult.current).toEqual("connected");
 
@@ -67,7 +67,7 @@ describe("useAddConnectedWallet", () => {
       },
     );
     const { result } = renderHook(() => useConnect(), { wrapper });
-    expect(statusResult.current).toEqual("disconnected");
+    expect(statusResult.current).toEqual("unknown");
     await result.current.connect(async () => wallet);
     expect(statusResult.current).toEqual("connected");
 
@@ -85,7 +85,7 @@ describe("useAddConnectedWallet", () => {
         wrapper,
       },
     );
-    expect(statusResult.current).toEqual("disconnected");
+    expect(statusResult.current).toEqual("unknown");
     const { result } = renderHook(() => useConnect(), { wrapper });
     await result.current.connect(async () => {
       throw new Error("test");

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}`;
               }