@ocap/tx-protocols 1.13.28 → 1.13.32

package/lib/protocols/rollup/create.js

@@ -5,7 +5,7 @@ const Error = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 const { formatMessage } = require('@ocap/message');
-const { isFromPublicKey } = require('@arcblock/did');
+const { isFromPublicKey, isEthereumDid } = require('@arcblock/did');
 const { toRollupAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
@@ -37,6 +37,11 @@ runner.use(
       message: 'Seed validator pk and address not match',
       fn: ({ formattedItx }) => formattedItx.seedValidators.every(({ pk, address }) => isFromPublicKey(address, pk)),
     },
+    {
+      error: 'INVALID_TX',
+      message: 'Seed validator must use ethereum compatible address',
+      fn: ({ formattedItx }) => formattedItx.seedValidators.every(({ address }) => isEthereumDid(address)),
+    },
     {
       error: 'INVALID_TX',
       message: 'Rollup address is not valid',

package/lib/protocols/rollup/join.js

@@ -6,6 +6,7 @@ const { BN, toHex } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup, stake, evidence, Joi } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
+const { isEthereumDid } = require('@arcblock/did');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:join-rollup`);
@@ -39,6 +40,10 @@ runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: '
 runner.use((context, next) => {
   const { tx, itx, rollupState } = context;
   const validator = { pk: toHex(tx.pk), address: tx.from, endpoint: itx.endpoint };
+  if (isEthereumDid(tx.from) === false) {
+    return next(new Error('INVALID_TX', 'Invalid tx.from: only ethereum compatible address can join rollup'));
+  }
+
   if (rollupState.validators.some((x) => x.address === validator.address)) {
     return next(new Error('INVALID_TX', `Address ${validator.address} already exist in validators`));
   }

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

@@ -5,6 +5,7 @@ const { BN, fromUnitToToken } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, stake, evidence, Joi } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
+const { isEthereumDid } = require('@arcblock/did');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:deposit-token`);
@@ -32,6 +33,10 @@ runner.use(({ tx, itx }, next) => {
     return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
   }
 
+  if (isEthereumDid(itx.to) === false) {
+    return next(new Error('INVALID_TX', 'Invalid itx.to: only ethereum compatible address can deposit token'));
+  }
+
   if (itx.to !== tx.from) {
     return next(new Error('INVALID_TX', 'You can only deposit to tx sender account'));
   }

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

@@ -4,6 +4,7 @@ const { BN, fromUnitToToken } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, stake, Joi } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
+const { isEthereumDid } = require('@arcblock/did');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:withdraw-token`);
@@ -28,6 +29,10 @@ runner.use(({ tx, itx }, next) => {
     return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
   }
 
+  if (isEthereumDid(itx.to) === false) {
+    return next(new Error('INVALID_TX', 'Invalid itx.to: only ethereum compatible address can withdraw token'));
+  }
+
   if (itx.to !== tx.from) {
     return next(new Error('INVALID_TX', 'You can only withdraw to tx sender account'));
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.28",
+  "version": "1.13.32",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -19,16 +19,16 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.13.28",
-    "@arcblock/did-util": "1.13.28",
-    "@ocap/asset": "1.13.28",
-    "@ocap/mcrypto": "1.13.28",
-    "@ocap/merkle-tree": "1.13.28",
-    "@ocap/message": "1.13.28",
-    "@ocap/state": "1.13.28",
-    "@ocap/tx-pipeline": "1.13.28",
-    "@ocap/util": "1.13.28",
-    "@ocap/wallet": "1.13.28",
+    "@arcblock/did": "1.13.32",
+    "@arcblock/did-util": "1.13.32",
+    "@ocap/asset": "1.13.32",
+    "@ocap/mcrypto": "1.13.32",
+    "@ocap/merkle-tree": "1.13.32",
+    "@ocap/message": "1.13.32",
+    "@ocap/state": "1.13.32",
+    "@ocap/tx-pipeline": "1.13.32",
+    "@ocap/util": "1.13.32",
+    "@ocap/wallet": "1.13.32",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "jest": "^26.6.3"
   },
-  "gitHead": "ca4f038d4d16194149328cba0959ce51ad2c0bbb"
+  "gitHead": "30a6554645478a0c3c29477e6e9954c8d42272e0"
 }