Remove new ThirdStorage() from ContractWrapper

thirdweb-dev · jnsdls · Jul 17, 2023 · Mar 1, 2023 · Jul 10, 2023 · Jul 10, 2023
commit 479ad2127eb6c9ac9f27c6836e9c5b1c8460dbb0
diff --git a/packages/sdk/src/evm/common/currency/approveErc20Allowance.ts b/packages/sdk/src/evm/common/currency/approveErc20Allowance.ts
@@ -17,6 +17,7 @@ export async function approveErc20Allowance(
     currencyAddress,
     ERC20Abi,
     contractToApprove.options,
+    contractToApprove.storage,
   );
   const owner = await contractToApprove.getSignerAddress();
   const spender = contractToApprove.readContract.address;

diff --git a/packages/sdk/src/evm/common/currency/hasERC20Allowance.ts b/packages/sdk/src/evm/common/currency/hasERC20Allowance.ts
@@ -14,6 +14,7 @@ export async function hasERC20Allowance(
     currencyAddress,
     ERC20Abi,
     {},
+    contractToApprove.storage,
   );
   const owner = await contractToApprove.getSignerAddress();
   const spender = contractToApprove.readContract.address;

diff --git a/packages/sdk/src/evm/common/currency/setErc20Allowance.ts b/packages/sdk/src/evm/common/currency/setErc20Allowance.ts
@@ -20,6 +20,7 @@ export async function setErc20Allowance(
       currencyAddress,
       ERC20Abi,
       contractToApprove.options,
+      contractToApprove.storage,
     );
 
     const owner = await contractToApprove.getSignerAddress();

diff --git a/packages/sdk/src/evm/common/marketplace.ts b/packages/sdk/src/evm/common/marketplace.ts
@@ -106,6 +106,7 @@ export async function handleTokenApproval(
     assetContract,
     ERC165Abi,
     contractWrapper.options,
+    contractWrapper.storage,
   );
   const isERC721 = await erc165.readContract.supportsInterface(
     InterfaceId_IERC721,
@@ -120,6 +121,7 @@ export async function handleTokenApproval(
       assetContract,
       ERC721Abi,
       contractWrapper.options,
+      contractWrapper.storage,
     );
     const approved = await asset.readContract.isApprovedForAll(
       from,
@@ -143,6 +145,7 @@ export async function handleTokenApproval(
       assetContract,
       ERC1155Abi,
       contractWrapper.options,
+      contractWrapper.storage,
     );
 
     const approved = await asset.readContract.isApprovedForAll(

diff --git a/packages/sdk/src/evm/common/plugin/getCompositePluginABI.ts b/packages/sdk/src/evm/common/plugin/getCompositePluginABI.ts
@@ -39,6 +39,7 @@ export async function getCompositePluginABI(
         address,
         getAllExtensionsAbi,
         options,
+        storage,
       );
 
       const plugins = await contract.call("getAllExtensions");
@@ -56,6 +57,7 @@ export async function getCompositePluginABI(
         address,
         getAllPluginsAbi,
         options,
+        storage,
       );
 
       const pluginMap = await contract.call("getAllPlugins");

diff --git a/packages/sdk/src/evm/common/plugin/getMetadataForPlugins.ts b/packages/sdk/src/evm/common/plugin/getMetadataForPlugins.ts
@@ -47,6 +47,7 @@ export async function getMetadataForPlugins(
             implementation,
             getAllPluginsAbi,
             {},
+            storage,
           );
 
           const pluginMap = await contract.call("getAllPlugins");

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/edition-drop.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/edition-drop.ts
@@ -131,6 +131,7 @@ export class EditionDrop extends StandardErc1155<PrebuiltEditionDrop> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/edition.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/edition.ts
@@ -112,6 +112,7 @@ export class Edition extends StandardErc1155<TokenERC1155> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplace.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplace.ts
@@ -162,6 +162,7 @@ export class Marketplace implements UpdateableNetwork {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     this._chainId = chainId;

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplacev3.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/marketplacev3.ts
@@ -214,6 +214,7 @@ export class MarketplaceV3 implements UpdateableNetwork {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     this._chainId = chainId;

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/multiwrap.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/multiwrap.ts
@@ -104,6 +104,7 @@ export class Multiwrap extends StandardErc721<MultiwrapContract> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/nft-collection.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/nft-collection.ts
@@ -116,6 +116,7 @@ export class NFTCollection extends StandardErc721<TokenERC721> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/nft-drop.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/nft-drop.ts
@@ -168,6 +168,7 @@ export class NFTDrop extends StandardErc721<PrebuiltNFTDrop> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/pack.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/pack.ts
@@ -141,6 +141,7 @@ export class Pack extends StandardErc1155<PackContract> {
             },
           }
         : options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/signature-drop.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/signature-drop.ts
@@ -179,6 +179,7 @@ export class SignatureDrop extends StandardErc721<SignatureDropContract> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/split.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/split.ts
@@ -81,6 +81,7 @@ export class Split implements UpdateableNetwork {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     this._chainId = chainId;

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/token-drop.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/token-drop.ts
@@ -97,6 +97,7 @@ export class TokenDrop extends StandardErc20<PrebuiltTokenDrop> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/token.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/token.ts
@@ -90,6 +90,7 @@ export class Token extends StandardErc20<TokenERC20> {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     super(contractWrapper, storage, chainId);

diff --git a/packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts b/packages/sdk/src/evm/contracts/prebuilt-implementations/vote.ts
@@ -83,6 +83,7 @@ export class Vote implements UpdateableNetwork {
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     this._chainId = chainId;

diff --git a/packages/sdk/src/evm/contracts/smart-contract.ts b/packages/sdk/src/evm/contracts/smart-contract.ts
@@ -352,6 +352,7 @@ export class SmartContract<
       address,
       abi,
       options,
+      storage,
     ),
   ) {
     this._chainId = chainId;

diff --git a/packages/sdk/src/evm/core/classes/account.ts b/packages/sdk/src/evm/core/classes/account.ts
@@ -151,6 +151,7 @@ export class Account<TContract extends IAccountCore>
       factoryAddress,
       IAccountFactoryAbi,
       this.contractWrapper.options,
+      this.contractWrapper.storage,
     );
     wrapper.updateSignerOrProvider(this.contractWrapper.getSigner() as Signer);
     return wrapper;

diff --git a/packages/sdk/src/evm/core/classes/contract-publisher.ts b/packages/sdk/src/evm/core/classes/contract-publisher.ts
@@ -65,6 +65,7 @@ export class ContractPublisher extends RPCConnectionHandler {
       getContractPublisherAddress(),
       ContractPublisherAbi,
       options,
+      storage,
     );
   }
 

diff --git a/packages/sdk/src/evm/core/classes/contract-wrapper.ts b/packages/sdk/src/evm/core/classes/contract-wrapper.ts
@@ -56,7 +56,7 @@ export class ContractWrapper<
 > extends RPCConnectionHandler {
   // TODO: In another PR, make this storage private, and have extending classes pass
   // down storage to be stored in contract wrapper.
-  #storage: ThirdwebStorage;
+  storage: ThirdwebStorage;
   private isValidContract = false;
   private customOverrides: () => CallOverrides = () => ({});
   /**
@@ -71,6 +71,7 @@ export class ContractWrapper<
     contractAddress: string,
     contractAbi: ContractInterface,
     options: SDKOptions,
+    storage: ThirdwebStorage,
   ) {
     super(network, options);
     this.abi = contractAbi;
@@ -84,9 +85,7 @@ export class ContractWrapper<
     this.readContract = this.writeContract.connect(
       this.getProvider(),
     ) as TContract;
-    this.#storage = new ThirdwebStorage({
-      apiKey: options?.thirdwebApiKey,
-    });
+    this.storage = storage;
   }
 
   public override updateSignerOrProvider(network: NetworkInput): void {
@@ -520,15 +519,15 @@ export class ContractWrapper<
       const metadata = await fetchContractMetadataFromAddress(
         this.readContract.address,
         this.getProvider(),
-        this.#storage,
+        this.storage,
       );
 
       if (metadata.name) {
         contractName = metadata.name;
       }
 
       if (metadata.metadata.sources) {
-        sources = await fetchSourceFilesFromMetadata(metadata, this.#storage);
+        sources = await fetchSourceFilesFromMetadata(metadata, this.storage);
       }
     } catch (err) {
       // no-op
@@ -798,11 +797,11 @@ export class ContractWrapper<
         ? CONTRACT_ADDRESSES[
             transaction.chainId as keyof typeof CONTRACT_ADDRESSES
           ].openzeppelinForwarderEOA ||
-          (await computeEOAForwarderAddress(this.getProvider(), this.#storage))
+          (await computeEOAForwarderAddress(this.getProvider(), this.storage))
         : CONTRACT_ADDRESSES[
             transaction.chainId as keyof typeof CONTRACT_ADDRESSES
           ].openzeppelinForwarder ||
-          (await computeForwarderAddress(this.getProvider(), this.#storage)));
+          (await computeForwarderAddress(this.getProvider(), this.storage)));
 
     const forwarder = new Contract(forwarderAddress, ForwarderABI, provider);
     const nonce = await getAndIncrementNonce(forwarder, "getNonce", [

diff --git a/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts b/packages/sdk/src/evm/core/classes/drop-claim-conditions.ts
@@ -468,6 +468,7 @@ export class DropClaimConditions<
           claimCondition.currencyAddress,
           ERC20Abi,
           {},
+          this.storage,
         );
         const balance = await erc20.readContract.balanceOf(resolvedAddress);
         if (balance.lt(totalPrice)) {

diff --git a/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts b/packages/sdk/src/evm/core/classes/drop-erc1155-claim-conditions.ts
@@ -440,6 +440,7 @@ export class DropErc1155ClaimConditions<
           claimCondition.currencyAddress,
           IERC20ABI,
           {},
+          this.storage,
         );
 
         const balance = await erc20.readContract.balanceOf(resolvedAddress);

diff --git a/packages/sdk/src/evm/core/classes/factory.ts b/packages/sdk/src/evm/core/classes/factory.ts
@@ -48,7 +48,7 @@ import { getDefaultTrustedForwarders } from "../../constants/addresses/getDefaul
  * @internal
  */
 export class ContractFactory extends ContractWrapper<TWFactory> {
-  private storage: ThirdwebStorage;
+  storage: ThirdwebStorage;
 
   // Map from contract type to version to deploy specific versions by default
   private DEFAULT_VERSION_MAP: Record<PrebuiltContractType, number> = {
@@ -73,7 +73,7 @@ export class ContractFactory extends ContractWrapper<TWFactory> {
     storage: ThirdwebStorage,
     options?: SDKOptions,
   ) {
-    super(network, factoryAddr, TWFactoryAbi, options);
+    super(network, factoryAddr, TWFactoryAbi, options, storage);
     this.storage = storage;
   }
 

diff --git a/packages/sdk/src/evm/core/classes/marketplacev3-offers.ts b/packages/sdk/src/evm/core/classes/marketplacev3-offers.ts
@@ -96,7 +96,9 @@ export class MarketplaceV3Offers<TContract extends OffersLogic>
    * @returns the Offer object array
    * @twfeature Offers
    */
-  public async getAll(filter?: MarketplaceFilterWithoutSeller): Promise<OfferV3[]> {
+  public async getAll(
+    filter?: MarketplaceFilterWithoutSeller,
+  ): Promise<OfferV3[]> {
     const totalOffers = await this.getTotalCount();
 
     let start = BigNumber.from(filter?.start || 0).toNumber();
@@ -133,7 +135,9 @@ export class MarketplaceV3Offers<TContract extends OffersLogic>
    * @returns the Offer object array
    * @twfeature Offers
    */
-  public async getAllValid(filter?: MarketplaceFilterWithoutSeller): Promise<OfferV3[]> {
+  public async getAllValid(
+    filter?: MarketplaceFilterWithoutSeller,
+  ): Promise<OfferV3[]> {
     const totalOffers = await this.getTotalCount();
 
     let start = BigNumber.from(filter?.start || 0).toNumber();
@@ -426,7 +430,13 @@ export class MarketplaceV3Offers<TContract extends OffersLogic>
       : offer.currencyContractAddress;
 
     const provider = this.contractWrapper.getProvider();
-    const erc20 = new ContractWrapper<IERC20>(provider, currency, ERC20Abi, {});
+    const erc20 = new ContractWrapper<IERC20>(
+      provider,
+      currency,
+      ERC20Abi,
+      {},
+      this.storage,
+    );
 
     const offerorBalance = await erc20.readContract.balanceOf(
       offer.offerorAddress,

diff --git a/packages/sdk/src/evm/core/classes/multichain-registry.ts b/packages/sdk/src/evm/core/classes/multichain-registry.ts
@@ -40,13 +40,15 @@ export class MultichainRegistry {
       getMultichainRegistryAddress(),
       TWRegistryABI,
       options,
+      storage,
     );
 
     this.registryRouter = new ContractWrapper<TWMultichainRegistryRouter>(
       network,
       getMultichainRegistryAddress(),
       TWRegistryRouterABI,
       options,
+      storage,
     );
   }
 

diff --git a/packages/sdk/src/evm/core/classes/pack-vrf.ts b/packages/sdk/src/evm/core/classes/pack-vrf.ts
@@ -45,6 +45,7 @@ export class PackVRF implements UpdateableNetwork, DetectableFeature {
       address,
       IPackAbi,
       options,
+      storage,
     ),
   ) {
     this.contractWrapper = contractWrapper;
@@ -344,6 +345,7 @@ export class PackVRF implements UpdateableNetwork, DetectableFeature {
       linkAddress,
       ERC20Abi,
       this.contractWrapper.options,
+      this.storage,
     );
     return new Erc20(contract, this.storage, this.chainId);
   }

diff --git a/packages/sdk/src/evm/core/classes/registry.ts b/packages/sdk/src/evm/core/classes/registry.ts
@@ -8,6 +8,7 @@ import { Transaction } from "./transactions";
 import type { TWRegistry } from "@thirdweb-dev/contracts-js";
 import TWRegistryABI from "@thirdweb-dev/contracts-js/dist/abis/TWRegistry.json";
 import { constants, utils } from "ethers";
+import type { ThirdwebStorage } from "@thirdweb-dev/storage";
 
 /**
  * @internal
@@ -16,9 +17,10 @@ export class ContractRegistry extends ContractWrapper<TWRegistry> {
   constructor(
     registryAddress: string,
     network: NetworkInput,
+    storage: ThirdwebStorage,
     options?: SDKOptions,
   ) {
-    super(network, registryAddress, TWRegistryABI, options);
+    super(network, registryAddress, TWRegistryABI, options, storage);
   }
 
   public async getContractAddresses(walletAddress: AddressOrEns) {

diff --git a/packages/sdk/src/evm/core/sdk.ts b/packages/sdk/src/evm/core/sdk.ts
@@ -279,7 +279,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
     this.storage = configuredStorage;
     this.storageHandler = configuredStorage;
 
-    this.wallet = new UserWallet(network, options);
+    this.wallet = new UserWallet(network, options, configuredStorage);
     this.deployer = new ContractDeployer(network, options, configuredStorage);
     this.verifier = new ContractVerifier(network, options, configuredStorage);
     this.multiChainRegistry = new MultichainRegistry(
@@ -1728,6 +1728,7 @@ export class ContractDeployer extends RPCConnectionHandler {
         return new ContractRegistry(
           registryAddress,
           this.getSignerOrProvider(),
+          this.storage,
           this.options,
         );
       }));
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,6 +141,7 @@ export class Pack extends StandardErc1155<PackContract> { @@
                 },
               }
             : options,
+          storage,
         ),
       ) {
         super(contractWrapper, storage, chainId);
@@ Expand Down @@