@ocap/tx-protocols 1.13.62 → 1.13.66

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');
 
@@ -61,9 +62,9 @@ runner.use(
 );
 
 // Ensure sender/receiver exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
-runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'OK', table: 'account' }));
 
 // Extract delegation
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', table: 'delegation', status: 'OK' }));
@@ -71,7 +72,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', tabl
 // Create delegation state
 runner.use(
   async (context, next) => {
-    const { tx, itx, ops, statedb, senderState, delegationState } = context;
+    const { tx, itx, ops, statedb, senderState, receiverState, delegationState } = context;
 
     const opsObj = ops.reduce(
       (acc, x) => {
@@ -86,8 +87,23 @@ runner.use(
       delegationState ? delegationState.ops : {}
     );
 
-    const [newSenderState, newDelegationState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+    const sender = senderState ? senderState.address : tx.from;
+    const receiver = receiverState ? receiverState.address : itx.to;
+
+    const [newSenderState, newReceiverState, newDelegationState] = await Promise.all([
+      // update sender
+      statedb.account.updateOrCreate(
+        senderState,
+        account.updateOrCreate(senderState, { address: sender, nonce: tx.nonce, pk: tx.pk }, context),
+        context
+      ),
+
+      // update receiver
+      receiverState
+        ? Promise.resolve(receiverState)
+        : statedb.account.create(receiver, account.create({ address: receiver }, context), context),
+
+      // update delegation
       delegationState
         ? statedb.delegation.update(itx.address, delegation.update(delegationState, { ...itx, ops: opsObj }, context), context) // prettier-ignore
         : statedb.delegation.create(itx.address, delegation.create({ ...itx, ops: opsObj }, context), context),
@@ -97,6 +113,7 @@ runner.use(
 
     // Update context
     context.senderState = newSenderState;
+    context.receiverState = newReceiverState;
     context.delegationState = newDelegationState;
 
     return next();

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`);
@@ -35,7 +36,7 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Create account state, and update old accounts
@@ -48,7 +49,7 @@ runner.use(
 
     // Ensure receiver does not exist
     if (receiver) {
-      return next(new Error('INVALID_SENDER_STATE', 'Can not migrate to an existing account'));
+      return next(new Error('INVALID_RECEIVER_STATE', 'Can not migrate to an existing account'));
     }
 
     // Create new account

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
@@ -53,10 +54,9 @@ runner.use(
 );
 
 // Ensure sender/receiver/delegation exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', status: 'INVALID_DELEGATION', table: 'delegation' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
-runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', status: 'INVALID_DELEGATION' }));
 
 // Update delegation state
 runner.use(

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

@@ -24,7 +24,7 @@ const runner = new Runner();
 runner.use(pipes.VerifyMultiSig(0));
 runner.use(verifyAcquireParams('acquire-v2'));
 
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK' }));
@@ -43,7 +43,7 @@ runner.use(
 
 // Though tokens are verified on factory creating phase, we need them here to construct tokenSymbols
 runner.use(extractFactoryTokens);
-runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN' }));
+runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 
 // Verify itx
 runner.use(verifyMintLimit);
@@ -86,6 +86,7 @@ runner.use(
     // Sender updates
     const senderUpdates = {
       nonce: tx.nonce,
+      pk: tx.pk,
       ...applyTokenUpdates(factoryTokens, senderState, 'sub'),
     };
 

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

@@ -82,9 +82,9 @@ runner.use(
 );
 
 // 5. verify sender & signer & owner
-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.owner', to: 'ownerState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', 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' }));
 
 // 6. verify token state and balance
@@ -153,6 +153,7 @@ runner.use(
     });
 
     const isAlsoSigner = !!signerUpdates[senderState.address];
+    const owner = ownerState ? ownerState.address : itx.owner;
 
     // Factory updates
     const factoryUpdates = { numMinted: factoryState.numMinted + 1 };
@@ -163,44 +164,53 @@ runner.use(
       context.tokenUpdates = applyTokenUpdates(factoryTokens, { tokens: {} }, 'add');
     }
 
-    const [newSenderState, assetState, newSignerStates, newFactoryState, newAssetStates] = await Promise.all([
-      // Update sender state
-      statedb.account.update(
-        senderState.address,
-        account.update(
-          senderState,
-          Object.assign({ nonce: tx.nonce }, signerUpdates[senderState.address] || {}),
+    const [newSenderState, newReceiverState, assetState, newSignerStates, newFactoryState, newAssetStates] =
+      await Promise.all([
+        // Update sender state
+        statedb.account.update(
+          senderState.address,
+          account.update(
+            senderState,
+            Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+            context
+          ),
           context
         ),
-        context
-      ),
-
-      // Create asset
-      statedb.asset.create(
-        itx.address,
-        asset.create({ ...mintedAsset, owner: ownerState.address, address: mintedAddress }, context),
-        context
-      ),
-
-      // Update signer state
-      Promise.all(
-        signerStates
-          .filter((x) => x.address !== senderState.address)
-          .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
-      ),
-
-      // Update factory state
-      statedb.factory.update(factoryState.address, factory.update(factoryState, factoryUpdates, context), context),
-
-      // Mark asset as consumed
-      Promise.all(
-        assetStates.map((x) =>
-          statedb.asset.update(x.address, asset.update(x, { consumedTime: txTime }, context), context)
-        )
-      ),
-    ]);
+
+        // create receiver if not exist: asset owner
+        ownerState
+          ? Promise.resolve(ownerState)
+          : statedb.account.create(owner, account.create({ address: owner }, context), context),
+
+        // Create asset
+        statedb.asset.create(
+          itx.address,
+          asset.create({ ...mintedAsset, owner, address: mintedAddress }, context),
+          context
+        ),
+
+        // Update signer state
+        Promise.all(
+          signerStates
+            .filter((x) => x.address !== senderState.address)
+            .map((x) =>
+              statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context)
+            )
+        ),
+
+        // Update factory state
+        statedb.factory.update(factoryState.address, factory.update(factoryState, factoryUpdates, context), context),
+
+        // Mark asset as consumed
+        Promise.all(
+          assetStates.map((x) =>
+            statedb.asset.update(x.address, asset.update(x, { consumedTime: txTime }, context), context)
+          )
+        ),
+      ]);
 
     context.senderState = newSenderState;
+    context.receiverState = newReceiverState;
     context.signerStates = isAlsoSigner ? newSignerStates.concat(newSenderState) : newSignerStates;
     context.assetState = assetState;
     context.factoryState = newFactoryState;

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();
 
@@ -64,7 +67,7 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Check if parent is a factory
@@ -83,26 +86,36 @@ runner.use(
 );
 
 // Ensure parent exist
-runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'parentAsset', status: 'INVALID_ASSET' }));
+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, newVaultState] = await Promise.all([
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
+        context
+      ),
 
-    const [newSenderState, assetState] = await Promise.all([
-      // Update owner state
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, 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

@@ -17,17 +17,17 @@ runner.use(pipes.VerifyMultiSig(0));
 runner.use(verifyAcquireParams('mint'));
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Ensure factory exist
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
 
 // Used to assemble issuer object
-runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER' }));
+runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER', table: 'account' })); // prettier-ignore
 
 // Ensure factory owner exist and equal to sender
-runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'INVALID_OWNER' }));
+runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
 runner.use(
   pipes.VerifyInfo([
     {
@@ -72,20 +72,30 @@ runner.use(
       assetStates = [],
     } = context;
 
-    // account updates
-    const senderUpdates = { nonce: tx.nonce };
+    const owner = ownerState ? ownerState.address : itx.owner;
 
-    // Factory updates
+    const senderUpdates = { nonce: tx.nonce, pk: tx.pk };
     const factoryUpdates = { numMinted: factoryState.numMinted + 1 };
 
-    const [newSenderState, assetState, newFactoryState, newAssetStates] = await Promise.all([
+    const [newSenderState, newReceiverState, assetState, newFactoryState, newAssetStates] = await Promise.all([
+      // update sender
       statedb.account.update(senderState.address, account.update(senderState, senderUpdates, context), context),
+
+      // create receiver if not exist: asset owner
+      ownerState
+        ? Promise.resolve(ownerState)
+        : statedb.account.create(owner, account.create({ address: owner }, context), context),
+
+      // create asset
       statedb.asset.create(
         itx.address,
-        asset.create({ ...mintedAsset, owner: ownerState.address, address: mintedAddress }, context),
+        asset.create({ ...mintedAsset, owner, address: mintedAddress }, context),
         context
       ),
+
+      // update factory
       statedb.factory.update(factoryState.address, factory.update(factoryState, factoryUpdates, context), context),
+
       // mark input assets as consumed
       Promise.all(
         assetStates.map((x) =>
@@ -95,6 +105,7 @@ runner.use(
     ]);
 
     context.senderState = newSenderState;
+    context.receiverState = newReceiverState;
     context.assetState = assetState;
     context.factoryState = newFactoryState;
     context.assetStates = newAssetStates;

package/lib/protocols/asset/pipes/verify-itx-address.js

@@ -10,11 +10,12 @@ module.exports = (mode) => (context, next) => {
   if (mode === 'acquire-v2') {
     owner = delegatorState || senderState;
     issuer = itx.issuer;
+    context.assetOwner = owner;
   } else if (mode === 'acquire-v3') {
-    owner = ownerState;
+    owner = ownerState || { address: itx.owner };
     issuer = itx.issuer;
   } else if (mode === 'mint') {
-    owner = ownerState;
+    owner = ownerState || { address: itx.owner };
     issuer = {
       id: factoryOwnerState.address,
       pk: factoryOwnerState.pk,
@@ -33,7 +34,6 @@ module.exports = (mode) => (context, next) => {
     return next(new Error('INVALID_ASSET', 'Invalid itx.address: does not match with minted asset address'));
   }
 
-  context.assetOwner = owner;
   context.mintedAsset = minted.asset;
   context.mintedAddress = minted.address;
 

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`);
@@ -52,7 +53,11 @@ runner.use(
 
     const [newSenderState, newAssetState] = await Promise.all([
       // update owner state
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk }, context),
+        context
+      ),
 
       // update asset state
       statedb.asset.update(

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();
 
@@ -79,23 +80,15 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(
-  pipes.ExtractState({ from: 'tx.from', to: 'senderState', table: 'account', status: 'INVALID_SENDER_STATE' })
-);
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', table: 'account', status: 'INVALID_SENDER_STATE' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Ensure tokens exist if we are creating an factory that consume tokens
-runner.use(
-  pipes.ExtractState({ from: 'factoryTokens', to: 'tokenStates', table: 'token', status: 'INVALID_FACTORY_INPUT' })
-);
+runner.use(pipes.ExtractState({ from: 'factoryTokens', to: 'tokenStates', table: 'token', status: 'INVALID_FACTORY_INPUT' })); // prettier-ignore
 
 // ensure input.assets all exist on chain
-runner.use(
-  pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputAssetStates', table: 'asset', status: 'OK' })
-);
-runner.use(
-  pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputFactoryStates', table: 'factory', status: 'OK' })
-);
+runner.use(pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputAssetStates', table: 'asset', status: 'OK' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputFactoryStates', table: 'factory', status: 'OK' })); // prettier-ignore
 runner.use((context, next) => {
   const { inputAssetStates = [], inputFactoryStates = [], factoryProps } = context;
   if (inputAssetStates.some((x) => !!x.consumedTime)) {
@@ -109,26 +102,37 @@ 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 }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
+        context
+      ),
+
       // Create factory state
       statedb.factory.create(
         itx.address,
         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 });

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`);
@@ -122,7 +123,7 @@ runner.use(
         senderState.address,
         account.update(
           senderState,
-          Object.assign({ nonce: tx.nonce }, signerUpdates[senderState.address] || {}),
+          Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.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(),

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(),

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();
 
@@ -105,13 +106,20 @@ runner.use(
   ])
 );
 
+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 = { tokens: {} };
+    context.vaultUpdates = { tokens: {} };
+    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 });
 
@@ -56,7 +58,7 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Ensure token not exist
@@ -86,26 +88,34 @@ runner.use(async (context, next) => {
   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[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 }, 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
@@ -11,14 +12,14 @@ const debug = require('debug')(`${require('../../../package.json').name}:deposit
 
 const VerifySigners = require('../rollup/pipes/verify-signers');
 const VerifyPaused = require('../rollup/pipes/verify-paused');
-const { applyTokenUpdates, getTxFee, getRewardLocker } = require('../../util');
+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(),
@@ -138,15 +139,15 @@ runner.use((context, next) => {
   const { itx, rollupState, tokenState } = context;
   const { depositFeeRate, maxDepositFee, minDepositFee } = rollupState;
 
-  context.txFee = getTxFee({
+  const { reward } = getTxFee({
     amount: itx.token.value,
     feeRate: depositFeeRate,
     maxFee: maxDepositFee,
     minFee: minDepositFee,
   });
 
-  if (new BN(itx.actualFee).lt(new BN(context.txFee.reward))) {
-    const expected = fromUnitToToken(context.txFee.reward, tokenState.decimal);
+  if (new BN(itx.actualFee).lt(new BN(reward))) {
+    const expected = fromUnitToToken(reward, tokenState.decimal);
     const actual = fromUnitToToken(itx.actualFee, tokenState.decimal);
     return next(new Error('INVALID_TX', `itx.actualFee too low, expect at least ${expected}, got ${actual}`));
   }
@@ -155,28 +156,33 @@ runner.use((context, next) => {
 });
 
 // 7. verify sender and signer states
-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' }));
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
 // 8. update state: the token minting is done when deposit finalized in rollup-block
 runner.use(
   async (context, next) => {
-    const { tx, itx, txFee, statedb, senderState, stakeState, stakeAddress, lockerState, lockerAddress } = context;
+    const { tx, itx, statedb, senderState, stakeState, stakeAddress, lockerState, lockerAddress } = context;
 
-    const stakeUpdates = applyTokenUpdates([{ address: itx.token.address, value: txFee.total }], stakeState, 'sub');
-    const senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: txFee.user }], senderState, 'add');
+    const user = itx.token.value;
+    const fee = itx.actualFee;
+    const total = getBNSum(user, fee);
+
+    const stakeUpdates = applyTokenUpdates([{ address: itx.token.address, value: total }], stakeState, 'sub');
+    const senderUpdates = applyTokenUpdates([{ address: itx.token.address, value: user }], senderState || {}, 'add');
     const lockerUpdates = applyTokenUpdates(
-      [{ address: itx.token.address, value: txFee.reward }],
+      [{ address: itx.token.address, value: fee }],
       lockerState || { tokens: {} },
       'add'
     );
 
+    const sender = senderState ? senderState.address : tx.from;
     const [newSenderState, newStakeState, newLockerState, evidenceState] = await Promise.all([
-      // update user account
-      statedb.account.update(
-        senderState.address,
-        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+      // updateOrCreate user account
+      statedb.account.updateOrCreate(
+        senderState,
+        account.updateOrCreate(senderState, { address: sender, nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
         context
       ),
 
@@ -218,11 +224,11 @@ runner.use(
 
     context.updatedAccounts = [
       // stake for tx proposer is decreased
-      { address: stakeAddress, token: itx.token.address, delta: `-${txFee.total}`, action: 'unlock' },
+      { address: stakeAddress, token: itx.token.address, delta: `-${total}`, action: 'unlock' },
       // mint to depositor from stake
-      { address: senderState.address, token: itx.token.address, delta: txFee.user, action: 'unlock' },
-      // block reward is locked for later claiming
-      { address: lockerAddress, token: itx.token.address, delta: txFee.reward, action: 'pending' },
+      { address: sender, token: itx.token.address, delta: user, action: 'unlock' },
+      // tx fee is locked for later claiming
+      { address: lockerAddress, token: itx.token.address, delta: fee, action: 'pending' },
     ];
 
     debug('deposit-token-v2', itx);

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(''),
@@ -99,15 +100,15 @@ runner.use((context, next) => {
 
   const isFixedFee = new BN(itx.maxFee).isZero();
   if (isFixedFee) {
-    context.txFee = getTxFee({
+    const { reward } = getTxFee({
       amount: itx.token.value,
       feeRate: withdrawFeeRate,
       maxFee: maxWithdrawFee,
       minFee: minWithdrawFee,
     });
 
-    if (new BN(itx.actualFee).lt(new BN(context.txFee.reward))) {
-      const expected = fromUnitToToken(context.txFee.reward, tokenState.decimal);
+    if (new BN(itx.actualFee).lt(new BN(reward))) {
+      const expected = fromUnitToToken(reward, tokenState.decimal);
       const actual = fromUnitToToken(itx.actualFee, tokenState.decimal);
       return next(new Error('INVALID_TX', `itx.actualFee too low, expect at least ${expected}, got ${actual}`));
     }

package/lib/protocols/trade/exchange-v2.js

@@ -81,8 +81,8 @@ runner.use(pipes.VerifyListSize({ listKey: ['senderTokens', 'receiverTokens'] })
 
 // TODO: anti-replay-exchange-attack
 
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
 runner.use(pipes.ExtractSigner({ signerKey: 'signerStates', delegatorKey: 'delegatorStates' }));
 runner.use(
@@ -94,9 +94,9 @@ runner.use(
   })
 );
 
-runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN' }));
+runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 
-runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState', signerKey: 'signerStates' }));
 runner.use((context, next) => {
   context.senderTokenConditions = {
@@ -114,11 +114,11 @@ runner.use(pipes.VerifyTokenBalance({ ownerKey: 'receiverState', conditionKey: '
 
 runner.use(pipes.AntiLandAttack({ senderState: 'senderState', receiverState: 'receiverState' }));
 
-runner.use(pipes.ExtractState({ from: 'senderAssets', to: 'priv.senderAssets', status: 'INVALID_ASSET' }));
+runner.use(pipes.ExtractState({ from: 'senderAssets', to: 'priv.senderAssets', status: 'INVALID_ASSET', table: 'asset' })); // prettier-ignore
 runner.use(pipes.VerifyTransferrable({ assets: 'priv.senderAssets' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'priv.senderAssets', ownerKey: 'senderState' }));
 
-runner.use(pipes.ExtractState({ from: 'receiverAssets', to: 'priv.receiverAssets', status: 'INVALID_ASSET' }));
+runner.use(pipes.ExtractState({ from: 'receiverAssets', to: 'priv.receiverAssets', status: 'INVALID_ASSET', table: 'asset' })); // prettier-ignore
 runner.use(pipes.VerifyTransferrable({ assets: 'priv.receiverAssets' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'priv.receiverAssets', ownerKey: 'receiverState' }));
 

package/lib/protocols/trade/transfer-v2.js

@@ -62,10 +62,10 @@ runner.use((context, next) => {
   next();
 });
 
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
-runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN' }));
+runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 runner.use((context, next) => {
   context.tokenConditions = {
     owner: context.senderState.address,
@@ -75,24 +75,32 @@ runner.use((context, next) => {
 });
 runner.use(pipes.VerifyTokenBalance({ ownerKey: 'senderState', conditionKey: 'tokenConditions' }));
 
-runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK' }));
+runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
 
-runner.use(pipes.ExtractReceiver({ from: 'itx.to' }));
-runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractReceiver({ from: 'itx.to', to: 'receiver' }));
+runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'OK', table: 'account' }));
 runner.use(pipes.AntiLandAttack({ senderState: 'senderState', receiverState: 'receiverState' }));
 
-runner.use(pipes.ExtractState({ from: 'assets', to: 'assetStates', status: 'INVALID_ASSET' }));
+runner.use(pipes.ExtractState({ from: 'assets', to: 'assetStates', status: 'INVALID_ASSET', table: 'asset' }));
 runner.use(pipes.VerifyTransferrable({ assets: 'assetStates' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'assetStates', ownerKey: 'senderState' }));
 
-runner.use(pipes.UpdateOwner({ assets: 'assetStates', owner: 'receiverState' }));
+// transfer assets to new owner
+runner.use((context, next) => {
+  const { itx, receiverState } = context;
+  context.receiverAddr = receiverState ? receiverState.address : itx.to;
+  return next();
+});
+runner.use(pipes.UpdateOwner({ assets: 'assetStates', owner: 'receiverAddr' }));
+
+// update statedb: transfer tokens to new owner
 runner.use(
   async (context, next) => {
-    const { tx, itx, tokens, senderState, receiverState, statedb } = context;
+    const { tx, itx, tokens, senderState, receiverAddr, receiverState, statedb } = context;
 
     const { tokens: senderTokens = {} } = senderState;
-    const { tokens: receiverTokens = {} } = receiverState;
+    const { tokens: receiverTokens = {} } = receiverState || {};
     for (const token of tokens) {
       const delta = new BN(token.value);
       senderTokens[token.address] = new BN(senderTokens[token.address]).sub(delta).toString();
@@ -103,14 +111,14 @@ runner.use(
       // Update sender state
       statedb.account.update(
         senderState.address,
-        account.update(senderState, { nonce: tx.nonce, tokens: senderTokens }, context),
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, tokens: senderTokens }, context),
         context
       ),
 
       // Update receiver state
-      statedb.account.update(
-        receiverState.address,
-        account.update(receiverState, { tokens: receiverTokens }, context),
+      statedb.account.updateOrCreate(
+        receiverState,
+        account.updateOrCreate(receiverState, { address: receiverAddr, tokens: receiverTokens }, context),
         context
       ),
     ]);

package/lib/protocols/trade/transfer-v3.js

@@ -108,9 +108,9 @@ runner.use(
 runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 
 // 4. 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: 'receivers', to: 'receiverStates', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', 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: 'receivers', to: 'receiverStates', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
 // 5. verify token state and balance
@@ -140,7 +140,17 @@ runner.use(async (context, next) => {
 
 runner.use(
   async (context, next) => {
-    const { tx, inputs, outputs, senderState, signerStates, receiverStates, assetStates = [], statedb } = context;
+    const {
+      tx,
+      inputs,
+      outputs,
+      receivers,
+      senderState,
+      signerStates,
+      receiverStates = [],
+      assetStates = [],
+      statedb,
+    } = context;
 
     const signerUpdates = {};
     inputs.forEach((x) => {
@@ -157,7 +167,7 @@ runner.use(
       const { owner, tokensList } = x;
       receiverUpdates[owner] = applyTokenUpdates(
         tokensList,
-        receiverStates.find((s) => s.address === owner),
+        receiverStates.find((s) => s.address === owner) || {},
         'add'
       );
     });
@@ -175,7 +185,6 @@ runner.use(
 
     debug('transfer-v3', { signerUpdates, receiverUpdates, assetUpdates, isAlsoSigner, isAlsoReceiver });
 
-    // FIXME: skip statedb update if account not changed at all
     const [newSenderState, newSignerStates, newReceiverStates, newAssetStates] = await Promise.all([
       // Update sender state
       statedb.account.update(
@@ -183,7 +192,7 @@ runner.use(
         account.update(
           senderState,
           Object.assign(
-            { nonce: tx.nonce },
+            { nonce: tx.nonce, pk: tx.pk },
             signerUpdates[senderState.address] || {},
             receiverUpdates[senderState.address] || {}
           ),
@@ -199,13 +208,18 @@ runner.use(
           .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
       ),
 
-      // Update receiver state
+      // UpdateOrCreate receiver state
       Promise.all(
-        receiverStates
-          .filter((x) => x.address !== senderState.address)
-          .map((x) =>
-            statedb.account.update(x.address, account.update(x, receiverUpdates[x.address], context), context)
-          )
+        receivers
+          .filter((x) => x !== senderState.address)
+          .map((x) => {
+            const receiverState = receiverStates.find((s) => s.address === x);
+            return statedb.account.updateOrCreate(
+              receiverState,
+              account.updateOrCreate(receiverState, { ...receiverUpdates[x], address: x }, context),
+              context
+            );
+          })
       ),
 
       // Update asset state

package/lib/util.js

@@ -165,7 +165,7 @@ const splitTxFee = ({ total, shares = {}, stringify = true }) => {
 
 const getRewardLocker = (rollupAddress) => toStakeAddress(rollupAddress, rollupAddress);
 const getBNSum = (...args) => flattenDeep(args).reduce((sum, x) => sum.add(new BN(x)), new BN(0)).toString(10); // prettier-ignore
-const isFixedFee = (x) => new BN(x.tx.itxJson.maxFee).isZero();
+const isFixedFee = (x) => !x.tx.itxJson.maxFee || new BN(x.tx.itxJson.maxFee).isZero();
 
 const ensureBlockReward = (rollupState, minReward, txStates) => {
   const { address, withdrawFeeRate, minWithdrawFee, maxWithdrawFee, tokenAddress } = rollupState;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.62",
+  "version": "1.13.66",
   "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.62",
-    "@arcblock/did-util": "1.13.62",
-    "@ocap/asset": "1.13.62",
-    "@ocap/mcrypto": "1.13.62",
-    "@ocap/merkle-tree": "1.13.62",
-    "@ocap/message": "1.13.62",
-    "@ocap/state": "1.13.62",
-    "@ocap/tx-pipeline": "1.13.62",
-    "@ocap/util": "1.13.62",
-    "@ocap/wallet": "1.13.62",
+    "@arcblock/did": "1.13.66",
+    "@arcblock/did-util": "1.13.66",
+    "@ocap/asset": "1.13.66",
+    "@ocap/mcrypto": "1.13.66",
+    "@ocap/merkle-tree": "1.13.66",
+    "@ocap/message": "1.13.66",
+    "@ocap/state": "1.13.66",
+    "@ocap/tx-pipeline": "1.13.66",
+    "@ocap/util": "1.13.66",
+    "@ocap/validator": "1.13.66",
+    "@ocap/wallet": "1.13.66",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -41,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "a14f8d2ade8dc0c58fd9fbf331a4eb9b842de6ed"
+  "gitHead": "1395a8dccee398dd0aed47c2b54a2c6e350d8621"
 }