@matterlabs/zksync-js 0.0.18 → 0.0.20

package/dist/adapters/viem/index.js

@@ -1,4 +1,4 @@
-export { buildDirectRequestStruct, createContractsResource, createDepositsResource, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createViemSdk, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-GBS7KQFU.js';
+export { buildDirectRequestStruct, createContractsResource, createDepositsResource, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createViemSdk, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-3T5V4HKS.js';
 import '../../chunk-6LYAENO6.js';
 import '../../chunk-3HHUZXSV.js';
 export { createViemClient as createClient, createViemClient } from '../../chunk-CK5UFAZK.js';

package/dist/adapters/viem/sdk.cjs

@@ -6730,6 +6730,20 @@ function routeEthDirect() {
   };
 }
 
+// src/core/codec/ntv.ts
+function createNTVCodec(deps) {
+  function encodeAssetId(originChainId, ntvAddress, tokenAddress) {
+    const encoded = deps.encode(
+      ["uint256", "address", "address"],
+      [originChainId, ntvAddress, tokenAddress]
+    );
+    return deps.keccak256(encoded);
+  }
+  return {
+    encodeAssetId
+  };
+}
+
 // src/adapters/viem/resources/deposits/routes/approval.ts
 function errorText(error) {
   const parts = [];
@@ -6780,12 +6794,25 @@ async function buildApprovalRequest({
 // src/adapters/viem/resources/deposits/routes/erc20-nonbase.ts
 var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
+var ntvCodec = createNTVCodec({
+  encode: (types, values) => viem.encodeAbiParameters(
+    types.map((t, i) => ({ type: t, name: `arg${i}` })),
+    values
+  ),
+  keccak256: viem.keccak256
+});
 async function encodeSecondBridgeErc20DepositCalldata(input) {
   if (!input.ctx.resolvedToken) {
     return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
   }
   const l1ChainId = BigInt(await input.ctx.client.l1.getChainId());
-  const isL1Origin = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID || input.ctx.resolvedToken.originChainId === 0n || input.ctx.resolvedToken.originChainId === l1ChainId;
+  const expectedL1AssetId = ntvCodec.encodeAssetId(
+    l1ChainId,
+    L2_NATIVE_TOKEN_VAULT_ADDRESS,
+    input.token
+  );
+  const assetId = input.ctx.resolvedToken.assetId.toLowerCase();
+  const isL1Origin = assetId === ZERO_ASSET_ID || assetId === expectedL1AssetId.toLowerCase();
   if (isL1Origin) {
     return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
   }
@@ -6801,8 +6828,8 @@ async function getPriorityGasModel(input) {
     const l1NativeTokenVault = await input.ctx.contracts.l1NativeTokenVault();
     const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
     const l1ChainId = BigInt(await input.ctx.client.l1.getChainId());
-    const isFirstBridge = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID || input.ctx.resolvedToken.originChainId === 0n;
-    const erc20MetadataOriginChainId = isFirstBridge ? l1ChainId : input.ctx.resolvedToken.originChainId;
+    const isFirstBridge = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID;
+    const erc20MetadataOriginChainId = isFirstBridge ? l1ChainId : input.ctx.resolvedToken.originChainId !== 0n ? input.ctx.resolvedToken.originChainId : await l1NativeTokenVault.read.originChainId([input.ctx.resolvedToken.assetId]);
     const erc20Metadata = await l1NativeTokenVault.read.getERC20Getters([
       input.token,
       erc20MetadataOriginChainId
@@ -7089,25 +7116,9 @@ function routeErc20NonBase() {
     }
   };
 }
-
-// src/core/codec/ntv.ts
-function createNTVCodec(deps) {
-  function encodeAssetId(originChainId, ntvAddress, tokenAddress) {
-    const encoded = deps.encode(
-      ["uint256", "address", "address"],
-      [originChainId, ntvAddress, tokenAddress]
-    );
-    return deps.keccak256(encoded);
-  }
-  return {
-    encodeAssetId
-  };
-}
-
-// src/adapters/viem/resources/deposits/routes/eth-nonbase.ts
 var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-var ntvCodec = createNTVCodec({
+var ntvCodec2 = createNTVCodec({
   encode: (types, values) => viem.encodeAbiParameters(
     types.map((type, index) => ({ type, name: `arg${index}` })),
     values
@@ -7119,7 +7130,7 @@ async function getPriorityGasModel2(input) {
     const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
     const l1NativeTokenVault = await input.ctx.contracts.l1NativeTokenVault();
     const originChainId = input.ctx.resolvedToken.originChainId !== 0n ? input.ctx.resolvedToken.originChainId : BigInt(await input.ctx.client.l1.getChainId());
-    const resolvedAssetId = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID2 ? ntvCodec.encodeAssetId(originChainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, ETH_ADDRESS) : input.ctx.resolvedToken.assetId;
+    const resolvedAssetId = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID2 ? ntvCodec2.encodeAssetId(originChainId, L2_NATIVE_TOKEN_VAULT_ADDRESS, ETH_ADDRESS) : input.ctx.resolvedToken.assetId;
     const erc20Metadata = await l1NativeTokenVault.read.getERC20Getters([
       ETH_ADDRESS,
       originChainId
@@ -7637,7 +7648,7 @@ async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
   return { l2Receipt, l2TxHash };
 }
 var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
-var ntvCodec2 = createNTVCodec({
+var ntvCodec3 = createNTVCodec({
   encode: (types, values) => viem.encodeAbiParameters(
     types.map((t, i) => ({ type: t, name: `arg${i}` })),
     values
@@ -7751,7 +7762,7 @@ function createTokensResource(client) {
     return wrapAs6("CONTRACT", "tokens.isChainEthBased", async () => {
       const baseAssetId = await getBaseTokenAssetId();
       const l1ChainId = await getL1ChainId();
-      const ethAssetId = ntvCodec2.encodeAssetId(
+      const ethAssetId = ntvCodec3.encodeAssetId(
         l1ChainId,
         L2_NATIVE_TOKEN_VAULT_ADDRESS,
         ETH_ADDRESS