@ocap/tx-protocols 1.17.22 → 1.18.0

package/lib/protocols/rollup/pause.js

@@ -5,6 +5,8 @@ const { account, rollup } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
 const EnsureValidator = require('./pipes/ensure-validator');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -31,14 +33,23 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INV
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 5. update rollup state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState } = context;
+    const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
 
     const [newSenderState, newRollupState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
       statedb.rollup.update(itx.rollup, rollup.pause(rollupState, context), context),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/rollup/resume.js

@@ -5,6 +5,8 @@ const { account, rollup } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
 const EnsureValidator = require('./pipes/ensure-validator');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -31,14 +33,23 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INV
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 5. update rollup state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState } = context;
+    const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
 
     const [newSenderState, newRollupState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
       statedb.rollup.update(itx.rollup, rollup.resume(rollupState, context), context),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/rollup/update.js

@@ -7,6 +7,8 @@ const { account, rollup } = require('@ocap/state');
 const debug = require('debug')(`${require('../../../package.json').name}:update-rollup`);
 
 const VerifySigners = require('./pipes/verify-signers');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const { decodeAnySafe } = require('../../util');
 
@@ -74,15 +76,24 @@ runner.use(
 );
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 5. update rollup state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState } = context;
+    const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
     const data = decodeAnySafe(itx.data);
 
     const [newSenderState, newRollupState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
       statedb.rollup.update(itx.rollup, rollup.update(rollupState, { ...itx, data }, context), context),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/token/create.js

@@ -10,7 +10,9 @@ const { fromTokenToUnit } = require('@ocap/util');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-token`);
 const { decodeAnySafe } = require('../../util');
-const ensureServiceFee = require('../rollup/pipes/ensure-service-fee');
+
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const MAX_TOTAL_SUPPLY = fromTokenToUnit(10000 * 100000000, 18); // 32
 
@@ -92,12 +94,23 @@ runner.use(async (context, next) => {
   return next();
 });
 
-runner.use(ensureServiceFee);
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    const result = { create: 1, update: 1, payment: 0 };
+    if (context.delegatorState) {
+      result.update += 1;
+    }
+
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // Update sender state, token state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, vaultState, vaultUpdates } = context;
+    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, updateVaults } = context;
     const data = decodeAnySafe(itx.data);
     const owner = delegatorState ? delegatorState.address : senderState.address;
 
@@ -113,7 +126,7 @@ runner.use(
       senderUpdates.tokens[itx.address] = itx.initialSupply;
     }
 
-    const [newSenderState, tokenState, newVaultState, newDelegatorState] = await Promise.all([
+    const [newSenderState, tokenState, newDelegatorState] = await Promise.all([
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
@@ -122,10 +135,6 @@ runner.use(
 
       statedb.token.create(itx.address, token.create({ ...cloneDeep(itx), data, issuer: owner }, context), context),
 
-      isEmpty(vaultUpdates)
-        ? vaultState
-        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
-
       delegatorState
         ? statedb.account.update(
             delegatorState.address,
@@ -133,11 +142,12 @@ runner.use(
             context
           )
         : null,
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;
     context.tokenState = tokenState;
-    context.vaultState = newVaultState;
     context.delegatorState = newDelegatorState;
 
     debug('create token v2', tokenState);

package/lib/protocols/token/deposit-v2.js

@@ -10,9 +10,12 @@ const { toStakeAddress } = require('@arcblock/did-util');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:deposit-token`);
 
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+
 const VerifySigners = require('../rollup/pipes/verify-signers');
 const VerifyPaused = require('../rollup/pipes/verify-paused');
-const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../../util');
+const { applyTokenUpdates, applyTokenChange, getTxFee, getBNSum, getRewardLocker } = require('../../util');
 
 const schema = Joi.object({
   token: schemas.tokenInput.required(),
@@ -160,23 +163,58 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK'
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const result = { create: 1, update: 1, payment: 0 };
+    if (context.senderState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+    if (context.lockerState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 8. update state: the token minting is done when deposit finalized in rollup-block
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, stakeState, stakeAddress, lockerState, lockerAddress } = context;
+    const {
+      tx,
+      itx,
+      statedb,
+      senderState,
+      stakeState,
+      stakeAddress,
+      lockerState,
+      lockerAddress,
+      senderChange,
+      updateVaults,
+    } = context;
 
     const user = itx.token.value;
     const fee = itx.actualFee;
     const total = getBNSum(user, fee);
 
     const stakeUpdates = applyTokenUpdates([{ address: itx.token.address, value: total }], stakeState, 'sub');
-    const senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: user }], senderState || {}, 'add');
+    let senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: user }], senderState || {}, 'add');
     const lockerUpdates = applyTokenUpdates(
       [{ address: itx.token.address, value: fee }],
       lockerState || { tokens: {} },
       'add'
     );
 
+    if (senderChange && senderState) {
+      senderUpdates = applyTokenChange(senderUpdates, senderChange);
+    }
+
     const sender = senderState ? senderState.address : tx.from;
     const [newSenderState, newStakeState, newLockerState, evidenceState] = await Promise.all([
       // updateOrCreate user account
@@ -215,6 +253,8 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'rollup-deposit' }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;
@@ -222,14 +262,14 @@ runner.use(
     context.evidenceState = evidenceState;
     context.stakeStates = [newStakeState, newLockerState];
 
-    context.updatedAccounts = [
+    context.updatedAccounts.push(
       // stake for tx proposer is decreased
       { address: stakeAddress, token: itx.token.address, delta: `-${total}`, action: 'unlock' },
       // mint to depositor from stake
       { address: sender, token: itx.token.address, delta: user, action: 'unlock' },
       // tx fee is locked for later claiming
-      { address: lockerAddress, token: itx.token.address, delta: fee, action: 'pending' },
-    ];
+      { address: lockerAddress, token: itx.token.address, delta: fee, action: 'pending' }
+    );
 
     debug('deposit-token-v2', itx);
 

package/lib/protocols/token/withdraw-v2.js

@@ -10,8 +10,11 @@ const { toStakeAddress } = require('@arcblock/did-util');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:withdraw-token`);
 
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+
 const VerifyPaused = require('../rollup/pipes/verify-paused');
-const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../../util');
+const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker, applyTokenChange } = require('../../util');
 
 const verifyMultiSigV2 = pipes.VerifyMultiSigV2({ signersKey: 'signers' });
 
@@ -161,15 +164,47 @@ runner.use((context, next) => {
   return next();
 });
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const result = { create: 0, update: 1, payment: 0 };
+    if (context.stakeState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+    if (context.lockerState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 8. update state: the fee splitting and token burning is done when withdraw finalized in rollup-block
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, stakeState, senderState, lockerState, lockerAddress, stakeAddress } = context;
+    const {
+      tx,
+      itx,
+      statedb,
+      stakeState,
+      senderState,
+      lockerState,
+      lockerAddress,
+      stakeAddress,
+      senderChange,
+      updateVaults,
+    } = context;
 
     const total = getBNSum(itx.token.value, itx.actualFee, itx.maxFee);
     const fee = getBNSum(itx.actualFee, itx.maxFee);
 
-    const senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: total }], senderState, 'sub');
+    let senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: total }], senderState, 'sub');
+    senderUpdates = applyTokenChange(senderUpdates, senderChange);
 
     // Burned amount should equal to user received amount
     const stakeUpdates = applyTokenUpdates(
@@ -232,6 +267,8 @@ runner.use(
             ),
             context
           ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;
@@ -239,11 +276,11 @@ runner.use(
     context.lockerState = newLockerState;
     context.stakeStates = [newStakeState, newLockerState];
 
-    context.updatedAccounts = [
+    context.updatedAccounts.push(
       { address: senderState.address, token: itx.token.address, delta: `-${total}`, action: 'lock' },
       { address: stakeAddress, token: itx.token.address, delta: itx.token.value, action: 'lock' },
-      { address: lockerAddress, token: itx.token.address, delta: fee, action: 'pending' },
-    ];
+      { address: lockerAddress, token: itx.token.address, delta: fee, action: 'pending' }
+    );
 
     debug('withdraw-token-v2', itx);
 

package/lib/protocols/trade/exchange-v2.js

@@ -9,6 +9,10 @@ const { account } = require('@ocap/state');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:exchange-v2`);
 
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+const { applyTokenChange } = require('../../util');
+
 const runner = new Runner();
 
 runner.use(pipes.VerifyMultiSig(1));
@@ -122,13 +126,38 @@ runner.use(pipes.ExtractState({ from: 'receiverAssets', to: 'priv.receiverAssets
 runner.use(pipes.VerifyTransferrable({ assets: 'priv.receiverAssets' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'priv.receiverAssets', ownerKey: 'receiverState' }));
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const ops = { create: 0, update: 2, payment: 0 };
+    ops.update += context.senderAssets.length;
+    ops.update += context.receiverAssets.length;
+
+    return ops;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 runner.use(pipes.UpdateOwner({ assets: 'priv.senderAssets', owner: 'receiverState' }));
 runner.use(pipes.UpdateOwner({ assets: 'priv.receiverAssets', owner: 'senderState' }));
 
+// update statedb
 runner.use(
   async (context, next) => {
-    const { tx, itx, senderAssets, receiverAssets, senderTokens, receiverTokens, senderState, receiverState, statedb } =
-      context;
+    const {
+      tx,
+      itx,
+      senderAssets,
+      receiverAssets,
+      senderTokens,
+      receiverTokens,
+      senderState,
+      receiverState,
+      senderChange,
+      updateVaults,
+      statedb,
+    } = context;
 
     const senderStateTokens = senderState.tokens || {};
     const receiverStateTokens = receiverState.tokens || {};
@@ -145,11 +174,13 @@ runner.use(
       receiverStateTokens[address] = new BN(receiverStateTokens[address] || '0').sub(delta).toString();
     }
 
+    const senderUpdates = applyTokenChange({ tokens: senderStateTokens }, senderChange);
+
     const [newSenderState, newReceiverState] = await Promise.all([
       // Update sender state
       statedb.account.update(
         senderState.address,
-        account.update(senderState, { nonce: tx.nonce, tokens: senderStateTokens }, context),
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
         context
       ),
 
@@ -159,6 +190,8 @@ runner.use(
         account.update(receiverState, { tokens: receiverStateTokens }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/trade/transfer-v2.js

@@ -8,6 +8,10 @@ const { account } = require('@ocap/state');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:transfer-v2`);
 
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+const { applyTokenChange } = require('../../util');
+
 const runner = new Runner();
 
 runner.use(pipes.VerifyMultiSig(0));
@@ -86,6 +90,23 @@ runner.use(pipes.ExtractState({ from: 'assets', to: 'assetStates', status: 'INVA
 runner.use(pipes.VerifyTransferrable({ assets: 'assetStates' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'assetStates', ownerKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const result = { create: 0, update: 1, payment: 0 };
+
+    if (context.receiverState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // transfer assets to new owner
 runner.use((context, next) => {
   const { itx, receiverState } = context;
@@ -97,7 +118,7 @@ runner.use(pipes.UpdateOwner({ assets: 'assetStates', owner: 'receiverAddr' }));
 // update statedb: transfer tokens to new owner
 runner.use(
   async (context, next) => {
-    const { tx, itx, tokens, senderState, receiverAddr, receiverState, statedb } = context;
+    const { tx, itx, tokens, senderState, receiverAddr, receiverState, statedb, senderChange, updateVaults } = context;
 
     const { tokens: senderTokens = {} } = senderState;
     const { tokens: receiverTokens = {} } = receiverState || {};
@@ -107,11 +128,13 @@ runner.use(
       receiverTokens[token.address] = new BN(receiverTokens[token.address] || '0').add(delta).toString();
     }
 
+    const senderUpdates = applyTokenChange({ tokens: senderTokens }, senderChange);
+
     const [newSenderState, newReceiverState] = await Promise.all([
       // Update sender state
       statedb.account.update(
         senderState.address,
-        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, tokens: senderTokens }, context),
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
         context
       ),
 
@@ -121,6 +144,8 @@ runner.use(
         account.updateOrCreate(receiverState, { address: receiverAddr, tokens: receiverTokens }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/trade/transfer-v3.js

@@ -11,7 +11,9 @@ const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:transfer-v2`);
 
-const { applyTokenUpdates } = require('../../util');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+const { applyTokenUpdates, applyTokenChange } = require('../../util');
 
 const runner = new Runner();
 
@@ -139,6 +141,27 @@ runner.use(async (context, next) => {
   return next();
 });
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const ops = { create: 0, update: 0, payment: 0 };
+    ops.update += context.signerStates.length;
+    ops.update += context.inputAssets.length;
+    ops.update += context.receivers.length;
+
+    if (context.senderState) {
+      ops.update += 1;
+    } else {
+      ops.create += 1;
+    }
+
+    return ops;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
+// Update statedb
 runner.use(
   async (context, next) => {
     const {
@@ -148,6 +171,8 @@ runner.use(
       receivers,
       senderState,
       signerStates,
+      senderChange,
+      updateVaults,
       receiverStates = [],
       assetStates = [],
       statedb,
@@ -161,6 +186,9 @@ runner.use(
         signerStates.find((s) => s.address === owner),
         'sub'
       );
+      if (senderChange && owner === senderChange.address) {
+        signerUpdates[owner] = applyTokenChange(signerUpdates[owner], senderChange);
+      }
     });
 
     const receiverUpdates = {};
@@ -169,6 +197,9 @@ runner.use(
       const { owner, tokensList, assetsList } = x;
       const ownerState = receiverStates.find((s) => getRelatedAddresses(s).includes(owner)) || { address: owner };
       receiverUpdates[ownerState.address] = applyTokenUpdates(tokensList, ownerState, 'add');
+      if (senderChange && ownerState.address === senderChange.address) {
+        receiverUpdates[ownerState.address] = applyTokenChange(receiverUpdates[ownerState.address], senderChange);
+      }
       assetsList.forEach((address) => {
         assetUpdates[address] = { owner: ownerState.address };
       });
@@ -224,6 +255,8 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, assetUpdates[x.address], context), context)
         )
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/util.js

@@ -68,7 +68,7 @@ const applyTokenUpdates = (tokens, state, operator) => {
     const requirement = new BN(value);
     const balance = new BN(oldTokens[address] || 0);
     const newBalance = balance[operator](requirement);
-    if (newBalance.lt(ZERO)) {
+    if (newBalance.isNeg()) {
       throw new Error('NEGATIVE_TOKEN_BALANCE', `Negative token balance when applyTokenUpdates for ${address}`);
     }
     newTokens[address] = newBalance.toString(10);
@@ -104,13 +104,13 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
   if (feeRate < 0) {
     throw new Error('NEGATIVE_FEE_RATE', 'Unexpected negative feeRate when getTxFee, abort!');
   }
-  if (userAmount.lt(ZERO)) {
+  if (userAmount.isNeg()) {
     throw new Error('NEGATIVE_AMOUNT', 'Unexpected negative amount when getTxFee, abort!');
   }
-  if (maxFeeAmount.lt(ZERO)) {
+  if (maxFeeAmount.isNeg()) {
     throw new Error('NEGATIVE_MAX_FEE', 'Unexpected negative maxFee when getTxFee, abort!');
   }
-  if (minFeeAmount.lt(ZERO)) {
+  if (minFeeAmount.isNeg()) {
     throw new Error('NEGATIVE_MIN_FEE', 'Unexpected negative minFee when getTxFee, abort!');
   }
 
@@ -143,7 +143,7 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
 
 const splitTxFee = ({ total, shares = {}, stringify = true }) => {
   const totalAmount = new BN(total);
-  if (totalAmount.lt(ZERO)) {
+  if (totalAmount.isNeg()) {
     throw new Error('NEGATIVE_TOTAL_AMOUNT', 'Unexpected negative total when splitTxFee, abort!');
   }
   Object.keys(shares).forEach((key) => {
@@ -211,14 +211,14 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
 
     let actualFee = new BN(0);
     // If totalMissingFee is less than 0, then the tx will be charged for fixedFee
-    if (totalMissingFee.lt(ZERO)) {
+    if (totalMissingFee.isNeg()) {
       actualFee = defaults.reward;
     } else {
       // Else the tx is charged for a portion of totalMissingFee
       actualFee = totalMissingFee.mul(maxFee).div(totalDynamicFee);
     }
 
-    if (actualFee.lt(ZERO)) {
+    if (actualFee.isNeg()) {
       throw new Error('NEGATIVE_ACTUAL_FEE', 'Got negative actualFee for tx, abort!');
     }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.22",
+  "version": "1.18.0",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,17 +21,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.17.22",
-    "@arcblock/did-util": "1.17.22",
-    "@arcblock/validator": "1.17.22",
-    "@ocap/asset": "1.17.22",
-    "@ocap/mcrypto": "1.17.22",
-    "@ocap/merkle-tree": "1.17.22",
-    "@ocap/message": "1.17.22",
-    "@ocap/state": "1.17.22",
-    "@ocap/tx-pipeline": "1.17.22",
-    "@ocap/util": "1.17.22",
-    "@ocap/wallet": "1.17.22",
+    "@arcblock/did": "1.18.0",
+    "@arcblock/did-util": "1.18.0",
+    "@arcblock/validator": "1.18.0",
+    "@ocap/asset": "1.18.0",
+    "@ocap/mcrypto": "1.18.0",
+    "@ocap/merkle-tree": "1.18.0",
+    "@ocap/message": "1.18.0",
+    "@ocap/state": "1.18.0",
+    "@ocap/tx-pipeline": "1.18.0",
+    "@ocap/util": "1.18.0",
+    "@ocap/wallet": "1.18.0",
     "debug": "^4.3.4",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -46,5 +46,5 @@
     "jest": "^27.5.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "f6cd2a2ca2a417081d0be22f86547195b0e2bc14"
+  "gitHead": "c48f928ee4f0deddf0f5e4bcb82fd6ffd7f2bc99"
 }