thirdweb 5.105.44 → 5.105.45

package/src/extensions/erc20/drops/write/resetClaimEligibility.ts

@@ -1,5 +1,8 @@
 import type { Hex } from "viem";
-import type { BaseTransactionOptions } from "../../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
 import {
   isSetClaimConditionsSupported,
@@ -28,7 +31,9 @@ import {
  * await sendTransaction({ transaction, account });
  * ```
  */
-export function resetClaimEligibility(options: BaseTransactionOptions) {
+export function resetClaimEligibility(
+  options: BaseTransactionOptions<WithOverrides<{}>>,
+) {
   // download existing conditions
   return setClaimConditions({
     asyncParams: async () => {
@@ -48,6 +53,7 @@ export function resetClaimEligibility(options: BaseTransactionOptions) {
       };
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc20/drops/write/setClaimConditions.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../transaction/types.js";
 import { getMulticallSetClaimConditionTransactions } from "../../../../utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.js";
 import type { ClaimConditionsInput } from "../../../../utils/extensions/drops/types.js";
 import { isSetContractURISupported } from "../../../common/__generated__/IContractMetadata/write/setContractURI.js";
@@ -47,7 +50,7 @@ export type SetClaimConditionsParams = {
  * ```
  */
 export function setClaimConditions(
-  options: BaseTransactionOptions<SetClaimConditionsParams>,
+  options: BaseTransactionOptions<WithOverrides<SetClaimConditionsParams>>,
 ) {
   return multicall({
     asyncParams: async () => {
@@ -62,6 +65,7 @@ export function setClaimConditions(
       };
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc20/write/approve.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 type { Prettify } from "../../../utils/type-utils.js";
 import { toUnits } from "../../../utils/units.js";
 import { approve as generatedApprove } from "../__generated__/IERC20/write/approve.js";
@@ -9,14 +12,16 @@ import { approve as generatedApprove } from "../__generated__/IERC20/write/appro
  * @extension ERC20
  */
 export type ApproveParams = Prettify<
-  { spender: Address } & (
-    | {
-        amount: number | string;
-      }
-    | {
-        amountWei: bigint;
-      }
-  )
+  WithOverrides<
+    { spender: Address } & (
+      | {
+          amount: number | string;
+        }
+      | {
+          amountWei: bigint;
+        }
+    )
+  >
 >;
 
 /**
@@ -58,6 +63,7 @@ export function approve(options: BaseTransactionOptions<ApproveParams>) {
             amountWei: amount,
             tokenAddress: options.contract.address,
           },
+          ...options.overrides,
         },
         spender: options.spender,
         value: amount,

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

@@ -1,16 +1,20 @@
 import { prepareContractCall } from "../../../transaction/prepare-contract-call.js";
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import { toWei } from "../../../utils/units.js";
 import { FN_SELECTOR } from "../__generated__/IWETH/write/deposit.js";
 
 /**
  * @extension ERC20
  */
-export type DepositParams =
+export type DepositParams = WithOverrides<
   | {
       amount: string;
     }
-  | { amountWei: bigint };
+  | { amountWei: bigint }
+>;
 
 /**
  * Calls the "deposit" function on the contract (useful to wrap ETH).
@@ -38,5 +42,6 @@ export function deposit(options: BaseTransactionOptions<DepositParams>) {
     },
     method: [FN_SELECTOR, [], []] as const,
     value,
+    ...options.overrides,
   });
 }

package/src/extensions/erc20/write/transferBatch.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 { multicall } from "../../common/__generated__/IMulticall/write/multicall.js";
@@ -8,18 +11,20 @@ import { encodeTransfer } from "../__generated__/IERC20/write/transfer.js";
  * Represents the parameters for a batch transfer operation.
  * @extension ERC20
  */
-export type TransferBatchParams = Prettify<{
-  batch: Array<
-    { to: string } & (
-      | {
-          amount: number | string;
-        }
-      | {
-          amountWei: bigint;
-        }
-    )
-  >;
-}>;
+export type TransferBatchParams = Prettify<
+  WithOverrides<{
+    batch: Array<
+      { to: string } & (
+        | {
+            amount: number | string;
+          }
+        | {
+            amountWei: bigint;
+          }
+      )
+    >;
+  }>
+>;
 
 /**
  * Transfers a batch of ERC20 tokens from the sender's address to the specified recipient address.
@@ -69,6 +74,7 @@ export function transferBatch(
       };
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc721/drops/write/claimTo.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 { getClaimParams } from "../../../../utils/extensions/drops/get-claim-params.js";
 import { isGetContractMetadataSupported } from "../../../common/read/getContractMetadata.js";
 import {
@@ -54,7 +57,9 @@ export type ClaimToParams = {
  * @throws If no claim condition is set
  * @returns A promise that resolves with the submitted transaction hash.
  */
-export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
+export function claimTo(
+  options: BaseTransactionOptions<WithOverrides<ClaimToParams>>,
+) {
   return claim({
     asyncParams: () =>
       getClaimParams({
@@ -66,6 +71,7 @@ export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
         type: "erc721",
       }),
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc721/drops/write/resetClaimEligibility.ts

@@ -1,5 +1,8 @@
 import type { Hex } from "viem";
-import type { BaseTransactionOptions } from "../../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
 import {
   isSetClaimConditionsSupported,
@@ -28,7 +31,9 @@ import {
  * await sendTransaction({ transaction, account });
  * ```
  */
-export function resetClaimEligibility(options: BaseTransactionOptions) {
+export function resetClaimEligibility(
+  options: BaseTransactionOptions<WithOverrides<{}>>,
+) {
   // download existing conditions
   return setClaimConditions({
     asyncParams: async () => {
@@ -48,6 +53,7 @@ export function resetClaimEligibility(options: BaseTransactionOptions) {
       };
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc721/drops/write/setClaimConditions.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../transaction/types.js";
 import { getMulticallSetClaimConditionTransactions } from "../../../../utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.js";
 import type { ClaimConditionsInput } from "../../../../utils/extensions/drops/types.js";
 import { isSetContractURISupported } from "../../../common/__generated__/IContractMetadata/write/setContractURI.js";
@@ -47,7 +50,7 @@ export type SetClaimConditionsParams = {
  * ```
  */
 export function setClaimConditions(
-  options: BaseTransactionOptions<SetClaimConditionsParams>,
+  options: BaseTransactionOptions<WithOverrides<SetClaimConditionsParams>>,
 ) {
   return multicall({
     asyncParams: async () => {
@@ -62,6 +65,7 @@ export function setClaimConditions(
       };
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc721/drops/write/updateMetadata.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../transaction/types.js";
 import type { NFT, NFTInput } from "../../../../utils/nft/parseNft.js";
 import * as BatchBaseURI from "../../__generated__/DropERC721/write/updateBatchBaseURI.js";
 import * as BaseURICount from "../../__generated__/IBatchMintMetadata/read/getBaseURICount.js";
@@ -128,12 +131,13 @@ async function getUpdateMetadataParams(
  * ```
  */
 export function updateMetadata(
-  options: BaseTransactionOptions<UpdateMetadataParams>,
+  options: BaseTransactionOptions<WithOverrides<UpdateMetadataParams>>,
 ) {
   const { contract } = options;
   return BatchBaseURI.updateBatchBaseURI({
     asyncParams: async () => getUpdateMetadataParams(options),
     contract,
+    overrides: options.overrides,
   });
 }
 

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

@@ -51,7 +51,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("erc721.getNFT", () => {
     `);
   });
 
-  it("with owner using indexer", async () => {
+  // skip until indexer restores owner functionality
+  it.skip("with owner using indexer", async () => {
     const nft = await getNFT({
       contract: { ...DOODLES_CONTRACT },
       includeOwner: true,

package/src/extensions/erc721/write/lazyMint.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import {
   getBaseUriFromBatch,
   uploadOrExtractURIs,
@@ -13,9 +16,9 @@ import * as LazyMint from "../__generated__/ILazyMint/write/lazyMint.js";
 /**
  * @extension ERC721
  */
-export type LazyMintParams = {
+export type LazyMintParams = WithOverrides<{
   nfts: (NFTInput | string)[];
-};
+}>;
 
 /**
  * Lazily mints ERC721 tokens.
@@ -66,6 +69,7 @@ export function lazyMint(options: BaseTransactionOptions<LazyMintParams>) {
       } as const;
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc721/write/setSharedMetadata.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import type { NFTInput } from "../../../utils/nft/parseNft.js";
 import { setSharedMetadata as generatedSharedMetadata } from "../__generated__/ISharedMetadata/write/setSharedMetadata.js";
 
@@ -7,9 +10,9 @@ export { isSetSharedMetadataSupported } from "../__generated__/ISharedMetadata/w
 /**
  * @extension ERC721
  */
-export type SetSharedMetadataParams = {
+export type SetSharedMetadataParams = WithOverrides<{
   nft: NFTInput;
-};
+}>;
 
 /**
  * Sets the shared metadata for a OpenEdition contract.
@@ -69,6 +72,7 @@ export function setSharedMetadata(
       };
     },
     contract: options.contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc721/write/updateTokenURI.ts

@@ -1,5 +1,8 @@
 import { upload } from "../../../storage/upload.js";
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import type { NFTInput } from "../../../utils/nft/parseNft.js";
 import {
   type SetTokenURIParams,
@@ -11,10 +14,10 @@ export { isSetTokenURISupported as isUpdateTokenURISupported } from "../../erc72
 /**
  * @extension ERC721
  */
-export type UpdateTokenURIParams = {
+export type UpdateTokenURIParams = WithOverrides<{
   tokenId: bigint;
   newMetadata: NFTInput;
-};
+}>;
 
 /**
  * This function is an abstracted layer of the [`setTokenURI` extension](https://portal.thirdweb.com/references/typescript/v5/erc721/setTokenURI),
@@ -48,6 +51,7 @@ export function updateTokenURI(
   return setTokenURI({
     asyncParams: async () => getUpdateTokenParams(options),
     contract,
+    overrides: options.overrides,
   });
 }
 

package/src/extensions/erc7702/account/createSessionKey.ts

@@ -1,4 +1,7 @@
-import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../transaction/types.js";
 import { randomBytesHex } from "../../../utils/random.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
 import {
@@ -68,7 +71,7 @@ export type CreateSessionKeyOptions = {
  * @extension ERC7702
  */
 export function createSessionKey(
-  options: BaseTransactionOptions<CreateSessionKeyOptions>,
+  options: BaseTransactionOptions<WithOverrides<CreateSessionKeyOptions>>,
 ) {
   const {
     contract,
@@ -161,6 +164,7 @@ export function createSessionKey(
       return { sessionSpec: req, signature };
     },
     contract,
+    overrides: options.overrides,
   });
 }
 

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.105.44";
+export const version = "5.105.45";

package/src/wallets/in-app/core/eip7702/minimal-account.ts

@@ -180,36 +180,49 @@ export const create7702MinimalAccount = (args: {
       abi: MinimalAccountAbi,
     });
     // check if account has been delegated already
-    let authorization: SignedAuthorization | undefined;
+    let authorization: SignedAuthorization | undefined =
+      firstTx.authorizationList?.[0];
     const delegationContractAddress = await getDelegationContractAddress({
       client,
       chain,
     });
-    const isMinimalAccount = await is7702MinimalAccount(
-      eoaContract,
-      delegationContractAddress,
-    );
-    if (!isMinimalAccount) {
-      // if not, sign authorization
-      let nonce = firstTx.nonce
-        ? BigInt(firstTx.nonce)
-        : BigInt(
-            await getNonce({
-              client,
-              address: adminAccount.address,
-              chain,
-            }),
-          );
-      nonce += sponsorGas ? 0n : 1n;
-      const auth = await adminAccount.signAuthorization?.({
-        address: getAddress(delegationContractAddress),
-        chainId: firstTx.chainId,
-        nonce,
-      });
-      if (!auth) {
-        throw new Error("Failed to sign authorization");
+    if (
+      authorization &&
+      authorization.address?.toLowerCase() !==
+        delegationContractAddress.toLowerCase()
+    ) {
+      throw new Error(
+        `Authorization address does not match expected delegation contract address. Expected ${delegationContractAddress} but got ${authorization.address}`,
+      );
+    }
+    // if the tx already has an authorization, use it, otherwise sign one
+    if (!authorization) {
+      const isMinimalAccount = await is7702MinimalAccount(
+        eoaContract,
+        delegationContractAddress,
+      );
+      if (!isMinimalAccount) {
+        // if not, sign authorization
+        let nonce = firstTx.nonce
+          ? BigInt(firstTx.nonce)
+          : BigInt(
+              await getNonce({
+                client,
+                address: adminAccount.address,
+                chain,
+              }),
+            );
+        nonce += sponsorGas ? 0n : 1n;
+        const auth = await adminAccount.signAuthorization?.({
+          address: getAddress(delegationContractAddress),
+          chainId: firstTx.chainId,
+          nonce,
+        });
+        if (!auth) {
+          throw new Error("Failed to sign authorization");
+        }
+        authorization = auth;
       }
-      authorization = auth;
     }
     if (sponsorGas) {
       // send transaction from executor, needs signature

package/src/wallets/injected/index.ts

@@ -1,11 +1,13 @@
 import * as ox__Authorization from "ox/Authorization";
-import type { EIP1193Provider } from "viem";
+import * as ox__Signature from "ox/Signature";
 import {
+  type EIP1193Provider,
   getTypesForEIP712Domain,
   type SignTypedDataParameters,
   serializeTypedData,
   stringify,
   validateTypedData,
+  withTimeout,
 } from "viem";
 import { isInsufficientFundsError } from "../../analytics/track/helpers.js";
 import {
@@ -187,7 +189,7 @@ function createAccount({
     async sendTransaction(tx: SendTransactionOption) {
       const gasFees = tx.gasPrice
         ? {
-            gasPrice: tx.gasPrice ? numberToHex(tx.gasPrice) : undefined,
+            gasPrice: numberToHex(tx.gasPrice),
           }
         : {
             maxFeePerGas: tx.maxFeePerGas
@@ -200,6 +202,9 @@ function createAccount({
       const params = [
         {
           ...tx,
+          authorizationList: tx.authorizationList
+            ? ox__Authorization.toRpcList(tx.authorizationList)
+            : undefined,
           ...gasFees,
           from: this.address,
           gas: tx.gas ? numberToHex(tx.gas) : undefined,
@@ -268,10 +273,25 @@ function createAccount({
     },
     async signAuthorization(authorization: AuthorizationRequest) {
       const payload = ox__Authorization.getSignPayload(authorization);
-      return await provider.request({
-        method: "eth_sign",
-        params: [getAddress(account.address), payload],
-      });
+      let signature: Hex | undefined;
+      try {
+        signature = await provider.request({
+          method: "eth_sign",
+          params: [getAddress(account.address), payload],
+        });
+      } catch {
+        // fallback to secp256k1_sign, some providers don't support eth_sign
+        signature = await provider.request({
+          // @ts-expect-error - overriding types here
+          method: "secp256k1_sign",
+          params: [payload],
+        });
+      }
+      if (!signature) {
+        throw new Error("Failed to sign authorization");
+      }
+      const parsedSignature = ox__Signature.fromHex(signature as Hex);
+      return { ...authorization, ...parsedSignature };
     },
     async signTypedData(typedData) {
       if (!provider || !account.address) {
@@ -400,6 +420,20 @@ async function onConnect({
     provider.removeListener("accountsChanged", onAccountsChanged);
     provider.removeListener("chainChanged", onChainChanged);
     provider.removeListener("disconnect", onDisconnect);
+
+    // Experimental support for MetaMask disconnect
+    // https://github.com/MetaMask/metamask-improvement-proposals/blob/main/MIPs/mip-2.md
+    try {
+      // Adding timeout as not all wallets support this method and can hang
+      await withTimeout(
+        () =>
+          provider.request({
+            method: "wallet_revokePermissions",
+            params: [{ eth_accounts: {} }],
+          }),
+        { timeout: 100 },
+      );
+    } catch {}
   }
 
   async function onDisconnect() {