append and resolve ipfs uri in calldata

Author: kumaryash90

packages/thirdweb/src/cli/commands/publish-stylus/publish-stylus.ts

@@ -102,7 +102,11 @@ export async function publishStylus(secretKey?: string) {
         devdoc: {},
         userdoc: {},
       },
-      settings: {},
+      settings: {
+        compilationTarget: {
+          "src/main.rs": contractName,
+        },
+      },
       sources: {},
     };
     writeFileSync(abiPath, JSON.stringify(metadata), "utf8");

packages/thirdweb/src/contract/actions/compiler-metadata.ts

@@ -41,10 +41,9 @@ export function formatCompilerMetadata(
     meta = metadata.source_metadata;
   }
 
-  // TODO: fix
-  // const compilationTarget = meta.settings.compilationTarget;
-  // const targets = Object.keys(compilationTarget);
-  const name = "";
+  const compilationTarget = meta.settings.compilationTarget;
+  const targets = Object.keys(compilationTarget);
+  const name = compilationTarget[targets[0] as keyof typeof compilationTarget];
   const info = {
     title: meta.output.devdoc.title,
     author: meta.output.devdoc.author,

packages/thirdweb/src/contract/actions/get-compiler-metadata.ts

@@ -1,3 +1,7 @@
+import { eth_getTransactionByHash } from "../../rpc/actions/eth_getTransactionByHash.js";
+import { getRpcClient } from "../../rpc/rpc.js";
+import { download } from "../../storage/download.js";
+import { hexToString } from "../../utils/encoding/hex.js";
 import type { ThirdwebContract } from "../contract.js";
 import { formatCompilerMetadata } from "./compiler-metadata.js";
 
@@ -21,6 +25,40 @@ import { formatCompilerMetadata } from "./compiler-metadata.js";
  */
 export async function getCompilerMetadata(contract: ThirdwebContract) {
   const { address, chain } = contract;
+
+  try {
+    const res = await fetch(
+      `https://contract.thirdweb-dev.com/creation/${contract.chain.id}/${contract.address}`,
+    );
+    const creationData = await res.json();
+
+    if (creationData.status === "1" && creationData.result[0]?.txHash) {
+      const rpcClient = getRpcClient({
+        client: contract.client,
+        chain: contract.chain,
+      });
+      const creationTx = await eth_getTransactionByHash(rpcClient, {
+        hash: creationData.result[0]?.txHash,
+      });
+
+      const initCode = creationTx.input;
+      const lengthHex = initCode.slice(-2);
+      const dataLength = Number.parseInt(lengthHex, 16) * 2;
+      const encodedIpfsHex = initCode.slice(-dataLength - 2, -2);
+      const uri = hexToString(`0x${encodedIpfsHex}`);
+
+      const res = await download({
+        client: contract.client,
+        uri,
+      });
+      const metadata = await res.json();
+
+      return formatCompilerMetadata(metadata);
+    }
+  } catch (e) {
+    console.debug(e);
+  }
+
   const response = await fetch(
     `https://contract.thirdweb.com/metadata/${chain.id}/${address}`,
     {

packages/thirdweb/src/contract/actions/resolve-abi.ts

@@ -1,5 +1,8 @@
 import { type Abi, formatAbi, parseAbi } from "abitype";
+import { eth_getTransactionByHash } from "../../rpc/actions/eth_getTransactionByHash.js";
+import { getRpcClient } from "../../rpc/rpc.js";
 import { download } from "../../storage/download.js";
+import { hexToString } from "../../utils/encoding/hex.js";
 import { getClientFetch } from "../../utils/fetch.js";
 import { withCache } from "../../utils/promise/withCache.js";
 import { type ThirdwebContract, getContract } from "../contract.js";
@@ -43,15 +46,53 @@ export function resolveContractAbi<abi extends Abi>(
         return (await resolveCompositeAbi(contract as ThirdwebContract)) as abi;
       }
 
-      // try to get it from the api
       try {
-        return (await resolveAbiFromContractApi(
-          contract,
-          contractApiBaseUrl,
-        )) as abi;
+        const res = await fetch(
+          `https://contract.thirdweb-dev.com/creation/${contract.chain.id}/${contract.address}`,
+        );
+        const creationData = await res.json();
+
+        if (creationData.status === "1" && creationData.result[0]?.txHash) {
+          const rpcClient = getRpcClient({
+            client: contract.client,
+            chain: contract.chain,
+          });
+          const creationTx = await eth_getTransactionByHash(rpcClient, {
+            hash: creationData.result[0]?.txHash,
+          });
+
+          const initCode = creationTx.input;
+          const lengthHex = initCode.slice(-2);
+          const dataLength = Number.parseInt(lengthHex, 16) * 2;
+          const encodedIpfsHex = initCode.slice(-dataLength - 2, -2);
+          const uri = hexToString(`0x${encodedIpfsHex}`);
+
+          const res = await download({
+            client: contract.client,
+            uri,
+          });
+          const metadata = await res.json();
+
+          return metadata.output.abi as abi;
+        } else {
+          return (await resolveCompositeAbi(
+            contract as ThirdwebContract,
+          )) as abi;
+        }
       } catch {
-        // if that fails, try to resolve it from the bytecode
-        return (await resolveCompositeAbi(contract as ThirdwebContract)) as abi;
+        // try to get it from the api
+        try {
+          return (await resolveAbiFromContractApi(
+            contract,
+            contractApiBaseUrl,
+          )) as abi;
+        } catch {
+          // console.debug(e);
+          // if that fails, try to resolve it from the bytecode
+          return (await resolveCompositeAbi(
+            contract as ThirdwebContract,
+          )) as abi;
+        }
       }
     },
     {

packages/thirdweb/src/contract/deployment/deploy-with-abi.ts

@@ -24,6 +24,7 @@ export type PrepareDirectDeployTransactionOptions = Prettify<
     abi: Abi;
     bytecode: Hex;
     constructorParams?: Record<string, unknown>;
+    extraData?: string;
   }
 >;
 
@@ -70,6 +71,7 @@ export function prepareDirectDeployTransaction(
         constructorAbi?.inputs || [], // Leave an empty array if there's no constructor
         normalizeFunctionParams(constructorAbi, options.constructorParams),
       ),
+      `0x${options.extraData}`,
     ]),
   });
 }
@@ -121,6 +123,7 @@ export async function deployContract(
   options: PrepareDirectDeployTransactionOptions & {
     account: Account;
     salt?: string;
+    extraData?: string;
   },
 ) {
   if (await isZkSyncChain(options.chain)) {
@@ -160,7 +163,11 @@ export async function deployContract(
         chain: options.chain,
         client: options.client,
         to: info.create2FactoryAddress,
-        data: info.initBytecodeWithsalt,
+        data: options.extraData
+          ? (info.initBytecodeWithsalt.concat(
+              options.extraData,
+            ) as `0x${string}`)
+          : info.initBytecodeWithsalt,
       }),
     });
     return address;

packages/thirdweb/src/extensions/prebuilts/deploy-published.ts

@@ -16,7 +16,11 @@ import {
   fetchBytecodeFromCompilerMetadata,
 } from "../../utils/any-evm/deploy-metadata.js";
 import type { FetchDeployMetadataResult } from "../../utils/any-evm/deploy-metadata.js";
-import type { Hex } from "../../utils/encoding/hex.js";
+import {
+  type Hex,
+  numberToHex,
+  stringToHex,
+} from "../../utils/encoding/hex.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import { getAllDefaultConstructorParamsForImplementation } from "./get-required-transactions.js";
 import {
@@ -194,6 +198,7 @@ export async function deployContractfromDeployMetadata(
         compilerMetadata: deployMetadata,
         contractParams: processedInitializeParams,
         salt,
+        metadataUri: deployMetadata.metadataUri,
       });
     }
     case "autoFactory": {
@@ -311,10 +316,21 @@ async function directDeploy(options: {
   compilerMetadata: CompilerMetadata;
   contractParams?: Record<string, unknown>;
   salt?: string;
+  metadataUri?: string;
 }): Promise<string> {
   const { account, client, chain, compilerMetadata, contractParams, salt } =
     options;
 
+  let extraData: string | undefined;
+  if (options.metadataUri) {
+    const uriHex = stringToHex(options.metadataUri).replace("0x", "");
+    const lengthHex = numberToHex(uriHex.length / 2, { size: 1 }).replace(
+      "0x",
+      "",
+    );
+    extraData = uriHex.concat(lengthHex);
+  }
+
   const { deployContract } = await import(
     "../../contract/deployment/deploy-with-abi.js"
   );
@@ -330,6 +346,7 @@ async function directDeploy(options: {
     abi: compilerMetadata.abi,
     constructorParams: contractParams,
     salt,
+    extraData,
   });
 }