enable crosschain deployments for non-modular prebuilts

Author: kumaryash90

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageSidebarLinks.ts

@@ -27,7 +27,6 @@ export function getContractPageSidebarLinks(data: {
     {
       label: "Cross Chain",
       href: `${layoutPrefix}/cross-chain`,
-      hide: !data.metadata.isModularCore,
       exactMatch: true,
     },
     {

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

@@ -99,12 +99,14 @@ export function DataTable({
   coreContract,
   modulesMetadata,
   initializeData,
+  inputSalt,
 }: {
   data: CrossChain[];
   coreMetadata: FetchDeployMetadataResult;
   coreContract: ThirdwebContract;
-  modulesMetadata: FetchDeployMetadataResult[];
+  modulesMetadata?: FetchDeployMetadataResult[];
   initializeData?: `0x${string}`;
+  inputSalt?: `0x${string}`;
 }) {
   const activeAccount = useActiveAccount();
   const switchChain = useSwitchActiveWalletChain();
@@ -263,7 +265,9 @@ export function DataTable({
       // eslint-disable-next-line no-restricted-syntax
       const chain = defineChain(chainId);
       const client = getThirdwebClient();
-      const salt = concatHex(["0x0101", padHex("0x", { size: 30 })]).toString();
+      const salt =
+        inputSalt ||
+        concatHex(["0x0101", padHex("0x", { size: 30 })]).toString();
 
       await switchChain(chain);
 
@@ -286,18 +290,18 @@ export function DataTable({
         chain,
         client,
         deployMetadata: coreMetadata,
-        isCrosschain,
+        isCrosschain: true,
         initializeData,
         salt,
       });
 
-      await verifyContract({
+      verifyContract({
         address: crosschainContractAddress,
         chain,
         client,
       });
 
-      if (isCrosschain) {
+      if (isCrosschain && modulesMetadata) {
         const owner = await readContract({
           contract: coreContract,
           method: "function owner() view returns (address)",

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

@@ -1,5 +1,5 @@
 import { fetchPublishedContractsFromDeploy } from "components/contract-components/fetchPublishedContractsFromDeploy";
-import { notFound, redirect } from "next/navigation";
+import { notFound } from "next/navigation";
 import { getContractEvents, prepareEvent } from "thirdweb";
 import { defineChain, getChainMetadata, localhost } from "thirdweb/chains";
 import {
@@ -42,10 +42,6 @@ export default async function Page(props: {
 
   const { isModularCore } = await getContractPageMetadata(contract);
 
-  if (!isModularCore) {
-    redirect(`/${params.chain_id}/${params.contractAddress}`);
-  }
-
   const originalCode = await eth_getCode(
     getRpcClient({
       client: contract.client,
@@ -90,32 +86,37 @@ export default async function Page(props: {
     }),
   );
 
-  const modules = await getInstalledModules({ contract });
-
   const coreMetadata = (
     await fetchPublishedContractsFromDeploy({
       contract,
       client: contract.client,
     })
   ).at(-1) as FetchDeployMetadataResult;
-  const modulesMetadata = (await Promise.all(
-    modules.map(async (m) =>
-      (
-        await fetchPublishedContractsFromDeploy({
-          contract: getContract({
-            chain: contract.chain,
+
+  let modulesMetadata: FetchDeployMetadataResult[] | undefined;
+
+  if (isModularCore) {
+    const modules = await getInstalledModules({ contract });
+
+    modulesMetadata = (await Promise.all(
+      modules.map(async (m) =>
+        (
+          await fetchPublishedContractsFromDeploy({
+            contract: getContract({
+              chain: contract.chain,
+              client: contract.client,
+              address: m.implementation,
+            }),
             client: contract.client,
-            address: m.implementation,
-          }),
-          client: contract.client,
-        })
-      ).at(-1),
-    ),
-  )) as FetchDeployMetadataResult[];
+          })
+        ).at(-1),
+      ),
+    )) as FetchDeployMetadataResult[];
+  }
 
   const ProxyDeployedEvent = prepareEvent({
     signature:
-      "event ProxyDeployed(address indexed implementation, address proxy, address indexed deployer, bytes data)",
+      "event ProxyDeployed(address indexed implementation, address indexed proxy, address indexed deployer, bytes32 inputSalt, bytes data)",
   });
 
   const twCloneFactoryContract = await getDeployedCloneFactoryContract({
@@ -139,6 +140,7 @@ export default async function Page(props: {
       coreMetadata={coreMetadata}
       modulesMetadata={modulesMetadata}
       initializeData={event?.args.data}
+      inputSalt={event?.args.inputSalt}
       data={chainsDeployedOn}
       coreContract={contract}
     />

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

@@ -44,9 +44,9 @@ export function prepareAutoFactoryDeployTransaction(
         ? args.salt.startsWith("0x") && args.salt.length === 66
           ? (args.salt as `0x${string}`)
           : keccakId(args.salt)
-        : toHex(blockNumber, {
-            size: 32,
-          });
+        : (`0x0101${toHex(blockNumber, {
+            size: 30,
+          }).replace(/^0x/, "")}` as `0x${string}`);
 
       if (args.isCrosschain) {
         if (!args.initializeData || !args.implementationAddress) {