four-flap-meme-sdk 4.3.13 → 4.3.14

package/dist/utils/hop-chains.d.ts

@@ -10,6 +10,9 @@ export type { DisperseHopPath } from './types/hop-chains.js';
 export declare const NATIVE_TRANSFER_GAS_LIMIT: 21055n;
 export declare const ERC20_TRANSFER_GAS_LIMIT_HOP: 120000n;
 export declare const BRIBE_GAS_LIMIT: 21000n;
+/** 末跳且买地址自备 gas 时，hop 不再转发原生币，ERC20 必须从 nonce 0 起。 */
+export declare function hopForwardsNativeGas(index: number, hopCount: number, finalGasAmount: bigint): boolean;
+export declare function hopErc20Nonce(index: number, hopCount: number, finalGasAmount: bigint): number;
 /**
  * 给交易对象附加 gasPrice/maxFeePerGas（根据 txType）
  */
@@ -25,7 +28,7 @@ export declare function buildNativeHopChain(payer: Wallet, path: DisperseHopPath
 /**
  * 构建 ERC20 多跳转账链（需要配合 BNB 多跳使用）
  */
-export declare function buildERC20HopChain(payer: Wallet, path: DisperseHopPath, erc20Address: string, erc20Amount: bigint, gasPrice: bigint, chainId: number, txType: 0 | 2, payerNonce: number): Promise<string[]>;
+export declare function buildERC20HopChain(payer: Wallet, path: DisperseHopPath, erc20Address: string, erc20Amount: bigint, gasPrice: bigint, chainId: number, txType: 0 | 2, payerNonce: number, finalNativeForwardAmount?: bigint): Promise<string[]>;
 /**
  * 构建 BNB 多跳转账链（为 ERC20 中间钱包预留 gas）
  */

package/dist/utils/hop-chains.js

@@ -11,6 +11,15 @@ import { generateWallets } from './wallet.js';
 export const NATIVE_TRANSFER_GAS_LIMIT = GAS_LIMITS.NATIVE_TRANSFER;
 export const ERC20_TRANSFER_GAS_LIMIT_HOP = GAS_LIMITS.ERC20_TRANSFER;
 export const BRIBE_GAS_LIMIT = GAS_LIMITS.BRIBE;
+/** 末跳且买地址自备 gas 时，hop 不再转发原生币，ERC20 必须从 nonce 0 起。 */
+export function hopForwardsNativeGas(index, hopCount, finalGasAmount) {
+    if (hopCount <= 0 || index < 0 || index >= hopCount)
+        return false;
+    return !(index === hopCount - 1 && finalGasAmount === 0n);
+}
+export function hopErc20Nonce(index, hopCount, finalGasAmount) {
+    return hopForwardsNativeGas(index, hopCount, finalGasAmount) ? 1 : 0;
+}
 /**
  * 给交易对象附加 gasPrice/maxFeePerGas（根据 txType）
  */
@@ -107,7 +116,7 @@ export async function buildNativeHopChain(payer, path, finalAmount, gasPrice, ch
 /**
  * 构建 ERC20 多跳转账链（需要配合 BNB 多跳使用）
  */
-export async function buildERC20HopChain(payer, path, erc20Address, erc20Amount, gasPrice, chainId, txType, payerNonce) {
+export async function buildERC20HopChain(payer, path, erc20Address, erc20Amount, gasPrice, chainId, txType, payerNonce, finalNativeForwardAmount = 0n) {
     const signedTxs = [];
     const hopCount = path.hopWallets.length;
     const erc20Interface = new ethers.Interface(ERC20_ABI);
@@ -139,7 +148,7 @@ export async function buildERC20HopChain(payer, path, erc20Address, erc20Amount,
     };
     applyTxTypeGas(firstTx, gasPrice, txType);
     signedTxs.push(await payer.signTransaction(firstTx));
-    // hop1 → hop2 → ... → target (nonce=1，nonce=0 用于 BNB 转发)
+    // hop1 → hop2 → ... → target。末跳若不再转发 BNB，ERC20 用 nonce=0。
     for (let i = 0; i < hopCount; i++) {
         const fromWallet = path.hopWallets[i];
         const toAddress = i === hopCount - 1 ? path.targetAddress : path.hopWallets[i + 1].address;
@@ -148,7 +157,7 @@ export async function buildERC20HopChain(payer, path, erc20Address, erc20Amount,
             to: erc20Address,
             data,
             value: 0n,
-            nonce: 1, // nonce=0 已用于 BNB 转发
+            nonce: hopErc20Nonce(i, hopCount, finalNativeForwardAmount),
             gasLimit: ERC20_TRANSFER_GAS_LIMIT_HOP,
             chainId,
             type: txType,
@@ -197,7 +206,7 @@ export async function buildBNBHopChainForERC20(payer, path, finalGasAmount, gasP
         const fromWallet = path.hopWallets[i];
         const toAddress = i === hopCount - 1 ? path.targetAddress : path.hopWallets[i + 1].address;
         const amount = i === hopCount - 1 ? finalGasAmount : amountsPerHop[i + 1];
-        if (i === hopCount - 1 && amount === 0n)
+        if (!hopForwardsNativeGas(i, hopCount, finalGasAmount))
             continue;
         const tx = {
             to: toAddress,

package/dist/utils/hop-chains.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/hop-chains.test.js

@@ -0,0 +1,16 @@
+import { describe, expect, it } from 'vitest';
+import { hopErc20Nonce, hopForwardsNativeGas } from './hop-chains.js';
+describe('hopErc20Nonce', () => {
+    it('uses nonce 0 on a single hop when the buyer keeps its own gas', () => {
+        expect(hopForwardsNativeGas(0, 1, 0n)).toBe(false);
+        expect(hopErc20Nonce(0, 1, 0n)).toBe(0);
+    });
+    it('keeps nonce 1 on intermediate hops and 0 on the last hop', () => {
+        expect(hopErc20Nonce(0, 2, 0n)).toBe(1);
+        expect(hopErc20Nonce(1, 2, 0n)).toBe(0);
+    });
+    it('uses nonce 1 on the last hop when it also forwards native gas', () => {
+        expect(hopForwardsNativeGas(0, 1, 1n)).toBe(true);
+        expect(hopErc20Nonce(0, 1, 1n)).toBe(1);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "four-flap-meme-sdk",
-  "version": "4.3.13",
+  "version": "4.3.14",
   "description": "SDK for Flap bonding curve and four.meme TokenManager",
   "type": "module",
   "main": "dist/index.js",