@ocap/tx-protocols 1.18.113 → 1.18.115

package/lib/pipes/ensure-gas.js

@@ -2,7 +2,7 @@ const { CustomError: Error } = require('@ocap/util/lib/error');
 const { BN, hexToNumber } = require('@ocap/util');
 
 // eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../package.json').name}:pipes:estimate-gas`);
+const debug = require('debug')(`${require('../../package.json').name}:pipes:ensure-gas`);
 
 // Must be called after all state ready
 // Must be called before creating/updating any state
@@ -19,9 +19,12 @@ module.exports = function CreateGasEnsureFn(estimateTxGas) {
     const basePrice = new BN(txGas.price);
 
     const estimate = estimateTxGas(context);
-    let totalGas = basePrice.mul(new BN(txGas.dataStorage)).mul(new BN(context.txSize));
-    totalGas = totalGas.add(basePrice.mul(new BN(txGas.createState)).mul(new BN(estimate.create + 1))); // 1 = tx insert
-    totalGas = totalGas.add(basePrice.mul(new BN(txGas.updateState)).mul(new BN(estimate.update)));
+    let totalGas = new BN(0);
+    if (context.txBaseGas) {
+      totalGas = basePrice.mul(new BN(txGas.dataStorage)).mul(new BN(context.txSize));
+      totalGas = totalGas.add(basePrice.mul(new BN(txGas.createState)).mul(new BN(estimate.create + 1))); // 1 = tx insert
+      totalGas = totalGas.add(basePrice.mul(new BN(txGas.updateState)).mul(new BN(estimate.update)));
+    }
 
     // gas receiver address
     const { txGas: gasVaults } = config.vaults;
@@ -42,6 +45,7 @@ module.exports = function CreateGasEnsureFn(estimateTxGas) {
       txType: context.txType,
       txHash: context.txHash,
       txSize: context.txSize,
+      txBaseGas: context.txBaseGas,
       totalGas: totalGas.toString(10),
       gasVault,
       estimate,

package/lib/protocols/governance/stake.js

@@ -145,8 +145,16 @@ runner.use(async (context, next) => {
 // Ensure tx fee and gas
 runner.use(
   EnsureTxGas((context) => {
-    // FIXME: payment check
     const result = { create: 0, update: 0, payment: 0 };
+
+    // Do not charge tx fee for self stake: https://github.com/ArcBlock/arc-wallet-ios/issues/4005
+    const sender = context.senderState ? context.senderState.address : context.tx.from;
+    const receiver = context.receiverState ? context.receiverState.address : context.itx.receiver;
+    if (sender === receiver) {
+      Object.defineProperty(context, 'txBaseGas', { value: false });
+      return result;
+    }
+
     if (context.senderState) {
       result.update += 1;
     } else {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.113",
+  "version": "1.18.115",
   "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.113",
-    "@arcblock/did-util": "1.18.113",
-    "@arcblock/jwt": "1.18.113",
-    "@arcblock/validator": "1.18.113",
-    "@ocap/asset": "1.18.113",
-    "@ocap/mcrypto": "1.18.113",
-    "@ocap/merkle-tree": "1.18.113",
-    "@ocap/message": "1.18.113",
-    "@ocap/state": "1.18.113",
-    "@ocap/tx-pipeline": "1.18.113",
-    "@ocap/util": "1.18.113",
-    "@ocap/wallet": "1.18.113",
+    "@arcblock/did": "1.18.115",
+    "@arcblock/did-util": "1.18.115",
+    "@arcblock/jwt": "1.18.115",
+    "@arcblock/validator": "1.18.115",
+    "@ocap/asset": "1.18.115",
+    "@ocap/mcrypto": "1.18.115",
+    "@ocap/merkle-tree": "1.18.115",
+    "@ocap/message": "1.18.115",
+    "@ocap/state": "1.18.115",
+    "@ocap/tx-pipeline": "1.18.115",
+    "@ocap/util": "1.18.115",
+    "@ocap/wallet": "1.18.115",
     "debug": "^4.3.4",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^27.5.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "658f9e820479ce9ee2280f524a4e471d58cde39f"
+  "gitHead": "aba7f4c4ec81a37b0977da9ea7b80c9504e8d4e1"
 }