Merge branch 'yash/ocr-contracts-integration' into 06-16-_tool-4689_dashboard_integrate_erc20asset_contract_in_token_creation_flow

Author: MananTank

packages/thirdweb/src/assets/constants.ts

@@ -1,21 +1,21 @@
 export const DEFAULT_MAX_SUPPLY_ERC20 = 10_000_000_000n;
-export const DEFAULT_POOL_FEE = 10000;
 export const DEFAULT_POOL_INITIAL_TICK = 230200;
+export const DEFAULT_REFERRER_REWARD_BPS = 5000; // 50%
 export const DEFAULT_INFRA_ADMIN = "0x1a472863cf21d5aa27f417df9140400324c48f22";
 export const DEFAULT_FEE_RECIPIENT =
-  "0x1af20c6b23373350ad464700b5965ce4b0d2ad94";
+  "0x1Af20C6B23373350aD464700B5965CE4B0D2aD94";
 export const DEFAULT_FEE_BPS = 50n;
 export const DEFAULT_SALT = "thirdweb";
 
 export const IMPLEMENTATIONS: Record<number, Record<string, string>> = {
   8453: {
-    AssetEntrypointERC20: "0x7FF679bFb89ee0F88645CAb8Ab0844ea485a3434",
+    AssetEntrypointERC20: "0x556688D4d192FC59b27E239ff6e06D28786aAdbE",
     ERC20AssetImpl: "",
     V3PositionManager: "",
     V4PositionManager: "",
   },
   84532: {
-    AssetEntrypointERC20: "0x79C1236cFe59f1f088A15Da08b0D8667387d9703",
+    AssetEntrypointERC20: "0xf0ED90ea4df819017ee1dfDADf26d65a678b31b7",
     ERC20AssetImpl: "",
     V3PositionManager: "",
     V4PositionManager: "",

packages/thirdweb/src/assets/create-token.ts

@@ -35,13 +35,21 @@ export async function createToken(options: CreateTokenOptions) {
     ...options,
   });
   const blockNumber = await eth_blockNumber(rpcRequest);
-  const salt = options.salt
-    ? options.salt.startsWith("0x") && options.salt.length === 66
-      ? (options.salt as `0x${string}`)
-      : keccakId(options.salt)
-    : toHex(blockNumber, {
+
+  let salt: Hex = "0x";
+  if (!options.salt) {
+    salt =
+      "0x1f" +
+      toHex(blockNumber, {
         size: 32,
-      });
+      }).substring(4);
+  } else {
+    if (options.salt.startsWith("0x") && options.salt.length === 66) {
+      salt = options.salt as `0x${string}`;
+    } else {
+      salt = "0x1f" + keccakId(options.salt).substring(4);
+    }
+  }
 
   const entrypoint = await getOrDeployEntrypointERC20(options);
 
@@ -87,7 +95,7 @@ export async function createToken(options: CreateTokenOptions) {
       amount,
       data: encodedInitData,
       hookData,
-      referrer: ZERO_ADDRESS,
+      referrer: options.referrerAddress || ZERO_ADDRESS,
       salt,
     },
     creator,

packages/thirdweb/src/assets/token-utils.ts

@@ -7,8 +7,8 @@ import { encodeAbiParameters } from "../utils/abi/encodeAbiParameters.js";
 import { toUnits } from "../utils/units.js";
 import {
   DEFAULT_MAX_SUPPLY_ERC20,
-  DEFAULT_POOL_FEE,
   DEFAULT_POOL_INITIAL_TICK,
+  DEFAULT_REFERRER_REWARD_BPS,
 } from "./constants.js";
 import type { MarketConfig, PoolConfig, TokenParams } from "./types.js";
 
@@ -50,29 +50,29 @@ export async function encodeInitParams(options: {
 
 export function encodePoolConfig(poolConfig: PoolConfig): Hex {
   const POOL_PARAMS = [
-    {
-      name: "currency",
-      type: "address",
-    },
     {
       name: "amount",
       type: "uint256",
     },
     {
-      name: "fee",
-      type: "uint24",
+      name: "currency",
+      type: "address",
     },
     {
       name: "initialTick",
-      type: "uint24",
+      type: "int24",
+    },
+    {
+      name: "referrerRewardBps",
+      type: "uint16",
     },
   ] as const;
 
   return encodeAbiParameters(POOL_PARAMS, [
-    poolConfig.currency || NATIVE_TOKEN_ADDRESS,
     toUnits(poolConfig.amount.toString(), 18),
-    poolConfig.fee || DEFAULT_POOL_FEE,
+    poolConfig.currency || NATIVE_TOKEN_ADDRESS,
     poolConfig.initialTick || DEFAULT_POOL_INITIAL_TICK,
+    poolConfig.referrerRewardBps || DEFAULT_REFERRER_REWARD_BPS,
   ]);
 }
 

packages/thirdweb/src/assets/types.ts

@@ -16,8 +16,8 @@ export type TokenParams = {
 export type PoolConfig = {
   amount: bigint;
   currency?: string;
-  fee?: number;
   initialTick?: number;
+  referrerRewardBps?: number;
 };
 
 export type MarketConfig = {
@@ -48,4 +48,5 @@ export type CreateTokenOptions = ClientAndChainAndAccount & {
   salt?: string;
   params: TokenParams;
   launchConfig?: LaunchConfig;
+  referrerAddress?: string;
 };