thirdweb 5.53.0 → 5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413

package/src/utils/abi/normalizeFunctionParams.ts

@@ -0,0 +1,29 @@
+import type { AbiConstructor, AbiFunction } from "abitype";
+
+export function normalizeFunctionParams(
+  abiFunction: AbiFunction | AbiConstructor | undefined,
+  params: Record<string, unknown> = {},
+): unknown[] {
+  if (!abiFunction) {
+    return [];
+  }
+  if (abiFunction.inputs?.length !== Object.keys(params).length) {
+    throw new Error(
+      `Expected ${abiFunction.inputs?.length || 0} parameters, but got ${Object.keys(params).length}`,
+    );
+  }
+  return abiFunction.inputs.map((input, index) => {
+    const value = input.name;
+    if (value === undefined) {
+      throw new Error(
+        `Missing named parameter for ${"name" in abiFunction ? abiFunction.name : "constructor"} at index ${index}`,
+      );
+    }
+    const valueWithoutUnderscore = value.replace(/^_+/, "");
+    const normalizedValue = params[value] ?? params[valueWithoutUnderscore]; // handle _name, _symbol, etc passed without underscore in the keys
+    if (normalizedValue === undefined) {
+      throw new Error(`Missing value for parameter ${value} at index ${index}`);
+    }
+    return normalizedValue;
+  });
+}

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

@@ -1,10 +1,8 @@
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
+import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { computeDeploymentAddress } from "./compute-deployment-address.js";
-import {
-  computeDeploymentInfoFromContractId,
-  computeDeploymentInfoFromMetadata,
-} from "./compute-published-contract-deploy-info.js";
+import { computeDeploymentInfoFromMetadata } from "./compute-published-contract-deploy-info.js";
 import type { FetchDeployMetadataResult } from "./deploy-metadata.js";
 
 /**
@@ -20,10 +18,6 @@ import type { FetchDeployMetadataResult } from "./deploy-metadata.js";
  * ```ts
  * import { computePublishedContractAddress } from "thirdweb/deploys";
  *
- * const contractMetadata = await fetchPublishedContractMetadata({
- *  client,
- *  chain,
- * });
  * const address = await computePublishedContractAddress({
  *   client,
  *   chain,
@@ -38,13 +32,24 @@ export async function computePublishedContractAddress(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractId: string;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   publisher?: string;
   version?: string;
   salt?: string;
 }): Promise<string> {
-  const info = await computeDeploymentInfoFromContractId(args);
-  return computeDeploymentAddress(info);
+  const contractMetadata = await fetchPublishedContractMetadata({
+    client: args.client,
+    contractId: args.contractId,
+    publisher: args.publisher,
+    version: args.version,
+  });
+  return computeContractAddress({
+    client: args.client,
+    chain: args.chain,
+    contractMetadata,
+    constructorParams: args.constructorParams,
+    salt: args.salt,
+  });
 }
 
 /**
@@ -54,7 +59,7 @@ export async function computeContractAddress(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractMetadata: FetchDeployMetadataResult;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   salt?: string;
 }): Promise<string> {
   const info = await computeDeploymentInfoFromMetadata(args);

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

@@ -1,9 +1,12 @@
-import type { AbiConstructor } from "abitype";
+import type { Abi, AbiConstructor } from "abitype";
 import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { computeCreate2FactoryAddress } from "../../contract/deployment/utils/create-2-factory.js";
 import { encodeAbiParameters } from "../abi/encodeAbiParameters.js";
+import { normalizeFunctionParams } from "../abi/normalizeFunctionParams.js";
+import { ensureBytecodePrefix } from "../bytecode/prefix.js";
+import type { Hex } from "../encoding/hex.js";
 import type { FetchDeployMetadataResult } from "./deploy-metadata.js";
 import { getInitBytecodeWithSalt } from "./get-init-bytecode-with-salt.js";
 
@@ -14,7 +17,7 @@ export async function computeDeploymentInfoFromContractId(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractId: string;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   publisher?: string;
   version?: string;
   salt?: string;
@@ -42,23 +45,39 @@ export async function computeDeploymentInfoFromMetadata(args: {
   client: ThirdwebClient;
   chain: Chain;
   contractMetadata: FetchDeployMetadataResult;
-  constructorParams: unknown[];
+  constructorParams?: Record<string, unknown>;
   salt?: string;
 }) {
-  const { client, chain, contractMetadata, constructorParams, salt } = args;
-  const { compilerMetadata } = contractMetadata;
+  return computeDeploymentInfoFromBytecode({
+    client: args.client,
+    chain: args.chain,
+    abi: args.contractMetadata.abi,
+    bytecode: args.contractMetadata.bytecode,
+    constructorParams: args.constructorParams,
+    salt: args.salt,
+  });
+}
+
+export async function computeDeploymentInfoFromBytecode(args: {
+  client: ThirdwebClient;
+  chain: Chain;
+  abi: Abi;
+  bytecode: Hex;
+  constructorParams?: Record<string, unknown>;
+  salt?: string;
+}) {
+  const { client, chain, constructorParams, salt } = args;
   const create2FactoryAddress = await computeCreate2FactoryAddress({
     client,
     chain,
   });
-  const bytecode = compilerMetadata.bytecode;
-  const constructorAbi =
-    (compilerMetadata.abi.find(
-      (abi) => abi.type === "constructor",
-    ) as AbiConstructor) || [];
+  const bytecode = ensureBytecodePrefix(args.bytecode);
+  const constructorAbi = args.abi.find((abi) => abi.type === "constructor") as
+    | AbiConstructor
+    | undefined;
   const encodedArgs = encodeAbiParameters(
-    constructorAbi.inputs ?? [],
-    constructorParams,
+    constructorAbi?.inputs ?? [],
+    normalizeFunctionParams(constructorAbi, constructorParams),
   );
   const initBytecodeWithsalt = getInitBytecodeWithSalt({
     bytecode,

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

@@ -10,10 +10,8 @@ export type FetchDeployMetadataOptions = {
   client: ThirdwebClient;
 };
 
-export type FetchDeployMetadataResult = {
-  compilerMetadata: CompilerMetadata;
-  extendedMetadata: ExtendedMetadata | undefined;
-};
+export type FetchDeployMetadataResult = Partial<ExtendedMetadata> &
+  CompilerMetadata;
 
 /**
  * Fetches the deployment metadata.
@@ -24,31 +22,6 @@ export type FetchDeployMetadataResult = {
 export async function fetchDeployMetadata(
   options: FetchDeployMetadataOptions,
 ): Promise<FetchDeployMetadataResult> {
-  const [compilerMetadata, extendedMetadata] = await Promise.all([
-    fetchCompilerMetadata(options),
-    fetchExtendedMetadata(options).catch(() => undefined),
-  ]);
-  return { compilerMetadata, extendedMetadata };
-}
-
-// helpers
-/**
- * Fetches the published metadata.
- * @param options - The options for fetching the published metadata.
- * @internal
- */
-async function fetchExtendedMetadata(
-  options: FetchDeployMetadataOptions,
-): Promise<ExtendedMetadata> {
-  return download({
-    uri: options.uri,
-    client: options.client,
-  }).then((r) => r.json());
-}
-
-async function fetchCompilerMetadata(
-  options: FetchDeployMetadataOptions,
-): Promise<CompilerMetadata> {
   const rawMeta: RawCompilerMetadata = await download({
     uri: options.uri,
     client: options.client,
@@ -144,11 +117,13 @@ export type ExtendedMetadata = {
         publisherAddress: string;
       }[]
     | undefined;
-  defaultModules?: {
-    moduleName: string;
-    moduleVersion: string;
-    publisherAddress: string;
-  }[];
+  defaultModules?:
+    | Array<{
+        moduleName: string;
+        moduleVersion: string;
+        publisherAddress: string;
+      }>
+    | undefined;
   publisher?: string | undefined;
   audit?: string | undefined;
   logo?: string | undefined;

package/src/utils/bytecode/resolveImplementation.test.ts

@@ -1,4 +1,4 @@
-import type { AbiConstructor } from "abitype";
+import type { Abi } from "abitype";
 import { describe, expect, it } from "vitest";
 import {
   DUMMY_BYTECODE,
@@ -46,8 +46,7 @@ describe("Resolve implementation", async () => {
       chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
       bytecode: DUMMY_BYTECODE,
-      constructorAbi: {} as AbiConstructor,
-      constructorParams: [],
+      abi: [],
     });
 
     const proxyAddress = await deployContract({
@@ -55,8 +54,11 @@ describe("Resolve implementation", async () => {
       chain: ANVIL_CHAIN,
       account: TEST_ACCOUNT_A,
       bytecode: ERC1967_PROXY_BYTECODE,
-      constructorAbi: ERC1967_PROXY_CONSTRUCTOR_ABI as AbiConstructor,
-      constructorParams: [implementationAddress, ""],
+      abi: ERC1967_PROXY_CONSTRUCTOR_ABI as Abi,
+      constructorParams: {
+        logic: implementationAddress,
+        data: "",
+      },
     });
 
     const proxy = getContract({

package/src/utils/caching/lru.test.ts

@@ -0,0 +1,38 @@
+import { expect, test } from "vitest";
+import { LruMap } from "./lru.js";
+
+test("default", () => {
+  const cache = new LruMap(5);
+  cache.set("a", 1);
+  cache.set("b", 2);
+  cache.set("c", 3);
+  cache.set("d", 4);
+  cache.set("e", 5);
+  cache.set("f", 6);
+  cache.set("g", 7);
+  expect(cache.size).toBe(5);
+  expect(cache.has("a")).toBe(false);
+  expect(cache.has("b")).toBe(false);
+  expect(cache.get("c")).toBe(3);
+  expect(cache.get("d")).toBe(4);
+  expect(cache.get("e")).toBe(5);
+  expect(cache.get("f")).toBe(6);
+  expect(cache.get("g")).toBe(7);
+});
+
+test("update touched keys", () => {
+  const cache = new LruMap(5);
+  cache.set("a", 1);
+  cache.set("b", 2);
+  cache.set("c", 3);
+  cache.set("d", 4);
+  cache.set("e", 5);
+  expect(cache.size).toBe(5);
+  cache.get("a");
+  cache.set("f", 6);
+  cache.set("g", 7);
+  expect(cache.has("a")).toBe(true);
+  expect(cache.has("b")).toBe(false);
+  expect(cache.has("c")).toBe(false);
+  expect(cache.has("d")).toBe(true);
+});

package/src/utils/caching/lru.ts

@@ -1,30 +1,34 @@
 /**
- * Represents a Least Recently Used (LRU) Map.
- * Extends the built-in Map class.
+ * Map with a LRU (Least recently used) policy.
+ *
+ * @link https://en.wikipedia.org/wiki/Cache_replacement_policies#LRU
  */
 export class LruMap<value = unknown> extends Map<string, value> {
   maxSize: number;
 
-  /**
-   *
-   * @param size
-   * @internal
-   */
   constructor(size: number) {
     super();
     this.maxSize = size;
   }
 
-  /**
-   *
-   * @param key
-   * @param value
-   * @internal
-   */
+  override get(key: string) {
+    const value = super.get(key);
+
+    if (super.has(key) && value !== undefined) {
+      this.delete(key);
+      super.set(key, value);
+    }
+
+    return value;
+  }
+
   override set(key: string, value: value) {
     super.set(key, value);
     if (this.maxSize && this.size > this.maxSize) {
-      this.delete(this.keys().next().value);
+      const firstKey = this.keys().next().value;
+      if (firstKey) {
+        this.delete(firstKey);
+      }
     }
     return this;
   }

package/src/utils/domains.ts

@@ -32,8 +32,8 @@ type DomainOverrides = {
 };
 
 export const DEFAULT_RPC_URL = "rpc.thirdweb.com";
-const DEFAULT_IN_APP_WALLET_URL = "embedded-wallet.thirdweb.com";
 const DEFAULT_SOCIAL_URL = "social.thirdweb.com";
+const DEFAULT_IN_APP_WALLET_URL = "embedded-wallet.thirdweb.com";
 const DEFAULT_PAY_URL = "pay.thirdweb.com";
 const DEFAULT_STORAGE_URL = "storage.thirdweb.com";
 const DEFAULT_BUNDLER_URL = "bundler.thirdweb.com";

package/src/utils/ipfs.ts

@@ -107,7 +107,9 @@ export async function uploadOrExtractURIs<
  * @throws If the batch contains URIs with different base URIs or if no base URI is found.
  * @internal
  */
-export function getBaseUriFromBatch(uris: string[]): string {
+export function getBaseUriFromBatch(uris: string | string[]): string {
+  // biome-ignore lint/style/noParameterAssign: lemme do my stuff
+  uris = Array.isArray(uris) ? uris : [uris];
   const [base, ...rest] = uris.map((uri) => {
     // remove query parameters
     // biome-ignore lint/style/noParameterAssign: lemme do my stuff

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.53.0";
+export const version = "5.54.0-nightly-c3800d6c0765a9a0b69ac0a4a390d20cec932419-20240912000413";

package/src/wallets/in-app/core/authentication/types.ts

@@ -76,6 +76,7 @@ export enum AuthProvider {
   APPLE = "Apple",
   PASSKEY = "Passkey",
   DISCORD = "Discord",
+  LINE = "Line",
   FARCASTER = "Farcaster",
   TELEGRAM = "Telegram",
 }

package/src/wallets/in-app/core/eip5972/in-app-wallet-calls.ts

@@ -3,6 +3,7 @@ import { eth_getTransactionReceipt } from "../../../../rpc/actions/eth_getTransa
 import { getRpcClient } from "../../../../rpc/rpc.js";
 import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
 import { sendBatchTransaction } from "../../../../transaction/actions/send-batch-transaction.js";
+import { LruMap } from "../../../../utils/caching/lru.js";
 import type { Hex } from "../../../../utils/encoding/hex.js";
 import { randomBytesHex } from "../../../../utils/random.js";
 import type { PreparedSendCall } from "../../../eip5792/send-calls.js";
@@ -13,19 +14,7 @@ import type {
 } from "../../../eip5792/types.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 
-const bundlesToTransactions = new Map<string, Hex[]>();
-const MAX_BUNDLE_ENTRIES = 1000;
-
-/**
- * @internal
- */
-function setBundleId(bundleId: Hex, hashes: Hex[]) {
-  if (bundlesToTransactions.size >= MAX_BUNDLE_ENTRIES) {
-    const lru = bundlesToTransactions.keys().next().value;
-    bundlesToTransactions.delete(lru);
-  }
-  bundlesToTransactions.set(bundleId, hashes);
-}
+const bundlesToTransactions = new LruMap<Hex[]>(1000);
 
 /**
  * @internal
@@ -45,7 +34,7 @@ export async function inAppWalletSendCalls(args: {
       transactions: calls,
     });
     hashes.push(receipt.transactionHash);
-    setBundleId(bundleId, hashes);
+    bundlesToTransactions.set(bundleId, hashes);
   } else {
     for (const tx of calls) {
       const receipt = await sendAndConfirmTransaction({

package/src/wallets/in-app/native/native-connector.ts

@@ -109,6 +109,7 @@ export class InAppNativeConnector implements InAppConnector {
       case "google":
       case "facebook":
       case "discord":
+      case "line":
       case "apple": {
         const ExpoLinking = require("expo-linking");
         const redirectUrl =
@@ -144,6 +145,7 @@ export class InAppNativeConnector implements InAppConnector {
       case "google":
       case "facebook":
       case "discord":
+      case "line":
       case "farcaster":
       case "telegram":
       case "apple": {

package/src/wallets/in-app/web/in-app.ts

@@ -14,6 +14,8 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  * - Apple
  * - Facebook
  * - Discord
+ * - Telegram
+ * - LINE
  * - Farcaster
  *
  * Can also be configured to use Account Abstraction to directly connect to a ERC4337 smart account based on those authentication methods.

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -215,6 +215,7 @@ export class InAppWebConnector implements InAppConnector {
       case "google":
       case "telegram":
       case "farcaster":
+      case "line":
       case "discord": {
         return loginWithOauth({
           authOption: strategy,
@@ -275,6 +276,7 @@ export class InAppWebConnector implements InAppConnector {
       case "google":
       case "farcaster":
       case "telegram":
+      case "line":
       case "discord": {
         const authToken = await this.authenticate(args);
         return this.auth.loginWithAuthToken(authToken);

package/src/wallets/types.ts

@@ -24,6 +24,7 @@ export const socialAuthOptions = [
   "apple",
   "facebook",
   "discord",
+  "line",
   "farcaster",
   "telegram",
 ] as const;