@ocap/tx-protocols 1.18.13 → 1.18.15

package/lib/pipes/ensure-cost.js

@@ -77,7 +77,6 @@ module.exports = function CreateEnsureTxCostPipe({ attachSenderChanges = true }
         address: senderState.address,
         token: config.token.address,
         delta: `-${txCost.toString(10)}`,
-        action: 'fee',
       };
 
       debug({ changes, senderUpdates: context.senderUpdates });
@@ -112,6 +111,14 @@ module.exports = function CreateEnsureTxCostPipe({ attachSenderChanges = true }
             delta: changes.fee.value,
             action: 'fee',
           });
+          if (attachSenderChanges) {
+            context.updatedAccounts.push({
+              address: senderState.address,
+              token: config.token.address,
+              delta: `-${changes.fee.value}`,
+              action: 'fee',
+            });
+          }
         }
         if (changes.gas) {
           context.updatedAccounts.push({
@@ -120,9 +127,14 @@ module.exports = function CreateEnsureTxCostPipe({ attachSenderChanges = true }
             delta: changes.gas.value,
             action: 'gas',
           });
-        }
-        if (attachSenderChanges) {
-          context.updatedAccounts.push(context.senderChange);
+          if (attachSenderChanges) {
+            context.updatedAccounts.push({
+              address: senderState.address,
+              token: config.token.address,
+              delta: `-${changes.gas.value}`,
+              action: 'gas',
+            });
+          }
         }
       };
     } else {

package/lib/pipes/ensure-gas.js

@@ -16,10 +16,12 @@ module.exports = function CreateGasEnsureFn(estimateTxGas) {
 
     // total gas in native token
     const { txGas } = config.transaction;
-    let totalGas = new BN(txGas.price * txGas.dataStorage * context.txSize);
+    const basePrice = new BN(txGas.price);
+
     const estimate = estimateTxGas(context);
-    totalGas = totalGas.add(new BN(txGas.price * txGas.createState * (estimate.create + 1))); // 1 = tx insert
-    totalGas = totalGas.add(new BN(txGas.price * txGas.updateState * estimate.update));
+    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)));
 
     // gas receiver address
     const { txGas: gasVaults } = config.vaults;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.13",
+  "version": "1.18.15",
   "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.13",
-    "@arcblock/did-util": "1.18.13",
-    "@arcblock/jwt": "1.18.13",
-    "@arcblock/validator": "1.18.13",
-    "@ocap/asset": "1.18.13",
-    "@ocap/mcrypto": "1.18.13",
-    "@ocap/merkle-tree": "1.18.13",
-    "@ocap/message": "1.18.13",
-    "@ocap/state": "1.18.13",
-    "@ocap/tx-pipeline": "1.18.13",
-    "@ocap/util": "1.18.13",
-    "@ocap/wallet": "1.18.13",
+    "@arcblock/did": "1.18.15",
+    "@arcblock/did-util": "1.18.15",
+    "@arcblock/jwt": "1.18.15",
+    "@arcblock/validator": "1.18.15",
+    "@ocap/asset": "1.18.15",
+    "@ocap/mcrypto": "1.18.15",
+    "@ocap/merkle-tree": "1.18.15",
+    "@ocap/message": "1.18.15",
+    "@ocap/state": "1.18.15",
+    "@ocap/tx-pipeline": "1.18.15",
+    "@ocap/util": "1.18.15",
+    "@ocap/wallet": "1.18.15",
     "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": "026028a4fe8d3178f0484980ceb9417809dce150"
+  "gitHead": "2a6967982b3e0ebadc01509d67dd6293a03912ff"
 }