thirdweb 5.55.0 → 5.56.0-nightly-07b949dd8c07ffdeda40a5549c31ad4b09abbbf1-20240916000437

package/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx

@@ -13,6 +13,7 @@ import { useSiweAuth } from "../../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButtonProps } from "../../../../core/hooks/connection/ConnectButtonProps.js";
 import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
+import { useAdminWallet } from "../../../../core/hooks/wallets/useAdminAccount.js";
 import { useDisconnect } from "../../../../core/hooks/wallets/useDisconnect.js";
 import { wait } from "../../../../core/utils/wait.js";
 import { LoadingScreen } from "../../../wallets/shared/LoadingScreen.js";
@@ -46,12 +47,12 @@ export const SignatureScreen: React.FC<{
     connectLocale,
   } = props;
 
-  const activeWallet = useActiveWallet();
+  const wallet = useActiveWallet();
+  const adminWallet = useAdminWallet();
   const activeAccount = useActiveAccount();
-  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
+  const siweAuth = useSiweAuth(wallet, activeAccount, props.auth);
   const [status, setStatus] = useState<Status>("idle");
   const { disconnect } = useDisconnect();
-  const wallet = useActiveWallet();
   const locale = connectLocale.signatureScreen;
 
   const signIn = useCallback(async () => {
@@ -66,12 +67,15 @@ export const SignatureScreen: React.FC<{
     }
   }, [onDone, siweAuth]);
 
-  // this should not happen
   if (!wallet) {
     return <LoadingScreen />;
   }
 
-  if (wallet.id === "inApp" || wallet.id === "embedded") {
+  if (
+    wallet.id === "inApp" ||
+    wallet.id === "embedded" ||
+    (wallet.id === "smart" && adminWallet?.id === "inApp")
+  ) {
     return (
       <HeadlessSignIn
         signIn={signIn}

package/src/utils/abi/normalizeFunctionParams.ts

@@ -1,4 +1,5 @@
 import type { AbiConstructor, AbiFunction } from "abitype";
+import { parseAbiParams } from "../contract/parse-abi-params.js";
 
 export function normalizeFunctionParams(
   abiFunction: AbiFunction | AbiConstructor | undefined,
@@ -7,23 +8,27 @@ export function normalizeFunctionParams(
   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;
-  });
+
+  return parseAbiParams(
+    abiFunction.inputs.map((i) => i.type),
+    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 =
+        valueWithoutUnderscore in params
+          ? params[valueWithoutUnderscore]
+          : params[value]; // 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/deploy-metadata.ts

@@ -48,6 +48,7 @@ export async function fetchDeployMetadata(
   return {
     ...rawMeta,
     ...parsedMeta,
+    version: rawMeta.version,
     bytecode: deployBytecode,
   };
 }
@@ -69,7 +70,7 @@ async function fetchAndParseCompilerMetadata(
       `Could not resolve metadata for contract at ${options.uri}`,
     );
   }
-  return formatCompilerMetadata(metadata);
+  return { ...metadata, ...formatCompilerMetadata(metadata) };
 }
 
 // types
@@ -87,7 +88,37 @@ type RawCompilerMetadata = {
 type ParsedCompilerMetadata = {
   name: string;
   abi: Abi;
-  metadata: Record<string, unknown>;
+  metadata: {
+    compiler: {
+      version: string;
+    };
+    language: string;
+    output: {
+      abi: Abi;
+      devdoc: Record<string, unknown>;
+      userdoc: Record<string, unknown>;
+    };
+    settings: {
+      compilationTarget: Record<string, unknown>;
+      evmVersion: string;
+      libraries: Record<string, string>;
+      optimizer: Record<string, unknown>;
+      remappings: string[];
+    };
+    sources: Record<
+      string,
+      { keccak256: string } & (
+        | {
+            content: string;
+          }
+        | {
+            urls: string[];
+            license?: string;
+          }
+      )
+    >;
+    [key: string]: unknown;
+  };
   info: {
     title?: string;
     author?: string;

package/src/utils/any-evm/get-init-bytecode-with-salt.ts

@@ -1,6 +1,6 @@
-import { type Hex, encodePacked } from "viem";
+import { encodePacked } from "viem/utils";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
-import { uint8ArrayToHex } from "../encoding/hex.js";
+import { type Hex, uint8ArrayToHex } from "../encoding/hex.js";
 import { getSaltHash } from "./get-salt-hash.js";
 import { keccakId } from "./keccak-id.js";
 

package/src/utils/contract/parse-abi-params.ts

@@ -79,6 +79,9 @@ export function parseAbiParams(
       return value;
     }
     if (type.startsWith("uint") || type.startsWith("int")) {
+      if (typeof value === "bigint") {
+        return value;
+      }
       if (typeof value !== "string" && typeof value !== "number") {
         throw new Error(`Cannot convert type ${typeof value} to BigInt`);
       }

package/src/utils/extensions/convert-erc20-amount.ts

@@ -22,24 +22,30 @@ export async function convertErc20Amount(
     } & AmountOrAmountInWei
   >,
 ): Promise<bigint> {
-  if ("amount" in options) {
-    // for native token, we know decimals are 18
-    if (!options.erc20Address || isNativeTokenAddress(options.erc20Address)) {
-      return toUnits(options.amount.toString(), 18);
+  try {
+    if ("amount" in options) {
+      // for native token, we know decimals are 18
+      if (!options.erc20Address || isNativeTokenAddress(options.erc20Address)) {
+        return toUnits(options.amount.toString(), 18);
+      }
+      // otherwise get the decimals of the currency
+      const currencyContract = getContract({
+        client: options.client,
+        chain: options.chain,
+        address: options.erc20Address,
+      });
+      const { decimals } = await import(
+        "../../extensions/erc20/read/decimals.js"
+      );
+      const currencyDecimals = await decimals({
+        contract: currencyContract,
+      });
+      return toUnits(options.amount.toString(), currencyDecimals);
     }
-    // otherwise get the decimals of the currency
-    const currencyContract = getContract({
-      client: options.client,
-      chain: options.chain,
-      address: options.erc20Address,
-    });
-    const { decimals } = await import(
-      "../../extensions/erc20/read/decimals.js"
+    return options.amountInWei;
+  } catch (e) {
+    throw new Error(
+      `Failed to convert ERC20 amount for token: ${options.erc20Address}: ${e}`,
     );
-    const currencyDecimals = await decimals({
-      contract: currencyContract,
-    });
-    return toUnits(options.amount.toString(), currencyDecimals);
   }
-  return options.amountInWei;
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.55.0";
+export const version = "5.56.0-nightly-07b949dd8c07ffdeda40a5549c31ad4b09abbbf1-20240916000437";

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

@@ -305,7 +305,6 @@ export class IFrameWallet {
         return signedMessage as Hex;
       },
       async signTypedData(_typedData) {
-        console.log("signTypedData", _typedData);
         const parsedTypedData = parseTypedData(_typedData);
         // deleting EIP712 Domain as it results in ambiguous primary type on some cases
         // this happens when going from viem to ethers via the iframe

package/src/wallets/interfaces/wallet.ts

@@ -141,6 +141,12 @@ export type Wallet<TWalletId extends WalletId = WalletId> = {
    * Can be used to execute any pre-connection actions like showing a modal, etc.
    */
   onConnectRequested?: () => Promise<void>;
+
+  /**
+   * Get the admin account of this wallet
+   * This is useful for smart wallets to get the underlying personal account
+   */
+  getAdminAccount?: () => Account | undefined;
 };
 
 /**

package/src/wallets/smart/smart-wallet.ts

@@ -102,6 +102,7 @@ export function smartWallet(
 ): Wallet<"smart"> {
   const emitter = createWalletEmitter<"smart">();
   let account: Account | undefined = undefined;
+  let adminAccount: Account | undefined = undefined;
   let chain: Chain | undefined = undefined;
   let lastConnectOptions: WalletConnectionOption<"smart"> | undefined;
 
@@ -118,6 +119,7 @@ export function smartWallet(
     },
     getConfig: () => createOptions,
     getAccount: () => account,
+    getAdminAccount: () => adminAccount,
     autoConnect: async (options) => {
       const { connectSmartWallet } = await import("./index.js");
       const [connectedAccount, connectedChain] = await connectSmartWallet(
@@ -145,6 +147,7 @@ export function smartWallet(
         createOptions,
       );
       // set the states
+      adminAccount = options.personalAccount;
       lastConnectOptions = options;
       account = connectedAccount;
       chain = connectedChain;