@ocap/tx-protocols 1.13.74 → 1.13.78

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

@@ -101,7 +101,7 @@ runner.use((context, next) => {
     return next(new Error('INVALID_STAKE_STATE', `Staking not locked for deposit: ${stakeState.address}`));
   }
 
-  const depositAmount = new BN(itx.token.value);
+  const depositAmount = new BN(itx.token.value).add(new BN(itx.actualFee));
   const minDepositAmount = new BN(rollupState.minDepositAmount);
   const maxDepositAmount = new BN(rollupState.maxDepositAmount);
   if (depositAmount.lt(minDepositAmount)) {

package/lib/util.js

@@ -197,20 +197,22 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
   const totalMissingFee = minRequiredReward.sub(totalFixedFee);
 
   // 2. calculate actual reward for each dynamic reward tx, mark tx to be updated
+  const minTxFee = minRequiredReward.div(new BN(txStates.length));
   const changes = { stake: [], account: [] };
   dynamicFeeTxs.forEach((x) => {
     const maxFee = new BN(x.tx.itxJson.maxFee);
+    const defaults = getTxFee({
+      amount: x.tx.itxJson.token.value,
+      feeRate: withdrawFeeRate,
+      maxFee: maxWithdrawFee,
+      minFee: minWithdrawFee,
+      stringify: false,
+    });
+
     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;
+      actualFee = defaults.reward;
     } else {
       // Else the tx is charged for a portion of totalMissingFee
       actualFee = totalMissingFee.mul(maxFee).div(totalDynamicFee);
@@ -220,6 +222,16 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
       throw new Error('NEGATIVE_ACTUAL_FEE', 'Got negative actualFee for tx, abort!');
     }
 
+    // If the actualFee is less than default fee, user will be charged the default fee
+    if (actualFee.lt(defaults.reward)) {
+      actualFee = defaults.reward;
+    }
+
+    // If the actualFee is less than minTxFee, user will be charged the minTxFee
+    if (actualFee.lt(minTxFee)) {
+      actualFee = minTxFee;
+    }
+
     // If the actualFee is less than the maxFee, user will have a refund
     if (actualFee.lt(maxFee)) {
       const refundFee = maxFee.sub(actualFee).toString(10);

package/package.json

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