@ocap/tx-protocols 1.13.65 → 1.13.69

package/lib/execute.js

@@ -29,7 +29,7 @@ module.exports = ({ filter, runAsLambda }) => {
       // Since bloom-filters may give false positive, we need to check for statedb if replay detected
       const exist = await context.statedb.tx.get(context.txHash, context);
       if (exist) {
-        return next(new Error('FORBIDDEN', 'Can not execute duplicate transaction'));
+        return next(new Error('DUPLICATE_TX', 'Can not execute duplicate transaction'));
       }
     }
 

package/lib/protocols/account/declare.js

@@ -1,6 +1,7 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, Joi } = require('@ocap/state');
+const { account } = require('@ocap/state');
 const { toBase58 } = require('@ocap/util');
 
 const runner = new Runner();

package/lib/protocols/account/delegate.js

@@ -1,8 +1,9 @@
 /* eslint-disable max-len */
 const get = require('lodash/get');
+const Joi = require('@ocap/validator');
 const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
-const { delegation, account, Joi } = require('@ocap/state');
+const { delegation, account } = require('@ocap/state');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { toDelegateAddress } = require('@arcblock/did-util');
 

package/lib/protocols/account/migrate.js

@@ -1,8 +1,9 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { fromPublicKey, toTypeInfo } = require('@arcblock/did');
-const { account, Joi } = require('@ocap/state');
+const { account } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:migrate`);

package/lib/protocols/account/revoke-delegate.js

@@ -1,8 +1,9 @@
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
+const Joi = require('@ocap/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { delegation, account, Joi } = require('@ocap/state');
+const { delegation, account } = require('@ocap/state');
 const { toDelegateAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require

package/lib/protocols/asset/acquire-v3.js

@@ -82,7 +82,7 @@ runner.use(
 );
 
 // 5. verify sender & signer & owner
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
@@ -152,7 +152,7 @@ runner.use(
       );
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
+    const isAlsoSigner = !!signerUpdates[tx.from];
     const owner = ownerState ? ownerState.address : itx.owner;
 
     // Factory updates
@@ -166,12 +166,12 @@ runner.use(
 
     const [newSenderState, newReceiverState, assetState, newSignerStates, newFactoryState, newAssetStates] =
       await Promise.all([
-        // Update sender state
-        statedb.account.update(
-          senderState.address,
-          account.update(
+        // update sender
+        statedb.account.updateOrCreate(
+          senderState,
+          account.updateOrCreate(
             senderState,
-            Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+            Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
             context
           ),
           context
@@ -192,7 +192,7 @@ runner.use(
         // Update signer state
         Promise.all(
           signerStates
-            .filter((x) => x.address !== senderState.address)
+            .filter((x) => x.address !== tx.from)
             .map((x) =>
               statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context)
             )

package/lib/protocols/asset/create.js

@@ -1,14 +1,17 @@
 /* eslint-disable indent */
 const Error = require('@ocap/util/lib/error');
+const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, Joi } = require('@ocap/state');
+const { account, asset } = require('@ocap/state');
 const { toAssetAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-asset`);
 
 const { decodeAnySafe } = require('../../util');
+const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
 
 const runner = new Runner();
 
@@ -74,7 +77,7 @@ runner.use(
     // For security consideration, user can not create fake assets from a factory
     // https://github.com/ArcBlock/asset-chain/issues/97
     {
-      error: 'FORBIDDEN',
+      error: 'CREATE_FROM_FACTORY',
       message: 'You can only get asset from factory from acquire or mint',
       fn: ({ itx, factoryState }) => !(itx.parent && factoryState),
       persist: true,
@@ -85,28 +88,34 @@ runner.use(
 // Ensure parent exist
 runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'parentAsset', status: 'INVALID_ASSET', table: 'asset' }));
 
+runner.use(ensureTxFee);
+
 // Update asset state
 runner.use(
   async (context, next) => {
-    const { tx, itx, assetData, statedb, senderState } = context;
+    const { tx, itx, assetData, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
 
-    const [newSenderState, assetState] = await Promise.all([
-      // Update owner state
+    const [newSenderState, assetState, newVaultState] = await Promise.all([
       statedb.account.update(
         senderState.address,
-        account.update(senderState, { nonce: tx.nonce, pk: tx.pk }, context),
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
         context
       ),
-      // Create asset state
+
       statedb.asset.create(
         itx.address,
         asset.create({ ...itx, data: assetData, owner: senderState.address }, context),
         context
       ),
+
+      isEmpty(vaultUpdates)
+        ? vaultState
+        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
     ]);
 
     context.senderState = newSenderState;
     context.assetState = assetState;
+    context.vaultState = newVaultState;
 
     debug('createAsset', assetState);
 

package/lib/protocols/asset/mint.js

@@ -31,7 +31,7 @@ runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'OWNER_ONLY_OPERATION',
       message: 'Only factory owner is allowed to mint',
       fn: ({ factoryState, senderState }) => factoryState.owner === senderState.address,
       persist: true,

package/lib/protocols/asset/pipes/verify-mint-limit.js

@@ -9,5 +9,5 @@ module.exports = ({ factoryState }, next) => {
     return next();
   }
 
-  return next(new Error('FORBIDDEN', 'This request will exceed factory mint limit'));
+  return next(new Error('EXCEED_MINT_LIMIT', 'This request will exceed factory mint limit'));
 };

package/lib/protocols/asset/update.js

@@ -1,6 +1,7 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, Joi } = require('@ocap/state');
+const { account, asset } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:update-asset`);

package/lib/protocols/factory/create.js

@@ -14,6 +14,7 @@ const { toFactoryAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-factory`);
 
 const { decodeAnySafe } = require('../../util');
+const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
 
 const runner = new Runner();
 
@@ -71,7 +72,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'factoryState', status:
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_FACTORY',
       message: 'This asset factory already exist on chain',
       fn: (context) => isEmpty(context.factoryState),
     },
@@ -101,18 +102,19 @@ runner.use((context, next) => {
   return next(new Error('INVALID_FACTORY_INPUT', 'Not all input.assets exist on chain'));
 });
 
+runner.use(ensureTxFee);
+
 // Create factory state
-// TODO: we need to support charging when creating new nft-factory
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, factoryProps } = context;
+    const { tx, itx, statedb, senderState, senderUpdates, vaultState, vaultUpdates, factoryProps } = context;
     const tokens = { [context.config.token.address]: '0' };
 
-    const [newSenderState, factoryState] = await Promise.all([
+    const [newSenderState, factoryState, newVaultState] = await Promise.all([
       // Update owner state
       statedb.account.update(
         senderState.address,
-        account.update(senderState, { nonce: tx.nonce, pk: tx.pk }, context),
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
         context
       ),
 
@@ -122,10 +124,15 @@ runner.use(
         factory.create({ ...factoryProps, tokens, owner: senderState.address }, context),
         context
       ),
+
+      isEmpty(vaultUpdates)
+        ? vaultState
+        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
     ]);
 
     context.senderState = newSenderState;
     context.factoryState = factoryState;
+    context.vaultState = newVaultState;
 
     debug('createFactory', factoryState);
 

package/lib/protocols/governance/claim-stake.js

@@ -1,7 +1,8 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, stake, evidence, Joi } = require('@ocap/state');
+const { account, asset, stake, evidence } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
@@ -16,7 +17,7 @@ runner.use(pipes.VerifyMultiSig(0));
 const schema = Joi.object({
   address: Joi.DID().role('ROLE_STAKE').required(),
   evidence: Joi.object({
-    hash: Joi.string().regex(Joi.hashRegexp).required(),
+    hash: Joi.string().regex(Joi.patterns.txHash).required(),
   }).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
@@ -30,7 +31,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: '
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to claim stake from this address',
       fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
     },
@@ -42,7 +43,7 @@ runner.use(pipes.ExtractState({ from: 'itx.evidence.hash', to: 'evidenceState',
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'ALREADY_CLAIMED',
       message: 'Revoke evidence already seen on this chain',
       fn: ({ evidenceState }) => !evidenceState,
     },
@@ -69,7 +70,7 @@ runner.use(
       fn: ({ txState, itx }) => txState.tx.itxJson.address === itx.address,
     },
     {
-      error: 'FORBIDDEN',
+      error: 'WITHIN_WAITING_PERIOD',
       message: 'You can not claim stake before waiting period ends',
       fn: ({ txState, stakeState, txTime }) => {
         const end = +new Date(txState.time) + (stakeState.revokeWaitingPeriod || 0) * 1000;

package/lib/protocols/governance/revoke-stake.js

@@ -49,12 +49,12 @@ runner.use(
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to revoke stake from this address',
       fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
     },
     {
-      error: 'FORBIDDEN',
+      error: 'STAKE_NOT_REVOCABLE',
       message: 'This stake address is not revocable',
       fn: ({ stakeState }) => stakeState.revocable,
     },

package/lib/protocols/governance/stake.js

@@ -1,10 +1,11 @@
 const pick = require('lodash/pick');
 const { promisify } = require('util');
 const isEmpty = require('empty-value');
+const Joi = require('@ocap/validator');
 const Error = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { toStakeAddress } = require('@arcblock/did-util');
-const { account, asset, stake, Joi } = require('@ocap/state');
+const { account, asset, stake } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
@@ -63,9 +64,9 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'OK', table: 'stake' }));
 
 // 5. verify sender & signer & receiver
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'itx.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
+runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'itx.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' })); // can by any type
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
 // 6. verify token state and balance
@@ -114,15 +115,15 @@ runner.use(
       stakeUpdates.assets.push(...assetsList);
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
+    const isAlsoSigner = !!signerUpdates[tx.from];
 
     const [newSenderState, newSignerStates, newStakeState, newAssetStates] = await Promise.all([
       // Update sender state
-      statedb.account.update(
-        senderState.address,
-        account.update(
+      statedb.account.updateOrCreate(
+        senderState,
+        account.updateOrCreate(
           senderState,
-          Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+          Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
           context
         ),
         context
@@ -131,7 +132,7 @@ runner.use(
       // Update signer state
       Promise.all(
         signerStates
-          .filter((x) => x.address !== senderState.address)
+          .filter((x) => x.address !== tx.from)
           .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
       ),
 

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

@@ -1,10 +1,11 @@
 const uniqBy = require('lodash/uniqBy');
 const groupBy = require('lodash/groupBy');
 const cloneDeep = require('lodash/cloneDeep');
+const Joi = require('@ocap/validator');
 const Error = require('@ocap/util/lib/error');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, stake, evidence, rollupBlock, Joi } = require('@ocap/state');
+const { account, stake, evidence, rollupBlock } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:claim-block-reward`);
@@ -19,9 +20,9 @@ const runner = new Runner();
 const schema = Joi.object({
   rollup: Joi.DID().role('ROLE_ROLLUP').required(),
   blockHeight: Joi.number().integer().greater(0).required(),
-  blockHash: Joi.string().regex(Joi.hashRegexp).required(),
+  blockHash: Joi.string().regex(Joi.patterns.txHash).required(),
   evidence: Joi.object({
-    hash: Joi.string().regex(Joi.hashRegexp).required(),
+    hash: Joi.string().regex(Joi.patterns.txHash).required(),
   }).required(),
   publisher: Joi.DID().wallet('ethereum').required(),
   data: Joi.any().optional(),
@@ -263,7 +264,10 @@ runner.use(
       ),
     ]);
 
-    context.stakeStates = newStakeStates;
+    // to avoid this to be incorrectly indexed
+    delete context.stakeState;
+
+    context.stakeStates = newStakeStates.filter((x) => updates.stake[x.address]);
     context.accountStates = newAccountStates;
     context.blockState = newBlockState;
 

package/lib/protocols/rollup/create-block.js

@@ -2,10 +2,11 @@
 const pick = require('lodash/pick');
 const Error = require('@ocap/util/lib/error');
 const MerkleTree = require('@ocap/merkle-tree');
+const Joi = require('@ocap/validator');
 const { formatMessage } = require('@ocap/message');
 const { toStakeAddress } = require('@arcblock/did-util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, stake, rollup, rollupBlock, tx: Tx, Joi } = require('@ocap/state');
+const { account, stake, rollup, rollupBlock, tx: Tx } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-rollup-block`);
@@ -19,18 +20,18 @@ const runner = new Runner();
 
 // 1. verify itx
 const schema = Joi.object({
-  hash: Joi.string().regex(Joi.hashRegexp).required(),
+  hash: Joi.string().regex(Joi.patterns.txHash).required(),
   height: Joi.number().integer().greater(0).required(),
-  merkleRoot: Joi.string().regex(Joi.hashRegexp).required(),
+  merkleRoot: Joi.string().regex(Joi.patterns.txHash).required(),
   previousHash: Joi.string().when('height', {
     is: 1,
     then: Joi.string().optional().allow(''),
-    otherwise: Joi.string().regex(Joi.hashRegexp).required(),
+    otherwise: Joi.string().regex(Joi.patterns.txHash).required(),
   }),
-  txsHash: Joi.string().regex(Joi.hashRegexp).required(),
-  txsList: Joi.array().items(Joi.string().regex(Joi.hashRegexp).required()).min(1).unique().required(),
+  txsHash: Joi.string().regex(Joi.patterns.txHash).required(),
+  txsList: Joi.array().items(Joi.string().regex(Joi.patterns.txHash).required()).min(1).unique().required(),
   proposer: Joi.DID().wallet('ethereum').required(),
-  signaturesList: Joi.multiSigSchema.min(1).required(),
+  signaturesList: Joi.schemas.multiSig.min(1).required(),
   rollup: Joi.DID().role('ROLE_ROLLUP').required(),
   minReward: Joi.BN().min(0).required(),
   data: Joi.any().optional(),
@@ -311,7 +312,7 @@ runner.use(
     ]);
 
     context.senderState = newSenderState;
-    context.stakeStates = newStakeStates;
+    context.stakeStates = newStakeStates.filter((x) => context.stakeUpdates[x.address]);
     context.newSenderStates = newSenderStates;
     context.rollupState = newRollupState;
     context.rollupBlockState = rollupBlockState;

package/lib/protocols/rollup/create.js

@@ -12,6 +12,7 @@ const { toRollupAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-rollup`);
 
 const { decodeAnySafe } = require('../../util');
+const ensureTxFee = require('./pipes/ensure-tx-fee');
 
 const runner = new Runner();
 
@@ -87,7 +88,7 @@ runner.use(async (context, next) => {
   const { statedb, itx } = context;
   const exist = await statedb.rollup.existByToken(itx.tokenAddress, context);
   if (exist) {
-    return next(new Error('FORBIDDEN', 'Only 1 rollup can be created for the token'));
+    return next(new Error('DUPLICATE_ROLLUP', 'Only 1 rollup can be created for the token'));
   }
 
   return next();
@@ -98,20 +99,27 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'rollupState', status:
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_ROLLUP',
       message: 'This rollup already exist on chain',
       fn: (context) => isEmpty(context.rollupState),
     },
   ])
 );
 
+runner.use(ensureTxFee);
+
 // 5. create rollup state
 runner.use(
   async (context, next) => {
-    const { tx, formattedItx, rollupData, statedb, senderState } = context;
+    const { tx, formattedItx, rollupData, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
+
+    const [newSenderState, rollupState, newVaultState] = await Promise.all([
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
 
-    const [newSenderState, rollupState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
       statedb.rollup.create(
         formattedItx.address,
         rollup.create(
@@ -128,6 +136,10 @@ runner.use(
         ),
         context
       ),
+
+      isEmpty(vaultUpdates)
+        ? vaultState
+        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
     ]);
 
     // FIXME: create-rollup 的时候不能校验 stake，还是在这里创建 stake？如果在这里创建 stake，是否需要多签？
@@ -135,6 +147,7 @@ runner.use(
 
     context.senderState = newSenderState;
     context.rollupState = rollupState;
+    context.vaultState = newVaultState;
 
     debug('create-rollup', rollupState);
 

package/lib/protocols/rollup/join.js

@@ -2,9 +2,10 @@
 const MerkleTree = require('@ocap/merkle-tree');
 const joinUrl = require('url-join');
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { BN, toHex } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, rollup, stake, evidence, Joi } = require('@ocap/state');
+const { account, rollup, stake, evidence } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
 const { isEthereumDid } = require('@arcblock/did');
 
@@ -24,9 +25,9 @@ const schema = Joi.object({
     .uri({ scheme: [/https?/] })
     .required(),
   evidence: Joi.object({
-    hash: Joi.string().regex(Joi.hashRegexp).required(),
+    hash: Joi.string().regex(Joi.patterns.txHash).required(),
   }).required(),
-  signaturesList: Joi.multiSigSchema.min(1).required(),
+  signaturesList: Joi.schemas.multiSig.min(1).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {

package/lib/protocols/rollup/leave.js

@@ -1,8 +1,9 @@
 /* eslint-disable indent */
 const MerkleTree = require('@ocap/merkle-tree');
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, rollup, stake, evidence, Joi } = require('@ocap/state');
+const { account, rollup, stake, evidence } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
@@ -18,9 +19,9 @@ const runner = new Runner();
 const schema = Joi.object({
   rollup: Joi.DID().role('ROLE_ROLLUP').required(),
   evidence: Joi.object({
-    hash: Joi.string().regex(Joi.hashRegexp).required(),
+    hash: Joi.string().regex(Joi.patterns.txHash).required(),
   }).required(),
-  signaturesList: Joi.multiSigSchema.min(1).required(),
+  signaturesList: Joi.schemas.multiSig.min(1).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {

package/lib/protocols/rollup/pipes/ensure-tx-fee.js

@@ -0,0 +1,38 @@
+const Error = require('@ocap/util/lib/error');
+const { fromTokenToUnit, BN } = require('@ocap/util');
+
+const { applyTokenUpdates } = require('../../../util');
+
+// FIXME: There maybe bug for tx that decrease senderState token balance
+module.exports = async (context, next) => {
+  const { config, statedb, txType, senderState } = context;
+  const txFee = config.transaction.txFee[txType];
+  const vaultState = await statedb.account.get(config.vaults.txFee, context);
+
+  if (!txFee) {
+    context.senderUpdates = {};
+    context.vaultUpdates = {};
+    context.vaultState = vaultState;
+    context.updatedAccounts = [];
+    return next();
+  }
+
+  const expected = fromTokenToUnit(txFee, config.token.decimal);
+  const actual = new BN(senderState.tokens[config.token.address] || 0);
+  if (actual.lt(expected)) {
+    return next(new Error('INSUFFICIENT_FUND', `Insufficient fund to pay for tx fee, expected ${txFee}`));
+  }
+
+  const tokenChange = { address: config.token.address, value: expected.toString(10) };
+
+  context.senderUpdates = applyTokenUpdates([tokenChange], senderState, 'sub');
+  context.vaultUpdates = applyTokenUpdates([tokenChange], vaultState, 'add');
+  context.vaultState = vaultState;
+
+  context.updatedAccounts = [
+    { address: senderState.address, token: config.token.address, delta: `-${tokenChange.value}`, action: 'fee' },
+    { address: vaultState.address, token: config.token.address, delta: tokenChange.value, action: 'fee' },
+  ];
+
+  return next();
+};

package/lib/protocols/rollup/update.js

@@ -1,6 +1,7 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, rollup, Joi } = require('@ocap/state');
+const { account, rollup } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:update-rollup`);

package/lib/protocols/token/create.js

@@ -1,14 +1,16 @@
 const isEmpty = require('empty-value');
 const cloneDeep = require('lodash/cloneDeep');
+const Joi = require('@ocap/validator');
 const Error = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, token, Joi } = require('@ocap/state');
+const { account, token } = require('@ocap/state');
 const { toTokenAddress } = require('@arcblock/did-util');
 const { fromTokenToUnit } = require('@ocap/util');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-token`);
 const { decodeAnySafe } = require('../../util');
+const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
 
 const MAX_TOTAL_SUPPLY = fromTokenToUnit(10000 * 100000000, 18); // 32
 
@@ -26,7 +28,7 @@ const schema = Joi.object({
   icon: Joi.string().optional().valid(''),
   totalSupply: Joi.BN().greater(0).max(MAX_TOTAL_SUPPLY).required(),
   initialSupply: Joi.BN().greater(0).max(Joi.ref('totalSupply')).required(),
-  foreignToken: Joi.foreignTokenSchema.optional().default(null),
+  foreignToken: Joi.schemas.foreignToken.optional().default(null),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 
@@ -64,7 +66,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'tokenState', table: 't
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_TOKEN',
       message: 'Token address already exists on chain',
       fn: (context) => isEmpty(context.tokenState),
     },
@@ -75,37 +77,46 @@ runner.use(
 runner.use(async (context, next) => {
   const { symbol } = context.config.token;
   if (symbol.toLowerCase() === context.itx.symbol.toLowerCase()) {
-    return next(new Error('FORBIDDEN', `Token symbol can not be ${symbol}`));
+    return next(new Error('DUPLICATE_SYMBOL', `Token symbol can not be ${symbol}`));
   }
 
   const exist = await context.statedb.token.existBySymbol(context.itx.symbol, context);
   if (exist) {
-    return next(new Error('FORBIDDEN', 'Token symbol already exists'));
+    return next(new Error('DUPLICATE_SYMBOL', 'Token symbol already exists'));
   }
 
   return next();
 });
 
+runner.use(ensureTxFee);
+
 // Update sender state, token state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState } = context;
+    const { tx, itx, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
     const data = decodeAnySafe(itx.data);
 
-    const senderTokens = senderState.tokens || {};
-    senderTokens[itx.address] = itx.initialSupply;
+    // We are definitely creating a different token, so it is safe to set tokens to initial supply
+    senderUpdates.tokens = senderUpdates.tokens || {};
+    senderUpdates.tokens[itx.address] = itx.initialSupply;
 
-    const [newSenderState, tokenState] = await Promise.all([
+    const [newSenderState, tokenState, newVaultState] = await Promise.all([
       statedb.account.update(
         senderState.address,
-        account.update(senderState, { tokens: senderTokens, nonce: tx.nonce, pk: tx.pk }, context),
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
         context
       ),
+
       statedb.token.create(itx.address, token.create({ ...itx, data, issuer: senderState.address }, context), context),
+
+      isEmpty(vaultUpdates)
+        ? vaultState
+        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
     ]);
 
     context.senderState = newSenderState;
     context.tokenState = tokenState;
+    context.vaultState = newVaultState;
 
     debug('create token v2', tokenState);
 

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

@@ -1,9 +1,10 @@
 /* eslint-disable indent */
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { BN, fromUnitToToken } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, stake, evidence, Joi } = require('@ocap/state');
+const { account, stake, evidence } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
@@ -14,11 +15,11 @@ const VerifyPaused = require('../rollup/pipes/verify-paused');
 const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../../util');
 
 const schema = Joi.object({
-  token: Joi.tokenInputSchema.required(),
+  token: Joi.schemas.tokenInput.required(),
   to: Joi.DID().wallet('ethereum').required(),
   proposer: Joi.DID().wallet('ethereum').required(),
   evidence: Joi.object({
-    hash: Joi.string().regex(Joi.hashRegexp).required(),
+    hash: Joi.string().regex(Joi.patterns.txHash).required(),
   }).required(),
   rollup: Joi.DID().role('ROLE_ROLLUP').required(),
   actualFee: Joi.BN().min(0).required(),

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

@@ -1,9 +1,10 @@
 /* eslint-disable indent */
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { BN, fromUnitToToken } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, stake, Joi } = require('@ocap/state');
+const { account, stake } = require('@ocap/state');
 const { toStakeAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
@@ -15,7 +16,7 @@ const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker } = require('../.
 const verifyMultiSigV2 = pipes.VerifyMultiSigV2({ signersKey: 'signers' });
 
 const schema = Joi.object({
-  token: Joi.tokenInputSchema.required(),
+  token: Joi.schemas.tokenInput.required(),
   to: Joi.DID().wallet('ethereum').required(),
   rollup: Joi.DID().role('ROLE_ROLLUP').required(),
   proposer: Joi.DID().wallet('ethereum').optional().allow('').default(''),

package/lib/util.js

@@ -54,7 +54,7 @@ const decodeAnySafe = (encoded) => {
 
 const applyTokenUpdates = (tokens, state, operator) => {
   if (['add', 'sub'].includes(operator) === false) {
-    throw new Error('FORBIDDEN', `Invalid operator when applyTokenUpdates: ${operator}`);
+    throw new Error('UNEXPECTED_OPERATOR', `Invalid operator when applyTokenUpdates: ${operator}`);
   }
 
   if (!state) {
@@ -69,7 +69,7 @@ const applyTokenUpdates = (tokens, state, operator) => {
     const balance = new BN(oldTokens[address] || 0);
     const newBalance = balance[operator](requirement);
     if (newBalance.lt(ZERO)) {
-      throw new Error('FORBIDDEN', `Negative token balance when applyTokenUpdates for ${address}`);
+      throw new Error('NEGATIVE_TOKEN_BALANCE', `Negative token balance when applyTokenUpdates for ${address}`);
     }
     newTokens[address] = newBalance.toString(10);
   }
@@ -102,16 +102,16 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
   const minFeeAmount = new BN(minFee);
 
   if (feeRate < 0) {
-    throw new Error('FORBIDDEN', 'Unexpected negative feeRate when getTxFee, abort!');
+    throw new Error('NEGATIVE_FEE_RATE', 'Unexpected negative feeRate when getTxFee, abort!');
   }
   if (userAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative amount when getTxFee, abort!');
+    throw new Error('NEGATIVE_AMOUNT', 'Unexpected negative amount when getTxFee, abort!');
   }
   if (maxFeeAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative maxFee when getTxFee, abort!');
+    throw new Error('NEGATIVE_MAX_FEE', 'Unexpected negative maxFee when getTxFee, abort!');
   }
   if (minFeeAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative minFee when getTxFee, abort!');
+    throw new Error('NEGATIVE_MIN_FEE', 'Unexpected negative minFee when getTxFee, abort!');
   }
 
   // total fee
@@ -144,11 +144,11 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
 const splitTxFee = ({ total, shares = {}, stringify = true }) => {
   const totalAmount = new BN(total);
   if (totalAmount.lt(ZERO)) {
-    throw new Error('FORBIDDEN', 'Unexpected negative total when splitTxFee, abort!');
+    throw new Error('NEGATIVE_TOTAL_AMOUNT', 'Unexpected negative total when splitTxFee, abort!');
   }
   Object.keys(shares).forEach((key) => {
     if (shares[key] < 0) {
-      throw new Error('FORBIDDEN', `Unexpected negative shares[${key}] when splitTxFee, abort!`);
+      throw new Error('NEGATIVE_FEE_SHARE', `Unexpected negative shares[${key}] when splitTxFee, abort!`);
     }
   });
 
@@ -217,7 +217,7 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
     }
 
     if (actualFee.lt(ZERO)) {
-      throw new Error('FORBIDDEN', 'Got negative actualFee for tx, abort!');
+      throw new Error('NEGATIVE_ACTUAL_FEE', 'Got negative actualFee for tx, abort!');
     }
 
     // If the actualFee is less than the maxFee, user will have a refund

package/package.json

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