@ocap/tx-protocols 1.13.63 → 1.13.64

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

@@ -11,7 +11,7 @@ const debug = require('debug')(`${require('../../../package.json').name}:deposit
 
 const VerifySigners = require('../rollup/pipes/verify-signers');
 const VerifyPaused = require('../rollup/pipes/verify-paused');
-const { applyTokenUpdates, getTxFee, getRewardLocker } = require('../../util');
+const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../../util');
 
 const schema = Joi.object({
   token: Joi.tokenInputSchema.required(),
@@ -138,15 +138,15 @@ runner.use((context, next) => {
   const { itx, rollupState, tokenState } = context;
   const { depositFeeRate, maxDepositFee, minDepositFee } = rollupState;
 
-  context.txFee = getTxFee({
+  const { reward } = getTxFee({
     amount: itx.token.value,
     feeRate: depositFeeRate,
     maxFee: maxDepositFee,
     minFee: minDepositFee,
   });
 
-  if (new BN(itx.actualFee).lt(new BN(context.txFee.reward))) {
-    const expected = fromUnitToToken(context.txFee.reward, tokenState.decimal);
+  if (new BN(itx.actualFee).lt(new BN(reward))) {
+    const expected = fromUnitToToken(reward, tokenState.decimal);
     const actual = fromUnitToToken(itx.actualFee, tokenState.decimal);
     return next(new Error('INVALID_TX', `itx.actualFee too low, expect at least ${expected}, got ${actual}`));
   }
@@ -162,12 +162,16 @@ runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey:
 // 8. update state: the token minting is done when deposit finalized in rollup-block
 runner.use(
   async (context, next) => {
-    const { tx, itx, txFee, statedb, senderState, stakeState, stakeAddress, lockerState, lockerAddress } = context;
+    const { tx, itx, statedb, senderState, stakeState, stakeAddress, lockerState, lockerAddress } = context;
 
-    const stakeUpdates = applyTokenUpdates([{ address: itx.token.address, value: txFee.total }], stakeState, 'sub');
-    const senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: txFee.user }], senderState, 'add');
+    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');
     const lockerUpdates = applyTokenUpdates(
-      [{ address: itx.token.address, value: txFee.reward }],
+      [{ address: itx.token.address, value: fee }],
       lockerState || { tokens: {} },
       'add'
     );
@@ -218,11 +222,11 @@ runner.use(
 
     context.updatedAccounts = [
       // stake for tx proposer is decreased
-      { address: stakeAddress, token: itx.token.address, delta: `-${txFee.total}`, action: 'unlock' },
+      { address: stakeAddress, token: itx.token.address, delta: `-${total}`, action: 'unlock' },
       // mint to depositor from stake
-      { address: senderState.address, token: itx.token.address, delta: txFee.user, action: 'unlock' },
-      // block reward is locked for later claiming
-      { address: lockerAddress, token: itx.token.address, delta: txFee.reward, action: 'pending' },
+      { address: senderState.address, 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' },
     ];
 
     debug('deposit-token-v2', itx);

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

@@ -99,15 +99,15 @@ runner.use((context, next) => {
 
   const isFixedFee = new BN(itx.maxFee).isZero();
   if (isFixedFee) {
-    context.txFee = getTxFee({
+    const { reward } = getTxFee({
       amount: itx.token.value,
       feeRate: withdrawFeeRate,
       maxFee: maxWithdrawFee,
       minFee: minWithdrawFee,
     });
 
-    if (new BN(itx.actualFee).lt(new BN(context.txFee.reward))) {
-      const expected = fromUnitToToken(context.txFee.reward, tokenState.decimal);
+    if (new BN(itx.actualFee).lt(new BN(reward))) {
+      const expected = fromUnitToToken(reward, tokenState.decimal);
       const actual = fromUnitToToken(itx.actualFee, tokenState.decimal);
       return next(new Error('INVALID_TX', `itx.actualFee too low, expect at least ${expected}, got ${actual}`));
     }

package/lib/util.js

@@ -165,7 +165,7 @@ const splitTxFee = ({ total, shares = {}, stringify = true }) => {
 
 const getRewardLocker = (rollupAddress) => toStakeAddress(rollupAddress, rollupAddress);
 const getBNSum = (...args) => flattenDeep(args).reduce((sum, x) => sum.add(new BN(x)), new BN(0)).toString(10); // prettier-ignore
-const isFixedFee = (x) => new BN(x.tx.itxJson.maxFee).isZero();
+const isFixedFee = (x) => !x.tx.itxJson.maxFee || new BN(x.tx.itxJson.maxFee).isZero();
 
 const ensureBlockReward = (rollupState, minReward, txStates) => {
   const { address, withdrawFeeRate, minWithdrawFee, maxWithdrawFee, tokenAddress } = rollupState;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.63",
+  "version": "1.13.64",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -19,16 +19,16 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.13.63",
-    "@arcblock/did-util": "1.13.63",
-    "@ocap/asset": "1.13.63",
-    "@ocap/mcrypto": "1.13.63",
-    "@ocap/merkle-tree": "1.13.63",
-    "@ocap/message": "1.13.63",
-    "@ocap/state": "1.13.63",
-    "@ocap/tx-pipeline": "1.13.63",
-    "@ocap/util": "1.13.63",
-    "@ocap/wallet": "1.13.63",
+    "@arcblock/did": "1.13.64",
+    "@arcblock/did-util": "1.13.64",
+    "@ocap/asset": "1.13.64",
+    "@ocap/mcrypto": "1.13.64",
+    "@ocap/merkle-tree": "1.13.64",
+    "@ocap/message": "1.13.64",
+    "@ocap/state": "1.13.64",
+    "@ocap/tx-pipeline": "1.13.64",
+    "@ocap/util": "1.13.64",
+    "@ocap/wallet": "1.13.64",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "7e40f22f90f4f5ac08fde3d4d3b7194aa792c95d"
+  "gitHead": "49c94d9fd5f12ec63c34ad609d041a92f68322a8"
 }