@matterlabs/zksync-js 0.0.17 → 0.0.18

package/dist/adapters/ethers/index.js

@@ -1,5 +1,5 @@
 export { createEthersClient as createClient, createEthersClient } from '../../chunk-24TE2NNJ.js';
-export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-J2RPWU2R.js';
+export { buildDirectRequestStruct, createDepositsResource, createEthersSdk, createFinalizationServices, createInteropFinalizationServices, createInteropResource, createTokensResource, createWithdrawalsResource, encodeNativeTokenVaultTransferData, encodeSecondBridgeArgs, encodeSecondBridgeDataV1, encodeSecondBridgeErc20Args, encodeSecondBridgeEthArgs, getL2TransactionHashFromLogs } from '../../chunk-U72MNQIY.js';
 export { classifyReadinessFromRevert, createErrorHandlers, decodeRevert, registerErrorAbi, toZKsyncError } from '../../chunk-NJK325XV.js';
 import '../../chunk-6LYAENO6.js';
 import '../../chunk-3HHUZXSV.js';

package/dist/adapters/ethers/sdk.cjs

@@ -6641,6 +6641,22 @@ var ZERO_HASH = "0x0000000000000000000000000000000000000000000000000000000000000
 var { wrapAs: wrapAs2 } = createErrorHandlers("deposits");
 var ZERO_L2_TOKEN_ADDRESS2 = "0x0000000000000000000000000000000000000000";
 var ZERO_ASSET_ID = "0x0000000000000000000000000000000000000000000000000000000000000000";
+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);
+  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();
@@ -6713,9 +6729,14 @@ function routeErc20NonBase() {
       const secondBridgeCalldata = await wrapAs2(
         "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."
         }
       );