[SDK] Deployment params: Empty default forwarders (#2090)

Author: kumaryash90

.changeset/empty-ears-notice.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/sdk": patch
+---
+
+empty default trusted forwarders param

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

@@ -22,6 +22,7 @@ import { ConstructorParamMap } from "../../types/any-evm/deploy-data";
 import { extractConstructorParamsFromAbi } from "../feature-detection/extractConstructorParamsFromAbi";
 import { caches } from "./caches";
 import { getRoyaltyEngineV1ByChainId } from "../../constants/royaltyEngine";
+import { AddressZero } from "../../constants/addresses/AddressZero";
 
 /**
  * @internal
@@ -168,22 +169,7 @@ export async function encodeConstructorParamsForImplementation(
         );
       } else if (p.name && p.name.includes("trustedForwarder")) {
         if (compilerMetadata.name === "Pack") {
-          // EOAForwarder for Pack
-          const deploymentInfo = await computeDeploymentInfo(
-            "infra",
-            provider,
-            storage,
-            create2Factory,
-            {
-              contractName: "ForwarderEOAOnly",
-            },
-            clientId,
-            secretKey,
-          );
-          if (!caches.deploymentPresets["ForwarderEOAOnly"]) {
-            caches.deploymentPresets["ForwarderEOAOnly"] = deploymentInfo;
-          }
-          return deploymentInfo.transaction.predictedAddress;
+          return AddressZero;
         }
 
         const deploymentInfo = await computeDeploymentInfo(

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

@@ -33,6 +33,8 @@ import { overrideRecipientAddress } from "./override-recipient-address";
  * @returns
  * @internal
  */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+// TODO: Update function interface: Remove unused param
 export async function getDeployArguments<
   TContractType extends PrebuiltContractType,
 >(
@@ -42,24 +44,10 @@ export async function getDeployArguments<
   signer: Signer,
   storage: ThirdwebStorage,
 ): Promise<any[]> {
-  const chainId = await signer.getChainId();
   const signerAddress = await signer.getAddress();
-  const chainEnum = SUPPORTED_CHAIN_IDS.find((c) => c === chainId);
-  let trustedForwarders: string[] = [];
-  if (!chainEnum) {
-    const forwarder = await computeForwarderAddress(
-      signer.provider as providers.Provider,
-      storage,
-    );
-    trustedForwarders = [forwarder];
-  } else {
-    trustedForwarders =
-      contractType === PackInitializer.contractType
-        ? []
-        : getDefaultTrustedForwarders(chainId);
-  }
+  const trustedForwarders: string[] = [];
 
-  // add default forwarders to any custom forwarders passed in
+  // add any custom forwarders passed in
   if (metadata.trusted_forwarders && metadata.trusted_forwarders.length > 0) {
     trustedForwarders.push(...metadata.trusted_forwarders);
   }

packages/sdk/src/evm/core/classes/internal/factory.ts

@@ -15,7 +15,6 @@ import { z } from "zod";
 import { getDeployArguments } from "../../../common/deploy";
 import { buildTransactionFunction } from "../../../common/transactions";
 import { getApprovedImplementation } from "../../../constants/addresses/getApprovedImplementation";
-import { getDefaultTrustedForwarders } from "../../../constants/addresses/getDefaultTrustedForwarders";
 import {
   DeploySchemaForPrebuiltContractType,
   EditionDropInitializer,
@@ -226,10 +225,7 @@ export class ContractFactory extends ContractWrapper<TWFactory> {
     metadata: z.input<DeploySchemaForPrebuiltContractType<TContractType>>,
     contractURI: string,
   ): Promise<any[]> {
-    let trustedForwarders =
-      contractType === PackInitializer.contractType
-        ? []
-        : await this.getDefaultTrustedForwarders();
+    let trustedForwarders: string[] = [];
     // override default forwarders if custom ones are passed in
     if (metadata.trusted_forwarders && metadata.trusted_forwarders.length > 0) {
       trustedForwarders = metadata.trusted_forwarders;
@@ -403,11 +399,6 @@ export class ContractFactory extends ContractWrapper<TWFactory> {
     }
   }
 
-  private async getDefaultTrustedForwarders(): Promise<string[]> {
-    const chainId = await this.getChainID();
-    return getDefaultTrustedForwarders(chainId);
-  }
-
   private async getImplementation(
     contract: (typeof PREBUILT_CONTRACTS_MAP)[PrebuiltContractType],
     version?: number,

packages/sdk/src/evm/core/sdk.ts

@@ -104,7 +104,6 @@ import {
   directDeployDeterministicPublished,
   predictAddressDeterministicPublished,
 } from "../common/any-evm-utils/deployDirectDeterministic";
-import { getDefaultTrustedForwarders } from "../constants/addresses/getDefaultTrustedForwarders";
 import { DeployEvent, DeployEvents } from "../types/deploy/deploy-events";
 import {
   AirdropContractDeployMetadata,
@@ -1025,9 +1024,8 @@ export class ContractDeployer extends RPCConnectionHandler {
       );
       const contractURI = await this.storage.upload(parsedMetadata);
 
-      const chainId = (await this.getProvider().getNetwork()).chainId;
-      const trustedForwarders = getDefaultTrustedForwarders(chainId);
-      // add default forwarders to any custom forwarders passed in
+      const trustedForwarders: string[] = [];
+      // add any custom forwarders passed in
       if (
         metadata.trusted_forwarders &&
         metadata.trusted_forwarders.length > 0
@@ -1085,9 +1083,8 @@ export class ContractDeployer extends RPCConnectionHandler {
       );
       const contractURI = await this.storage.upload(parsedMetadata);
 
-      const chainId = (await this.getProvider().getNetwork()).chainId;
-      const trustedForwarders = getDefaultTrustedForwarders(chainId);
-      // add default forwarders to any custom forwarders passed in
+      const trustedForwarders: string[] = [];
+      // add any custom forwarders passed in
       if (
         metadata.trusted_forwarders &&
         metadata.trusted_forwarders.length > 0
@@ -1456,9 +1453,8 @@ export class ContractDeployer extends RPCConnectionHandler {
       const parsedMetadata = await AirdropContractDeploy.parseAsync(metadata);
       const contractURI = await this.storage.upload(parsedMetadata);
 
-      const chainId = (await this.getProvider().getNetwork()).chainId;
-      const trustedForwarders = getDefaultTrustedForwarders(chainId);
-      // add default forwarders to any custom forwarders passed in
+      const trustedForwarders: string[] = [];
+      // add any custom forwarders passed in
       if (
         metadata.trusted_forwarders &&
         metadata.trusted_forwarders.length > 0
@@ -1488,9 +1484,8 @@ export class ContractDeployer extends RPCConnectionHandler {
       const parsedMetadata = await AirdropContractDeploy.parseAsync(metadata);
       const contractURI = await this.storage.upload(parsedMetadata);
 
-      const chainId = (await this.getProvider().getNetwork()).chainId;
-      const trustedForwarders = getDefaultTrustedForwarders(chainId);
-      // add default forwarders to any custom forwarders passed in
+      const trustedForwarders: string[] = [];
+      // add any custom forwarders passed in
       if (
         metadata.trusted_forwarders &&
         metadata.trusted_forwarders.length > 0
@@ -1520,9 +1515,8 @@ export class ContractDeployer extends RPCConnectionHandler {
       const parsedMetadata = await AirdropContractDeploy.parseAsync(metadata);
       const contractURI = await this.storage.upload(parsedMetadata);
 
-      const chainId = (await this.getProvider().getNetwork()).chainId;
-      const trustedForwarders = getDefaultTrustedForwarders(chainId);
-      // add default forwarders to any custom forwarders passed in
+      const trustedForwarders: string[] = [];
+      // add any custom forwarders passed in
       if (
         metadata.trusted_forwarders &&
         metadata.trusted_forwarders.length > 0

packages/sdk/src/evm/zksync/constants/addresses.ts

@@ -97,5 +97,7 @@ export function zkGetDefaultTrustedForwarders(
   chainId: number,
   contractName?: string,
 ): string[] {
+  //  Since ZkSync has gas sponsoring through native Account Abstraction,
+  //  it doesn’t need a forwarder
   return [];
 }