@ocap/tx-protocols 1.19.15 → 1.19.17

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2019 ArcBlock
+Copyright 2018-2025 ArcBlock
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/execute.js

@@ -2,7 +2,6 @@
 const { promisify } = require('util');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
-const omit = require('lodash/omit');
 const camelCase = require('lodash/camelCase');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
@@ -132,49 +131,76 @@ module.exports = ({ filter, runAsLambda }) => {
     return async (context, protocols) => {
       let ctx = null;
       let error = null;
+      let runCount = 0;
+      const retryLimit = context.statedb?.config?.retryLimit || 0;
+      const shouldRetry = context.statedb?.config?.shouldRetry || (() => false);
+      const startTime = Date.now();
+
+      await runAsLambda(async (txn) => {
+        runCount += 1;
+
+        // create a new context each time in case we are retrying
+        ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra', 'logger']);
+        Object.defineProperty(ctx, 'txn', { value: txn });
+
+        try {
+          await execute(ctx, protocols, true);
+        } catch (err) {
+          if (runCount <= retryLimit && shouldRetry(err)) {
+            // throw the error to retry
+            throw err;
+          }
+          error = err;
+        }
 
-      try {
-        await runAsLambda((txn) => {
-          // create a new context each time in case we are retrying
-          ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra', 'logger']);
-          Object.defineProperty(ctx, 'txn', { value: txn });
-          return execute(ctx, protocols, true);
-        });
-      } catch (err) {
-        error = err;
-      } finally {
-        if (shouldPersistTx(error)) {
-          try {
-            let txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK');
-            flushEvents(ctx, { txState });
-            await runAsLambda(async (txn) => {
-              ctx = { ...omit(ctx, ['txn']), txn };
-              if (error) {
-                await ensureGasFeePaid(ctx);
-                // Recreate tx to pick up gas related fields
-                txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK');
-              }
-              await context.statedb.tx.create(txState.hash, txState, ctx);
-            });
-            flushEvents(ctx, { txState });
-            ctx?.logger?.info('Tx finalized', {
-              txHash: ctx.txHash,
-              txStatus: error ? error.code || 'INTERNAL' : 'OK',
-              txState,
-              error,
-            });
-          } catch (err) {
-            const txState = context.states.tx.create(ctx, error ? error.code || 'INTERNAL' : 'OK', false);
-            ctx?.logger?.error('Failed to save invalid transaction to statedb', {
-              error: err,
-              txHash: ctx.txHash,
-              txState,
-            });
+        if (error && !shouldPersistTx(error)) {
+          ctx.logger?.error('Failed to execute transaction', { error, txHash: ctx.txHash });
+          // throw the error to the abort transaction
+          throw error;
+        }
+
+        // create tx
+        const txStatus = error ? error.code || 'INTERNAL' : 'OK';
+        try {
+          let txState = context.states.tx.create(ctx, txStatus);
+          flushEvents(ctx, { txState });
+
+          if (error) {
+            await ensureGasFeePaid(ctx);
+            // Recreate tx to pick up gas related fields
+            txState = context.states.tx.create(ctx, txStatus);
           }
-        } else {
-          ctx?.logger?.error('Failed to execute transaction', { error, txHash: ctx.txHash });
+
+          await context.statedb.tx.create(txState.hash, txState, ctx);
+          flushEvents(ctx, { txState });
+
+          ctx.logger?.info('Tx finalized', {
+            txHash: ctx.txHash,
+            txStatus,
+            txState,
+            error,
+            runCount,
+            duration: Date.now() - startTime,
+          });
+        } catch (err) {
+          if (runCount <= retryLimit && shouldRetry(err)) {
+            // throw error to retry
+            throw err;
+          }
+
+          const txState = context.states.tx.create(ctx, txStatus, false);
+          ctx.logger?.error('Failed to save invalid transaction to statedb', {
+            error: err,
+            protocolError: error,
+            txHash: ctx.txHash,
+            txState,
+            duration: Date.now() - startTime,
+          });
+
+          // throw error to abort transaction
+          throw err;
         }
-      }
+      });
 
       if (error) {
         throw error;

package/lib/pipes/ensure-cost.js

@@ -1,6 +1,6 @@
 const noop = require('lodash/noop');
 const { CustomError: Error } = require('@ocap/util/lib/error');
-const { fromTokenToUnit, BN, fromUnitToToken } = require('@ocap/util');
+const { fromTokenToUnit, BN, fromUnitToToken, hexToNumber } = require('@ocap/util');
 const JWT = require('@arcblock/jwt');
 const { account } = require('@ocap/state');
 const { toAddress } = require('@arcblock/did');
@@ -71,6 +71,17 @@ module.exports = function CreateEnsureTxCostPipe({
       context.gasVaultChange = changes.gas;
     }
 
+    // pick fee vault
+    if (changes.fee) {
+      if (config.vaults.txFees?.length) {
+        const feeIndex = hexToNumber(txHash.slice(-8)) % config.vaults.txFees.length;
+        const feeVault = config.vaults.txFees[feeIndex];
+        context.feeVault = feeVault;
+      } else {
+        context.feeVault = config.vaults.txFee;
+      }
+    }
+
     let isCostCharged = false;
     if (senderState && txCost.gt(ZERO)) {
       const expected = new BN(gasEstimate.payment || 0).add(txCost);
@@ -96,8 +107,8 @@ module.exports = function CreateEnsureTxCostPipe({
         // to be called in later pipes
         context.updateVaults = async function updateVaults() {
           const [feeVaultState, gasVaultState] = await Promise.all([
-            statedb.account.get(config.vaults.txFee, context),
-            statedb.account.get(gasVault, context),
+            changes.fee ? statedb.account.get(context.feeVault, context) : null,
+            changes.gas ? statedb.account.get(gasVault, context) : null,
           ]);
 
           const [newFeeVaultState, newGasVaultState] = await Promise.all([
@@ -107,18 +118,18 @@ module.exports = function CreateEnsureTxCostPipe({
                   account.update(feeVaultState, applyTokenUpdates([changes.fee], feeVaultState, 'add'), context),
                   context
                 )
-              : Promise.resolve(feeVaultState),
+              : null,
             changes.gas
               ? statedb.account.update(
                   gasVaultState.address,
                   account.update(gasVaultState, applyTokenUpdates([changes.gas], gasVaultState, 'add'), context),
                   context
                 )
-              : Promise.resolve(gasVaultState),
+              : null,
           ]);
 
-          context.feeVaultState = newFeeVaultState;
-          context.gasVaultState = newGasVaultState;
+          if (newFeeVaultState) context.feeVaultState = newFeeVaultState;
+          if (newGasVaultState) context.gasVaultState = newGasVaultState;
 
           context.updatedAccounts = context.updatedAccounts || [];
           if (changes.fee) {

package/lib/pipes/ensure-gas.js

@@ -27,8 +27,8 @@ module.exports = function CreateGasEnsureFn(estimateTxGas) {
 
     // gas receiver address
     const { txGas: gasVaults } = config.vaults;
-    const index = hexToNumber(txHash.slice(txHash.length - 4)) % gasVaults.length;
-    const gasVault = gasVaults[index];
+    const gasIndex = hexToNumber(txHash.slice(-8)) % gasVaults.length;
+    const gasVault = gasVaults[gasIndex];
     context.gasVault = gasVault;
 
     debug({

package/lib/protocols/account/delegate.js

@@ -21,25 +21,31 @@ runner.use(pipes.VerifyMultiSig(0));
 
 const rateLimit = Joi.object({
   interval: Joi.number().integer().greater(0).required(),
-  anchor: Joi.number().integer().min(0).optional().default(0),
+  anchor: Joi.number().integer().min(0).optional().allow(null).default(0),
 });
 
 const tokenLimit = Joi.object({
   address: Joi.DID().prefix().role('ROLE_TOKEN').required(),
-  toList: Joi.array().items(Joi.DID().prefix()).max(32).unique().optional().default([]),
-  txCount: Joi.number().integer().min(0).empty('').optional().default(0),
-  txAllowance: Joi.BN().optional().default('0'),
-  totalAllowance: Joi.BN().optional().default('0'),
-  validUntil: Joi.number().integer().min(0).empty('').optional().default(0),
-  rate: rateLimit.optional(),
+  toList: Joi.array().items(Joi.DID().prefix()).max(32).unique().optional().allow(null).default([]),
+  txCount: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  txAllowance: Joi.BN().optional().allow(null).default('0'),
+  totalAllowance: Joi.BN().optional().allow(null).default('0'),
+  validUntil: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  rate: rateLimit.optional().allow(null),
 });
 
 const assetLimit = Joi.object({
-  address: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).unique().max(1024).optional().default([]),
-  toList: Joi.array().items(Joi.DID().prefix()).unique().max(32).optional().default([]),
-  txCount: Joi.number().integer().min(0).empty('').optional().default(0),
-  validUntil: Joi.number().integer().min(0).empty('').optional().default(0),
-  rate: rateLimit.optional(),
+  address: Joi.array()
+    .items(Joi.DID().prefix().role('ROLE_ASSET'))
+    .unique()
+    .max(1024)
+    .optional()
+    .allow(null)
+    .default([]),
+  toList: Joi.array().items(Joi.DID().prefix()).unique().max(32).optional().allow(null).default([]),
+  txCount: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  validUntil: Joi.number().integer().min(0).empty('').optional().allow(null).default(0),
+  rate: rateLimit.optional().allow(null),
 });
 
 // verify itx
@@ -58,13 +64,14 @@ const schema = Joi.object({
           assetsList: Joi.array().items(assetLimit).max(32),
         })
           .optional()
+          .allow(null)
           .default({ tokensList: [], assetsList: [] }),
       })
     )
     .unique((a, b) => a.typeUrl === b.typeUrl)
     .min(1)
     .required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { error, value } = schema.validate(context.itx);

package/lib/protocols/account/migrate.js

@@ -24,7 +24,7 @@ runner.use(pipes.VerifyMultiSig(0));
 const schema = Joi.object({
   address: Joi.DID().prefix().required(),
   pk: Joi.any().required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_DELEGATION').required(),
   to: Joi.DID().prefix().required(),
   typeUrlsList: Joi.array().items(Joi.string().required()).min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -32,9 +32,9 @@ const schema = Joi.object({
   factory: Joi.DID().prefix().role('ROLE_FACTORY').required(),
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
-  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().allow(null).default([]),
   issuer: schemas.nftIssuer.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -35,9 +35,9 @@ const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
   inputsList: schemas.multiInput.min(1).required(),
   owner: schemas.tokenHolder.required(),
-  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().allow(null).default([]),
   issuer: schemas.nftIssuer.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/asset/consume.js

@@ -14,7 +14,7 @@ const runner = new Runner();
 // Verify itx
 const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { itx } = context;

package/lib/protocols/asset/mint.js

@@ -24,9 +24,9 @@ const schema = Joi.object({
   factory: Joi.DID().prefix().role('ROLE_FACTORY').required(),
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
-  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().allow(null).default([]),
   owner: schemas.tokenHolder.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/asset/pipes/exec-mint-hook.js

@@ -34,6 +34,7 @@ module.exports = async (context, next) => {
           txn: context.txn,
           txTime: context.txTime,
           txHash: context.txHash,
+          logger: context.logger,
           args: x.args,
         });
 

package/lib/protocols/asset/update.js

@@ -19,9 +19,9 @@ runner.use(pipes.VerifyMultiSig(0));
 // Verify itx
 const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
-  moniker: Joi.string().min(2).max(255).optional().allow(''),
-  consumed: Joi.boolean().optional().default(false),
-  data: Joi.any().optional(),
+  moniker: Joi.string().min(2).max(255).optional().allow(null).allow(''),
+  consumed: Joi.boolean().optional().allow(null).default(false),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { itx } = context;

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   evidence: Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_STAKE').required(),
   message: Joi.string().trim().min(1).max(256).required(),
   outputsList: schemas.multiInput.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -21,7 +21,7 @@ runner.use(pipes.VerifyMultiSig(0));
 const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_STAKE').required(),
   outputsList: schemas.multiInput.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -22,7 +22,7 @@ const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_STAKE').required(),
   message: Joi.string().trim().min(1).max(256).required(),
   outputsList: schemas.multiInput.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/governance/stake.js

@@ -29,8 +29,8 @@ const schema = Joi.object({
   inputsList: schemas.multiInput.min(1).required(),
   message: Joi.string().trim().min(1).max(256).required(),
   revokeWaitingPeriod: Joi.number().integer().min(0).default(0),
-  data: Joi.any().optional(),
-  nonce: Joi.string().trim().min(1).max(256).allow('').optional(),
+  data: Joi.any().optional().allow(null),
+  nonce: Joi.string().trim().min(1).max(256).allow('').optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -29,7 +29,7 @@ const schema = Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
   publisher: Joi.DID().prefix().wallet('ethereum').required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use((context, next) => {
   const { tx, itx } = context;

package/lib/protocols/rollup/close.js

@@ -20,7 +20,7 @@ const schema = Joi.object({
     address: Joi.DID().prefix().wallet('ethereum').required(),
     value: Joi.BN().positive().required(),
   }),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -30,7 +30,7 @@ const schema = Joi.object({
   merkleRoot: Joi.string().regex(patterns.txHash).required(),
   previousHash: Joi.string().when('height', {
     is: 1,
-    then: Joi.string().optional().allow(''),
+    then: Joi.string().optional().allow(null).allow(''),
     otherwise: Joi.string().regex(patterns.txHash).required(),
   }),
   txsHash: Joi.string().regex(patterns.txHash).required(),
@@ -40,7 +40,7 @@ const schema = Joi.object({
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   minReward: Joi.BN().min(0).required(),
   governance: Joi.boolean().default(false),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 runner.use((context, next) => {

package/lib/protocols/rollup/join.js

@@ -30,7 +30,7 @@ const schema = Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
   signaturesList: schemas.multiSig.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/leave.js

@@ -25,7 +25,7 @@ const schema = Joi.object({
     hash: Joi.string().regex(patterns.txHash).required(),
   }).required(),
   signaturesList: schemas.multiSig.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/migrate.js

@@ -17,7 +17,7 @@ const schema = Joi.object({
   to: Joi.DID().prefix().wallet('ethereum').required(),
   type: Joi.string().trim().valid('vault', 'contract').required(),
   message: Joi.string().trim().min(1).max(512).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/pause.js

@@ -14,7 +14,7 @@ const runner = new Runner();
 // 1. verify itx
 const schema = Joi.object({
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/resume.js

@@ -14,7 +14,7 @@ const runner = new Runner();
 // 1. verify itx
 const schema = Joi.object({
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/rollup/update.js

@@ -45,7 +45,7 @@ const schema = Joi.object({
   minWithdrawFee: Joi.BN().positive().required(),
   maxWithdrawFee: Joi.BN().greater(Joi.ref('minWithdrawFee')).required(),
 
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/lib/protocols/token/create.js

@@ -27,11 +27,11 @@ const schema = Joi.object({
   symbol: Joi.string().min(2).max(6).uppercase().required(),
   unit: Joi.string().min(1).max(6).lowercase().required(),
   decimal: Joi.number().min(6).max(18).required(),
-  icon: Joi.string().optional().valid(''),
+  icon: Joi.string().optional().allow(null).valid(''),
   totalSupply: Joi.BN().greater(0).max(MAX_TOTAL_SUPPLY).required(),
   initialSupply: Joi.BN().greater(0).max(Joi.ref('totalSupply')).required(),
-  foreignToken: schemas.foreignToken.optional().default(null),
-  data: Joi.any().optional(),
+  foreignToken: schemas.foreignToken.optional().allow(null).default(null),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 // 1. verify itx

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

@@ -26,7 +26,7 @@ const schema = Joi.object({
   }).required(),
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   actualFee: Joi.BN().min(0).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 const runner = new Runner();

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

@@ -22,10 +22,10 @@ const schema = Joi.object({
   token: schemas.tokenInput.required(),
   to: Joi.DID().prefix().wallet('ethereum').required(),
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
-  proposer: Joi.DID().prefix().wallet('ethereum').optional().allow('').default(''),
+  proposer: Joi.DID().prefix().wallet('ethereum').optional().allow(null).allow('').default(''),
   actualFee: Joi.BN().min(0).required(),
   maxFee: Joi.BN().min(0).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 
 const runner = new Runner();

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

@@ -19,7 +19,7 @@ const runner = new Runner();
 
 // 0. verify itx
 const exchangeInfoSchema = Joi.object({
-  value: Joi.any().optional(),
+  value: Joi.any().optional().allow(null),
   tokensList: Joi.array().items(schemas.tokenInput).default([]),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
 });
@@ -27,7 +27,7 @@ const schema = Joi.object({
   to: schemas.tokenHolder.required(),
   sender: exchangeInfoSchema.required(),
   receiver: exchangeInfoSchema.required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

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

@@ -6,9 +6,7 @@ const { Joi, schemas } = require('@arcblock/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, delegation } = require('@ocap/state');
-
-// eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../../package.json').name}:transfer-v2`);
+const { toStakeAddress } = require('@arcblock/did-util');
 
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -21,10 +19,10 @@ runner.use(pipes.VerifyMultiSig(0));
 // 1. verify itx
 const schema = Joi.object({
   to: schemas.tokenHolder.required(),
-  value: Joi.any().optional(),
+  value: Joi.any().optional().allow(null),
   tokensList: Joi.array().items(schemas.tokenInput).default([]),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);
@@ -82,7 +80,38 @@ runner.use((context, next) => {
   next();
 });
 
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const result = { create: 0, update: 2, payment: 0 };
+    result.update += context.assetStates?.length || 0;
+
+    if (context.receiverState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+
+    return result;
+  })
+);
+
+// Pre-query states to cache them for later use
+runner.use(async (context, next) => {
+  const { statedb, tx, gasVault } = context;
+  const accounts = [tx.from, context.receiver, gasVault].filter(Boolean);
+
+  await Promise.all([
+    ...accounts.map((x) => statedb.account.get(x, context)),
+    statedb.stake.get(toStakeAddress(tx.from, tx.from), context),
+  ]);
+
+  next();
+});
+
+runner.use(
+  pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })
+);
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
@@ -119,21 +148,6 @@ runner.use(pipes.VerifyTransferrable({ assets: 'assetStates' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'assetStates', ownerKey: 'senderState' }));
 
 // Ensure tx fee and gas
-runner.use(
-  EnsureTxGas((context) => {
-    // FIXME: payment check
-    const result = { create: 0, update: 2, payment: 0 };
-    result.update += context.assetStates?.length || 0;
-
-    if (context.receiverState) {
-      result.update += 1;
-    } else {
-      result.create += 1;
-    }
-
-    return result;
-  })
-);
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // transfer assets to new owner
@@ -152,7 +166,6 @@ runner.use(
   async (context, next) => {
     const {
       tx,
-      itx,
       tokens,
       senderState,
       receiverAddr,
@@ -196,13 +209,11 @@ runner.use(
         : delegationState,
     ]);
 
-    await updateVaults();
-
     context.senderState = newSenderState;
     context.receiverState = newReceiverState;
     context.delegationState = newDelegationState;
 
-    debug('transfer-v2', { from: tx.from, to: itx.to, tokens });
+    await updateVaults();
 
     next();
   },

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

@@ -25,7 +25,7 @@ const verifyAssetOwner = promisify(pipes.VerifyUpdater({ assetKey: 'assets', own
 const schema = Joi.object({
   inputsList: schemas.multiInput.min(1).required(),
   outputsList: schemas.multiInput.min(1).required(),
-  data: Joi.any().optional(),
+  data: Joi.any().optional().allow(null),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
   const { error } = schema.validate(itx);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.15",
+  "version": "1.19.17",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.19.15",
-    "@arcblock/did-util": "1.19.15",
-    "@arcblock/jwt": "1.19.15",
-    "@arcblock/validator": "1.19.15",
-    "@ocap/asset": "1.19.15",
-    "@ocap/mcrypto": "1.19.15",
-    "@ocap/merkle-tree": "1.19.15",
-    "@ocap/message": "1.19.15",
-    "@ocap/state": "1.19.15",
-    "@ocap/tx-pipeline": "1.19.15",
-    "@ocap/util": "1.19.15",
-    "@ocap/wallet": "1.19.15",
+    "@arcblock/did": "1.19.17",
+    "@arcblock/did-util": "1.19.17",
+    "@arcblock/jwt": "1.19.17",
+    "@arcblock/validator": "1.19.17",
+    "@ocap/asset": "1.19.17",
+    "@ocap/mcrypto": "1.19.17",
+    "@ocap/merkle-tree": "1.19.17",
+    "@ocap/message": "1.19.17",
+    "@ocap/state": "1.19.17",
+    "@ocap/tx-pipeline": "1.19.17",
+    "@ocap/util": "1.19.17",
+    "@ocap/wallet": "1.19.17",
     "debug": "^4.3.6",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "ab6cd19ab8633c815ab0235b7ab5d80fc071de15"
+  "gitHead": "d25d8b52053b0e3254a28c3b44ea5e447ce1c08a"
 }