@matterlabs/zksync-js 0.0.17 → 0.0.19

package/dist/adapters/ethers/index.cjs

@@ -8556,16 +8556,58 @@ 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/ethers/resources/deposits/routes/erc20-nonbase.ts
 var { wrapAs: wrapAs3 } = createErrorHandlers("deposits");
 var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
 var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
+var ntvCodec = createNTVCodec({
+  encode: (types, values) => ethers.AbiCoder.defaultAbiCoder().encode(types, values),
+  keccak256: (data) => ethers.keccak256(data)
+});
+async function encodeSecondBridgeErc20DepositCalldata(input) {
+  if (!input.ctx.resolvedToken) {
+    return encodeSecondBridgeErc20Args(input.token, input.amount, input.receiver);
+  }
+  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);
+  }
+  const transferData = encodeNativeTokenVaultTransferData(
+    input.amount,
+    input.receiver,
+    input.token
+  );
+  return encodeSecondBridgeDataV1(input.ctx.resolvedToken.assetId, transferData);
+}
 async function getPriorityGasModel(input) {
   try {
     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
@@ -8631,9 +8673,14 @@ function routeErc20NonBase() {
       const secondBridgeCalldata = await wrapAs3(
         "INTERNAL",
         OP_DEPOSITS.nonbase.encodeCalldata,
-        () => Promise.resolve(encodeSecondBridgeErc20Args(p.token, p.amount, receiver)),
+        () => encodeSecondBridgeErc20DepositCalldata({
+          ctx,
+          token: p.token,
+          amount: p.amount,
+          receiver
+        }),
         {
-          ctx: { where: "encodeSecondBridgeErc20Args" },
+          ctx: { where: "encodeSecondBridgeErc20DepositCalldata" },
           message: "Failed to encode bridging calldata."
         }
       );
@@ -8767,26 +8814,10 @@ 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/ethers/resources/deposits/routes/eth-nonbase.ts
 var { wrapAs: wrapAs4 } = createErrorHandlers("deposits");
 var ZERO_L2_TOKEN_ADDRESS3 = "0x0000000000000000000000000000000000000000";
 var ZERO_ASSET_ID2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-var ntvCodec = createNTVCodec({
+var ntvCodec2 = createNTVCodec({
   encode: (types, values) => ethers.AbiCoder.defaultAbiCoder().encode(types, values),
   keccak256: (data) => ethers.keccak256(data)
 });
@@ -8795,7 +8826,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
@@ -9133,7 +9164,7 @@ function routeErc20Base() {
 }
 var { wrapAs: wrapAs6 } = createErrorHandlers("tokens");
 var abi = ethers.AbiCoder.defaultAbiCoder();
-var ntvCodec2 = createNTVCodec({
+var ntvCodec3 = createNTVCodec({
   encode: (types, values) => abi.encode(types, values),
   keccak256: (data) => ethers.ethers.keccak256(data)
 });
@@ -9252,7 +9283,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