WIP: TODO's created to fetch for ContractInitialized event and updated salt transforming

Author: GWSzeto

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/data-table.tsx

@@ -101,6 +101,11 @@ export function DataTable({
         throw new Error("No active account");
       }
 
+      // TODO: fetch the ContractIntialized event
+      // Guessing it has to fetch the transaction hash based on the contract address
+      // Then fetch the block number from the transaction hash
+      // Then fetch the event by limiting the block number
+
       const coreInitializeParams = {
         ...(
           coreMetadata.abi

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/page.tsx

@@ -77,7 +77,10 @@ export default async function Page(props: {
         id: chainId,
         network: chainMetadata.name,
         chainId: chain.id,
-        status: code === _originalCode ? "DEPLOYED" : "NOT_DEPLOYED",
+        status:
+          code === _originalCode
+            ? ("DEPLOYED" as const)
+            : ("NOT_DEPLOYED" as const),
       };
     }),
   );
@@ -129,7 +132,6 @@ export default async function Page(props: {
       coreMetadata={coreMetadata}
       modulesMetadata={modulesMetadata}
       erc20InitialData={erc20InitialData}
-      contract={contract}
       data={chainsDeployedOn}
     />
   );

apps/dashboard/src/data/explore.ts

@@ -201,7 +201,7 @@ const CROSS_CHAIN = {
   contracts: [
     // erc20 drop
     [
-      "thirdweb.eth/ERC20CoreInitializable",
+      "0x5bb2610C42280674d6f70682f76311B44D1c07FB/ERC20CoreInitializable", // TODO: replace this with the thirdweb published contract
       [
         "deployer.thirdweb.eth/ClaimableERC20",
         "0xf2d22310905EaD92C19c7ef0003C1AD38e129cb1/SuperChainInterop", // TODO: replace this with the OP published contract

packages/thirdweb/src/contract/deployment/deploy-via-autofactory.ts

@@ -1,3 +1,4 @@
+import { keccakId } from "src/exports/utils.js";
 import { parseEventLogs } from "../../event/actions/parse-logs.js";
 import { proxyDeployedEvent } from "../../extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.js";
 import { deployProxyByImplementation } from "../../extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.js";
@@ -34,8 +35,9 @@ export function prepareAutoFactoryDeployTransaction(
       });
       const blockNumber = await eth_blockNumber(rpcRequest);
       const salt = args.salt
-        ? //? keccakId(args.salt)
-          (args.salt as `0x${string}`)
+        ? args.salt.startsWith("0x") && args.salt.length === 66
+          ? (args.salt as `0x${string}`)
+          : keccakId(args.salt)
         : toHex(blockNumber, {
             size: 32,
           });