thirdweb 5.93.6 → 5.93.7-nightly-12bcfc596ae789cbeb8918896f18033258cee15f-20250329000332

package/src/contract/deployment/deploy-with-abi.ts

@@ -1,5 +1,7 @@
 import type { Abi, AbiConstructor } from "abitype";
+import { activateStylusContract } from "../../extensions/stylus/write/activateStylusContract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
+import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
 import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
 import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
@@ -24,6 +26,7 @@ export type PrepareDirectDeployTransactionOptions = Prettify<
     abi: Abi;
     bytecode: Hex;
     constructorParams?: Record<string, unknown>;
+    extraDataWithUri?: string;
   }
 >;
 
@@ -70,6 +73,7 @@ export function prepareDirectDeployTransaction(
         constructorAbi?.inputs || [], // Leave an empty array if there's no constructor
         normalizeFunctionParams(constructorAbi, options.constructorParams),
       ),
+      (options.extraDataWithUri as `0x${string}`) || "0x",
     ]),
   });
 }
@@ -121,6 +125,8 @@ export async function deployContract(
   options: PrepareDirectDeployTransactionOptions & {
     account: Account;
     salt?: string;
+    extraDataWithUri?: Hex;
+    isStylus?: boolean;
   },
 ) {
   if (await isZkSyncChain(options.chain)) {
@@ -135,14 +141,16 @@ export async function deployContract(
     });
   }
 
+  let address: string | null | undefined;
   if (options.salt !== undefined) {
     // Deploy with CREATE2 if salt is provided
     const info = await computeDeploymentInfoFromBytecode(options);
-    const address = computeDeploymentAddress({
+    address = computeDeploymentAddress({
       bytecode: options.bytecode,
       encodedArgs: info.encodedArgs,
       create2FactoryAddress: info.create2FactoryAddress,
       salt: options.salt,
+      extraDataWithUri: options.extraDataWithUri,
     });
     const isDeployed = await isContractDeployed(
       getContract({
@@ -160,21 +168,39 @@ export async function deployContract(
         chain: options.chain,
         client: options.client,
         to: info.create2FactoryAddress,
-        data: info.initBytecodeWithsalt,
+        data: info.initCalldata,
       }),
     });
-    return address;
+  } else {
+    const deployTx = prepareDirectDeployTransaction(options);
+    const receipt = await sendAndConfirmTransaction({
+      account: options.account,
+      transaction: deployTx,
+    });
+    address = receipt.contractAddress;
+    if (!address) {
+      throw new Error(
+        `Could not find deployed contract address in transaction: ${receipt.transactionHash}`,
+      );
+    }
   }
 
-  const deployTx = prepareDirectDeployTransaction(options);
-  const receipt = await sendAndConfirmTransaction({
-    account: options.account,
-    transaction: deployTx,
-  });
-  if (!receipt.contractAddress) {
-    throw new Error(
-      `Could not find deployed contract address in transaction: ${receipt.transactionHash}`,
-    );
+  if (options.isStylus) {
+    try {
+      const activationTransaction = await activateStylusContract({
+        chain: options.chain,
+        client: options.client,
+        contractAddress: address,
+      });
+
+      await sendTransaction({
+        transaction: activationTransaction,
+        account: options.account,
+      });
+    } catch {
+      console.error("Error: Contract could not be activated.");
+    }
   }
-  return receipt.contractAddress;
+
+  return address;
 }

package/src/contract/deployment/utils/bootstrap.ts

@@ -1,4 +1,6 @@
+import { activateStylusContract } from "../../../extensions/stylus/write/activateStylusContract.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import { sendTransaction } from "../../../transaction/actions/send-transaction.js";
 import {
   type FetchDeployMetadataResult,
   fetchBytecodeFromCompilerMetadata,
@@ -255,5 +257,24 @@ export async function getOrDeployInfraContractFromMetadata(
   if (!deployedInfraContract) {
     throw new Error(`Failed to deploy ${options.contractMetadata.name}`);
   }
+
+  const isStylus = options.contractMetadata.metadata.language === "rust";
+  if (isStylus) {
+    try {
+      const activationTransaction = await activateStylusContract({
+        chain: options.chain,
+        client: options.client,
+        contractAddress: deployedInfraContract.address,
+      });
+
+      await sendTransaction({
+        transaction: activationTransaction,
+        account: options.account,
+      });
+    } catch {
+      console.error("Error: Contract could not be activated.");
+    }
+  }
+
   return deployedInfraContract;
 }

package/src/contract/deployment/utils/infra.ts

@@ -100,7 +100,7 @@ export function prepareInfraContractDeployTransactionFromMetadata(options: {
     data: async () => {
       const infraContractInfo =
         await computeDeploymentInfoFromMetadata(options);
-      return infraContractInfo.initBytecodeWithsalt;
+      return infraContractInfo.initCalldata;
     },
   });
 }

package/src/exports/extensions/stylus.ts

@@ -0,0 +1,7 @@
+/**
+ * Write
+ */
+export {
+  activateStylusContract,
+  type ActivateStylusContractOptions,
+} from "../../extensions/stylus/write/activateStylusContract.js";

package/src/extensions/prebuilts/deploy-published.ts

@@ -16,6 +16,7 @@ import {
   fetchBytecodeFromCompilerMetadata,
 } from "../../utils/any-evm/deploy-metadata.js";
 import type { FetchDeployMetadataResult } from "../../utils/any-evm/deploy-metadata.js";
+import { encodeExtraDataWithUri } from "../../utils/any-evm/encode-extra-data-with-uri.js";
 import type { Hex } from "../../utils/encoding/hex.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import { getAllDefaultConstructorParamsForImplementation } from "./get-required-transactions.js";
@@ -194,6 +195,7 @@ export async function deployContractfromDeployMetadata(
         compilerMetadata: deployMetadata,
         contractParams: processedInitializeParams,
         salt,
+        metadataUri: deployMetadata.metadataUri,
       });
     }
     case "autoFactory": {
@@ -320,6 +322,7 @@ export async function deployContractfromDeployMetadata(
         compilerMetadata: deployMetadata,
         contractParams: processedInitializeParams,
         salt,
+        metadataUri: deployMetadata.metadataUri,
       });
     }
     default:
@@ -335,6 +338,7 @@ async function directDeploy(options: {
   compilerMetadata: CompilerMetadata;
   contractParams?: Record<string, unknown>;
   salt?: string;
+  metadataUri?: string;
 }): Promise<string> {
   const { account, client, chain, compilerMetadata, contractParams, salt } =
     options;
@@ -342,6 +346,7 @@ async function directDeploy(options: {
   const { deployContract } = await import(
     "../../contract/deployment/deploy-with-abi.js"
   );
+  const isStylus = options.compilerMetadata.metadata.language === "rust";
   return deployContract({
     account,
     client,
@@ -354,6 +359,13 @@ async function directDeploy(options: {
     abi: compilerMetadata.abi,
     constructorParams: contractParams,
     salt,
+    extraDataWithUri:
+      isStylus && options.metadataUri
+        ? encodeExtraDataWithUri({
+            metadataUri: options.metadataUri,
+          })
+        : undefined,
+    isStylus,
   });
 }
 

package/src/extensions/stylus/__generated__/IArbWasm/write/activateProgram.ts

@@ -0,0 +1,144 @@
+import type { AbiParameterToPrimitiveType } from "abitype";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../../transaction/types.js";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
+import { once } from "../../../../../utils/promise/once.js";
+import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+
+/**
+ * Represents the parameters for the "activateProgram" function.
+ */
+export type ActivateProgramParams = WithOverrides<{
+  program: AbiParameterToPrimitiveType<{ type: "address"; name: "program" }>;
+}>;
+
+export const FN_SELECTOR = "0x58c780c2" as const;
+const FN_INPUTS = [
+  {
+    type: "address",
+    name: "program",
+  },
+] as const;
+const FN_OUTPUTS = [
+  {
+    type: "uint16",
+  },
+  {
+    type: "uint256",
+  },
+] as const;
+
+/**
+ * Checks if the `activateProgram` method is supported by the given contract.
+ * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
+ * @returns A boolean indicating if the `activateProgram` method is supported.
+ * @extension STYLUS
+ * @example
+ * ```ts
+ * import { isActivateProgramSupported } from "thirdweb/extensions/stylus";
+ *
+ * const supported = isActivateProgramSupported(["0x..."]);
+ * ```
+ */
+export function isActivateProgramSupported(availableSelectors: string[]) {
+  return detectMethod({
+    availableSelectors,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+  });
+}
+
+/**
+ * Encodes the parameters for the "activateProgram" function.
+ * @param options - The options for the activateProgram function.
+ * @returns The encoded ABI parameters.
+ * @extension STYLUS
+ * @example
+ * ```ts
+ * import { encodeActivateProgramParams } from "thirdweb/extensions/stylus";
+ * const result = encodeActivateProgramParams({
+ *  program: ...,
+ * });
+ * ```
+ */
+export function encodeActivateProgramParams(options: ActivateProgramParams) {
+  return encodeAbiParameters(FN_INPUTS, [options.program]);
+}
+
+/**
+ * Encodes the "activateProgram" function into a Hex string with its parameters.
+ * @param options - The options for the activateProgram function.
+ * @returns The encoded hexadecimal string.
+ * @extension STYLUS
+ * @example
+ * ```ts
+ * import { encodeActivateProgram } from "thirdweb/extensions/stylus";
+ * const result = encodeActivateProgram({
+ *  program: ...,
+ * });
+ * ```
+ */
+export function encodeActivateProgram(options: ActivateProgramParams) {
+  // we do a "manual" concat here to avoid the overhead of the "concatHex" function
+  // we can do this because we know the specific formats of the values
+  return (FN_SELECTOR +
+    encodeActivateProgramParams(options).slice(
+      2,
+    )) as `${typeof FN_SELECTOR}${string}`;
+}
+
+/**
+ * Prepares a transaction to call the "activateProgram" function on the contract.
+ * @param options - The options for the "activateProgram" function.
+ * @returns A prepared transaction object.
+ * @extension STYLUS
+ * @example
+ * ```ts
+ * import { sendTransaction } from "thirdweb";
+ * import { activateProgram } from "thirdweb/extensions/stylus";
+ *
+ * const transaction = activateProgram({
+ *  contract,
+ *  program: ...,
+ *  overrides: {
+ *    ...
+ *  }
+ * });
+ *
+ * // Send the transaction
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function activateProgram(
+  options: BaseTransactionOptions<
+    | ActivateProgramParams
+    | {
+        asyncParams: () => Promise<ActivateProgramParams>;
+      }
+  >,
+) {
+  const asyncOptions = once(async () => {
+    return "asyncParams" in options ? await options.asyncParams() : options;
+  });
+
+  return prepareContractCall({
+    contract: options.contract,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.program] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+  });
+}

package/src/extensions/stylus/write/activateStylusContract.ts

@@ -0,0 +1,95 @@
+import {
+  decodeAbiParameters,
+  formatTransactionRequest,
+  parseEther,
+} from "viem";
+import type { Chain } from "../../../chains/types.js";
+import type { ThirdwebClient } from "../../../client/client.js";
+import { getContract } from "../../../contract/contract.js";
+import { eth_call } from "../../../rpc/actions/eth_call.js";
+import { getRpcClient } from "../../../rpc/rpc.js";
+import { encode } from "../../../transaction/actions/encode.js";
+import type { PreparedTransaction } from "../../../transaction/prepare-transaction.js";
+import { activateProgram } from "../__generated__/IArbWasm/write/activateProgram.js";
+
+const ARB_WASM_ADDRESS = "0x0000000000000000000000000000000000000071";
+
+export type ActivateStylusContractOptions = {
+  chain: Chain;
+  client: ThirdwebClient;
+  contractAddress: string;
+};
+
+/**
+ * Activate a stylus contract by calling ArbWasm Precompile
+ * @param options - The options for activating the contract
+ * @returns A prepared transaction to send
+ * @example
+ * ```ts
+ * import { activateStylusContract } from "thirdweb/stylus";
+ * const transaction = activateStylusContract({
+ *  client,
+ *  chain,
+ *  contractAddress,
+ * });
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export async function activateStylusContract(
+  options: ActivateStylusContractOptions,
+) {
+  const { chain, client, contractAddress } = options;
+  const arbWasmPrecompile = getContract({
+    client,
+    chain,
+    address: ARB_WASM_ADDRESS,
+  });
+
+  const dataFee = await estimateDataFee({
+    transaction: activateProgram({
+      program: contractAddress,
+      contract: arbWasmPrecompile,
+    }),
+  });
+
+  return activateProgram({
+    program: contractAddress,
+    contract: arbWasmPrecompile,
+    overrides: {
+      value: dataFee,
+    },
+  });
+}
+
+async function estimateDataFee(options: {
+  // biome-ignore lint/suspicious/noExplicitAny:
+  transaction: PreparedTransaction<any>;
+}) {
+  const data = await encode(options.transaction);
+
+  const serializedTx = formatTransactionRequest({
+    data,
+    to: ARB_WASM_ADDRESS,
+    value: parseEther("1"), // only for simulation. it will be replaced with estimated data fee.
+  });
+
+  const rpcRequest = getRpcClient(options.transaction);
+  try {
+    const result = await eth_call(rpcRequest, serializedTx);
+    const [, dataFee] = decodeAbiParameters(
+      [
+        {
+          type: "uint16",
+        },
+        {
+          type: "uint256",
+        },
+      ],
+      result,
+    );
+
+    return (dataFee * BigInt(100 + 10)) / BigInt(100); // bump 10%
+  } catch {
+    return 0n;
+  }
+}

package/src/utils/any-evm/compute-deployment-address.ts

@@ -11,6 +11,7 @@ type ComputeDeploymentAddressOptions = {
   encodedArgs: Hex;
   create2FactoryAddress: string;
   salt?: string;
+  extraDataWithUri?: Hex;
 };
 
 /**
@@ -40,10 +41,12 @@ export function computeDeploymentAddress(
     : getSaltHash(bytecode);
 
   // 1. create init bytecode hash with contract's bytecode and encoded args
-  const initBytecode = encodePacked(
-    ["bytes", "bytes"],
-    [bytecode, options.encodedArgs],
-  );
+  const initBytecode = options.extraDataWithUri
+    ? encodePacked(
+        ["bytes", "bytes", "bytes"],
+        [bytecode, options.encodedArgs, options.extraDataWithUri],
+      )
+    : encodePacked(["bytes", "bytes"], [bytecode, options.encodedArgs]);
 
   // 2. abi-encode pack the deployer address, salt, and bytecode hash
   const deployInfoPacked = encodePacked(

package/src/utils/any-evm/compute-published-contract-deploy-info.ts

@@ -1,4 +1,5 @@
 import type { Abi, AbiConstructor } from "abitype";
+import { encodePacked } from "viem";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
@@ -13,6 +14,7 @@ import {
   type FetchDeployMetadataResult,
   fetchBytecodeFromCompilerMetadata,
 } from "./deploy-metadata.js";
+import { encodeExtraDataWithUri } from "./encode-extra-data-with-uri.js";
 import { getInitBytecodeWithSalt } from "./get-init-bytecode-with-salt.js";
 
 /**
@@ -70,6 +72,7 @@ export async function computeDeploymentInfoFromMetadata(args: {
     }
   }
 
+  const isStylus = contractMetadata.metadata.language === "rust";
   return computeDeploymentInfoFromBytecode({
     client: args.client,
     chain: args.chain,
@@ -81,6 +84,11 @@ export async function computeDeploymentInfoFromMetadata(args: {
     }),
     constructorParams: processedConstructorParams,
     salt: args.salt,
+    extraDataWithUri: isStylus
+      ? encodeExtraDataWithUri({
+          metadataUri: contractMetadata.metadataUri,
+        })
+      : undefined,
   });
 }
 
@@ -91,8 +99,9 @@ export async function computeDeploymentInfoFromBytecode(args: {
   bytecode: Hex;
   constructorParams?: Record<string, unknown>;
   salt?: string;
+  extraDataWithUri?: Hex;
 }) {
-  const { client, chain, constructorParams, salt } = args;
+  const { client, chain, constructorParams, salt, extraDataWithUri } = args;
   const create2FactoryAddress = await computeCreate2FactoryAddress({
     client,
     chain,
@@ -110,11 +119,16 @@ export async function computeDeploymentInfoFromBytecode(args: {
     encodedArgs,
     salt,
   });
+
+  const initCalldata = extraDataWithUri
+    ? encodePacked(["bytes", "bytes"], [initBytecodeWithsalt, extraDataWithUri])
+    : initBytecodeWithsalt;
   return {
     bytecode,
-    initBytecodeWithsalt,
+    initCalldata,
     encodedArgs,
     create2FactoryAddress,
     salt,
+    extraDataWithUri,
   };
 }

package/src/utils/any-evm/deploy-metadata.ts

@@ -253,7 +253,7 @@ export type ExtendedMetadata = {
   >;
   compositeAbi?: Abi;
   compilers?: Record<
-    "solc" | "zksolc",
+    "solc" | "zksolc" | "stylus",
     {
       evmVersion: string;
       compilerVersion: string;

package/src/utils/any-evm/encode-extra-data-with-uri.ts

@@ -0,0 +1,13 @@
+import { encodePacked } from "ox/AbiParameters";
+import { numberToHex, stringToHex } from "../encoding/hex.js";
+
+export function encodeExtraDataWithUri(options: {
+  metadataUri: string;
+}) {
+  const uriHex = stringToHex(options.metadataUri);
+  const lengthHex = numberToHex(uriHex.replace("0x", "").length / 2, {
+    size: 1,
+  });
+
+  return encodePacked(["bytes", "bytes"], [uriHex, lengthHex]);
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.93.6";
+export const version = "5.93.7-nightly-12bcfc596ae789cbeb8918896f18033258cee15f-20250329000332";