Merge branch 'main' into ike/i18n

Author: ikethirdweb

packages/sdk/src/evm/common/any-evm-utils/fetchPublishedContractFromPolygon.ts

@@ -1,5 +1,4 @@
 import { Contract } from "ethers";
-import ContractPublisherAbi from "@thirdweb-dev/contracts-js/dist/abis/ContractPublisher.json";
 import type { ContractPublisher } from "@thirdweb-dev/contracts-js";
 import { getContractPublisherAddress } from "../../constants/addresses/getContractPublisherAddress";
 import { getChainProvider } from "../../constants/urls";
@@ -25,6 +24,9 @@ export async function fetchPublishedContractFromPolygon(
   const polygonChain = getSupportedChains().find((c) => c.chainId === 137);
   const chain = polygonChain || Polygon;
   const publisher = await resolveAddress(publisherAddress);
+  const ContractPublisherAbi = (
+    await import("@thirdweb-dev/contracts-js/dist/abis/ContractPublisher.json")
+  ).default;
   const contract = new Contract(
     getContractPublisherAddress(),
     ContractPublisherAbi,

packages/sdk/src/evm/common/currency/approveErc20Allowance.ts

@@ -1,5 +1,4 @@
 import type { IERC20 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { BigNumber, utils, type BigNumberish } from "ethers";
 import { ContractWrapper } from "../../core/classes/contract-wrapper";
 
@@ -12,6 +11,9 @@ export async function approveErc20Allowance(
 ) {
   const signer = contractToApprove.getSigner();
   const provider = contractToApprove.getProvider();
+  const ERC20Abi = (
+    await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+  ).default;
   const erc20 = new ContractWrapper<IERC20>(
     signer || provider,
     currencyAddress,

packages/sdk/src/evm/common/currency/fetchCurrencyMetadata.ts

@@ -1,7 +1,6 @@
 import { getNativeTokenByChainId } from "../../constants/currency";
 import { Currency } from "../../types/currency";
 import type { IERC20Metadata } from "@thirdweb-dev/contracts-js";
-import ERC20MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC20Metadata.json";
 import { Contract, providers } from "ethers";
 import { isNativeToken } from "./isNativeToken";
 
@@ -25,6 +24,9 @@ export async function fetchCurrencyMetadata(
       decimals: nativeToken.decimals,
     };
   } else {
+    const ERC20MetadataAbi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC20Metadata.json")
+    ).default;
     const erc20 = new Contract(
       asset,
       ERC20MetadataAbi,

packages/sdk/src/evm/common/currency/hasERC20Allowance.ts

@@ -1,5 +1,4 @@
 import type { IERC20 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { BigNumber } from "ethers";
 import { ContractWrapper } from "../../core/classes/contract-wrapper";
 
@@ -9,6 +8,9 @@ export async function hasERC20Allowance(
   value: BigNumber,
 ) {
   const provider = contractToApprove.getProvider();
+  const ERC20Abi = (
+    await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+  ).default;
   const erc20 = new ContractWrapper<IERC20>(
     provider,
     currencyAddress,

packages/sdk/src/evm/common/currency/setErc20Allowance.ts

@@ -1,5 +1,4 @@
 import type { IERC20 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { BigNumber } from "ethers";
 import { ContractWrapper } from "../../core/classes/contract-wrapper";
 import { isNativeToken } from "./isNativeToken";
@@ -13,6 +12,9 @@ export async function setErc20Allowance(
   if (isNativeToken(currencyAddress)) {
     overrides["value"] = value;
   } else {
+    const ERC20Abi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+    ).default;
     const signer = contractToApprove.getSigner();
     const provider = contractToApprove.getProvider();
     const erc20 = new ContractWrapper<IERC20>(

packages/sdk/src/evm/common/legacy.ts

@@ -1,11 +1,15 @@
-import IThirdwebContractABI from "@thirdweb-dev/contracts-js/dist/abis/IThirdwebContract.json";
 import { providers, Contract, utils } from "ethers";
 
 export async function getPrebuiltInfo(
   address: string,
   provider: providers.Provider,
 ): Promise<{ type: string; version: number } | undefined> {
   try {
+    const IThirdwebContractABI = (
+      await import(
+        "@thirdweb-dev/contracts-js/dist/abis/IThirdwebContract.json"
+      )
+    ).default;
     const contract = new Contract(address, IThirdwebContractABI, provider);
     const [_type, version] = await Promise.all([
       contract.contractType(),

packages/sdk/src/evm/common/marketplace.ts

@@ -1,7 +1,4 @@
 import type { IERC1155, IERC165, IERC721 } from "@thirdweb-dev/contracts-js";
-import ERC1155Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155.json";
-import ERC165Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC165.json";
-import ERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC721.json";
 import {
   BigNumber,
   BigNumberish,
@@ -43,12 +40,18 @@ export async function isTokenApprovedForTransfer(
   owner: string,
 ): Promise<boolean> {
   try {
+    const ERC165Abi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC165.json")
+    ).default;
     const erc165 = new Contract(assetContract, ERC165Abi, provider) as IERC165;
     const [isERC721, isERC1155] = await Promise.all([
       erc165.supportsInterface(InterfaceId_IERC721),
       erc165.supportsInterface(InterfaceId_IERC1155),
     ]);
     if (isERC721) {
+      const ERC721Abi = (
+        await import("@thirdweb-dev/contracts-js/dist/abis/IERC721.json")
+      ).default;
       const asset = new Contract(assetContract, ERC721Abi, provider) as IERC721;
 
       const approved = await asset.isApprovedForAll(
@@ -69,6 +72,9 @@ export async function isTokenApprovedForTransfer(
         transferrerContractAddress.toLowerCase()
       );
     } else if (isERC1155) {
+      const ERC1155Abi = (
+        await import("@thirdweb-dev/contracts-js/dist/abis/IERC1155.json")
+      ).default;
       const asset = new Contract(
         assetContract,
         ERC1155Abi,
@@ -101,6 +107,9 @@ export async function handleTokenApproval(
   tokenId: BigNumberish,
   from: string,
 ): Promise<void> {
+  const ERC165Abi = (
+    await import("@thirdweb-dev/contracts-js/dist/abis/IERC165.json")
+  ).default;
   const erc165 = new ContractWrapper<IERC165>(
     contractWrapper.getSignerOrProvider(),
     assetContract,
@@ -114,6 +123,9 @@ export async function handleTokenApproval(
   ]);
   // check for token approval
   if (isERC721) {
+    const ERC721Abi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC721.json")
+    ).default;
     const asset = new ContractWrapper<IERC721>(
       contractWrapper.getSignerOrProvider(),
       assetContract,
@@ -138,6 +150,9 @@ export async function handleTokenApproval(
       }
     }
   } else if (isERC1155) {
+    const ERC1155Abi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC1155.json")
+    ).default;
     const asset = new ContractWrapper<IERC1155>(
       contractWrapper.getSignerOrProvider(),
       assetContract,

packages/sdk/src/evm/common/metadata-resolver.ts

@@ -4,7 +4,6 @@ import { resolveContractUriAndBytecode } from "./feature-detection/resolveContra
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import { Contract, providers } from "ethers";
 import { fetchContractMetadata } from "./fetchContractMetadata";
-import TWRegistryABI from "@thirdweb-dev/contracts-js/dist/abis/TWMultichainRegistryLogic.json";
 import { getMultichainRegistryAddress } from "../constants/addresses/getMultichainRegistryAddress";
 import { getChainProvider } from "../constants/urls";
 import type { TWMultichainRegistryLogic } from "@thirdweb-dev/contracts-js";
@@ -113,6 +112,11 @@ async function getMetadataUriFromMultichainRegistry(
   chainId: number,
   sdkOptions: SDKOptions,
 ) {
+  const TWRegistryABI = (
+    await import(
+      "@thirdweb-dev/contracts-js/dist/abis/TWMultichainRegistryLogic.json"
+    )
+  ).default;
   if (!multichainRegistry) {
     const polygonChain = sdkOptions?.supportedChains?.find(
       (c) => c.chainId === 137,

packages/sdk/src/evm/common/nft.ts

@@ -14,9 +14,6 @@ import type {
   IERC165,
   IERC721Metadata,
 } from "@thirdweb-dev/contracts-js";
-import ERC165MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC165.json";
-import ERC721MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC721Metadata.json";
-import ERC1155MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155Metadata.json";
 import type {
   ThirdwebStorage,
   UploadProgressEvent,
@@ -109,6 +106,9 @@ export async function fetchTokenMetadataForContract(
   storage: ThirdwebStorage,
 ): Promise<NFTMetadata> {
   let uri: string | undefined;
+  const ERC165MetadataAbi = (
+    await import("@thirdweb-dev/contracts-js/dist/abis/IERC165.json")
+  ).default;
   const erc165 = new Contract(
     contractAddress,
     ERC165MetadataAbi,
@@ -119,13 +119,19 @@ export async function fetchTokenMetadataForContract(
     erc165.supportsInterface(InterfaceId_IERC1155),
   ]);
   if (isERC721) {
+    const ERC721MetadataAbi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC721Metadata.json")
+    ).default;
     const erc721 = new Contract(
       contractAddress,
       ERC721MetadataAbi,
       provider,
     ) as IERC721Metadata;
     uri = await erc721.tokenURI(tokenId);
   } else if (isERC1155) {
+    const ERC1155MetadataAbi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC1155Metadata.json")
+    ).default;
     const erc1155 = new Contract(
       contractAddress,
       ERC1155MetadataAbi,

packages/sdk/src/evm/common/verification.ts

@@ -13,7 +13,6 @@ import { getChainProvider } from "../constants/urls";
 import invariant from "tiny-invariant";
 import { fetchContractMetadataFromAddress } from "./metadata-resolver";
 import type { ContractPublisher } from "@thirdweb-dev/contracts-js";
-import ContractPublisherAbi from "@thirdweb-dev/contracts-js/dist/abis/ContractPublisher.json";
 import { fetchExtendedReleaseMetadata } from "./feature-detection/fetchExtendedReleaseMetadata";
 import { getContractPublisherAddress } from "../constants/addresses/getContractPublisherAddress";
 
@@ -457,14 +456,20 @@ async function fetchDeployBytecodeFromPublishedContractMetadata(
     provider,
   );
   if (compilerMetaUri) {
+    const ContractPublisherAbi = (
+      await import(
+        "@thirdweb-dev/contracts-js/dist/abis/ContractPublisher.json"
+      )
+    ).default;
     const contract = new Contract(
       getContractPublisherAddress(),
       ContractPublisherAbi,
       getChainProvider("polygon", {}),
     ) as ContractPublisher;
 
-    const publishedMetadataUri =
-      await contract.getPublishedUriFromCompilerUri(compilerMetaUri);
+    const publishedMetadataUri = await contract.getPublishedUriFromCompilerUri(
+      compilerMetaUri,
+    );
     if (publishedMetadataUri.length === 0) {
       throw Error(
         `Could not resolve published metadata URI from ${compilerMetaUri}`,

packages/sdk/src/evm/contracts/prebuilt-implementations/split.ts

@@ -2,7 +2,6 @@ import type {
   IERC20,
   Split as SplitContract,
 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import { BigNumber, CallOverrides, Contract } from "ethers";
 import { fetchCurrencyValue } from "../../common/currency/fetchCurrencyValue";
@@ -247,6 +246,9 @@ export class Split implements UpdateableNetwork {
       resolveAddress(tokenAddress),
       resolveAddress(walletAddress),
     ]);
+    const ERC20Abi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+    ).default;
     const erc20 = new Contract(
       resolvedToken,
       ERC20Abi,

packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts

@@ -1,5 +1,4 @@
 import type { IERC20, VoteERC20 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { ProposalCreatedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/VoteERC20";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import {
@@ -301,6 +300,9 @@ export class Vote implements UpdateableNetwork {
   public async balanceOfToken(
     tokenAddress: AddressOrEns,
   ): Promise<CurrencyValue> {
+    const ERC20Abi = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+    ).default;
     const erc20 = new Contract(
       await resolveAddress(tokenAddress),
       ERC20Abi,

packages/sdk/src/evm/core/classes/contract-wrapper.ts

@@ -1,4 +1,3 @@
-import ForwarderABI from "@thirdweb-dev/contracts-js/dist/abis/Forwarder.json";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import {
   BaseContract,
@@ -759,6 +758,9 @@ export class ContractWrapper<
     const provider = this.getProvider();
     invariant(signer, "provider is not set");
     invariant(provider, "provider is not set");
+    const ForwarderABI = (
+      await import("@thirdweb-dev/contracts-js/dist/abis/Forwarder.json")
+    ).default;
     const forwarderAddress =
       this.options.gasless.openzeppelin.relayerForwarderAddress ||
       (this.options.gasless.openzeppelin.useEOAForwarder

packages/sdk/src/evm/core/classes/delayed-reveal.ts

@@ -3,7 +3,6 @@ import type {
   IThirdwebContract,
   SignatureDrop,
 } from "@thirdweb-dev/contracts-js";
-import DeprecatedAbi from "@thirdweb-dev/contracts-js/dist/abis/IDelayedRevealDeprecated.json";
 import { TokensLazyMintedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/DropERC721";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import { BigNumber, Contract, utils, type BigNumberish } from "ethers";
@@ -353,6 +352,11 @@ export class DelayedReveal<
   }
 
   private async getLegacyEncryptedData(index: BigNumber) {
+    const DeprecatedAbi = (
+      await import(
+        "@thirdweb-dev/contracts-js/dist/abis/IDelayedRevealDeprecated.json"
+      )
+    ).default;
     const legacy = new Contract(
       this.contractWrapper.address,
       DeprecatedAbi,

packages/sdk/src/evm/core/classes/drop-claim-conditions.ts

@@ -10,7 +10,6 @@ import type {
   IERC20Metadata,
   Multicall,
 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import type { IDropSinglePhase } from "@thirdweb-dev/contracts-js/src/DropSinglePhase";
 import type { IClaimCondition } from "@thirdweb-dev/contracts-js/src/IDrop";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
@@ -503,6 +502,9 @@ export class DropClaimConditions<
           reasons.push(ClaimEligibility.NotEnoughTokens);
         }
       } else {
+        const ERC20Abi = (
+          await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+        ).default;
         const erc20 = new ContractWrapper<IERC20>(
           provider,
           claimCondition.currencyAddress,

packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts

@@ -9,7 +9,6 @@ import type {
   IERC20,
   Multicall,
 } from "@thirdweb-dev/contracts-js";
-import IERC20ABI from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import { BigNumber, constants, utils, type BigNumberish } from "ethers";
 import deepEqual from "fast-deep-equal";
@@ -486,6 +485,9 @@ export class DropErc1155ClaimConditions<
           reasons.push(ClaimEligibility.NotEnoughTokens);
         }
       } else {
+        const IERC20ABI = (
+          await import("@thirdweb-dev/contracts-js/dist/abis/IERC20.json")
+        ).default;
         const erc20 = new ContractWrapper<IERC20>(
           provider,
           claimCondition.currencyAddress,