four-flap-meme-sdk 4.3.15 → 4.3.16

package/dist/bundle/four-meme/core/create-openfour.js

@@ -11,7 +11,7 @@ import { getTxType, getGasPriceConfig, getBribeAmount, calculateProfit, getProfi
 import { signBribeTransaction } from '../../../core/sign-context-helpers.js';
 import { createChainContext, loginFourClient, resolveTokenImage } from '../core-helpers.js';
 import { OPENFOUR_CORE_ABI } from '../../../abis/openfour.js';
-import { OPENFOUR_CREATE_EXPIRED_MESSAGE, computeOpenFourCreateValueWei, decodeOpenFourCreateArg, isOpenFourPresaleNative, loadOpenFourAddresses, shouldRefreshOpenFourCreateArg, } from '../../../domains/openfour/index.js';
+import { OPENFOUR_CREATE_EXPIRED_MESSAGE, computeOpenFourCreateValueWei, decodeOpenFourCreateArg, isOpenFourCreateArgExpired, isOpenFourPresaleNative, loadOpenFourAddresses, shouldRefreshOpenFourCreateArg, } from '../../../domains/openfour/index.js';
 import { signQuoteApproveIfNeeded } from './create-token-quote.js';
 const BSC_SUBMIT_FEE_DUST_WEI = 10n ** 12n;
 export function openFourSubmitProfitWei(nativeFlowWei) {
@@ -44,7 +44,7 @@ async function fetchFreshOpenFourCreateArg(fourClient, accessToken, body, provid
         createResp = await pull();
         decoded = decodeOpenFourCreateArg(createResp.createArg);
     }
-    if (shouldRefreshOpenFourCreateArg(decoded.validTimestamp, await readChainTimestamp(provider))) {
+    if (isOpenFourCreateArgExpired(decoded.validTimestamp, await readChainTimestamp(provider))) {
         throw new Error(OPENFOUR_CREATE_EXPIRED_MESSAGE);
     }
     return createResp;

package/dist/bundle/four-meme/utils-disperse.js

@@ -1,6 +1,6 @@
 import { ethers, Wallet } from 'ethers';
 import { getOptimizedGasPrice, NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../utils/bundle-helpers.js';
-import { calculateTransferFee, GAS_LIMITS, isBscChain } from '../../core/constants/index.js';
+import { calculateTransferFee, floorErc20TransferGasLimit, GAS_LIMITS, isBscChain } from '../../core/constants/index.js';
 import { getGasPriceConfig, shouldExtractProfit, getProfitRecipient, getBribeAmount } from '../config-helpers.js';
 import { getErc20Decimals as _getErc20Decimals, generateHopWallets as _generateHopWallets, normalizeAmounts as _normalizeAmounts, calculateGasLimit as _calculateGasLimit, isNativeTokenAddress as _isNativeTokenAddress, } from '../internal.js';
 import { normalizeItemsOrRecipientsAmounts, resolveHopCountInput, resolveProvidedHops, resolveSignContext, signBribeTransaction, } from '../../core/sign-context-helpers.js';
@@ -138,7 +138,7 @@ export async function disperseWithBundleMerkle(params) {
         // - 原生代币转账：贿赂档
         // - ERC20 转账：走 GAS_LIMITS（含股票币代理）
         const nativeTransferGasLimit = GAS_LIMITS.BRIBE;
-        const erc20TransferGasLimit = GAS_LIMITS.ERC20_TRANSFER;
+        const erc20TransferGasLimit = floorErc20TransferGasLimit(finalGasLimit);
         // ✅ 原生代币多跳的 gas 费（每跳只需要 21000）
         const nativeHopGasFee = nativeTransferGasLimit * gasPrice;
         // ✅ ERC20 多跳时，中转钱包需要执行 2 笔交易（转 gas + 转 ERC20）

package/dist/bundle/four-meme/utils-pairwise.js

@@ -1,6 +1,6 @@
 import { ethers, Wallet } from 'ethers';
 import { getOptimizedGasPrice, NonceManager, buildProfitHopTransactions, PROFIT_HOP_COUNT, buildGasFields, } from '../../utils/bundle-helpers.js';
-import { BLOCKRAZOR_BUILDER_EOA, calculateTransferFee, CHAINS, GAS_LIMITS, isBscChain } from '../../core/constants/index.js';
+import { BLOCKRAZOR_BUILDER_EOA, calculateTransferFee, CHAINS, floorErc20TransferGasLimit, isBscChain, } from '../../core/constants/index.js';
 import { getTxType, getGasPriceConfig, shouldExtractProfit, getProfitRecipient, getBribeAmount, } from '../config-helpers.js';
 import { getErc20Decimals as _getErc20Decimals, generateHopWallets as _generateHopWallets, calculateGasLimit as _calculateGasLimit, isNativeTokenAddress as _isNativeTokenAddress, } from '../internal.js';
 import { createSignProvider, resolveProvidedHops } from '../../core/sign-context-helpers.js';
@@ -48,7 +48,7 @@ export async function pairwiseTransferWithBundleMerkle(params) {
     const finalGasLimit = _calculateGasLimit(config, isNative, hasHops, maxHopCount);
     const nativeGasLimit = (config.prefer21000ForNative ?? false) ? 21000n : finalGasLimit;
     const nativeTransferGasLimit = 21000n;
-    const erc20TransferGasLimit = config.gasLimit ? BigInt(config.gasLimit) : GAS_LIMITS.ERC20_TRANSFER;
+    const erc20TransferGasLimit = floorErc20TransferGasLimit(config.gasLimit);
     const [gasPrice, decimals] = await Promise.all([
         getOptimizedGasPrice(provider, getGasPriceConfig(config)),
         isNative

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

@@ -4,7 +4,7 @@
 import { ethers, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
 import { getGasPriceConfig } from '../../config-helpers.js';
-import { calculateTransferFee } from '../../../core/constants/index.js';
+import { calculateTransferFee, floorErc20TransferGasLimit } from '../../../core/constants/index.js';
 import { batchGetBalances as _batchGetBalances, getErc20Decimals as _getErc20Decimals } from '../../internal.js';
 import { clampRatio } from './context.js';
 export async function sweepErc20NoHop(ctx) {
@@ -134,7 +134,7 @@ export async function sweepErc20NoHop(ctx) {
             value: 0n,
             nonce,
             gasPrice,
-            gasLimit: finalGasLimit,
+            gasLimit: floorErc20TransferGasLimit(finalGasLimit),
             chainId: BigInt(chainIdNum),
             type: txType,
         });

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

@@ -4,7 +4,7 @@
 import { ethers, Wallet } from 'ethers';
 import { NonceManager, getOptimizedGasPrice, buildProfitHopTransactions, PROFIT_HOP_COUNT, } from '../../../utils/bundle-helpers.js';
 import { getGasPriceConfig } from '../../config-helpers.js';
-import { calculateTransferFee, GAS_LIMITS } from '../../../core/constants/index.js';
+import { calculateTransferFee, floorErc20TransferGasLimit, GAS_LIMITS } from '../../../core/constants/index.js';
 import { batchGetBalances as _batchGetBalances, getErc20Decimals as _getErc20Decimals } from '../../internal.js';
 import { clampRatio } from './context.js';
 export async function sweepWithHops(ctx, preparedHops) {
@@ -38,7 +38,7 @@ export async function sweepWithHops(ctx, preparedHops) {
     const iface = isNative ? null : new ethers.Interface(['function transfer(address,uint256) returns (bool)']);
     // ✅ Gas limit 设置（与分散函数保持一致）
     const nativeTransferGasLimit = GAS_LIMITS.BRIBE;
-    const erc20TransferGasLimit = GAS_LIMITS.ERC20_TRANSFER;
+    const erc20TransferGasLimit = floorErc20TransferGasLimit(finalGasLimit);
     // ✅ 原生代币多跳的 gas 费（每跳只需要 21000）
     const nativeHopGasFee = nativeTransferGasLimit * gasPrice;
     // ✅ ERC20 多跳时，中转钱包需要执行 2 笔交易（转 gas + 转 ERC20）
@@ -124,7 +124,7 @@ export async function sweepWithHops(ctx, preparedHops) {
                 value: 0n,
                 nonce,
                 gasPrice,
-                gasLimit: finalGasLimit,
+                gasLimit: erc20TransferGasLimit,
                 chainId: BigInt(chainIdNum),
                 type: txType,
             });

package/dist/bundle/internal.d.ts

@@ -11,6 +11,6 @@ export declare function normalizeAmounts(recipients: string[], amount?: AmountLi
 export declare function batchGetBalances(provider: JsonRpcProvider, addresses: string[], tokenAddress?: string, chainId?: number): Promise<bigint[]>;
 export declare function estimateErc20TransferGas(provider: JsonRpcProvider, tokenAddress: string, from: string, to: string, amount: bigint, bufferPercent?: number): Promise<bigint>;
 export declare function estimateMaxErc20TransferGas(provider: JsonRpcProvider, tokenAddress: string, from: string, recipients: string[], amounts: bigint[], bufferPercent?: number): Promise<bigint>;
-export declare function calculateGasLimit(config: BundleGasConfig, isNative: boolean, hasHops: boolean, hopCount?: number): bigint;
+export declare function calculateGasLimit(config: BundleGasConfig, isNative: boolean, _hasHops: boolean, _hopCount?: number): bigint;
 export declare function isNativeTokenAddress(tokenAddress?: string): boolean;
 export type { AmountLike, BundleGasConfig } from './types/index.js';

package/dist/bundle/internal.js

@@ -1,6 +1,6 @@
 import { ethers, Wallet } from 'ethers';
 import { MULTICALL3_ABI, ERC20_BALANCE_ABI } from '../abis/common.js';
-import { CHAINS, GAS_LIMITS, getMulticall3Address } from '../core/constants/index.js';
+import { CHAINS, GAS_LIMITS, floorErc20TransferGasLimit, getMulticall3Address } from '../core/constants/index.js';
 export { getErc20Decimals, getErc20DecimalsMerkle } from '../core/erc20/decimals.js';
 function mapAggregate3Results(results, decode, fallback) {
     return results.map((result) => {
@@ -129,20 +129,17 @@ export async function estimateMaxErc20TransferGas(provider, tokenAddress, from,
         return 52000n;
     }
 }
-export function calculateGasLimit(config, isNative, hasHops, hopCount = 0) {
+export function calculateGasLimit(config, isNative, _hasHops, _hopCount = 0) {
+    if (!isNative) {
+        return floorErc20TransferGasLimit(config.gasLimit);
+    }
     if (config.gasLimit !== undefined) {
         return BigInt(config.gasLimit);
     }
     const isXLayer = config.chainId === CHAINS.XLAYER.chainId;
-    const baseGas = isNative
-        ? isXLayer
-            ? Number(GAS_LIMITS.XLAYER_NATIVE_TRANSFER)
-            : Number(GAS_LIMITS.NATIVE_TRANSFER)
-        : 46815;
-    if (hasHops && hopCount > 0) {
-        const multiplier = config.gasLimitMultiplier ?? 1.1;
-        return BigInt(Math.ceil(baseGas * multiplier));
-    }
+    const baseGas = isXLayer
+        ? Number(GAS_LIMITS.XLAYER_NATIVE_TRANSFER)
+        : Number(GAS_LIMITS.NATIVE_TRANSFER);
     const multiplier = config.gasLimitMultiplier ?? 1.1;
     return BigInt(Math.ceil(baseGas * multiplier));
 }

package/dist/core/constants/gas-erc20-floor.test.d.ts

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

package/dist/core/constants/gas-erc20-floor.test.js

@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest';
+import { calculateGasLimit } from '../../bundle/internal.js';
+import { GAS_LIMITS, floorErc20TransferGasLimit } from './gas.js';
+describe('floorErc20TransferGasLimit', () => {
+    it('raises USDT-era 65000 to SPCXB-safe 120000', () => {
+        expect(floorErc20TransferGasLimit(65000)).toBe(GAS_LIMITS.ERC20_TRANSFER);
+        expect(floorErc20TransferGasLimit(65000n)).toBe(120000n);
+    });
+    it('keeps higher user limits for tax tokens', () => {
+        expect(floorErc20TransferGasLimit(150000)).toBe(150000n);
+        expect(floorErc20TransferGasLimit(300000n)).toBe(300000n);
+    });
+    it('defaults to ERC20_TRANSFER', () => {
+        expect(floorErc20TransferGasLimit()).toBe(120000n);
+    });
+});
+describe('bundle calculateGasLimit ERC20 floor', () => {
+    it('does not honor 65000 for ERC20 collect', () => {
+        expect(calculateGasLimit({ gasLimit: 65000 }, false, false)).toBe(120000n);
+    });
+    it('keeps native collect at 21055', () => {
+        expect(calculateGasLimit({ gasLimit: 21055 }, true, false)).toBe(21055n);
+    });
+});

package/dist/core/constants/gas.d.ts

@@ -82,3 +82,5 @@ export declare function calculateGasLimit(chainId: number, isNative: boolean, ha
  * @param isNative 是否原生代币
  */
 export declare function getTransferGasLimit(chainId: number, isNative: boolean): bigint;
+/** 归集/分发 ERC20：UI 常传 65000（USDT），SPCXB/税币 transfer 会 OOG。 */
+export declare function floorErc20TransferGasLimit(requested?: number | bigint): bigint;

package/dist/core/constants/gas.js

@@ -119,3 +119,8 @@ export function getTransferGasLimit(chainId, isNative) {
     }
     return GAS_LIMITS.ERC20_TRANSFER;
 }
+/** 归集/分发 ERC20：UI 常传 65000（USDT），SPCXB/税币 transfer 会 OOG。 */
+export function floorErc20TransferGasLimit(requested) {
+    const n = requested === undefined ? GAS_LIMITS.ERC20_TRANSFER : BigInt(requested);
+    return n < GAS_LIMITS.ERC20_TRANSFER ? GAS_LIMITS.ERC20_TRANSFER : n;
+}

package/dist/core/constants/index.d.ts

@@ -9,7 +9,7 @@
  * const wbnb = ADDRESSES.BSC.WBNB;
  */
 export { CHAINS, CHAIN_ID_MAP, getChainById, getChainName, getDefaultRpcUrl, isKnownChain, isBscChain, isXLayerChain, isMonadChain, isEniChain, isRobinhoodChain, getConfirmationTimeout, type ChainKey, type ChainConfig, } from './chains.js';
-export { GAS_LIMITS, GAS_CONFIG, V3_FEE_TIERS, calculateGasLimit, getTransferGasLimit, type GasLimitKey, type V3FeeTier, } from './gas.js';
+export { GAS_LIMITS, GAS_CONFIG, V3_FEE_TIERS, calculateGasLimit, getTransferGasLimit, floorErc20TransferGasLimit, type GasLimitKey, type V3FeeTier, } from './gas.js';
 export { QUOTE_CONFIG, QUOTE_V3_FEE_TIERS, getQuoteChainKey, type QuoteConfigChain } from './quote.js';
 export { applySlippageBps, reverseSlippageBps } from './slippage.js';
 /** Flap 链标识（与 `FlapPortal` 一致，供子路径 `./constants` 使用） */

package/dist/core/constants/index.js

@@ -15,7 +15,7 @@ export { CHAINS, CHAIN_ID_MAP, getChainById, getChainName, getDefaultRpcUrl, isK
 // ============================================================================
 // Gas 常量
 // ============================================================================
-export { GAS_LIMITS, GAS_CONFIG, V3_FEE_TIERS, calculateGasLimit, getTransferGasLimit, } from './gas.js';
+export { GAS_LIMITS, GAS_CONFIG, V3_FEE_TIERS, calculateGasLimit, getTransferGasLimit, floorErc20TransferGasLimit, } from './gas.js';
 export { QUOTE_CONFIG, QUOTE_V3_FEE_TIERS, getQuoteChainKey } from './quote.js';
 export { applySlippageBps, reverseSlippageBps } from './slippage.js';
 // ============================================================================

package/dist/domains/openfour/create-arg.d.ts

@@ -4,11 +4,13 @@ export type OpenFourDecodedCreateArg = {
     quoteAsset: string;
     validTimestamp: bigint;
 };
-/** Four 签名在链上只活到 validTimestamp；提交前至少留这么多秒，否则重拉 createArg。 */
-export declare const OPENFOUR_CREATE_MIN_REMAIN_SEC = 15n;
+/** Four 签名在链上只活到 validTimestamp；剩余少于此秒数就再拉一次 createArg，但未过期仍提交。 */
+export declare const OPENFOUR_CREATE_MIN_REMAIN_SEC = 90n;
 export declare const OPENFOUR_CREATE_EXPIRED_MESSAGE = "OpenFour \u53D1\u5E01\u7B7E\u540D\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u518D\u70B9\u4E00\u6B21\u53D1\u5C04\u3002Four \u7684 validTimestamp \u5F88\u77ED\uFF0C\u63A5\u53E3\u6162\u65F6\u7B7E\u540D\u5230\u8FBE\u94FE\u4E0A\u5C31\u5DF2\u7ECF\u5931\u6548\u3002";
 export declare function decodeOpenFourCreateArg(rawCreateArg: string): OpenFourDecodedCreateArg;
 export declare function shouldRefreshOpenFourCreateArg(validTimestamp: bigint, chainTimestamp: bigint, minRemainSec?: bigint): boolean;
+/** 合约是 block.timestamp > validTimestamp 才回滚；相等这一秒仍有效。 */
+export declare function isOpenFourCreateArgExpired(validTimestamp: bigint, chainTimestamp: bigint): boolean;
 export declare function isOpenFourPresaleNative(params: {
     presaleQuote: bigint;
     quoteAsset: string;

package/dist/domains/openfour/create-arg.js

@@ -40,8 +40,8 @@ const ABI_13 = [
     }),
 ];
 const coder = AbiCoder.defaultAbiCoder();
-/** Four 签名在链上只活到 validTimestamp；提交前至少留这么多秒，否则重拉 createArg。 */
-export const OPENFOUR_CREATE_MIN_REMAIN_SEC = 15n;
+/** Four 签名在链上只活到 validTimestamp；剩余少于此秒数就再拉一次 createArg，但未过期仍提交。 */
+export const OPENFOUR_CREATE_MIN_REMAIN_SEC = 90n;
 export const OPENFOUR_CREATE_EXPIRED_MESSAGE = 'OpenFour 发币签名已过期，请再点一次发射。Four 的 validTimestamp 很短，接口慢时签名到达链上就已经失效。';
 function toBigInt(value) {
     if (value == null)
@@ -69,6 +69,10 @@ export function decodeOpenFourCreateArg(rawCreateArg) {
 export function shouldRefreshOpenFourCreateArg(validTimestamp, chainTimestamp, minRemainSec = OPENFOUR_CREATE_MIN_REMAIN_SEC) {
     return validTimestamp < chainTimestamp + minRemainSec;
 }
+/** 合约是 block.timestamp > validTimestamp 才回滚；相等这一秒仍有效。 */
+export function isOpenFourCreateArgExpired(validTimestamp, chainTimestamp) {
+    return validTimestamp < chainTimestamp;
+}
 export function isOpenFourPresaleNative(params) {
     if (params.presaleQuote <= 0n)
         return false;

package/dist/domains/openfour/create-arg.test.js

@@ -1,6 +1,6 @@
 import { AbiCoder, ParamType, ZeroAddress, ZeroHash } from 'ethers';
 import { describe, expect, it } from 'vitest';
-import { OPENFOUR_CREATE_MIN_REMAIN_SEC, decodeOpenFourCreateArg, shouldRefreshOpenFourCreateArg, } from './create-arg.js';
+import { OPENFOUR_CREATE_MIN_REMAIN_SEC, decodeOpenFourCreateArg, isOpenFourCreateArgExpired, shouldRefreshOpenFourCreateArg, } from './create-arg.js';
 const INIT = [
     { name: 'name', type: 'string' },
     { name: 'symbol', type: 'string' },
@@ -79,3 +79,13 @@ describe('shouldRefreshOpenFourCreateArg', () => {
         expect(shouldRefreshOpenFourCreateArg(100n + OPENFOUR_CREATE_MIN_REMAIN_SEC, 100n)).toBe(false);
     });
 });
+describe('isOpenFourCreateArgExpired', () => {
+    it('treats equal timestamps as still valid', () => {
+        expect(isOpenFourCreateArgExpired(100n, 100n)).toBe(false);
+    });
+    it('treats the dumped Royalty+SPCXB deadline as expired at 17:30 CST', () => {
+        const validTimestamp = 1789982212n;
+        const reportedAt = BigInt(Math.floor(Date.parse('2026-09-21T09:30:00.000Z') / 1000));
+        expect(isOpenFourCreateArgExpired(validTimestamp, reportedAt)).toBe(true);
+    });
+});

package/dist/domains/openfour/index.d.ts

@@ -1,4 +1,4 @@
 export type { OpenFourAddresses, OpenFourCreateReq, OpenFourInitParams, OpenFourModuleSchema, OpenFourParamDescriptor, OpenFourPresetSchemas, OpenFourTemplate, OpenFourTemplateConfig, } from './types.js';
 export { collectOpenFourSchemaParams, defaultOpenFourFormFromSchema, emptyOpenFourInitParams, encodeOpenFourInitParams, encodeOpenFourModuleParams, } from './schema.js';
-export { OPENFOUR_CREATE_EXPIRED_MESSAGE, OPENFOUR_CREATE_MIN_REMAIN_SEC, computeOpenFourCreateValueWei, decodeOpenFourCreateArg, isOpenFourPresaleNative, shouldRefreshOpenFourCreateArg, type OpenFourDecodedCreateArg, } from './create-arg.js';
+export { OPENFOUR_CREATE_EXPIRED_MESSAGE, OPENFOUR_CREATE_MIN_REMAIN_SEC, computeOpenFourCreateValueWei, decodeOpenFourCreateArg, isOpenFourCreateArgExpired, isOpenFourPresaleNative, shouldRefreshOpenFourCreateArg, type OpenFourDecodedCreateArg, } from './create-arg.js';
 export { loadOpenFourAddresses, loadOpenFourPresetSchemas } from './registry.js';

package/dist/domains/openfour/index.js

@@ -1,3 +1,3 @@
 export { collectOpenFourSchemaParams, defaultOpenFourFormFromSchema, emptyOpenFourInitParams, encodeOpenFourInitParams, encodeOpenFourModuleParams, } from './schema.js';
-export { OPENFOUR_CREATE_EXPIRED_MESSAGE, OPENFOUR_CREATE_MIN_REMAIN_SEC, computeOpenFourCreateValueWei, decodeOpenFourCreateArg, isOpenFourPresaleNative, shouldRefreshOpenFourCreateArg, } from './create-arg.js';
+export { OPENFOUR_CREATE_EXPIRED_MESSAGE, OPENFOUR_CREATE_MIN_REMAIN_SEC, computeOpenFourCreateValueWei, decodeOpenFourCreateArg, isOpenFourCreateArgExpired, isOpenFourPresaleNative, shouldRefreshOpenFourCreateArg, } from './create-arg.js';
 export { loadOpenFourAddresses, loadOpenFourPresetSchemas } from './registry.js';

package/package.json

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