thirdweb 5.59.0-nightly-5ab3a81f79e96cb7caed6f591969942b2b67dbb6-20240926000312 → 5.59.1-nightly-21b032d1b845276817c2f8ada5566f4719a41ad0-20240927000336

package/src/transaction/actions/zksync/send-eip712-transaction.ts

@@ -1,4 +1,4 @@
-import { toRlp } from "viem";
+import { hexToBytes, toRlp } from "viem";
 import { eth_sendRawTransaction } from "../../../rpc/actions/eth_sendRawTransaction.js";
 import { getRpcClient } from "../../../rpc/rpc.js";
 import { toBigInt } from "../../../utils/bigint.js";
@@ -87,25 +87,17 @@ export async function populateEip712Transaction(
   options: SendEip712TransactionOptions,
 ): Promise<EIP721TransactionSerializable> {
   const { account, transaction } = options;
-  let [
-    data,
-    to,
-    value,
-    gas,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    gasPerPubdata,
-  ] = await Promise.all([
-    encode(transaction),
-    resolvePromisedValue(transaction.to),
-    resolvePromisedValue(transaction.value),
-    resolvePromisedValue(transaction.gas),
-    resolvePromisedValue(transaction.maxFeePerGas),
-    resolvePromisedValue(transaction.maxPriorityFeePerGas),
-    resolvePromisedValue(transaction.eip712).then(
-      (eip712) => eip712?.gasPerPubdata,
-    ),
-  ]);
+  let [data, to, value, gas, maxFeePerGas, maxPriorityFeePerGas, eip712] =
+    await Promise.all([
+      encode(transaction),
+      resolvePromisedValue(transaction.to),
+      resolvePromisedValue(transaction.value),
+      resolvePromisedValue(transaction.gas),
+      resolvePromisedValue(transaction.maxFeePerGas),
+      resolvePromisedValue(transaction.maxPriorityFeePerGas),
+      resolvePromisedValue(transaction.eip712),
+    ]);
+  let gasPerPubdata = eip712?.gasPerPubdata;
   if (!gas || !maxFeePerGas || !maxPriorityFeePerGas) {
     // fetch fees and gas
     const rpc = getRpcClient(transaction);
@@ -118,6 +110,15 @@ export async function populateEip712Transaction(
           to,
           data,
           value: value ? numberToHex(value) : undefined,
+          gasPerPubdata,
+          eip712Meta: {
+            ...eip712,
+            gasPerPubdata: gasPerPubdata ? toHex(gasPerPubdata) : toHex(50000n),
+            factoryDeps: eip712?.factoryDeps?.map((dep) =>
+              Array.from(hexToBytes(dep)),
+            ),
+          },
+          type: "0x71",
           // biome-ignore lint/suspicious/noExplicitAny: TODO add to RPC method types
         } as any,
       ],

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

@@ -8,6 +8,7 @@ import type { Prettify } from "../type-utils.js";
 type FetchDeployMetadataOptions = {
   uri: string;
   client: ThirdwebClient;
+  compilerType?: "solc" | "zksolc";
 };
 
 export type FetchDeployMetadataResult = Partial<ExtendedMetadata> &
@@ -22,19 +23,25 @@ export type FetchDeployMetadataResult = Partial<ExtendedMetadata> &
 export async function fetchDeployMetadata(
   options: FetchDeployMetadataOptions,
 ): Promise<FetchDeployMetadataResult> {
+  const isZksolc = options.compilerType === "zksolc";
   const rawMeta: RawCompilerMetadata = await download({
     uri: options.uri,
     client: options.client,
   }).then((r) => r.json());
-  // TODO: proper handling of different compiler metadata types
-  const metadataUri =
-    rawMeta.compilers?.zksolc?.length > 0 && rawMeta.name.endsWith("_ZkSync")
-      ? rawMeta.compilers.zksolc[0].metadataUri
-      : rawMeta.metadataUri;
-  const bytecodeUri =
-    rawMeta.compilers?.zksolc?.length > 0 && rawMeta.name.endsWith("_ZkSync")
-      ? rawMeta.compilers.zksolc[0].bytecodeUri
-      : rawMeta.bytecodeUri;
+
+  if (
+    isZksolc &&
+    (!rawMeta.compilers?.zksolc || rawMeta.compilers?.zksolc.length === 0)
+  ) {
+    throw new Error(`No zksolc metadata found for contract: ${rawMeta.name}`);
+  }
+
+  const metadataUri = isZksolc
+    ? rawMeta.compilers.zksolc[0].metadataUri
+    : rawMeta.metadataUri;
+  const bytecodeUri = isZksolc
+    ? rawMeta.compilers.zksolc[0].bytecodeUri
+    : rawMeta.bytecodeUri;
   const [deployBytecode, parsedMeta] = await Promise.all([
     download({ uri: bytecodeUri, client: options.client }).then(
       (res) => res.text() as Promise<Hex>,
@@ -42,6 +49,7 @@ export async function fetchDeployMetadata(
     fetchAndParseCompilerMetadata({
       client: options.client,
       uri: metadataUri,
+      compilerType: options.compilerType,
     }),
   ]);
 
@@ -66,12 +74,18 @@ async function fetchAndParseCompilerMetadata(
       requestTimeoutMs: CONTRACT_METADATA_TIMEOUT_SEC,
     })
   ).json();
-  if (!metadata || !metadata.output) {
+  if (
+    (!metadata || !metadata.output) &&
+    (!metadata.source_metadata || !metadata.source_metadata.output)
+  ) {
     throw new Error(
       `Could not resolve metadata for contract at ${options.uri}`,
     );
   }
-  return { ...metadata, ...formatCompilerMetadata(metadata) };
+  return {
+    ...metadata,
+    ...formatCompilerMetadata(metadata, options.compilerType),
+  };
 }
 
 // types
@@ -128,6 +142,7 @@ type ParsedCompilerMetadata = {
   };
   licenses: string[];
   isPartialAbi?: boolean;
+  zk_version?: string;
 };
 
 export type CompilerMetadata = Prettify<

package/src/utils/any-evm/zksync/isZkSyncChain.ts

@@ -5,6 +5,8 @@ export function isZkSyncChain(chain: Chain) {
     chain.id === 324 ||
     chain.id === 300 ||
     chain.id === 302 ||
-    chain.id === 11124
+    chain.id === 11124 ||
+    chain.id === 282 || // cronos zkevm testnet
+    chain.id === 388 // cronos zkevm mainnet
   );
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.59.0-nightly-5ab3a81f79e96cb7caed6f591969942b2b67dbb6-20240926000312";
+export const version = "5.59.1-nightly-21b032d1b845276817c2f8ada5566f4719a41ad0-20240927000336";

package/src/wallets/in-app/web/lib/auth/iframe-auth.ts

@@ -321,6 +321,13 @@ export class Auth {
    * @internal
    */
   async logout(): Promise<LogoutReturnType> {
+    if (this.AuthQuerier) {
+      await this.AuthQuerier.call<LogoutReturnType>({
+        procedureName: "logout",
+        params: undefined,
+      });
+    }
+
     const isRemoveAuthCookie = await this.localStorage.removeAuthCookie();
     const isRemoveUserId = await this.localStorage.removeWalletUserId();