@matterlabs/zksync-js 0.0.18 → 0.0.19

package/dist/adapters/viem/sdk.js

@@ -1,4 +1,4 @@
-export { createViemSdk } from '../../chunk-GBS7KQFU.js';
+export { createViemSdk } from '../../chunk-3T5V4HKS.js';
 import '../../chunk-6LYAENO6.js';
 import '../../chunk-3HHUZXSV.js';
 import '../../chunk-SBGBYZJM.js';

package/dist/{chunk-GBS7KQFU.js → chunk-3T5V4HKS.js}

@@ -512,12 +512,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) => encodeAbiParameters(
+    types.map((t, i) => ({ type: t, name: `arg${i}` })),
+    values
+  ),
+  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);
   }
@@ -533,8 +546,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
@@ -823,19 +836,19 @@ function routeErc20NonBase() {
 }
 var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-var ntvCodec = createNTVCodec({
+var ntvCodec2 = createNTVCodec({
   encode: (types, values) => encodeAbiParameters(
     types.map((type, index) => ({ type, name: `arg${index}` })),
     values
   ),
-  keccak256
+  keccak256: keccak256
 });
 async function getPriorityGasModel2(input) {
   try {
     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
@@ -1353,7 +1366,7 @@ async function waitForL2ExecutionFromL1Tx(l1, l2, l1TxHash) {
   return { l2Receipt, l2TxHash };
 }
 var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
-var ntvCodec2 = createNTVCodec({
+var ntvCodec3 = createNTVCodec({
   encode: (types, values) => encodeAbiParameters(
     types.map((t, i) => ({ type: t, name: `arg${i}` })),
     values
@@ -1467,7 +1480,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

package/dist/{chunk-U72MNQIY.js → chunk-5H3VTIYD.js}

@@ -456,12 +456,22 @@ function routeEthDirect() {
 var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
 var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
 var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
+var ntvCodec = createNTVCodec({
+  encode: (types, values) => AbiCoder.defaultAbiCoder().encode(types, values),
+  keccak256: (data) => keccak256(data)
+});
 async function encodeSecondBridgeErc20DepositCalldata(input) {
   if (!input.ctx.resolvedToken) {
     return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
   }
-  const { chainId: l1ChainId } = await input.ctx.client.l1.getNetwork();
-  const isL1Origin = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID || input.ctx.resolvedToken.originChainId === 0n || input.ctx.resolvedToken.originChainId === BigInt(l1ChainId);
+  const { chainId } = await input.ctx.client.l1.getNetwork();
+  const expectedL1AssetId = ntvCodec.encodeAssetId(
+    BigInt(chainId),
+    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);
   }
@@ -477,8 +487,8 @@ async function getPriorityGasModel(input) {
     const l1NativeTokenVault = await input.ctx.contracts.l1NativeTokenVault();
     const l1AssetRouter = await input.ctx.contracts.l1AssetRouter();
     const { chainId: l1ChainId } = await input.ctx.client.l1.getNetwork();
-    const isFirstBridge = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID || input.ctx.resolvedToken.originChainId === 0n;
-    const erc20MetadataOriginChainId = isFirstBridge ? BigInt(l1ChainId) : input.ctx.resolvedToken.originChainId;
+    const isFirstBridge = input.ctx.resolvedToken.assetId.toLowerCase() === ZERO_ASSET_ID;
+    const erc20MetadataOriginChainId = isFirstBridge ? BigInt(l1ChainId) : input.ctx.resolvedToken.originChainId !== 0n ? input.ctx.resolvedToken.originChainId : await l1NativeTokenVault.originChainId(input.ctx.resolvedToken.assetId);
     const erc20Metadata = await l1NativeTokenVault.getERC20Getters(
       input.token,
       erc20MetadataOriginChainId
@@ -688,7 +698,7 @@ function routeErc20NonBase() {
 var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 var ZERO_L2_TOKEN_ADDRESS3 = "0x0000000000000000000000000000000000000000";
 var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-var ntvCodec = createNTVCodec({
+var ntvCodec2 = createNTVCodec({
   encode: (types, values) => AbiCoder.defaultAbiCoder().encode(types, values),
   keccak256: (data) => keccak256(data)
 });
@@ -697,7 +707,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.getNetwork()).chainId);
-    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.getERC20Getters(
       ETH_ADDRESS,
       originChainId
@@ -1035,7 +1045,7 @@ function routeErc20Base() {
 }
 var { wrapAs: wrapAs5 } = createErrorHandlers("tokens");
 var abi = AbiCoder.defaultAbiCoder();
-var ntvCodec2 = createNTVCodec({
+var ntvCodec3 = createNTVCodec({
   encode: (types, values) => abi.encode(types, values),
   keccak256: (data) => ethers.keccak256(data)
 });
@@ -1154,7 +1164,7 @@ function createTokensResource(client) {
     return wrapAs5("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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterlabs/zksync-js",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "devDependencies": {
@@ -148,7 +148,7 @@
     "test:watch": "bun test --watch",
     "test:cov": "bun test --coverage",
     "test:core": "bun test src/core",
-    "test:docs": "bun test docs/snippets --timeout 100000"
+    "test:docs": "bun test docs/snippets --timeout 200000"
   },
   "sideEffects": false,
   "type": "module",