get deployed entrypoint, fix router check

Author: kumaryash90

packages/thirdweb/src/assets/bootstrap.ts

@@ -28,6 +28,7 @@ import {
   IMPLEMENTATIONS,
 } from "./constants.js";
 import { deployInfraProxy } from "./deploy-infra-proxy.js";
+import { getInitCodeHashERC1967 } from "./get-initcode-hash-1967.js";
 
 export async function deployRouter(options: ClientAndChainAndAccount) {
   let [feeManager, marketSaleImpl] = await Promise.all([
@@ -328,10 +329,3 @@ export async function getDeployedAssetFactory(args: ClientAndChain) {
   }
   return assetFactory;
 }
-
-function getInitCodeHashERC1967(implementation: string) {
-  // See `initCodeHashERC1967` - LibClone {https://github.com/vectorized/solady/blob/main/src/utils/LibClone.sol}
-  return keccak256(
-    `0x603d3d8160223d3973${implementation.toLowerCase().replace(/^0x/, "")}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3`,
-  );
-}

packages/thirdweb/src/assets/get-entrypoint-erc20.ts

@@ -1,16 +1,24 @@
+import { encodePacked } from "viem";
+import { ZERO_ADDRESS } from "../constants/addresses.js";
 import { type ThirdwebContract, getContract } from "../contract/contract.js";
 import { getOrDeployInfraContract } from "../contract/deployment/utils/bootstrap.js";
+import { getDeployedInfraContract } from "../contract/deployment/utils/infra.js";
 import { encodeInitialize } from "../extensions/assets/__generated__/AssetEntrypointERC20/write/initialize.js";
-import type { ClientAndChainAndAccount } from "../utils/types.js";
+import { keccakId } from "../utils/any-evm/keccak-id.js";
+import { isContractDeployed } from "../utils/bytecode/is-contract-deployed.js";
+import { keccak256 } from "../utils/hashing/keccak256.js";
+import type {
+  ClientAndChain,
+  ClientAndChainAndAccount,
+} from "../utils/types.js";
+import { getDeployedAssetFactory } from "./bootstrap.js";
 import {
-  deployRewardLocker,
-  deployRouter,
-  getDeployedAssetFactory,
-  getDeployedRewardLocker,
-  getDeployedRouter,
-} from "./bootstrap.js";
-import { DEFAULT_INFRA_ADMIN, IMPLEMENTATIONS } from "./constants.js";
+  DEFAULT_INFRA_ADMIN,
+  DEFAULT_SALT,
+  IMPLEMENTATIONS,
+} from "./constants.js";
 import { deployInfraProxy } from "./deploy-infra-proxy.js";
+import { getInitCodeHashERC1967 } from "./get-initcode-hash-1967.js";
 
 export async function getOrDeployEntrypointERC20(
   options: ClientAndChainAndAccount,
@@ -25,19 +33,6 @@ export async function getOrDeployEntrypointERC20(
     });
   }
 
-  let [router, rewardLocker] = await Promise.all([
-    getDeployedRouter(options),
-    getDeployedRewardLocker(options),
-  ]);
-
-  if (!router) {
-    router = await deployRouter(options);
-  }
-
-  if (!rewardLocker) {
-    rewardLocker = await deployRewardLocker(options);
-  }
-
   const assetFactory = await getDeployedAssetFactory(options);
   if (!assetFactory) {
     throw new Error(`Asset factory not found for chain: ${options.chain.id}`);
@@ -53,8 +48,8 @@ export async function getOrDeployEntrypointERC20(
   // encode init data
   const initData = encodeInitialize({
     owner: DEFAULT_INFRA_ADMIN,
-    router: router.address,
-    rewardLocker: rewardLocker.address,
+    router: ZERO_ADDRESS,
+    rewardLocker: ZERO_ADDRESS,
   });
 
   const entyrpointProxyAddress = await deployInfraProxy({
@@ -71,3 +66,58 @@ export async function getOrDeployEntrypointERC20(
     address: entyrpointProxyAddress,
   });
 }
+
+export async function getDeployedEntrypointERC20(options: ClientAndChain) {
+  const implementations = IMPLEMENTATIONS[options.chain.id];
+
+  if (implementations?.AssetEntrypointERC20) {
+    return getContract({
+      client: options.client,
+      chain: options.chain,
+      address: implementations.AssetEntrypointERC20,
+    });
+  }
+
+  const [assetFactory, entrypointImpl] = await Promise.all([
+    getDeployedAssetFactory(options),
+    getDeployedInfraContract({
+      ...options,
+      contractId: "AssetEntrypointERC20",
+      publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936",
+      version: "0.0.2",
+    }),
+  ]);
+
+  if (!assetFactory || !entrypointImpl) {
+    return null;
+  }
+
+  const initCodeHash = getInitCodeHashERC1967(entrypointImpl.address);
+
+  const saltHash = keccak256(
+    encodePacked(
+      ["bytes32", "address"],
+      [keccakId(DEFAULT_SALT), DEFAULT_INFRA_ADMIN],
+    ),
+  );
+
+  const hashedDeployInfo = keccak256(
+    encodePacked(
+      ["bytes1", "address", "bytes32", "bytes32"],
+      ["0xff", assetFactory.address, saltHash, initCodeHash],
+    ),
+  );
+
+  const entrypointProxyAddress = `0x${hashedDeployInfo.slice(26)}`;
+  const entrypointProxy = getContract({
+    client: options.client,
+    chain: options.chain,
+    address: entrypointProxyAddress,
+  });
+
+  if (!(await isContractDeployed(entrypointProxy))) {
+    return null;
+  }
+
+  return entrypointProxy;
+}

packages/thirdweb/src/assets/get-initcode-hash-1967.ts

@@ -0,0 +1,8 @@
+import { keccak256 } from "../utils/hashing/keccak256.js";
+
+export function getInitCodeHashERC1967(implementation: string) {
+  // See `initCodeHashERC1967` - LibClone {https://github.com/vectorized/solady/blob/main/src/utils/LibClone.sol}
+  return keccak256(
+    `0x603d3d8160223d3973${implementation.toLowerCase().replace(/^0x/, "")}60095155f3363d3d373d3d363d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545af43d6000803e6038573d6000fd5b3d6000f3`,
+  );
+}

packages/thirdweb/src/assets/is-router-enabled.ts

@@ -1,10 +1,17 @@
 import { ZERO_ADDRESS } from "../constants/addresses.js";
-import type { ThirdwebContract } from "../contract/contract.js";
 import { getRouter } from "../extensions/assets/__generated__/AssetEntrypointERC20/read/getRouter.js";
+import type { ClientAndChain } from "../utils/types.js";
+import { getDeployedEntrypointERC20 } from "./get-entrypoint-erc20.js";
 
 export async function isRouterEnabled(
-  entrypoint: ThirdwebContract,
+  options: ClientAndChain,
 ): Promise<boolean> {
+  const entrypoint = await getDeployedEntrypointERC20(options);
+
+  if (!entrypoint) {
+    return false;
+  }
+
   const router = await getRouter({
     contract: entrypoint,
   });