Remove un-used byoc registry and factory (#440)

* remove byoc registry and factory

* fix tests

* remove await adn log

Co-authored-by: Jonas Daniels <[email protected]>

Author: joaquim-verges

docs/sdk.ipfsstorage.uploadmetadatabatch.md

@@ -11,23 +11,20 @@ Uploads JSON metadata to IPFS
 ```typescript
 uploadMetadataBatch(metadatas: JsonObject[], fileStartNumber?: number, contractAddress?: string, signerAddress?: string, options?: {
         onProgress: (event: UploadProgressEvent) => void;
-    }): Promise<{
-        baseUri: string;
-        uris: string[];
-    }>;
+    }): Promise<UploadResult>;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  metadatas | [JsonObject](./sdk.jsonobject.md)<!-- -->\[\] |  |
+|  metadatas | [JsonObject](./sdk.jsonobject.md)<!-- -->\[\] | The metadata to be uploaded. |
 |  fileStartNumber | number | <i>(Optional)</i> Optional. The first file file name begins with. |
 |  contractAddress | string | <i>(Optional)</i> Optional. The contract address the data belongs to. |
 |  signerAddress | string | <i>(Optional)</i> Optional. The address of the signer. |
-|  options | { onProgress: (event: [UploadProgressEvent](./sdk.uploadprogressevent.md)<!-- -->) =&gt; void; } | <i>(Optional)</i> |
+|  options | { onProgress: (event: [UploadProgressEvent](./sdk.uploadprogressevent.md)<!-- -->) =&gt; void; } | <i>(Optional)</i> Optional. Upload progress callback. |
 
 <b>Returns:</b>
 
-Promise&lt;{ baseUri: string; uris: string\[\]; }&gt;
+Promise&lt;[UploadResult](./sdk.uploadresult.md)<!-- -->&gt;
 

docs/sdk.istorage.uploadmetadatabatch.md

@@ -18,11 +18,11 @@ uploadMetadataBatch(metadatas: JsonObject[], fileStartNumber?: number, contractA
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  metadatas | [JsonObject](./sdk.jsonobject.md)<!-- -->\[\] |  |
+|  metadatas | [JsonObject](./sdk.jsonobject.md)<!-- -->\[\] | The metadata to be uploaded. |
 |  fileStartNumber | number | <i>(Optional)</i> Optional. The first file file name begins with. |
 |  contractAddress | string | <i>(Optional)</i> Optional. The contract address the data belongs to. |
 |  signerAddress | string | <i>(Optional)</i> Optional. The address of the signer. |
-|  options | { onProgress: (event: [UploadProgressEvent](./sdk.uploadprogressevent.md)<!-- -->) =&gt; void; } | <i>(Optional)</i> |
+|  options | { onProgress: (event: [UploadProgressEvent](./sdk.uploadprogressevent.md)<!-- -->) =&gt; void; } | <i>(Optional)</i> Optional. Upload progress callback. |
 
 <b>Returns:</b>
 

etc/sdk.api.md

@@ -2040,10 +2040,7 @@ export class IpfsStorage implements IStorage {
     }): Promise<string>;
     uploadMetadataBatch(metadatas: JsonObject[], fileStartNumber?: number, contractAddress?: string, signerAddress?: string, options?: {
         onProgress: (event: UploadProgressEvent) => void;
-    }): Promise<{
-        baseUri: string;
-        uris: string[];
-    }>;
+    }): Promise<UploadResult>;
     // @internal
     uploadSingle(data: string | Record<string, any>, contractAddress?: string, signerAddress?: string): Promise<string>;
 }
@@ -4921,7 +4918,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
     // Warning: (ae-forgotten-export) The symbol "ContractPublisher" needs to be exported by the entry point index.d.ts
     //
     // @internal (undocumented)
-    getPublisher(): Promise<ContractPublisher>;
+    getPublisher(): ContractPublisher;
     // @internal
     getSignatureDrop(contractAddress: string): SignatureDrop;
     getSplit(address: string): Split;

src/constants/addresses.ts

@@ -122,10 +122,6 @@ export function getContractAddressByChainId(
       return process.env.factoryAddress as string;
     } else if (contractName === "twRegistry") {
       return process.env.registryAddress as string;
-    } else if (contractName === "twBYOCRegistry") {
-      return process.env.byocRegistryAddress as string;
-    } else if (contractName === "contractDeployer") {
-      return process.env.contractDeployerAddress as string;
     } else if (contractName === "contractMetadataRegistry") {
       return process.env.contractMetadataRegistryAddress as string;
     } else if (contractName === "sigMint") {

src/core/classes/contract-deployer.ts

@@ -362,13 +362,8 @@ export class ContractDeployer extends RPCConnectionHandler {
           chainId,
           "twRegistry",
         );
-        const contractPublisherAddress = getContractAddressByChainId(
-          chainId,
-          "twBYOCRegistry",
-        );
         return new ContractRegistry(
           registryAddress,
-          contractPublisherAddress,
           this.getSignerOrProvider(),
           this.options,
         );

src/core/classes/contract-publisher.ts

@@ -26,12 +26,10 @@ import {
 } from "../../schema/contracts/custom";
 import { ContractWrapper } from "./contract-wrapper";
 import {
-  ContractDeployer,
   ContractPublisher as OnChainContractPublisher,
   IContractPublisher,
 } from "contracts";
 import { getContractPublisherAddress } from "../../constants";
-import ContractDeployerAbi from "../../../abis/ContractDeployer.json";
 import ContractPublisherAbi from "../../../abis/ContractPublisher.json";
 import { ContractPublishedEvent } from "contracts/ContractPublisher";
 
@@ -42,10 +40,8 @@ import { ContractPublishedEvent } from "contracts/ContractPublisher";
 export class ContractPublisher extends RPCConnectionHandler {
   private storage: IStorage;
   private publisher: ContractWrapper<OnChainContractPublisher>;
-  private factory: ContractWrapper<ContractDeployer>;
 
   constructor(
-    contractDeployerAddress: string,
     network: NetworkOrSignerOrProvider,
     options: SDKOptions,
     storage: IStorage,
@@ -58,20 +54,13 @@ export class ContractPublisher extends RPCConnectionHandler {
       ContractPublisherAbi,
       options,
     );
-    this.factory = new ContractWrapper<ContractDeployer>(
-      network,
-      contractDeployerAddress,
-      ContractDeployerAbi,
-      options,
-    );
   }
 
   public override updateSignerOrProvider(
     network: NetworkOrSignerOrProvider,
   ): void {
     super.updateSignerOrProvider(network);
     this.publisher.updateSignerOrProvider(network);
-    this.factory.updateSignerOrProvider(network);
   }
 
   /**

src/core/classes/ipfs-storage.ts

@@ -14,6 +14,7 @@ import { IpfsUploader } from "../uploaders/ipfs-uploader";
 import { UploadProgressEvent } from "../../types/events";
 import { File } from "@web-std/file";
 import FormData from "form-data";
+import { UploadResult } from "../interfaces";
 
 /**
  * IPFS Storage implementation, accepts custom IPFS gateways
@@ -149,7 +150,7 @@ export class IpfsStorage implements IStorage {
     options?: {
       onProgress: (event: UploadProgressEvent) => void;
     },
-  ) {
+  ): Promise<UploadResult> {
     const metadataToUpload = (
       await this.batchUploadProperties(metadatas, options)
     ).map((m: any) => JSON.stringify(m));

src/core/classes/registry.ts

@@ -9,39 +9,20 @@ import { TransactionResult } from "..";
  * @internal
  */
 export class ContractRegistry extends ContractWrapper<TWRegistry> {
-  private byocRegistry: ContractWrapper<TWRegistry>;
-
   constructor(
     registryAddress: string,
-    contractPublisherAddress: string,
     network: NetworkOrSignerOrProvider,
     options?: SDKOptions,
   ) {
     super(network, registryAddress, TWRegistry__factory.abi, options);
-    this.byocRegistry = new ContractWrapper<TWRegistry>(
-      network,
-      contractPublisherAddress,
-      TWRegistry__factory.abi,
-      options,
-    );
   }
 
   public async getContractAddresses(walletAddress: string) {
-    let byocContracts: string[] = [];
-    try {
-      byocContracts = await this.byocRegistry.readContract.getAll(
-        walletAddress,
-      );
-    } catch (e) {
-      // do nothing
-    }
     // TODO @fixme the filter here is necessary because for some reason getAll returns a 0x0 address for the first entry
-    return (await this.readContract.getAll(walletAddress))
-      .concat(byocContracts)
-      .filter(
-        (adr) =>
-          utils.isAddress(adr) && adr.toLowerCase() !== constants.AddressZero,
-      );
+    return (await this.readContract.getAll(walletAddress)).filter(
+      (adr) =>
+        utils.isAddress(adr) && adr.toLowerCase() !== constants.AddressZero,
+    );
   }
 
   public async addContract(
@@ -70,32 +51,6 @@ export class ContractRegistry extends ContractWrapper<TWRegistry> {
     };
   }
 
-  public async addCustomContract(
-    contractAddress: string,
-  ): Promise<TransactionResult> {
-    return await this.addCustomContracts([contractAddress]);
-  }
-
-  public async addCustomContracts(
-    contractAddresses: string[],
-  ): Promise<TransactionResult> {
-    const deployerAddress = await this.getSignerAddress();
-
-    const encoded: string[] = [];
-    contractAddresses.forEach((address) => {
-      encoded.push(
-        this.byocRegistry.readContract.interface.encodeFunctionData("add", [
-          deployerAddress,
-          address,
-        ]),
-      );
-    });
-
-    return {
-      receipt: await this.byocRegistry.multiCall(encoded),
-    };
-  }
-
   public async removeContract(
     contractAddress: string,
   ): Promise<TransactionResult> {
@@ -121,30 +76,4 @@ export class ContractRegistry extends ContractWrapper<TWRegistry> {
       receipt: await this.multiCall(encoded),
     };
   }
-
-  public async removeCustomContract(
-    contractAddress: string,
-  ): Promise<TransactionResult> {
-    return await this.removeCustomContracts([contractAddress]);
-  }
-
-  public async removeCustomContracts(
-    contractAddresses: string[],
-  ): Promise<TransactionResult> {
-    const deployerAddress = await this.getSignerAddress();
-
-    const encoded: string[] = [];
-    contractAddresses.forEach((address) => {
-      encoded.push(
-        this.byocRegistry.readContract.interface.encodeFunctionData("remove", [
-          deployerAddress,
-          address,
-        ]),
-      );
-    });
-
-    return {
-      receipt: await this.byocRegistry.multiCall(encoded),
-    };
-  }
 }

src/core/interfaces/IStorage.ts

@@ -84,10 +84,11 @@ export interface IStorage {
    *
    * Uploads JSON metadata to IPFS
    *
-   * @param metadata - The metadata to be uploaded.
+   * @param metadatas - The metadata to be uploaded.
    * @param fileStartNumber - Optional. The first file file name begins with.
    * @param contractAddress - Optional. The contract address the data belongs to.
    * @param signerAddress - Optional. The address of the signer.
+   * @param options - Optional. Upload progress callback.
    */
   uploadMetadataBatch(
     metadatas: JsonObject[],

src/core/sdk.ts

@@ -8,9 +8,9 @@ import {
   Marketplace,
   NFTCollection,
   NFTDrop,
-  SignatureDrop,
   Pack,
   REMOTE_CONTRACT_TO_CONTRACT_TYPE,
+  SignatureDrop,
   Split,
   Token,
   Vote,
@@ -34,7 +34,6 @@ import { ContractPublisher } from "./classes/contract-publisher";
 import { ContractMetadata } from "./classes";
 import {
   ChainOrRpc,
-  getContractAddressByChainId,
   getProviderForNetwork,
   getReadOnlyProvider,
 } from "../constants";
@@ -121,7 +120,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
    * @internal
    * should never be accessed directly, use {@link ThirdwebSDK.getPublisher} instead
    */
-  private _publisher: Promise<ContractPublisher> | undefined;
+  private _publisher: ContractPublisher;
   /**
    * Internal handler for uploading and downloading files
    */
@@ -151,6 +150,11 @@ export class ThirdwebSDK extends RPCConnectionHandler {
     this.storage = new RemoteStorage(storage);
     this.deployer = new ContractDeployer(signerOrProvider, options, storage);
     this.wallet = new UserWallet(signerOrProvider, options);
+    this._publisher = new ContractPublisher(
+      signerOrProvider,
+      this.options,
+      this.storageHandler,
+    );
   }
 
   /**
@@ -405,9 +409,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
   private updateContractSignerOrProvider() {
     this.wallet.onNetworkUpdated(this.getSignerOrProvider());
     this.deployer.updateSignerOrProvider(this.getSignerOrProvider());
-    this._publisher?.then((publisher) => {
-      publisher.updateSignerOrProvider(this.getSignerOrProvider());
-    });
+    this._publisher.updateSignerOrProvider(this.getSignerOrProvider());
     for (const [, contract] of this.contractCache) {
       contract.onNetworkUpdated(this.getSignerOrProvider());
     }
@@ -424,7 +426,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
       return this.contractCache.get(address) as SmartContract;
     }
     try {
-      const publisher = await this.getPublisher();
+      const publisher = this.getPublisher();
       const metadata = await publisher.fetchContractMetadataFromAddress(
         address,
       );
@@ -459,29 +461,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
   /**
    * @internal
    */
-  public async getPublisher(): Promise<ContractPublisher> {
-    // if we already have a registry just return it back
-    if (this._publisher) {
-      return this._publisher;
-    }
-
-    // otherwise get the factory address for the active chain and get a new one
-
-    // have to do it like this otherwise we run it over and over and over
-    // "this._publisher" has to be assigned to the promise upfront.
-    return (this._publisher = this.getProvider()
-      .getNetwork()
-      .then(async ({ chainId }) => {
-        const factoryAddress = getContractAddressByChainId(
-          chainId,
-          "contractDeployer",
-        );
-        return new ContractPublisher(
-          factoryAddress,
-          this.getSignerOrProvider(),
-          this.options,
-          this.storageHandler,
-        );
-      }));
+  public getPublisher(): ContractPublisher {
+    return this._publisher;
   }
 }