@ocap/tx-protocols 1.13.63 → 1.13.67

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();
 
@@ -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 });
 
@@ -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
@@ -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 }, 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
       ),
     ]);