@ocap/tx-protocols 1.18.95 → 1.18.97

package/lib/protocols/account/delegate.js

@@ -1,11 +1,13 @@
 /* eslint-disable max-len */
 const get = require('lodash/get');
+const cloneDeep = require('lodash/cloneDeep');
+const pick = require('lodash/pick');
 const { Joi } = require('@arcblock/validator');
 const { CustomError: Error } = require('@ocap/util/lib/error');
-const { getListField } = require('@ocap/util/lib/get-list-field');
 const { delegation, account } = require('@ocap/state');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { toDelegateAddress } = require('@arcblock/did-util');
+const { formatMessage } = require('@ocap/message');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:delegate`);
@@ -17,6 +19,29 @@ const runner = new Runner();
 
 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),
+});
+
+const tokenLimit = Joi.object({
+  address: Joi.DID().role('ROLE_TOKEN').required(),
+  toList: Joi.array().items(Joi.DID()).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(),
+});
+
+const assetLimit = Joi.object({
+  address: Joi.array().items(Joi.DID().role('ROLE_ASSET')).unique().max(1024).optional().default([]),
+  toList: Joi.array().items(Joi.DID()).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(),
+});
+
 // verify itx
 const schema = Joi.object({
   address: Joi.DID().prefix().role('ROLE_DELEGATION').required(),
@@ -25,28 +50,33 @@ const schema = Joi.object({
     .items(
       Joi.object({
         typeUrl: Joi.string().required(),
+        limit: Joi.object({
+          tokensList: Joi.array()
+            .items(tokenLimit)
+            .unique((a, b) => a.address === b.address)
+            .max(32),
+          assetsList: Joi.array().items(assetLimit).max(32),
+        })
+          .optional()
+          .default({ tokensList: [], assetsList: [] }),
       })
     )
+    .unique((a, b) => a.typeUrl === b.typeUrl)
     .min(1)
     .required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
-runner.use(({ itx }, next) => {
-  const { error } = schema.validate(itx);
+runner.use((context, next) => {
+  const { error, value } = schema.validate(context.itx);
   if (error) {
     return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
   }
+  context.formattedItx = formatMessage('DelegateTx', context.itx);
+  context.validatedItx = value;
   return next();
 });
 runner.use(
   pipes.VerifyInfo([
-    {
-      error: 'OK',
-      fn: (context) => {
-        context.ops = getListField(context, 'itx.ops');
-        return true;
-      },
-    },
     {
       error: 'INVALID_TX',
       message: 'Delegation address does not match',
@@ -55,10 +85,9 @@ runner.use(
     {
       error: 'INVALID_DELEGATION_TYPE_URL',
       message: 'Delegation type url is not allowed',
-      fn: ({ ops, config }) => {
+      fn: ({ formattedItx, config }) => {
         const allowed = get(config, 'transaction.delegate.typeUrls', []);
-        // TODO: support rule simulating and checking here
-        return ops.every((op) => allowed.includes(op.typeUrl));
+        return formattedItx.ops.every((op) => allowed.includes(op.typeUrl));
       },
     },
   ])
@@ -98,15 +127,40 @@ runner.use(EnsureTxCost({ attachSenderChanges: true }));
 // Create delegation state
 runner.use(
   async (context, next) => {
-    const { tx, itx, ops, statedb, senderState, receiverState, delegationState, senderUpdates, updateVaults } = context;
-
-    const opsObj = ops.reduce(
-      (acc, x) => {
+    const {
+      tx,
+      itx,
+      formattedItx,
+      validatedItx,
+      statedb,
+      senderState,
+      receiverState,
+      delegationState,
+      senderUpdates,
+      updateVaults,
+    } = context;
+
+    const merged = cloneDeep(formattedItx.ops).reduce(
+      (acc, x, i) => {
         acc[x.typeUrl] = {
-          balance: 0,
-          numTxs: 0,
-          // TODO: 可以考虑结合现有的 DSL 去实现
-          rule: true,
+          // This performs a reset of the limit
+          limit: {
+            tokens: (x.limit?.tokens || []).map((y, j) => {
+              const input = validatedItx.opsList[i].limit.tokensList[j];
+              return Object.assign(y, pick(input, ['txCount', 'txAllowance', 'totalAllowance', 'validUntil', 'rate']), {
+                txSent: 0,
+                lastTx: y.rate ? y.rate.anchor : 0,
+                spentAllowance: '0',
+              });
+            }),
+            assets: (x.limit?.assets || []).map((y, j) => {
+              const input = validatedItx.opsList[i].limit.assetsList[j];
+              return Object.assign(y, pick(input, ['txCount', 'validUntil', 'rate']), {
+                txSent: 0,
+                lastTx: y.rate ? y.rate.anchor : 0,
+              });
+            }),
+          },
         };
         return acc;
       },
@@ -129,10 +183,9 @@ runner.use(
         ? 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),
+        ? statedb.delegation.update(itx.address, delegation.update(delegationState, { ...itx, ops: merged }, context), context) // prettier-ignore
+        : statedb.delegation.create(itx.address, delegation.create({ ...itx, from: tx.from, ops: merged }, context), context), // prettier-ignore
 
       updateVaults(),
     ]);

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

@@ -50,7 +50,6 @@ runner.use(
       message: 'Delegation type url is not allowed',
       fn: ({ typeUrls, config }) => {
         const allowed = get(config, 'transaction.delegate.typeUrls', []);
-        // TODO: support rule simulating and checking here
         return typeUrls.every((x) => allowed.includes(x));
       },
     },

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

@@ -1,7 +1,7 @@
 /* eslint-disable function-paren-newline */
 const { promisify } = require('util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, factory } = require('@ocap/state');
+const { account, asset, factory, delegation } = require('@ocap/state');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Joi, schemas } = require('@arcblock/validator');
 
@@ -61,9 +61,16 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INV
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK' }));
-runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
-
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
+runner.use(
+  pipes.VerifyDelegation({
+    type: 'signature',
+    signerKey: 'senderState',
+    delegatorKey: 'delegatorState',
+    getRequirements: (context) => context.factoryState.input.tokens.map((x) => ({ type: 'token', ...x })),
+  })
+);
+
 runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER_STATE' , table: 'account'})); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'factoryState.trustedIssuers', to: 'issuerStates', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'itx.issuer.id', to: 'issuerState', status: 'INVALID_ISSUER_STATE', table: 'account' })); // prettier-ignore
@@ -124,7 +131,7 @@ runner.use(verifyItxAssets);
 runner.use(
   EnsureTxGas((context) => {
     // FIXME: payment check
-    const result = { create: 1, update: 2, payment: 0 };
+    const result = { create: 1, update: 3, payment: 0 };
     if (context.assetStates) {
       result.update += context.assetStates.length;
     }
@@ -148,6 +155,7 @@ runner.use(
       assetOwner,
       factoryState,
       factoryTokens,
+      delegationState,
       mintedAsset,
       mintedAddress,
       senderChange,
@@ -177,7 +185,7 @@ runner.use(
       context.tokenUpdates = applyTokenUpdates(factoryTokens, { tokens: {} }, 'add');
     }
 
-    const [newSenderState, assetState, newFactoryState, newAssetStates] = await Promise.all([
+    const [newSenderState, assetState, newFactoryState, newAssetStates, newDelegationState] = await Promise.all([
       // Update sender state
       statedb.account.update(senderState.address, account.update(senderState, senderUpdates, context), context),
 
@@ -198,6 +206,11 @@ runner.use(
         )
       ),
 
+      // Update delegation state
+      context.isDelegationChanged
+        ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
+        : delegationState,
+
       // Update delegator state
       context.delegatorState
         ? statedb.account.update(assetOwner.address, account.update(assetOwner, ownerUpdates, context), context)
@@ -210,6 +223,7 @@ runner.use(
     context.assetState = assetState;
     context.factoryState = newFactoryState;
     context.assetStates = newAssetStates;
+    context.delegationState = newDelegationState;
 
     debug('acquire-v2', assetState);
 

package/lib/protocols/asset/create.js

@@ -2,14 +2,14 @@
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const cloneDeep = require('lodash/cloneDeep');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset } = require('@ocap/state');
+const { account, asset, delegation } = require('@ocap/state');
 const { formatMessage } = require('@ocap/message');
 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 { decodeAnySafe, getDelegationRequirements } = require('../../util');
 
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -71,14 +71,21 @@ runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: '
 // Ensure delegation
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'delegatorState', addressKey: 'tx.delegator' }));
-runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+runner.use(
+  pipes.VerifyDelegation({
+    type: 'signature',
+    signerKey: 'senderState',
+    delegatorKey: 'delegatorState',
+    getRequirements: getDelegationRequirements,
+  })
+);
 
 // Check if parent is a factory
 runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'factoryState', status: 'OK', table: 'factory' }));
 runner.use(
   pipes.VerifyInfo([
     // For security consideration, user can not create fake assets from a factory
-    // https://github.com/ArcBlock/asset-chain/issues/97
+    // https://github.com/ArcBlock/blockchain/issues/97
     {
       error: 'CREATE_FROM_FACTORY',
       message: 'You can only get asset from factory from acquire or mint',
@@ -92,16 +99,17 @@ runner.use(
 runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'parentAsset', status: 'INVALID_ASSET', table: 'asset' }));
 
 // Ensure tx fee and gas
-runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));
+runner.use(EnsureTxGas(() => ({ create: 1, update: 2, payment: 0 })));
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // Update asset state
 runner.use(
   async (context, next) => {
-    const { tx, itx, assetData, statedb, senderState, delegatorState, senderUpdates, updateVaults } = context;
+    const { tx, itx, assetData, statedb, senderState, delegatorState, delegationState, senderUpdates, updateVaults } =
+      context;
     const owner = delegatorState ? delegatorState.address : senderState.address;
 
-    const [newSenderState, assetState] = await Promise.all([
+    const [newSenderState, assetState, newDelegationState] = await Promise.all([
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
@@ -115,10 +123,16 @@ runner.use(
       ),
 
       updateVaults(),
+
+      // Update delegation state
+      context.isDelegationChanged
+        ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
+        : delegationState,
     ]);
 
     context.senderState = newSenderState;
     context.assetState = assetState;
+    context.delegationState = newDelegationState;
 
     debug('createAsset', assetState);
 

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

@@ -16,7 +16,7 @@ module.exports = (context, next) => {
     return next(new Error('INVALID_ASSET', 'Input asset does not exist on chain'));
   }
 
-  // https://github.com/ArcBlock/asset-chain/issues/96
+  // https://github.com/ArcBlock/blockchain/issues/96
   // If factory.input.assets are all factory
   if (expectedFactoryStates.length === expectedAssets.length) {
     // Just ensure that input assets are minted from any of the factory

package/lib/protocols/factory/create.js

@@ -7,13 +7,13 @@ const { isValidFactory } = require('@ocap/asset');
 const { formatMessage } = require('@ocap/message');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { BN } = require('@ocap/util');
-const { account, factory } = require('@ocap/state');
+const { account, factory, delegation } = require('@ocap/state');
 const { toFactoryAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-factory`);
 
-const { decodeAnySafe } = require('../../util');
+const { decodeAnySafe, getDelegationRequirements } = require('../../util');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
@@ -87,7 +87,14 @@ runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: '
 // Ensure delegation
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'delegatorState', addressKey: 'tx.delegator' }));
-runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+runner.use(
+  pipes.VerifyDelegation({
+    type: 'signature',
+    signerKey: 'senderState',
+    delegatorKey: 'delegatorState',
+    getRequirements: getDelegationRequirements,
+  })
+);
 
 // 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' })); // prettier-ignore
@@ -113,17 +120,27 @@ runner.use(pipes.ExtractState({ from: 'factoryProps.trustedIssuers', to: 'issuer
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'issuerStates', addressKey: 'factoryProps.trustedIssuers' }));
 
 // Ensure tx fee and gas
-runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));
+runner.use(EnsureTxGas(() => ({ create: 1, update: 2, payment: 0 })));
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // Create factory state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, factoryProps, updateVaults } = context;
+    const {
+      tx,
+      itx,
+      statedb,
+      senderState,
+      delegatorState,
+      delegationState,
+      senderUpdates,
+      factoryProps,
+      updateVaults,
+    } = context;
     const tokens = { [context.config.token.address]: '0' };
     const owner = delegatorState ? delegatorState.address : senderState.address;
 
-    const [newSenderState, factoryState] = await Promise.all([
+    const [newSenderState, factoryState, newDelegationState] = await Promise.all([
       // Update owner state
       statedb.account.update(
         senderState.address,
@@ -134,11 +151,17 @@ runner.use(
       // Create factory state
       statedb.factory.create(itx.address, factory.create({ ...factoryProps, tokens, owner }, context), context),
 
+      // Update delegation state
+      context.isDelegationChanged
+        ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
+        : delegationState,
+
       updateVaults(),
     ]);
 
     context.senderState = newSenderState;
     context.factoryState = factoryState;
+    context.delegationState = newDelegationState;
 
     debug('createFactory', factoryState);
 

package/lib/protocols/rollup/create.js

@@ -3,7 +3,7 @@ const isEmpty = require('empty-value');
 const cloneDeep = require('lodash/cloneDeep');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, rollup } = require('@ocap/state');
+const { account, rollup, delegation } = require('@ocap/state');
 const { formatMessage } = require('@ocap/message');
 const { isFromPublicKey, isEthereumDid } = require('@arcblock/did');
 const { toRollupAddress } = require('@arcblock/did-util');
@@ -11,7 +11,7 @@ const { toRollupAddress } = require('@arcblock/did-util');
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:create-rollup`);
 
-const { decodeAnySafe } = require('../../util');
+const { decodeAnySafe, getDelegationRequirements } = require('../../util');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
@@ -73,7 +73,14 @@ runner.use(pipes.ExtractState({ from: 'seedValidators', to: 'validatorStates', s
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'validatorStates', stateKey: 'senderState', addressKey: 'tx.from' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'delegatorState', addressKey: 'tx.delegator' }));
-runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+runner.use(
+  pipes.VerifyDelegation({
+    type: 'signature',
+    signerKey: 'senderState',
+    delegatorKey: 'delegatorState',
+    getRequirements: getDelegationRequirements,
+  })
+);
 
 // 2. ensure token exist and match
 runner.use(pipes.ExtractState({ from: 'itx.tokenAddress', to: 'tokenState', status: 'INVALID_TOKEN', table: 'token' }));
@@ -111,16 +118,26 @@ runner.use(
 );
 
 // Ensure tx fee and gas
-runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));
+runner.use(EnsureTxGas(() => ({ create: 1, update: 2, payment: 0 })));
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // 5. create rollup state
 runner.use(
   async (context, next) => {
-    const { tx, formattedItx, rollupData, statedb, senderState, delegatorState, senderUpdates, updateVaults } = context;
+    const {
+      tx,
+      formattedItx,
+      rollupData,
+      statedb,
+      senderState,
+      delegatorState,
+      delegationState,
+      senderUpdates,
+      updateVaults,
+    } = context;
 
     const issuer = delegatorState ? delegatorState.address : senderState.address;
-    const [newSenderState, rollupState] = await Promise.all([
+    const [newSenderState, rollupState, newDelegationState] = await Promise.all([
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
@@ -141,6 +158,11 @@ runner.use(
         context
       ),
 
+      // Update delegation state
+      context.isDelegationChanged
+        ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
+        : delegationState,
+
       updateVaults(),
     ]);
 
@@ -149,6 +171,7 @@ runner.use(
 
     context.senderState = newSenderState;
     context.rollupState = rollupState;
+    context.delegationState = newDelegationState;
 
     debug('create-rollup', rollupState);
 

package/lib/protocols/token/create.js

@@ -3,13 +3,13 @@ const cloneDeep = require('lodash/cloneDeep');
 const { Joi, schemas } = require('@arcblock/validator');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, token } = require('@ocap/state');
+const { account, token, delegation } = 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 { decodeAnySafe, getDelegationRequirements } = require('../../util');
 
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -66,7 +66,14 @@ runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: '
 // Ensure delegation
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'delegatorState', addressKey: 'tx.delegator' }));
-runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+runner.use(
+  pipes.VerifyDelegation({
+    type: 'signature',
+    signerKey: 'senderState',
+    delegatorKey: 'delegatorState',
+    getRequirements: getDelegationRequirements,
+  })
+);
 
 // Ensure token not exist
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'tokenState', table: 'token', status: 'OK' }));
@@ -101,7 +108,7 @@ runner.use(
 // Ensure tx fee and gas
 runner.use(
   EnsureTxGas((context) => {
-    const result = { create: 1, update: 1, payment: 0 };
+    const result = { create: 1, update: 2, payment: 0 };
     if (context.delegatorState) {
       result.update += 1;
     }
@@ -114,7 +121,7 @@ runner.use(EnsureTxCost({ attachSenderChanges: true }));
 // Update sender state, token state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, updateVaults } = context;
+    const { tx, itx, statedb, senderState, delegatorState, delegationState, senderUpdates, updateVaults } = context;
     const data = decodeAnySafe(itx.data);
     const owner = delegatorState ? delegatorState.address : senderState.address;
 
@@ -130,7 +137,7 @@ runner.use(
       senderUpdates.tokens[itx.address] = itx.initialSupply;
     }
 
-    const [newSenderState, tokenState, newDelegatorState] = await Promise.all([
+    const [newSenderState, tokenState, newDelegatorState, newDelegationState] = await Promise.all([
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
@@ -147,12 +154,18 @@ runner.use(
           )
         : null,
 
+      // Update delegation state
+      context.isDelegationChanged
+        ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
+        : delegationState,
+
       updateVaults(),
     ]);
 
     context.senderState = newSenderState;
     context.tokenState = tokenState;
     context.delegatorState = newDelegatorState;
+    context.delegationState = newDelegationState;
 
     debug('create token v2', tokenState);
 

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

@@ -99,6 +99,8 @@ runner.use(
     signerKey: 'signerStates',
     delegatorKey: 'delegatorStates',
     delegationKey: 'delegationStates',
+    // FIXME: this is not working
+    getRequirements: () => [],
   })
 );
 
@@ -134,7 +136,7 @@ runner.use(pipes.VerifyUpdater({ assetKey: 'priv.receiverAssets', ownerKey: 'rec
 runner.use(
   EnsureTxGas((context) => {
     // FIXME: payment check
-    const ops = { create: 0, update: 2, payment: 0 };
+    const ops = { create: 0, update: 3, payment: 0 };
     ops.update += context.senderAssets.length;
     ops.update += context.receiverAssets.length;
 

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

@@ -5,7 +5,7 @@ const { decodeBigInt } = require('@ocap/message');
 const { Joi, schemas } = require('@arcblock/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account } = require('@ocap/state');
+const { account, delegation } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:transfer-v2`);
@@ -97,7 +97,17 @@ runner.use(pipes.VerifyTokenBalance({ ownerKey: 'senderState', conditionKey: 'to
 
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'delegatorState', addressKey: 'tx.delegator' }));
-runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+runner.use(
+  pipes.VerifyDelegation({
+    type: 'signature',
+    signerKey: 'senderState',
+    delegatorKey: 'delegatorState',
+    getRequirements: (ctx) => [
+      ...ctx.tokens.map((x) => ({ type: 'token', ...x, to: ctx.itx.to })),
+      ...ctx.assets.map((x) => ({ type: 'asset', address: x, to: ctx.itx.to })),
+    ],
+  })
+);
 
 runner.use(pipes.ExtractReceiver({ from: 'itx.to', to: 'receiver' }));
 runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'OK', table: 'account' }));
@@ -111,7 +121,7 @@ runner.use(pipes.VerifyUpdater({ assetKey: 'assetStates', ownerKey: 'senderState
 runner.use(
   EnsureTxGas((context) => {
     // FIXME: payment check
-    const result = { create: 0, update: 1, payment: 0 };
+    const result = { create: 0, update: 2, payment: 0 };
     result.update += context.assetStates?.length || 0;
 
     if (context.receiverState) {
@@ -136,7 +146,18 @@ 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, receiverAddr, receiverState, statedb, senderChange, updateVaults } = context;
+    const {
+      tx,
+      itx,
+      tokens,
+      senderState,
+      receiverAddr,
+      receiverState,
+      statedb,
+      senderChange,
+      delegationState,
+      updateVaults,
+    } = context;
 
     const { tokens: senderTokens = {} } = senderState;
     const { tokens: receiverTokens = {} } = receiverState || {};
@@ -150,7 +171,7 @@ runner.use(
       ? applyTokenChange({ tokens: senderTokens }, senderChange)
       : { tokens: senderTokens };
 
-    const [newSenderState, newReceiverState] = await Promise.all([
+    const [newSenderState, newReceiverState, newDelegationState] = await Promise.all([
       // Update sender state
       statedb.account.update(
         senderState.address,
@@ -165,11 +186,17 @@ runner.use(
         context
       ),
 
+      // Update delegation state
+      context.isDelegationChanged
+        ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
+        : delegationState,
+
       updateVaults(),
     ]);
 
     context.senderState = newSenderState;
     context.receiverState = newReceiverState;
+    context.delegationState = newDelegationState;
 
     debug('transfer-v2', { from: tx.from, to: itx.to, tokens });
 

package/lib/util.js

@@ -160,6 +160,22 @@ const getTxFee = ({ amount, feeRate, maxFee, minFee, stringify = true }) => {
   };
 };
 
+const getDelegationRequirements = (context) => {
+  const { txType, config } = context;
+  const txFee = config.transaction.txFee[txType];
+  if (!txFee) {
+    return [];
+  }
+
+  return [
+    {
+      type: 'token',
+      address: config.token.address,
+      value: fromTokenToUnit(txFee, config.token.decimal).toString(),
+    },
+  ];
+};
+
 const splitTxFee = ({ total, shares = {}, stringify = true }) => {
   const totalAmount = new BN(total);
   if (totalAmount.isNeg()) {
@@ -397,4 +413,5 @@ module.exports = {
   isGasStakeInput,
   isGasStakeValid,
   RATE_BASE,
+  getDelegationRequirements,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.95",
+  "version": "1.18.97",
   "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.18.95",
-    "@arcblock/did-util": "1.18.95",
-    "@arcblock/jwt": "1.18.95",
-    "@arcblock/validator": "1.18.95",
-    "@ocap/asset": "1.18.95",
-    "@ocap/mcrypto": "1.18.95",
-    "@ocap/merkle-tree": "1.18.95",
-    "@ocap/message": "1.18.95",
-    "@ocap/state": "1.18.95",
-    "@ocap/tx-pipeline": "1.18.95",
-    "@ocap/util": "1.18.95",
-    "@ocap/wallet": "1.18.95",
+    "@arcblock/did": "1.18.97",
+    "@arcblock/did-util": "1.18.97",
+    "@arcblock/jwt": "1.18.97",
+    "@arcblock/validator": "1.18.97",
+    "@ocap/asset": "1.18.97",
+    "@ocap/mcrypto": "1.18.97",
+    "@ocap/merkle-tree": "1.18.97",
+    "@ocap/message": "1.18.97",
+    "@ocap/state": "1.18.97",
+    "@ocap/tx-pipeline": "1.18.97",
+    "@ocap/util": "1.18.97",
+    "@ocap/wallet": "1.18.97",
     "debug": "^4.3.4",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^27.5.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "1d243016b59c4532a8ca6f01d810e4a8f4b3ccb2"
+  "gitHead": "691aabefd37f53b6fbcf771ce130f09197f0b268"
 }