@ocap/tx-pipeline 1.20.1 → 1.20.3

package/README.md

@@ -5,7 +5,7 @@ Defines the interface of OCAP query resolver.
 ## Usage
 
 ```shell
-yarn add @ocap/tx-pipeline
+pnpm install @ocap/tx-pipeline
 ```
 
 Then:

package/lib/index.js

@@ -24,7 +24,6 @@ const VerifyTxInput = require('./pipes/verify-tx-input');
 const VerifyUpdater = require('./pipes/verify-updater');
 const VerifyTokenBalance = require('./pipes/verify-token-balance');
 const VerifyStateDiff = require('./pipes/verify-state-diff');
-const VerifyGasPayer = require('./pipes/verify-gas-payer');
 const TakeStateSnapshot = require('./pipes/take-state-snapshot');
 
 module.exports = {
@@ -55,7 +54,6 @@ module.exports = {
     VerifyTxInput,
     VerifyTokenBalance,
     VerifyStateDiff,
-    VerifyGasPayer,
     TakeStateSnapshot,
   },
 };

package/lib/pipes/verify-signature.js

@@ -35,7 +35,7 @@ module.exports = async function VerifySignature(context, next) {
       return next(new Error('INVALID_SIGNATURE', 'tx.signature is invalid'));
     }
   } catch (err) {
-    console.error(err);
+    console.error('tx.signature verify failed', err);
     return next(new Error('INVALID_SIGNATURE', 'tx.signature verify failed'));
   }
 

package/package.json

@@ -3,20 +3,12 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.20.1",
+  "version": "1.20.3",
   "description": "Pipeline runner and common pipelines to process transactions",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
-  "scripts": {
-    "lint": "eslint tests lib",
-    "lint:fix": "eslint --fix tests lib",
-    "start": "node tools/start-chain.js",
-    "test": "jest --forceExit --detectOpenHandles",
-    "test:ci": "jest --forceExit --detectOpenHandles --coverage",
-    "coverage": "start-server-and-test start http://127.0.0.1:4002 test:ci"
-  },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
@@ -29,16 +21,26 @@
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.20.1",
-    "@arcblock/did-util": "1.20.1",
-    "@ocap/mcrypto": "1.20.1",
-    "@ocap/message": "1.20.1",
-    "@ocap/state": "1.20.1",
-    "@ocap/util": "1.20.1",
-    "@ocap/wallet": "1.20.1",
     "debug": "^4.3.6",
     "empty-value": "^1.0.1",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "@arcblock/did": "1.20.3",
+    "@ocap/mcrypto": "1.20.3",
+    "@ocap/message": "1.20.3",
+    "@arcblock/did-util": "1.20.3",
+    "@ocap/util": "1.20.3",
+    "@ocap/state": "1.20.3",
+    "@ocap/wallet": "1.20.3",
+    "@ocap/client": "1.20.3",
+    "@ocap/statedb-memory": "1.20.3",
+    "@ocap/e2e-test": "1.20.3"
   },
-  "gitHead": "f73bddbe4b86106fd348e43ce9e19a626acdc9f6"
-}
+  "scripts": {
+    "lint": "eslint tests lib",
+    "lint:fix": "eslint --fix tests lib",
+    "start": "node tools/start-chain.js",
+    "test": "jest --forceExit --detectOpenHandles",
+    "test:ci": "jest --forceExit --detectOpenHandles --coverage",
+    "coverage": "start-server-and-test start http://127.0.0.1:4003 test:ci"
+  }
+}

package/lib/pipes/verify-gas-payer.js

@@ -1,30 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-const get = require('lodash/get');
-const { CustomError: Error } = require('@ocap/util/lib/error');
-const { BN } = require('@ocap/util');
-
-module.exports = function CreateVerifyGasPayerPipe({ gasPayer = 'senderState' } = {}) {
-  return function VerifyGasPayer(context, next) {
-    // From ensureTxCost
-    // Pass if someone has staked for this tx
-    const { gasStake } = context;
-    if (gasStake?.valid) {
-      return next();
-    }
-
-    // From ensureTxCost
-    // Pass if gas is free
-    const { gasVaultChange } = context;
-    if (!gasVaultChange || new BN(gasVaultChange.value ?? 0).isZero()) {
-      return next();
-    }
-
-    // Pass if payer on chain
-    const gasPayerState = get(context, gasPayer);
-    if (gasPayerState) {
-      return next();
-    }
-
-    return next(new Error('INVALID_GAS_PAYER', 'Gas payer does not exist on chain'));
-  };
-};