four-flap-meme-sdk 4.0.0 → 4.0.2

package/dist/bundle/four-meme/utils-sweep/context.d.ts

@@ -4,6 +4,7 @@
 import type { JsonRpcProvider, Wallet } from 'ethers';
 import type { SweepSignParams } from '../types/index.js';
 import type { GeneratedWallet } from '../../../utils/wallet.js';
+import type { NonceManager } from '../../../core/nonce/nonce-manager.js';
 /** 归集比例收窄（0-100 整数） */
 export declare function clampRatio(n?: number): number | undefined;
 /** 归集各分支共用的只读上下文 */
@@ -29,6 +30,8 @@ export interface SweepBranchContext {
     nativeGasLimit: bigint;
     /** clampRatio(ratioPct) 的结果 */
     ratio: number | undefined;
+    /** 共享 NonceManager（用于统一协调 贿赂/利润提取 等 targetWallet 交易的 nonce，避免 nonce 冲突） */
+    nonceManager: NonceManager;
 }
 /** 归集分支返回值（由主流程合并） */
 export interface SweepBranchResult {

package/dist/bundle/four-meme/utils-sweep/erc20-no-hop.js

@@ -15,7 +15,7 @@ export async function sweepErc20NoHop(ctx) {
     let profitHopWallets;
     const wallets = actualKeys.map((pk) => new Wallet(pk, provider));
     const addresses = wallets.map((w) => w.address);
-    const nonceManager = new NonceManager(provider);
+    const nonceManager = ctx.nonceManager ?? new NonceManager(provider);
     // ✅ ERC20：并行获取 gasPrice、decimals、余额（传入 chainIdNum 避免 NETWORK_ERROR）
     const [gasPrice, decimals, balances, bnbBalances] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),

package/dist/bundle/four-meme/utils-sweep/main.js

@@ -10,6 +10,7 @@ import { CHAINS, isBscChain } from '../../../core/constants/index.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient, getBribeAmount } from '../../config-helpers.js';
 import { generateHopWallets as _generateHopWallets, calculateGasLimit as _calculateGasLimit, isNativeTokenAddress as _isNativeTokenAddress, } from '../../internal.js';
 import { createSignProvider, resolveHopCountInput, resolveProvidedHops, signBribeTransaction } from '../../../core/sign-context-helpers.js';
+import { NonceManager } from '../../../core/nonce/nonce-manager.js';
 import { clampRatio } from './context.js';
 import { sweepNativeNoHop } from './native-no-hop.js';
 import { sweepErc20NoHop } from './erc20-no-hop.js';
@@ -55,11 +56,13 @@ export async function sweepWithBundleMerkle(params) {
     const bribeAmount = isBscChain(chainIdNum) ? getBribeAmount(config) : 0n;
     const needBribeTx = bribeAmount > 0n && targetWallet !== null;
     const bribeSignedTx = [];
+    // ✅ 共享 NonceManager：统一协调 贿赂/利润提取 等 targetWallet 交易的 nonce，避免同一钱包 nonce 冲突
+    const nonceManager = new NonceManager(provider);
     // ✅ 贿赂交易放在最前面（由 targetWallet 签名）
     if (needBribeTx && targetWallet) {
         const [bribeGasPrice, bribeNonce] = await Promise.all([
             getOptimizedGasPrice(provider, getGasPriceConfig(config)),
-            provider.getTransactionCount(targetWallet.address),
+            nonceManager.getNextNonceBatch(targetWallet, 1).then((ns) => ns[0]), // 预留 nonce 0
         ]);
         bribeSignedTx.push(await signBribeTransaction(targetWallet, bribeAmount, bribeNonce, bribeGasPrice, chainIdNum, txType));
     }
@@ -84,6 +87,7 @@ export async function sweepWithBundleMerkle(params) {
         finalGasLimit,
         nativeGasLimit,
         ratio,
+        nonceManager,
     };
     const branch = !preparedHops
         ? isNative

package/dist/bundle/four-meme/utils-sweep/native-no-hop.js

@@ -15,7 +15,8 @@ export async function sweepNativeNoHop(ctx) {
     let profitHopWallets;
     const wallets = actualKeys.map((pk) => new Wallet(pk, provider));
     const addresses = wallets.map((w) => w.address);
-    const nonceManager = new NonceManager(provider);
+    // ✅ 复用主流程共享的 NonceManager（贿赂交易已用它预留 targetWallet 的 nonce，避免利润提取与之冲突）
+    const nonceManager = ctx.nonceManager ?? new NonceManager(provider);
     // ✅ 优化：并行获取 gasPrice 和余额
     const [gasPrice, balances] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),

package/dist/bundle/four-meme/utils-sweep/with-hops.js

@@ -46,7 +46,7 @@ export async function sweepWithHops(ctx, preparedHops) {
     // ✅ ERC20 多跳时，中转钱包需要执行 2 笔交易（转 gas + 转 ERC20）
     const erc20HopGasFee = erc20TransferGasLimit * gasPrice;
     const nativeHopGasFeeForErc20 = nativeTransferGasLimit * gasPrice;
-    const nonceManager = new NonceManager(provider);
+    const nonceManager = ctx.nonceManager ?? new NonceManager(provider);
     // ✅ 用于记录每个钱包的归集金额
     const sweepAmounts = new Array(sourceWallets.length).fill(0n);
     // ✅ 辅助函数：获取比例和金额

package/dist/domains/flap/vault/constants.js

@@ -29,6 +29,7 @@ export const VAULT_TYPE_CATEGORIES = {
 export const VAULT_PORTAL_ADDRESSES = {
     BSC: '0x90497450f2a706f1951b5bdda52B4E5d16f34C06',
     BASE: '0x027e3704fC5C16522e9393d04C60A3ac5c0d775f',
+    MORPH: '0xe9F7AB7DE8FB8756acbB6a1cd13316A43308197B',
 };
 /**
  * VaultFactory 合约地址（每种金库类型 + 每条链）
@@ -38,18 +39,25 @@ export const VAULT_PORTAL_ADDRESSES = {
  */
 export const VAULT_FACTORY_ADDRESSES = {
     BSC: {
-        gift: '0x025549F52B03cF36f9e1a337c02d3AA7Af66ab32',
+        gift: '0xFb7ccc4Fd09Da5b7016A18d51e227Af4ABE53f44',
         split: '0xfab75Dc774cB9B38b91749B8833360B46a52345F',
         // bnbshare: '0x53AD93F2454cFA532656f80E30571159d7E726A7', // 已禁用 (enabled: false)
         buyback_burn: '0xB64655dab7156c29B63C70fb3ED7f071e2658D19',
         burnToEarn: '0x47A216040Dc9e0AfE2e6fc5dcC44f7bBD1B60d25',
+        scheduled_buyback: '0x4ac94f87863012C4F133ef748b7cC5b75CAFE801',
+        relay: '0xB8dfFd67204105fB32d51d9cAa7c17A7bf880d9E',
+        lp_staking: '0x59F3b82Ea3aA3BCE6156CA61c0A6613C0A632452',
+        rank_burn: '0x9F5bF8EB9c4cA7179E60d0B529F4910B9A7eE0Ee',
         buildYourVault: ZeroAddress, // 用户自定义地址
     },
     BASE: {
-        gift: '0xa02DA44D67DB6D692efa7f751b5952bd670d5326',
+        gift: '0x2eDD880AB36b07bD030BDa28A13c3E9148C11622',
         split: '0x1ae091F75D593eb7dC6539600a185C8A6076A424',
         buyback_burn: '0x6F97fA674a6FE5EC37e309B63aB54E33c9e64d2E',
         burnToEarn: '0x47A216040Dc9e0AfE2e6fc5dcC44f7bBD1B60d25',
+        scheduled_buyback: '0xdc40982a586e4692e1E4D0b05416B1FB5155075a',
+        lp_staking: '0xbFfAb600105C83Ea5009A9ccbf7a0f2D007Ad198',
+        rank_burn: '0x971ec9df7CEA81d612d48c1f6021ADeF6C6682B4',
         buildYourVault: ZeroAddress,
     },
 };

package/package.json

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