@ocap/tx-protocols 1.13.61 → 1.13.62

package/lib/protocols/rollup/create-block.js

@@ -235,7 +235,7 @@ runner.use(pipes.ExtractState({ from: 'stakeAddress', to: 'stakeStates', status:
 runner.use((context, next) => {
   const { itx, txStates, rollupState } = context;
   try {
-    const result = ensureBlockReward(rollupState.address, rollupState.tokenAddress, itx.minReward, txStates);
+    const result = ensureBlockReward(rollupState, itx.minReward, txStates);
     context.senders = Object.keys(result.accountUpdates);
     Object.assign(context, result);
     return next();

package/lib/util.js

@@ -7,6 +7,7 @@ const { toStakeAddress } = require('@arcblock/did-util');
 const cloneDeep = require('lodash/cloneDeep');
 
 const ZERO = new BN(0);
+const RATE_BASE = new BN(10000);
 
 const decodeAnyNested = (encoded) => {
   if (!encoded) {
@@ -95,12 +96,24 @@ const fixTokenInput = (input, config) => {
   return input;
 };
 
-const RATE_BASE = new BN(10000);
 const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
   const userAmount = new BN(amount);
   const maxFeeAmount = new BN(maxFee);
   const minFeeAmount = new BN(minFee);
 
+  if (feeRate < 0) {
+    throw new Error('FORBIDDEN', 'Unexpected negative feeRate when getTxFee, abort!');
+  }
+  if (userAmount.lt(ZERO)) {
+    throw new Error('FORBIDDEN', 'Unexpected negative amount when getTxFee, abort!');
+  }
+  if (maxFeeAmount.lt(ZERO)) {
+    throw new Error('FORBIDDEN', 'Unexpected negative maxFee when getTxFee, abort!');
+  }
+  if (minFeeAmount.lt(ZERO)) {
+    throw new Error('FORBIDDEN', 'Unexpected negative minFee when getTxFee, abort!');
+  }
+
   // total fee
   let rewardAmount = userAmount.mul(new BN(feeRate)).div(RATE_BASE);
   if (rewardAmount.lt(minFeeAmount)) {
@@ -130,6 +143,15 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
 
 const splitTxFee = ({ total, shares = {}, stringify = true }) => {
   const totalAmount = new BN(total);
+  if (totalAmount.lt(ZERO)) {
+    throw new Error('FORBIDDEN', 'Unexpected negative total when splitTxFee, abort!');
+  }
+  Object.keys(shares).forEach((key) => {
+    if (shares[key] < 0) {
+      throw new Error('FORBIDDEN', `Unexpected negative shares[${key}] when splitTxFee, abort!`);
+    }
+  });
+
   const rewardShares = Object.keys(shares).reduce((acc, x) => {
     acc[x] = totalAmount.mul(new BN(shares[x])).div(RATE_BASE);
     return acc;
@@ -145,8 +167,9 @@ const getRewardLocker = (rollupAddress) => toStakeAddress(rollupAddress, rollupA
 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 ensureBlockReward = (rollupAddress, tokenAddress, minReward, txStates) => {
-  const locker = toStakeAddress(rollupAddress, rollupAddress);
+const ensureBlockReward = (rollupState, minReward, txStates) => {
+  const { address, withdrawFeeRate, minWithdrawFee, maxWithdrawFee, tokenAddress } = rollupState;
+  const locker = getRewardLocker(address);
 
   const result = {
     mintedAmount: new BN(0),
@@ -177,7 +200,25 @@ const ensureBlockReward = (rollupAddress, tokenAddress, minReward, txStates) =>
   const changes = { stake: [], account: [] };
   dynamicFeeTxs.forEach((x) => {
     const maxFee = new BN(x.tx.itxJson.maxFee);
-    const actualFee = totalMissingFee.mul(maxFee).div(totalDynamicFee);
+    let actualFee = new BN(0);
+    // If totalMissingFee is less than 0, then the tx will be charged for fixedFee
+    if (totalMissingFee.lt(ZERO)) {
+      const fee = getTxFee({
+        amount: x.tx.itxJson.token.value,
+        feeRate: withdrawFeeRate,
+        maxFee: maxWithdrawFee,
+        minFee: minWithdrawFee,
+        stringify: false,
+      });
+      actualFee = fee.reward;
+    } else {
+      // Else the tx is charged for a portion of totalMissingFee
+      actualFee = totalMissingFee.mul(maxFee).div(totalDynamicFee);
+    }
+
+    if (actualFee.lt(ZERO)) {
+      throw new Error('FORBIDDEN', 'Got negative actualFee for tx, abort!');
+    }
 
     // If the actualFee is less than the maxFee, user will have a refund
     if (actualFee.lt(maxFee)) {
@@ -209,7 +250,7 @@ const ensureBlockReward = (rollupAddress, tokenAddress, minReward, txStates) =>
 
       // mint tokens for deposit proposer
       changes.stake.push({
-        address: toStakeAddress(x.tx.itxJson.proposer, rollupAddress),
+        address: toStakeAddress(x.tx.itxJson.proposer, address),
         delta: total,
         action: 'mint',
       });
@@ -219,7 +260,7 @@ const ensureBlockReward = (rollupAddress, tokenAddress, minReward, txStates) =>
 
       // burn tokens from locked withdraws: user amount
       changes.stake.push({
-        address: toStakeAddress(x.tx.from, rollupAddress),
+        address: toStakeAddress(x.tx.from, address),
         delta: `-${user}`,
         action: 'burn',
       });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.61",
+  "version": "1.13.62",
   "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.61",
-    "@arcblock/did-util": "1.13.61",
-    "@ocap/asset": "1.13.61",
-    "@ocap/mcrypto": "1.13.61",
-    "@ocap/merkle-tree": "1.13.61",
-    "@ocap/message": "1.13.61",
-    "@ocap/state": "1.13.61",
-    "@ocap/tx-pipeline": "1.13.61",
-    "@ocap/util": "1.13.61",
-    "@ocap/wallet": "1.13.61",
+    "@arcblock/did": "1.13.62",
+    "@arcblock/did-util": "1.13.62",
+    "@ocap/asset": "1.13.62",
+    "@ocap/mcrypto": "1.13.62",
+    "@ocap/merkle-tree": "1.13.62",
+    "@ocap/message": "1.13.62",
+    "@ocap/state": "1.13.62",
+    "@ocap/tx-pipeline": "1.13.62",
+    "@ocap/util": "1.13.62",
+    "@ocap/wallet": "1.13.62",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "79d07bbde4df1d0d37afe76aaa1eaa2f30cc55a7"
+  "gitHead": "a14f8d2ade8dc0c58fd9fbf331a4eb9b842de6ed"
 }