thirdweb 5.59.0-nightly-e2b3484764275560aa899f3f894b767faedaa9a1-20240925000331 → 5.59.0

package/dist/types/wallets/native/create-wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-wallet.d.ts","sourceRoot":"","sources":["../../../../src/wallets/native/create-wallet.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EACV,gBAAgB,EAEhB,QAAQ,EACT,MAAM,oBAAoB,CAAC;AAE5B;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,SAAS,QAAQ,EACpD,GAAG,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAC5B,MAAM,CAAC,EAAE,CAAC,CAwLZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,4BAE5B"}
+{"version":3,"file":"create-wallet.d.ts","sourceRoot":"","sources":["../../../../src/wallets/native/create-wallet.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EACV,gBAAgB,EAGhB,QAAQ,EACT,MAAM,oBAAoB,CAAC;AAE5B;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,SAAS,QAAQ,EACpD,GAAG,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAC5B,MAAM,CAAC,EAAE,CAAC,CAwLZ;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,4BAE5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.59.0-nightly-e2b3484764275560aa899f3f894b767faedaa9a1-20240925000331",
+  "version": "5.59.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"

package/src/contract/actions/compiler-metadata.ts

@@ -18,6 +18,7 @@ export type CompilerMetadata = {
   };
   licenses: string[];
   isPartialAbi?: boolean;
+  zk_version?: string;
 };
 
 /**
@@ -26,29 +27,37 @@ export type CompilerMetadata = {
  * @returns The formatted metadata.
  * @internal
  */
-// biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
-export function formatCompilerMetadata(metadata: any): CompilerMetadata {
-  const compilationTarget = metadata.settings.compilationTarget;
+export function formatCompilerMetadata(
+  // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
+  metadata: any,
+  compilerType?: "solc" | "zksolc",
+): CompilerMetadata {
+  let meta = metadata;
+  if (compilerType === "zksolc") {
+    meta = metadata.source_metadata || meta;
+  }
+  const compilationTarget = meta.settings.compilationTarget;
   const targets = Object.keys(compilationTarget);
   const name = compilationTarget[targets[0] as keyof typeof compilationTarget];
   const info = {
-    title: metadata.output.devdoc.title,
-    author: metadata.output.devdoc.author,
-    details: metadata.output.devdoc.detail,
-    notice: metadata.output.userdoc.notice,
+    title: meta.output.devdoc.title,
+    author: meta.output.devdoc.author,
+    details: meta.output.devdoc.detail,
+    notice: meta.output.userdoc.notice,
   };
   const licenses: string[] = [
     ...new Set(
       // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
-      Object.entries(metadata.sources).map(([, src]) => (src as any).license),
+      Object.entries(meta.sources).map(([, src]) => (src as any).license),
     ),
   ];
   return {
     name,
-    abi: metadata?.output?.abi || [],
-    metadata,
+    abi: meta?.output?.abi || [],
+    metadata: meta,
     info,
     licenses,
-    isPartialAbi: metadata.isPartialAbi,
+    isPartialAbi: meta.isPartialAbi,
+    zk_version: metadata.zk_version,
   };
 }

package/src/contract/deployment/publisher.ts

@@ -24,6 +24,7 @@ export async function fetchPublishedContractMetadata(options: {
   contractId: string;
   publisher?: string;
   version?: string;
+  compilerType?: "solc" | "zksolc";
 }): Promise<FetchDeployMetadataResult> {
   const cacheKey = `${options.contractId}-${options.publisher}-${options.version}`;
   return withCache(
@@ -33,6 +34,7 @@ export async function fetchPublishedContractMetadata(options: {
         publisherAddress: options.publisher || THIRDWEB_DEPLOYER,
         contractId: options.contractId,
         version: options.version,
+        compilerType: options.compilerType,
       });
       if (!publishedContract.publishMetadataUri) {
         throw new Error(
@@ -42,6 +44,7 @@ export async function fetchPublishedContractMetadata(options: {
       const data = await fetchDeployMetadata({
         client: options.client,
         uri: publishedContract.publishMetadataUri,
+        compilerType: options.compilerType,
       });
       return data;
     },
@@ -211,6 +214,7 @@ type FetchPublishedContractOptions = {
   contractId: string;
   version?: string;
   client: ThirdwebClient;
+  compilerType?: "solc" | "zksolc";
 };
 
 /**

package/src/contract/deployment/utils/bootstrap.ts

@@ -27,6 +27,7 @@ export async function getOrDeployInfraForPublishedContract(
     constructorParams?: Record<string, unknown>;
     publisher?: string;
     version?: string;
+    compilerType?: "solc" | "zksolc";
   },
 ): Promise<{
   cloneFactoryContract: ThirdwebContract;
@@ -40,6 +41,7 @@ export async function getOrDeployInfraForPublishedContract(
     constructorParams,
     publisher,
     version,
+    compilerType,
   } = args;
 
   if (isZkSyncChain(chain)) {
@@ -50,9 +52,10 @@ export async function getOrDeployInfraForPublishedContract(
     });
     const compilerMetadata = await fetchPublishedContractMetadata({
       client,
-      contractId: `${contractId}_ZkSync`, // different contract id for zkSync
+      contractId,
       publisher,
       version,
+      compilerType,
     });
     const implementationContract = await zkDeployContractDeterministic({
       chain,

package/src/exports/utils.ts

@@ -22,6 +22,7 @@ export { isEIP155Enforced } from "../utils/any-evm/is-eip155-enforced.js";
 export { keccakId } from "../utils/any-evm/keccak-id.js";
 export { getKeylessTransaction } from "../utils/any-evm/keyless-transaction.js";
 export type { ExtendedMetadata } from "../utils/any-evm/deploy-metadata.js";
+export { isZkSyncChain } from "../utils/any-evm/zksync/isZkSyncChain.js";
 
 //signatures
 export {

package/src/exports/wallets.native.ts

@@ -5,6 +5,12 @@ export {
   walletConnect,
 } from "../wallets/native/create-wallet.js";
 export { inAppWallet } from "../wallets/in-app/native/in-app.js";
+export { ecosystemWallet } from "../wallets/in-app/native/ecosystem.js";
+export type {
+  EcosystemWalletCreationOptions,
+  EcosystemWalletConnectionOptions,
+  EcosystemWalletAutoConnectOptions,
+} from "../wallets/ecosystem/types.js";
 export { smartWallet } from "../wallets/smart/smart-wallet.js";
 
 export type { Wallet, Account } from "../wallets/interfaces/wallet.js";

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

@@ -206,10 +206,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
-          [TransactionError: Error - !Qty
+          [TransactionError: DropClaimExceedLimit - 0,1
 
           contract: ${contract.address}
-          chainId: 31337]
+          chainId: ${contract.chain.id}]
         `);
       });
 
@@ -247,7 +247,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
-          [TransactionError: Error - !Qty
+          [TransactionError: DropClaimExceedLimit - 1,2
 
           contract: ${contract.address}
           chainId: ${contract.chain.id}]
@@ -378,7 +378,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
-        [TransactionError: Error - !Qty
+        [TransactionError: DropClaimExceedLimit - 1,2
 
         contract: ${contract.address}
         chainId: ${contract.chain.id}]

package/src/extensions/erc20/drop20.test.ts

@@ -212,10 +212,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
-          [TransactionError: Error - !Qty
+          [TransactionError: DropClaimExceedLimit - 0,1000000000000000000
 
           contract: ${contract.address}
-          chainId: 31337]
+          chainId: ${contract.chain.id}]
         `);
       });
 
@@ -262,7 +262,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
-          [TransactionError: Error - !Qty
+          [TransactionError: DropClaimExceedLimit - 3000000000000000000,4000000000000000000
 
           contract: ${contract.address}
           chainId: ${contract.chain.id}]
@@ -421,7 +421,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
-        [TransactionError: Error - !Qty
+        [TransactionError: DropClaimExceedLimit - 1,2
 
         contract: ${contract.address}
         chainId: ${contract.chain.id}]

package/src/extensions/erc20/write/transfer.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import type { Prettify } from "../../../utils/type-utils.js";
 import { toUnits } from "../../../utils/units.js";
 import { transfer as generatedTransfer } from "../__generated__/IERC20/write/transfer.js";
@@ -8,14 +11,16 @@ import { transfer as generatedTransfer } from "../__generated__/IERC20/write/tra
  * @extension ERC20
  */
 export type TransferParams = Prettify<
-  { to: string } & (
-    | {
-        amount: number | string;
-      }
-    | {
-        amountWei: bigint;
-      }
-  )
+  WithOverrides<
+    { to: string } & (
+      | {
+          amount: number | string;
+        }
+      | {
+          amountWei: bigint;
+        }
+    )
+  >
 >;
 
 /**
@@ -60,6 +65,7 @@ export function transfer(options: BaseTransactionOptions<TransferParams>) {
             amountWei: amount,
             tokenAddress: options.contract.address,
           },
+          ...options.overrides,
         },
       } as const;
     },

package/src/extensions/erc20/write/transferFrom.ts

@@ -1,5 +1,8 @@
 import type { Address } from "abitype";
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import { toUnits } from "../../../utils/units.js";
 
 import type { Prettify } from "../../../utils/type-utils.js";
@@ -10,14 +13,16 @@ import { transferFrom as generatedTransferFrom } from "../__generated__/IERC20/w
  * @extension ERC20
  */
 export type TransferFromParams = Prettify<
-  { to: Address; from: Address } & (
-    | {
-        amount: number | string;
-      }
-    | {
-        amountWei: bigint;
-      }
-  )
+  WithOverrides<
+    { to: Address; from: Address } & (
+      | {
+          amount: number | string;
+        }
+      | {
+          amountWei: bigint;
+        }
+    )
+  >
 >;
 
 /**
@@ -66,6 +71,7 @@ export function transferFrom(
             amountWei: amount,
             tokenAddress: options.contract.address,
           },
+          ...options.overrides,
         },
       } as const;
     },

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

@@ -237,10 +237,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
-          [TransactionError: Error - !Qty
+          [TransactionError: DropClaimExceedLimit - 0,1
 
           contract: ${contract.address}
-          chainId: 31337]
+          chainId: ${contract.chain.id}]
         `);
       });
 
@@ -279,7 +279,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             }),
           }),
         ).rejects.toThrowErrorMatchingInlineSnapshot(`
-          [TransactionError: Error - !Qty
+          [TransactionError: DropClaimExceedLimit - 3,4
 
           contract: ${contract.address}
           chainId: ${contract.chain.id}]
@@ -405,7 +405,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           account: TEST_ACCOUNT_D,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
-        [TransactionError: Error - !Qty
+        [TransactionError: DropClaimExceedLimit - 1,2
 
         contract: ${contract.address}
         chainId: ${contract.chain.id}]

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

@@ -93,7 +93,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         },
         salt: "test",
       });
-      expect(address).toBe("0x777151741260F8d4098dD492e45FdB536F442672");
+      expect(address).toBe("0x9A18AD1DdCfA00009C2db7dc78a5746d85feF759");
       const isDeployed = await isContractDeployed({
         client: TEST_CLIENT,
         chain: ANVIL_CHAIN,

package/src/extensions/prebuilts/deploy-published.ts

@@ -33,6 +33,7 @@ export type DeployPublishedContractOptions = {
   version?: string;
   implementationConstructorParams?: Record<string, unknown>;
   salt?: string;
+  compilerType?: "solc" | "zksolc";
 };
 
 /**
@@ -92,12 +93,14 @@ export async function deployPublishedContract(
     version,
     implementationConstructorParams,
     salt,
+    compilerType,
   } = options;
   const deployMetadata = await fetchPublishedContractMetadata({
     client,
-    contractId: isZkSyncChain(chain) ? `${contractId}_ZkSync` : contractId,
+    contractId,
     publisher,
     version,
+    compilerType,
   });
 
   return deployContractfromDeployMetadata({
@@ -108,6 +111,7 @@ export async function deployPublishedContract(
     initializeParams: contractParams,
     implementationConstructorParams,
     salt,
+    compilerType,
   });
 }
 
@@ -126,6 +130,7 @@ export type DeployContractfromDeployMetadataOptions = {
     initializeParams?: Record<string, unknown>;
   }[];
   salt?: string;
+  compilerType?: "solc" | "zksolc";
 };
 
 /**
@@ -143,6 +148,7 @@ export async function deployContractfromDeployMetadata(
     implementationConstructorParams,
     modules,
     salt,
+    compilerType,
   } = options;
   switch (deployMetadata?.deployType) {
     case "standard": {
@@ -176,6 +182,7 @@ export async function deployContractfromDeployMetadata(
               client,
             })),
           publisher: deployMetadata.publisher,
+          compilerType,
         });
 
       const initializeTransaction = await getInitializeTransaction({

package/src/extensions/vote/types.ts

@@ -1,9 +1,11 @@
+// biome-ignore lint/nursery/noEnum: TODO convert this
 export enum VoteType {
   against = 0,
   for = 1,
   abstain = 2,
 }
 
+// biome-ignore lint/nursery/noEnum: TODO convert this
 export enum ProposalState {
   pending = 0,
   active = 1,

package/src/react/core/hooks/wallets/useAutoConnect.ts

@@ -1,6 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
 import type { AsyncStorage } from "../../../../utils/storage/AsyncStorage.js";
-import { createWallet } from "../../../../wallets/create-wallet.js";
 import { getUrlToken } from "../../../../wallets/in-app/web/lib/get-url-token.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
 import {
@@ -8,6 +7,7 @@ import {
   getStoredActiveWalletId,
   getStoredConnectedWalletIds,
 } from "../../../../wallets/manager/index.js";
+import type { WalletId } from "../../../../wallets/wallet-types.js";
 import { useConnectionManagerCtx } from "../../providers/connection-manager.js";
 import { setLastAuthProvider } from "../../utils/storage.js";
 import { timeoutPromise } from "../../utils/timeoutPromise.js";
@@ -18,6 +18,7 @@ import { useSetActiveWalletConnectionStatus } from "./useSetActiveWalletConnecti
 export function useAutoConnectCore(
   storage: AsyncStorage,
   props: AutoConnectProps & { wallets: Wallet[] },
+  createWalletFn: (id: WalletId) => Wallet,
   getInstalledWallets?: () => Wallet[],
 ) {
   const manager = useConnectionManagerCtx("useAutoConnect");
@@ -73,7 +74,7 @@ export function useAutoConnectCore(
     const activeWallet =
       lastActiveWalletId &&
       (availableWallets.find((w) => w.id === lastActiveWalletId) ||
-        createWallet(lastActiveWalletId));
+        createWalletFn(lastActiveWalletId));
 
     if (activeWallet) {
       try {

package/src/react/native/hooks/wallets/useAutoConnect.ts

@@ -1,4 +1,5 @@
 import { nativeLocalStorage } from "../../../../utils/storage/nativeStorage.js";
+import { createWallet } from "../../../../wallets/native/create-wallet.js";
 import type { AutoConnectProps } from "../../../core/hooks/connection/types.js";
 import { useAutoConnectCore } from "../../../core/hooks/wallets/useAutoConnect.js";
 import { getDefaultWallets } from "../../wallets/defaultWallets.js";
@@ -23,8 +24,12 @@ import { getDefaultWallets } from "../../wallets/defaultWallets.js";
  * @returns whether the auto connect was successful.
  */
 export function useAutoConnect(props: AutoConnectProps) {
-  return useAutoConnectCore(nativeLocalStorage, {
-    ...props,
-    wallets: props.wallets || getDefaultWallets(props),
-  });
+  return useAutoConnectCore(
+    nativeLocalStorage,
+    {
+      ...props,
+      wallets: props.wallets || getDefaultWallets(props),
+    },
+    createWallet,
+  );
 }

package/src/react/web/hooks/wallets/useAutoConnect.ts

@@ -33,6 +33,7 @@ export function useAutoConnect(props: AutoConnectProps) {
       ...props,
       wallets,
     },
+    createWallet,
     () => {
       const specifiedWalletIds = new Set(wallets.map((x) => x.id));
 

package/src/react/web/ui/ConnectWallet/Details.tsx

@@ -1075,7 +1075,10 @@ function InAppWalletUserInfo(props: {
   const { data: walletInfo } = useWalletInfo(activeWallet?.id);
   const isSmartWallet = hasSmartAccount(activeWallet);
   const { data: walletName } = useQuery({
-    queryKey: [activeWallet?.id, "wallet-name"],
+    queryKey: [
+      "wallet-name",
+      { walletId: activeWallet?.id, walletAddress: account?.address },
+    ],
     queryFn: async () => {
       const lastAuthProvider = await getLastAuthProvider(webLocalStorage);
       if (lastAuthProvider === "guest") {

package/src/storage/upload.ts

@@ -33,6 +33,25 @@ type UploadReturnType<TFiles extends UploadableFile[]> = TFiles extends {
  * @returns A promise that resolves to the uploaded file URI or URIs (when passing multiple files).
  * @throws An error if the upload fails.
  * @example
+ *
+ * ### Uploading JSON objects
+ *
+ * ```ts
+ * import { upload } from "thirdweb/storage";
+ * const uri = await upload({
+ *  client,
+ *  files: [
+ *    {
+ *      name: "something",
+ *      data: {
+ *        hello: "world",
+ *      },
+ *    },
+ *  ],
+ * });
+ *
+ * ### Uploading files
+ *
  * ```ts
  * import { upload } from "thirdweb/storage";
  * const uri = await upload({

package/src/transaction/actions/zksync/send-eip712-transaction.ts

@@ -1,4 +1,4 @@
-import { toRlp } from "viem";
+import { hexToBytes, toRlp } from "viem";
 import { eth_sendRawTransaction } from "../../../rpc/actions/eth_sendRawTransaction.js";
 import { getRpcClient } from "../../../rpc/rpc.js";
 import { toBigInt } from "../../../utils/bigint.js";
@@ -87,25 +87,17 @@ export async function populateEip712Transaction(
   options: SendEip712TransactionOptions,
 ): Promise<EIP721TransactionSerializable> {
   const { account, transaction } = options;
-  let [
-    data,
-    to,
-    value,
-    gas,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    gasPerPubdata,
-  ] = await Promise.all([
-    encode(transaction),
-    resolvePromisedValue(transaction.to),
-    resolvePromisedValue(transaction.value),
-    resolvePromisedValue(transaction.gas),
-    resolvePromisedValue(transaction.maxFeePerGas),
-    resolvePromisedValue(transaction.maxPriorityFeePerGas),
-    resolvePromisedValue(transaction.eip712).then(
-      (eip712) => eip712?.gasPerPubdata,
-    ),
-  ]);
+  let [data, to, value, gas, maxFeePerGas, maxPriorityFeePerGas, eip712] =
+    await Promise.all([
+      encode(transaction),
+      resolvePromisedValue(transaction.to),
+      resolvePromisedValue(transaction.value),
+      resolvePromisedValue(transaction.gas),
+      resolvePromisedValue(transaction.maxFeePerGas),
+      resolvePromisedValue(transaction.maxPriorityFeePerGas),
+      resolvePromisedValue(transaction.eip712),
+    ]);
+  let gasPerPubdata = eip712?.gasPerPubdata;
   if (!gas || !maxFeePerGas || !maxPriorityFeePerGas) {
     // fetch fees and gas
     const rpc = getRpcClient(transaction);
@@ -118,6 +110,15 @@ export async function populateEip712Transaction(
           to,
           data,
           value: value ? numberToHex(value) : undefined,
+          gasPerPubdata,
+          eip712Meta: {
+            ...eip712,
+            gasPerPubdata: gasPerPubdata ? toHex(gasPerPubdata) : toHex(50000n),
+            factoryDeps: eip712?.factoryDeps?.map((dep) =>
+              Array.from(hexToBytes(dep)),
+            ),
+          },
+          type: "0x71",
           // biome-ignore lint/suspicious/noExplicitAny: TODO add to RPC method types
         } as any,
       ],

package/src/transaction/extract-error.ts

@@ -4,6 +4,7 @@ import { resolveContractAbi } from "../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../contract/contract.js";
 import { isHex } from "../utils/encoding/hex.js";
 import { stringify } from "../utils/json.js";
+import { IS_DEV } from "../utils/process.js";
 
 /**
  * @internal
@@ -46,15 +47,13 @@ export async function extractError<abi extends Abi>(args: {
   return error;
 }
 
-const __DEV__ = process.env.NODE_ENV !== "production";
-
 class TransactionError<abi extends Abi> extends Error {
   public contractAddress: string | undefined;
   public chainId: number | undefined;
 
   constructor(reason: string, contract?: ThirdwebContract<abi>) {
     let message = reason;
-    if (__DEV__ && contract) {
+    if (IS_DEV && contract) {
       // show more infor in dev
       message = [
         reason,