@ocap/tx-protocols 1.18.139 → 1.18.142

package/lib/execute.js

@@ -149,6 +149,8 @@ module.exports = ({ filter, runAsLambda }) => {
               flushEvents(newCtx, { txState });
             });
           } catch (err) {
+            const txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK', false);
+            logError('failed to save invalid transaction to statedb', JSON.stringify(txState, null));
             logError('failed to save invalid transaction to statedb', err);
           }
         }

package/lib/protocols/rollup/claim-reward.js

@@ -149,11 +149,17 @@ runner.use(async (context, next) => {
       changes.account.push({ address: blockState.proposer, delta: proposer.toString(10), action: 'fee' });
 
       // block signers share the validator part
-      // FIXME: delegation is not supported here yet
       const validators = blockState.signatures.map((s) => s.signer);
-      const validatorShare = validator.div(new BN(validators.length));
-      validators.forEach((v) =>
-        changes.account.push({ address: v, delta: validatorShare.toString(10), action: 'fee' })
+      const validatorShares = splitTxFee({
+        total: validator,
+        shares: validators.reduce((acc, signer) => {
+          acc[signer] = 1;
+          return acc;
+        }, {}),
+        rateBase: new BN(validators.length),
+      });
+      Object.keys(validatorShares).forEach((v) =>
+        changes.account.push({ address: v, delta: validatorShares[v], action: 'fee' })
       );
     }
   });

package/lib/util.js

@@ -176,7 +176,7 @@ const getDelegationRequirements = (context) => {
   ];
 };
 
-const splitTxFee = ({ total, shares = {}, stringify = true }) => {
+const splitTxFee = ({ total, shares = {}, stringify = true, rateBase = RATE_BASE }) => {
   const totalAmount = new BN(total);
   if (totalAmount.isNeg()) {
     throw new Error('NEGATIVE_TOTAL_AMOUNT', 'Unexpected negative total when splitTxFee, abort!');
@@ -186,12 +186,31 @@ const splitTxFee = ({ total, shares = {}, stringify = true }) => {
       throw new Error('NEGATIVE_FEE_SHARE', `Unexpected negative shares[${key}] when splitTxFee, abort!`);
     }
   });
+  if (
+    Object.values(shares)
+      .reduce((sum, x) => sum.add(new BN(x)), new BN(0))
+      .eq(rateBase) === false
+  ) {
+    throw new Error('INVALID_FEE_SHARE', 'Invalid share config when splitTxFee, abort!');
+  }
 
   const rewardShares = Object.keys(shares).reduce((acc, x) => {
-    acc[x] = totalAmount.mul(new BN(shares[x])).div(RATE_BASE);
+    acc[x] = totalAmount.mul(new BN(shares[x])).div(rateBase);
     return acc;
   }, {});
 
+  // ensure sum of shares equals to total, to avoid floating point precision issue
+  // Adjust the first share to compensate for rounding errors
+  if (
+    Object.values(rewardShares)
+      .reduce((sum, x) => sum.add(x), new BN(0))
+      .eq(totalAmount) === false
+  ) {
+    const firstKey = Object.keys(rewardShares)[0];
+    const currentSum = Object.values(rewardShares).reduce((sum, x) => sum.add(x), new BN(0));
+    rewardShares[firstKey] = rewardShares[firstKey].add(totalAmount.sub(currentSum));
+  }
+
   return Object.keys(rewardShares).reduce((acc, x) => {
     acc[x] = stringify ? rewardShares[x].toString(10) : rewardShares[x];
     return acc;

package/package.json

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