@ocap/tx-protocols 1.18.33 → 1.18.35

package/lib/index.js

@@ -25,11 +25,11 @@ const updateRollup = require('./protocols/rollup/update');
 const joinRollup = require('./protocols/rollup/join');
 const leaveRollup = require('./protocols/rollup/leave');
 const pauseRollup = require('./protocols/rollup/pause');
+const closeRollup = require('./protocols/rollup/close');
 const resumeRollup = require('./protocols/rollup/resume');
 const createRollupBlock = require('./protocols/rollup/create-block');
 const claimBlockReward = require('./protocols/rollup/claim-reward');
-const migrateRollupContract = require('./protocols/rollup/migrate-contract');
-const migrateRollupToken = require('./protocols/rollup/migrate-token');
+const migrateRollup = require('./protocols/rollup/migrate');
 
 const executor = require('./execute');
 
@@ -74,11 +74,11 @@ const createExecutor = ({ filter, runAsLambda }) => {
     joinRollup,
     leaveRollup,
     pauseRollup,
+    closeRollup,
     resumeRollup,
     createRollupBlock,
     claimBlockReward,
-    migrateRollupContract,
-    migrateRollupToken,
+    migrateRollup,
   };
 
   const execute = executor({ filter, runAsLambda });

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

@@ -31,10 +31,8 @@ runner.use(pipes.VerifyMultiSig(0));
 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.alternatives().try(Joi.DID().prefix().role('ROLE_ASSET'), Joi.DID().prefix().role('ROLE_FACTORY')))
-    .default([]),
-  variablesList: Joi.array().items(schemas.variableInput).min(1).required(),
+  assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
   issuer: schemas.nftIssuer.required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

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

@@ -34,8 +34,8 @@ const schema = Joi.object({
   factory: Joi.DID().prefix().role('ROLE_FACTORY').required(),
   address: Joi.DID().prefix().role('ROLE_ASSET').required(),
   inputsList: schemas.multiInput.min(1).required(),
-  owner: Joi.DID().prefix().required(),
-  variablesList: Joi.array().items(schemas.variableInput).min(1).required(),
+  owner: schemas.tokenHolder.required(),
+  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
   issuer: schemas.nftIssuer.required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });

package/lib/protocols/asset/mint.js

@@ -23,11 +23,9 @@ runner.use(pipes.VerifyMultiSig(0));
 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.alternatives().try(Joi.DID().prefix().role('ROLE_ASSET'), Joi.DID().prefix().role('ROLE_FACTORY')))
-    .default([]),
-  variablesList: Joi.array().items(schemas.variableInput).min(1).required(),
-  owner: Joi.DID().prefix().required(),
+  assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
+  variablesList: Joi.array().items(schemas.variableInput).optional().default([]),
+  owner: schemas.tokenHolder.required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {

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

@@ -12,6 +12,8 @@ const debug = require('debug')(`${require('../../../package.json').name}:claim-b
 
 const { toStakeAddress } = require('@arcblock/did-util');
 const VerifySigners = require('./pipes/verify-signers');
+const VerifyStatus = require('./pipes/verify-status');
+const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 const { applyTokenChange, splitTxFee, getBNSum, getRewardLocker, RATE_BASE } = require('../../util');
@@ -58,6 +60,8 @@ runner.use(({ evidenceSeen, blockClaimed }, next) => {
 
 // 3. verify rollup and block state
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
+runner.use(EnsureValidator());
+runner.use(VerifyStatus({ closed: false }));
 runner.use(pipes.ExtractState({ from: 'itx.blockHash', to: 'blockState', status: 'INVALID_ROLLUP_BLOCK', table: 'rollupBlock' })); // prettier-ignore
 runner.use((context, next) => {
   const { blockState, rollupState, itx } = context;

package/lib/protocols/rollup/{migrate-token.js → close.js}

@@ -1,9 +1,11 @@
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { Joi } = require('@arcblock/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account } = require('@ocap/state');
+const { account, rollup, stake } = require('@ocap/state');
 
+const { toStakeAddress } = require('@arcblock/did-util');
 const VerifySigners = require('./pipes/verify-signers');
+const VerifyStatus = require('./pipes/verify-status');
 const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -13,8 +15,7 @@ const runner = new Runner();
 // 1. verify itx
 const schema = Joi.object({
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
-  from: Joi.DID().prefix().wallet('ethereum').required(),
-  to: Joi.DID().prefix().wallet('ethereum').required(),
+  message: Joi.string().trim().min(1).max(512).required(),
   token: Joi.object({
     address: Joi.DID().prefix().wallet('ethereum').required(),
     value: Joi.BN().positive().required(),
@@ -29,16 +30,7 @@ runner.use(({ itx }, next) => {
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
 runner.use(EnsureValidator(true));
-runner.use(({ itx, rollupState }, next) => {
-  if (rollupState.migrateHistory.includes(itx.from) === false) {
-    return next(new Error('INVALID_MIGRATE_ATTEMPT', 'itx.from must exist in rollup migrate history'));
-  }
-  if (itx.to !== rollupState.contractAddress) {
-    return next(new Error('INVALID_MIGRATE_ATTEMPT', 'itx.to must equal to latest rollup contract address'));
-  }
-
-  return next();
-});
+runner.use(VerifyStatus({ paused: true, closed: false }));
 
 // 3. verify tx signers and signatures
 runner.use(VerifySigners({ signersKey: 'tx.signaturesList', allowSender: true }));
@@ -49,25 +41,51 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INV
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
-// Ensure tx fee and gas
-runner.use(EnsureTxGas(() => ({ create: 0, update: 1, payment: 0 })));
+// 5. extract validator stake stakes
+runner.use((context, next) => {
+  const { validators, address } = context.rollupState;
+  context.stakes = validators.map((x) => toStakeAddress(x.address, address));
+  return next();
+});
+runner.use(pipes.ExtractState({ from: 'stakes', to: 'stakeStates', status: 'INVALID_STAKE_STATE', table: 'stake' }));
+
+// 6. Ensure tx fee and gas
+runner.use(EnsureTxGas((context) => ({ create: 0, update: context.stakeStates.length + 2, payment: 0 })));
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
-// 5. update state
+// 7. update rollup state
 runner.use(
   async (context, next) => {
-    const { tx, statedb, senderState, senderUpdates, updateVaults } = context;
+    const { tx, itx, rollupState, statedb, senderState, stakeStates, senderUpdates, updateVaults } = context;
 
-    const [newSenderState] = await Promise.all([
+    const [newSenderState, newRollupState, newStakeStates] = await Promise.all([
+      // update sender state
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
         context
       ),
+
+      // update rollup
+      statedb.rollup.update(itx.rollup, rollup.close(rollupState, context), context),
+
+      // update stake states
+      Promise.all(
+        stakeStates.map((x) =>
+          statedb.stake.update(
+            x.address,
+            stake.update(x, { revocable: true, leaveWaitingPeriod: rollupState.leaveWaitingPeriod }, context),
+            context
+          )
+        )
+      ),
+
       updateVaults(),
     ]);
 
     context.senderState = newSenderState;
+    context.rollupState = newRollupState;
+    context.stakeStates = newStakeStates;
 
     next();
   },

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

@@ -14,7 +14,8 @@ const debug = require('debug')(`${require('../../../package.json').name}:create-
 
 const VerifySigners = require('./pipes/verify-signers');
 const VerifyEvidence = require('./pipes/verify-evidence');
-const VerifyPaused = require('./pipes/verify-paused');
+const VerifyStatus = require('./pipes/verify-status');
+const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
@@ -38,6 +39,7 @@ const schema = Joi.object({
   signaturesList: schemas.multiSig.min(1).required(),
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   minReward: Joi.BN().min(0).required(),
+  governance: Joi.boolean().default(false),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
 
@@ -81,31 +83,43 @@ runner.use((context, next) => {
 
 // 2. verify rollup state & height
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
-runner.use(VerifyPaused());
+runner.use(EnsureValidator());
+runner.use(VerifyStatus({ closed: false }));
 runner.use((context, next) => {
   const { itx, rollupState } = context;
+
   if (itx.height !== rollupState.blockHeight + 1) {
     return next(
       new Error('INVALID_TX', `Expect new block height to be ${rollupState.blockHeight + 1}, got ${itx.height}`)
     );
   }
 
-  // ensure proposer in validator list
-  if (rollupState.validators.some((x) => x.address === itx.proposer) === false) {
-    return next(new Error('INVALID_TX', 'itx.proposer does not exist in validators'));
-  }
+  if (itx.governance) {
+    // ensure minReward for governance block
+    if (itx.minReward !== '0') {
+      return next(new Error('INVALID_TX', 'itx.minReward should be 0 for governance block'));
+    }
+    // ensure blockSize for governance block
+    if (itx.txsList.length !== 1) {
+      return next(new Error('INVALID_TX', 'itx.txs should contain only 1 tx for governance block'));
+    }
+  } else {
+    if (rollupState.paused) {
+      return next(new Error('INVALID_TX', 'Normal block is only allowed when rollup is not paused'));
+    }
 
-  // ensure block size
-  const blockSize = itx.txsList.length;
-  if (blockSize < rollupState.minBlockSize) {
-    return next(
-      new Error('INVALID_TX', `Expect at least ${rollupState.minBlockSize} tx in the block, got ${blockSize}`)
-    );
-  }
-  if (blockSize > rollupState.maxBlockSize) {
-    return next(
-      new Error('INVALID_TX', `Expect at most ${rollupState.maxBlockSize} tx in the block, got ${blockSize}`)
-    );
+    // ensure block size
+    const blockSize = itx.txsList.length;
+    if (blockSize < rollupState.minBlockSize) {
+      return next(
+        new Error('INVALID_TX', `Expect at least ${rollupState.minBlockSize} tx in the block, got ${blockSize}`)
+      );
+    }
+    if (blockSize > rollupState.maxBlockSize) {
+      return next(
+        new Error('INVALID_TX', `Expect at most ${rollupState.maxBlockSize} tx in the block, got ${blockSize}`)
+      );
+    }
   }
 
   return next();
@@ -146,13 +160,18 @@ runner.use((context, next) => {
       );
     }
 
-    // ensure minBlockInterval
-    const minBlockTime = +new Date(previousBlock.context.genesisTime) + rollupState.minBlockInterval * 1000;
-    const newBlockTime = +new Date(txTime);
-    if (newBlockTime < minBlockTime) {
-      return next(
-        new Error('INVALID_TX', `Block does not comply with minBlockInterval: ${new Date(minBlockTime).toISOString()}`)
-      );
+    // ensure minBlockInterval for normal blocks
+    if (itx.governance === false) {
+      const minBlockTime = +new Date(previousBlock.context.genesisTime) + rollupState.minBlockInterval * 1000;
+      const newBlockTime = +new Date(txTime);
+      if (newBlockTime < minBlockTime) {
+        return next(
+          new Error(
+            'INVALID_TX',
+            `Block does not comply with minBlockInterval: ${new Date(minBlockTime).toISOString()}`
+          )
+        );
+      }
     }
   }
 
@@ -177,6 +196,9 @@ runner.use(
 // 8. verify txs
 runner.use(pipes.ExtractState({ from: 'itx.txsList', to: 'txStates', status: 'INVALID_TX', table: 'tx' }));
 runner.use(({ itx, txStates }, next) => {
+  const normalTxTypes = ['deposit_token_v2', 'withdraw_token_v2'];
+  const governanceTxTypes = ['pause_rollup', 'resume_rollup', 'migrate_rollup'];
+
   // ensure not finalized
   const finalizedTx = txStates.some((x) => x.finalized);
   if (finalizedTx) {
@@ -189,10 +211,19 @@ runner.use(({ itx, txStates }, next) => {
     return next(new Error('INVALID_TX', 'Rollup block can only include successful executed transactions'));
   }
 
-  // ensure tx type
-  const invalidTypeTx = txStates.some((x) => ['deposit_token_v2', 'withdraw_token_v2'].includes(x.type) === false);
-  if (invalidTypeTx) {
-    return next(new Error('INVALID_TX', "Rollup block can only include 'withdraw_token' and 'deposit_token' tx"));
+  // ensure governance block only contains governance tx
+  if (itx.governance) {
+    if (txStates.some((x) => governanceTxTypes.includes(x.type) === false)) {
+      return next(
+        new Error('INVALID_TX', `Governance block can only include governance txs: ${governanceTxTypes.join(',')}`)
+      );
+    }
+  } else {
+    // ensure tx type for normal block
+    const invalidTypeTx = txStates.some((x) => normalTxTypes.includes(x.type) === false);
+    if (invalidTypeTx) {
+      return next(new Error('INVALID_TX', `Rollup block can only include normal txs: ${normalTxTypes.join(',')}`));
+    }
   }
 
   // ensure rollup belonging
@@ -201,15 +232,25 @@ runner.use(({ itx, txStates }, next) => {
     return next(new Error('INVALID_TX', `Rollup block can only include tx from rollup ${itx.rollup}`));
   }
 
-  // ensure merkleRoot
+  // ensure merkleRoot: deposit_token tx not included in the merkleTree
   const merkleTree = MerkleTree.getBlockMerkleTree(
     txStates
-      .filter((x) => x.type === 'withdraw_token_v2')
-      .map((x) => ({
-        hash: x.hash,
-        to: x.tx.itxJson.to,
-        amount: x.tx.itxJson.token.value,
-      }))
+      .map((x) => {
+        if (x.type === 'withdraw_token_v2') {
+          return { hash: x.hash, to: x.tx.itxJson.to, amount: x.tx.itxJson.token.value };
+        }
+        if (x.type === 'pause_rollup') {
+          return { hash: x.hash, to: MerkleTree.BLACK_HOLE, amount: '0' };
+        }
+        if (x.type === 'resume_rollup') {
+          return { hash: x.hash, to: MerkleTree.BLACK_HOLE, amount: '0' };
+        }
+        if (x.type === 'migrate_rollup') {
+          return { hash: x.hash, to: x.tx.itxJson.to, amount: '0' };
+        }
+        return null;
+      })
+      .filter(Boolean)
   );
   if (merkleTree.getHexRoot() !== itx.merkleRoot) {
     return next(new Error('INVALID_TX', 'Invalid rollup block merkle root'));

package/lib/protocols/rollup/create.js

@@ -144,7 +144,7 @@ runner.use(
     ]);
 
     // FIXME: create-rollup 的时候不能校验 stake，还是在这里创建 stake？如果在这里创建 stake，是否需要多签？
-    // FIXME: seed validator 无法离开， account migration 也需要测试下
+    // FIXME: account migration 也需要测试下
 
     context.senderState = newSenderState;
     context.rollupState = rollupState;

package/lib/protocols/rollup/join.js

@@ -14,7 +14,7 @@ const debug = require('debug')(`${require('../../../package.json').name}:join-ro
 
 const VerifySigners = require('./pipes/verify-signers');
 const VerifyEvidence = require('./pipes/verify-evidence');
-const VerifyPaused = require('./pipes/verify-paused');
+const VerifyStatus = require('./pipes/verify-status');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
@@ -39,7 +39,7 @@ runner.use(({ itx }, next) => {
 
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
-runner.use(VerifyPaused());
+runner.use(VerifyStatus({ paused: false }));
 
 // 3. verify new validator
 runner.use((context, next) => {

package/lib/protocols/rollup/leave.js

@@ -11,7 +11,8 @@ const debug = require('debug')(`${require('../../../package.json').name}:leave-r
 
 const VerifySigners = require('./pipes/verify-signers');
 const VerifyEvidence = require('./pipes/verify-evidence');
-const VerifyPaused = require('./pipes/verify-paused');
+const VerifyStatus = require('./pipes/verify-status');
+const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
@@ -33,7 +34,8 @@ runner.use(({ itx }, next) => {
 
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
-runner.use(VerifyPaused());
+runner.use(EnsureValidator());
+runner.use(VerifyStatus({ paused: false }));
 
 // 3. verify evidence signers, signatures, state
 runner.use((context, next) => {

package/lib/protocols/rollup/{migrate-contract.js → migrate.js}

@@ -4,6 +4,7 @@ const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
+const VerifyStatus = require('./pipes/verify-status');
 const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -14,6 +15,8 @@ const runner = new Runner();
 const schema = Joi.object({
   rollup: Joi.DID().prefix().role('ROLE_ROLLUP').required(),
   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(),
 }).options({ stripUnknown: true, noDefaults: false });
 runner.use(({ itx }, next) => {
@@ -24,6 +27,7 @@ runner.use(({ itx }, next) => {
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
 runner.use(EnsureValidator(true));
+runner.use(VerifyStatus({ paused: true, closed: false }));
 
 // 3. verify tx signers and signatures
 runner.use(VerifySigners({ signersKey: 'tx.signaturesList', allowSender: true }));
@@ -38,10 +42,17 @@ runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey:
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
-// 5. update rollup state
+// 5. update state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
+    const { tx, itx, statedb, rollupState, senderState, senderUpdates, updateVaults } = context;
+    let updates = {};
+    if (itx.type === 'vault') {
+      updates = rollup.migrateVault(rollupState, itx.to, context);
+    }
+    if (itx.type === 'contract') {
+      updates = rollup.migrateContract(rollupState, itx.to, context);
+    }
 
     const [newSenderState, newRollupState] = await Promise.all([
       statedb.account.update(
@@ -49,7 +60,7 @@ runner.use(
         account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
         context
       ),
-      statedb.rollup.update(itx.rollup, rollup.migrate(rollupState, itx.to, context), context),
+      statedb.rollup.update(itx.rollup, updates, context),
       updateVaults(),
     ]);
 

package/lib/protocols/rollup/pause.js

@@ -4,6 +4,7 @@ const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
+const VerifyStatus = require('./pipes/verify-status');
 const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -23,6 +24,7 @@ runner.use(({ itx }, next) => {
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
 runner.use(EnsureValidator(true));
+runner.use(VerifyStatus({ paused: false }));
 
 // 3. verify tx signers and signatures
 runner.use(VerifySigners({ signersKey: 'tx.signaturesList', allowSender: true }));

package/lib/protocols/rollup/pipes/ensure-validator.js

@@ -1,4 +1,6 @@
-module.exports = (isSeed) => async (context, next) => {
+const { CustomError: Error } = require('@ocap/util/lib/error');
+
+module.exports = (isSeed) => (context, next) => {
   const { rollupState, tx } = context;
 
   const validators = isSeed ? rollupState.seedValidators : rollupState.validators;

package/lib/protocols/rollup/pipes/verify-status.js

@@ -0,0 +1,30 @@
+const { pipes } = require('@ocap/tx-pipeline');
+
+module.exports = ({ paused, closed } = {}) => {
+  const fns = [];
+  if (paused === false) {
+    fns.push({
+      error: 'INVALID_TX',
+      message: 'The rollup is paused',
+      fn: (context) => !context.rollupState.paused,
+    });
+  }
+
+  if (paused === true) {
+    fns.push({
+      error: 'INVALID_TX',
+      message: 'The rollup is not paused',
+      fn: (context) => context.rollupState.paused,
+    });
+  }
+
+  if (closed === false) {
+    fns.push({
+      error: 'INVALID_TX',
+      message: 'The rollup is closed',
+      fn: (context) => !context.rollupState.closed,
+    });
+  }
+
+  return pipes.VerifyInfo(fns);
+};

package/lib/protocols/rollup/resume.js

@@ -4,6 +4,7 @@ const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, rollup } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
+const VerifyStatus = require('./pipes/verify-status');
 const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
@@ -23,6 +24,7 @@ runner.use(({ itx }, next) => {
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
 runner.use(EnsureValidator(true));
+runner.use(VerifyStatus({ paused: true, closed: false }));
 
 // 3. verify tx signers and signatures
 runner.use(VerifySigners({ signersKey: 'tx.signaturesList', allowSender: true }));

package/lib/protocols/rollup/update.js

@@ -7,6 +7,8 @@ const { account, rollup } = require('@ocap/state');
 const debug = require('debug')(`${require('../../../package.json').name}:update-rollup`);
 
 const VerifySigners = require('./pipes/verify-signers');
+const VerifyStatus = require('./pipes/verify-status');
+const EnsureValidator = require('./pipes/ensure-validator');
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
@@ -62,6 +64,8 @@ runner.use(
 
 // 2. verify rollup
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
+runner.use(EnsureValidator(true));
+runner.use(VerifyStatus({ paused: false }));
 
 // 3. verify tx signers and signatures
 runner.use(VerifySigners({ signersKey: 'tx.signaturesList', allowSender: true }));

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

@@ -14,7 +14,7 @@ const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const VerifySigners = require('../rollup/pipes/verify-signers');
-const VerifyPaused = require('../rollup/pipes/verify-paused');
+const VerifyStatus = require('../rollup/pipes/verify-status');
 const { applyTokenUpdates, applyTokenChange, getTxFee, getBNSum, getRewardLocker } = require('../../util');
 
 const schema = Joi.object({
@@ -58,7 +58,7 @@ runner.use(({ tx, itx }, next) => {
 
 // 2. verify rollup against itx
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
-runner.use(VerifyPaused());
+runner.use(VerifyStatus({ paused: false }));
 runner.use((context, next) => {
   const { itx, rollupState } = context;
   if (rollupState.tokenAddress !== itx.token.address) {

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

@@ -12,8 +12,8 @@ const debug = require('debug')(`${require('../../../package.json').name}:withdra
 
 const EnsureTxGas = require('../../pipes/ensure-gas');
 const EnsureTxCost = require('../../pipes/ensure-cost');
+const VerifyStatus = require('../rollup/pipes/verify-status');
 
-const VerifyPaused = require('../rollup/pipes/verify-paused');
 const { applyTokenUpdates, getTxFee, getBNSum, getRewardLocker, applyTokenChange } = require('../../util');
 
 const verifyMultiSigV2 = pipes.VerifyMultiSigV2({ signersKey: 'signers' });
@@ -46,7 +46,7 @@ runner.use(({ tx, itx }, next) => {
 
 // 2. verify rollup against itx
 runner.use(pipes.ExtractState({ from: 'itx.rollup', to: 'rollupState', status: 'INVALID_ROLLUP', table: 'rollup' }));
-runner.use(VerifyPaused());
+runner.use(VerifyStatus({ paused: false }));
 runner.use((context, next) => {
   const { itx, rollupState } = context;
   if (rollupState.tokenAddress !== itx.token.address) {

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

@@ -24,7 +24,7 @@ const exchangeInfoSchema = Joi.object({
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),
 });
 const schema = Joi.object({
-  to: Joi.DID().prefix().role('ROLE_ACCOUNT').required(),
+  to: schemas.tokenHolder.required(),
   sender: exchangeInfoSchema.required(),
   receiver: exchangeInfoSchema.required(),
   data: Joi.any().optional(),

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

@@ -20,7 +20,7 @@ runner.use(pipes.VerifyMultiSig(0));
 
 // 1. verify itx
 const schema = Joi.object({
-  to: Joi.DID().prefix().role('ROLE_ACCOUNT').required(),
+  to: schemas.tokenHolder.required(),
   value: Joi.any().optional(),
   tokensList: Joi.array().items(schemas.tokenInput).default([]),
   assetsList: Joi.array().items(Joi.DID().prefix().role('ROLE_ASSET')).default([]),

package/lib/util.js

@@ -184,6 +184,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 isGovernanceTx = (x) => ['pause_rollup', 'resume_rollup', 'migrate_rollup'].includes(x.type);
 const isFixedFee = (x) => !x.tx.itxJson.maxFee || new BN(x.tx.itxJson.maxFee).isZero();
 
 const ensureBlockReward = (rollupState, minReward, txStates) => {
@@ -207,10 +208,10 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
   }
 
   // 1. find dynamic reward tx
-  const dynamicFeeTxs = txStates.filter((x) => isFixedFee(x) === false);
+  const dynamicFeeTxs = txStates.filter((x) => isGovernanceTx(x) === false && isFixedFee(x) === false);
   const totalDynamicFee = dynamicFeeTxs.reduce((sum, x) => sum.add(new BN(x.tx.itxJson.maxFee)), new BN(0));
 
-  const fixedFeeTxs = txStates.filter((x) => isFixedFee(x));
+  const fixedFeeTxs = txStates.filter((x) => isGovernanceTx(x) === false && isFixedFee(x));
   const totalFixedFee = fixedFeeTxs.reduce((sum, x) => sum.add(new BN(x.tx.itxJson.actualFee)), new BN(0));
 
   const totalMissingFee = minRequiredReward.sub(totalFixedFee);
@@ -270,33 +271,35 @@ const ensureBlockReward = (rollupState, minReward, txStates) => {
   });
 
   // 3. bur/mint tokens, update stakes
-  txStates.forEach((x) => {
-    const user = x.tx.itxJson.token.value;
-    const fee = x.tx.itxJson.actualFee;
-    const total = getBNSum(user, fee);
-
-    if (x.type === 'deposit_token_v2') {
-      result.rewardAmount = result.rewardAmount.add(new BN(fee));
-      result.mintedAmount = result.mintedAmount.add(new BN(total));
-
-      // mint tokens for deposit proposer
-      changes.stake.push({
-        address: toStakeAddress(x.tx.itxJson.proposer, address),
-        delta: total,
-        action: 'mint',
-      });
-    } else if (x.type === 'withdraw_token_v2') {
-      result.rewardAmount = result.rewardAmount.add(new BN(fee));
-      result.burnedAmount = result.burnedAmount.add(new BN(user));
-
-      // burn tokens from locked withdraws: user amount
-      changes.stake.push({
-        address: toStakeAddress(x.tx.from, address),
-        delta: `-${user}`,
-        action: 'burn',
-      });
-    }
-  });
+  txStates
+    .filter((x) => isGovernanceTx(x) === false)
+    .forEach((x) => {
+      const user = x.tx.itxJson.token.value;
+      const fee = x.tx.itxJson.actualFee;
+      const total = getBNSum(user, fee);
+
+      if (x.type === 'deposit_token_v2') {
+        result.rewardAmount = result.rewardAmount.add(new BN(fee));
+        result.mintedAmount = result.mintedAmount.add(new BN(total));
+
+        // mint tokens for deposit proposer
+        changes.stake.push({
+          address: toStakeAddress(x.tx.itxJson.proposer, address),
+          delta: total,
+          action: 'mint',
+        });
+      } else if (x.type === 'withdraw_token_v2') {
+        result.rewardAmount = result.rewardAmount.add(new BN(fee));
+        result.burnedAmount = result.burnedAmount.add(new BN(user));
+
+        // burn tokens from locked withdraws: user amount
+        changes.stake.push({
+          address: toStakeAddress(x.tx.from, address),
+          delta: `-${user}`,
+          action: 'burn',
+        });
+      }
+    });
 
   const grouped = {
     stake: groupBy(changes.stake, 'address'),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.33",
+  "version": "1.18.35",
   "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.33",
-    "@arcblock/did-util": "1.18.33",
-    "@arcblock/jwt": "1.18.33",
-    "@arcblock/validator": "1.18.33",
-    "@ocap/asset": "1.18.33",
-    "@ocap/mcrypto": "1.18.33",
-    "@ocap/merkle-tree": "1.18.33",
-    "@ocap/message": "1.18.33",
-    "@ocap/state": "1.18.33",
-    "@ocap/tx-pipeline": "1.18.33",
-    "@ocap/util": "1.18.33",
-    "@ocap/wallet": "1.18.33",
+    "@arcblock/did": "1.18.35",
+    "@arcblock/did-util": "1.18.35",
+    "@arcblock/jwt": "1.18.35",
+    "@arcblock/validator": "1.18.35",
+    "@ocap/asset": "1.18.35",
+    "@ocap/mcrypto": "1.18.35",
+    "@ocap/merkle-tree": "1.18.35",
+    "@ocap/message": "1.18.35",
+    "@ocap/state": "1.18.35",
+    "@ocap/tx-pipeline": "1.18.35",
+    "@ocap/util": "1.18.35",
+    "@ocap/wallet": "1.18.35",
     "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": "0d03089c6651d92a3451e9bbbc865c18c2f5d8ad"
+  "gitHead": "21178573bd44a1fb3a3a71f21bb8e81433322a69"
 }

package/lib/protocols/rollup/pipes/verify-paused.js

@@ -1,10 +0,0 @@
-const { pipes } = require('@ocap/tx-pipeline');
-
-module.exports = () =>
-  pipes.VerifyInfo([
-    {
-      error: 'INVALID_TX',
-      message: 'The rollup is paused',
-      fn: (context) => context.rollupState.paused === false,
-    },
-  ]);