@ocap/tx-protocols 1.18.165 → 1.19.0

package/lib/execute.js

@@ -64,14 +64,14 @@ module.exports = ({ filter, runAsLambda }) => {
           context.states.account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
           context
         ),
-
-        updateVaults(),
       ]);
+      await updateVaults();
     } catch (err) {
       context.logger?.error('Failed to charge gas fee for errored tx', { error: err, txHash: context.txHash });
     }
   };
 
+  // eslint-disable-next-line require-await
   const execute = async (context, protocols, isRetrySupported = false) =>
     new Promise((resolve, reject) => {
       pre.run(context, (err) => {

package/lib/pipes/ensure-cost.js

@@ -24,8 +24,7 @@ module.exports = function CreateEnsureTxCostPipe({
 } = {}) {
   return async function EnsureTxCost(context, next) {
     // TODO: we are using the sender as gas payer, this may change in future
-    const { config, statedb, txType, senderState, gasEstimate, gasVaultState, totalGas } = context;
-    const feeVaultState = await statedb.account.get(config.vaults.txFee, context);
+    const { config, statedb, txType, senderState, gasEstimate, gasVault, totalGas } = context;
 
     // verify gas staking headers
     const { tx, extra = {}, txHash } = context;
@@ -96,6 +95,11 @@ 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),
+          ]);
+
           const [newFeeVaultState, newGasVaultState] = await Promise.all([
             changes.fee
               ? statedb.account.update(

package/lib/pipes/ensure-gas.js

@@ -1,4 +1,3 @@
-const { CustomError: Error } = require('@ocap/util/lib/error');
 const { BN, hexToNumber } = require('@ocap/util');
 
 // eslint-disable-next-line global-require
@@ -11,8 +10,8 @@ const debug = require('debug')(`${require('../../package.json').name}:pipes:ensu
 // - update: state updating ops
 // - payment: sender payment amount of the gas token
 module.exports = function CreateGasEnsureFn(estimateTxGas) {
-  return async function EnsureTxGas(context, next) {
-    const { txHash, statedb, config } = context;
+  return function EnsureTxGas(context, next) {
+    const { txHash, config } = context;
 
     // total gas in native token
     const { txGas } = config.transaction;
@@ -30,16 +29,7 @@ module.exports = function CreateGasEnsureFn(estimateTxGas) {
     const { txGas: gasVaults } = config.vaults;
     const index = hexToNumber(txHash.slice(txHash.length - 4)) % gasVaults.length;
     const gasVault = gasVaults[index];
-
-    // extract gasReceiver
-    if (gasVault) {
-      const gasVaultState = await statedb.account.get(gasVault, context);
-      if (!gasVaultState) {
-        return next(new Error('INVALID_GAS_VAULT', `Can not find gas vault state: ${gasVault}`));
-      }
-
-      context.gasVaultState = gasVaultState;
-    }
+    context.gasVault = gasVault;
 
     debug({
       txType: context.txType,

package/lib/protocols/account/delegate.js

@@ -193,10 +193,10 @@ runner.use(
       delegationState
         ? statedb.delegation.update(itx.address, delegation.update(delegationState, { ...itx, from: sender, ops: merged }, context), context) // prettier-ignore
         : statedb.delegation.create(itx.address, delegation.create({ ...itx, from: sender, ops: merged }, context), context), // prettier-ignore
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     debug(delegationState ? 'update' : 'create', newDelegationState);
 
     // Update context

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

@@ -89,9 +89,10 @@ runner.use(
         delegation.update(context.delegationState, { ops: newOps }, context),
         context
       ),
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     // Update context
     context.senderState = newSenderState;
     context.delegationState = newDelegationState;

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

@@ -219,10 +219,10 @@ runner.use(
       context.delegatorState
         ? statedb.account.update(assetOwner.address, account.update(assetOwner, ownerUpdates, context), context)
         : null,
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.assetState = assetState;
     context.factoryState = newFactoryState;

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

@@ -289,10 +289,10 @@ runner.use(
             statedb.asset.update(x.address, asset.update(x, { consumedTime: txTime }, context), context)
           )
         ),
-
-        updateVaults(),
       ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverState = newReceiverState;
     context.signerStates = isAlsoSigner ? newSignerStates.concat(newSenderState) : newSignerStates;

package/lib/protocols/asset/calls/transfer-token.js

@@ -9,7 +9,7 @@ const runner = new Runner();
 
 runner.use(pipes.ExtractState({ from: 'args.to', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
 
-runner.use(async (context, next) => {
+runner.use((context, next) => {
   const { states, receiverState, args } = context;
   const { tokenAddress, amount } = args;
 

package/lib/protocols/asset/calls/transfer.js

@@ -8,7 +8,7 @@ const runner = new Runner();
 
 runner.use(pipes.ExtractState({ from: 'args.to', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
 
-runner.use(async (context, next) => {
+runner.use((context, next) => {
   const { states, receiverState, args } = context;
 
   const old = new BN(receiverState.balance);

package/lib/protocols/asset/consume.js

@@ -81,10 +81,10 @@ runner.use(
 
       // update asset state
       statedb.asset.update(itx.address, asset.update(assetState, { consumedTime: txTime }, context), context),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.assetState = newAssetState;
 

package/lib/protocols/asset/create.js

@@ -125,14 +125,14 @@ runner.use(
         context
       ),
 
-      updateVaults(),
-
       // Update delegation state
       context.isDelegationChanged
         ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
         : delegationState,
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.assetState = assetState;
     context.delegationState = newDelegationState;

package/lib/protocols/asset/mint.js

@@ -161,10 +161,10 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, { consumedTime: txTime }, context), context)
         )
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverState = newReceiverState;
     context.assetState = assetState;

package/lib/protocols/asset/update.js

@@ -65,7 +65,7 @@ runner.use(
 );
 
 // Ensure we are in append-only mode update proposed by issuer
-runner.use(async (context, next) => {
+runner.use((context, next) => {
   const { itx, newData, senderState, assetState, issuerState } = context;
   if (issuerState && senderState.address === issuerState.address) {
     if (itx.moniker !== assetState.moniker) {
@@ -111,10 +111,10 @@ runner.use(
 
       // update asset state
       statedb.asset.update(itx.address, asset.update(assetState, updates, context), context),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.assetState = newAssetState;
 

package/lib/protocols/factory/create.js

@@ -158,10 +158,10 @@ runner.use(
       context.isDelegationChanged
         ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
         : delegationState,
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.factoryState = factoryState;
     context.delegationState = newDelegationState;

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

@@ -239,10 +239,10 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'claim-stake' }, context),
         context
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverStates = isAlsoSigner ? newReceiverStates.concat(newSenderState) : newReceiverStates;
     context.stakeState = newStakeState;

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

@@ -222,10 +222,10 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, assetUpdates[x.address], context), context)
         )
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverStates = newReceiverStates;
     context.stakeState = newStakeState;

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

@@ -148,9 +148,10 @@ runner.use(
         context
       ),
       statedb.stake.update(stakeState.address, stake.update(stakeState, stakeUpdates, context), context),
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.stakeState = newStakeState;
 

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

@@ -238,10 +238,10 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, assetUpdates[x.address], context), context)
         )
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverStates = newReceiverStates;
     context.stakeState = newStakeState;

package/lib/protocols/governance/stake.js

@@ -114,7 +114,7 @@ runner.use(pipes.ExtractState({ from: 'itx.slashersList', to: 'slasherStates', s
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'slasherStates', addressKey: 'itx.slashersList' }));
 
 // 8. handle tx gas stakes
-runner.use(async (context, next) => {
+runner.use((context, next) => {
   const { tx, itx, inputs, config } = context;
   const { token, transaction } = config;
   const { minStake, maxStake } = transaction.txGas;
@@ -266,10 +266,10 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, { owner: itx.address }, context), context)
         )
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.signerStates = isAlsoSigner ? newSignerStates.concat(newSenderState) : newSignerStates;
     context.stakeState = newStakeState;

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

@@ -104,7 +104,7 @@ runner.use(pipes.ExtractState({ from: 'rollupState.tokenAddress', to: 'tokenStat
 
 // 8. split and aggregate block reward for each tx and the block
 runner.use(pipes.ExtractState({ from: 'blockState.txs', to: 'txs', status: 'INVALID_TX', table: 'tx' }));
-runner.use(async (context, next) => {
+runner.use((context, next) => {
   const { itx, txs, rollupState, blockState, lockerState, tokenState, stakeState } = context;
   const { proposerFeeShare, publisherFeeShare } = rollupState;
 
@@ -306,10 +306,10 @@ runner.use(
         evidence.create({ hash: itx.blockHash, data: 'rollup-claim-block-reward' }, context),
         context
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     // to avoid this to be incorrectly indexed
     delete context.stakeState;
 

package/lib/protocols/rollup/close.js

@@ -82,10 +82,10 @@ runner.use(
           )
         )
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
     context.stakeStates = newStakeStates;

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

@@ -381,10 +381,10 @@ runner.use(
         Promise.all(
           txStates.map((x) => statedb.tx.update(x.hash, Tx.update(x, { finalized: true, tx: x.tx }), context))
         ),
-
-        updateVaults(),
       ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.stakeStates = newStakeStates.filter((x) => context.stakeUpdates[x.address]);
     context.newSenderStates = newSenderStates;

package/lib/protocols/rollup/create.js

@@ -165,10 +165,10 @@ runner.use(
       context.isDelegationChanged
         ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
         : delegationState,
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     // FIXME: create-rollup 的时候不能校验 stake，还是在这里创建 stake？如果在这里创建 stake，是否需要多签？
     // FIXME: account migration 也需要测试下
 

package/lib/protocols/rollup/join.js

@@ -163,10 +163,10 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'rollup-join' }, context),
         context
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
     context.stakeState = newStakeState;

package/lib/protocols/rollup/leave.js

@@ -126,10 +126,10 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'rollup-leave' }, context),
         context
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
     context.stakeState = newStakeState;

package/lib/protocols/rollup/migrate.js

@@ -64,9 +64,10 @@ runner.use(
         context
       ),
       statedb.rollup.update(itx.rollup, updates, context),
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
 

package/lib/protocols/rollup/pause.js

@@ -54,9 +54,10 @@ runner.use(
         context
       ),
       statedb.rollup.update(itx.rollup, rollup.pause(rollupState, context), context),
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
 

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

@@ -9,7 +9,7 @@ module.exports = function CreateVerifyEvidencePipe({ evidenceKey, signaturesKey,
     throw new Error(`Invalid verify method: ${verifyMethod}, supported methods are: verify, ethVerify`);
   }
 
-  return (context, next) => {
+  return async (context, next) => {
     const evidence = get(context, evidenceKey);
     const signatures = get(context, signaturesKey);
 
@@ -22,7 +22,8 @@ module.exports = function CreateVerifyEvidencePipe({ evidenceKey, signaturesKey,
       const wallet = fromPublicKey(pk, toTypeInfo(address));
 
       try {
-        if (wallet[verifyMethod](toHex(evidence), toHex(signature)) === false) {
+        // eslint-disable-next-line no-await-in-loop
+        if ((await wallet[verifyMethod](toHex(evidence), toHex(signature))) === false) {
           return next(new Error('INVALID_SIGNATURE', `Signature for evidence from ${address} is not valid`));
         }
       } catch (err) {

package/lib/protocols/rollup/resume.js

@@ -54,9 +54,10 @@ runner.use(
         context
       ),
       statedb.rollup.update(itx.rollup, rollup.resume(rollupState, context), context),
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
 

package/lib/protocols/rollup/update.js

@@ -100,9 +100,10 @@ runner.use(
         context
       ),
       statedb.rollup.update(itx.rollup, rollup.update(rollupState, { ...itx, data }, context), context),
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.rollupState = newRollupState;
 

package/lib/protocols/token/create.js

@@ -161,10 +161,10 @@ runner.use(
       context.isDelegationChanged
         ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
         : delegationState,
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.tokenState = tokenState;
     context.delegatorState = newDelegatorState;

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

@@ -256,10 +256,10 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'rollup-deposit' }, context),
         context
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.stakeState = newStakeState;
     context.evidenceState = evidenceState;

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

@@ -275,10 +275,10 @@ runner.use(
             ),
             context
           ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.stakeState = newStakeState;
     context.lockerState = newLockerState;

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

@@ -200,10 +200,10 @@ runner.use(
         account.update(receiverState, { tokens: receiverStateTokens }, context),
         context
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverState = newReceiverState;
 

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

@@ -194,10 +194,10 @@ runner.use(
       context.isDelegationChanged
         ? statedb.delegation.update(delegationState.address, delegation.update(delegationState, {}, context), context)
         : delegationState,
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.receiverState = newReceiverState;
     context.delegationState = newDelegationState;

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

@@ -287,10 +287,10 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, assetUpdates[x.address], context), context)
         )
       ),
-
-      updateVaults(),
     ]);
 
+    await updateVaults();
+
     context.senderState = newSenderState;
     context.signerStates = isAlsoSigner ? newSignerStates.concat(newSenderState) : newSignerStates;
     context.receiverStates = isAlsoReceiver ? newReceiverStates.concat(newSenderState) : newReceiverStates;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.165",
+  "version": "1.19.0",
   "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.165",
-    "@arcblock/did-util": "1.18.165",
-    "@arcblock/jwt": "1.18.165",
-    "@arcblock/validator": "1.18.165",
-    "@ocap/asset": "1.18.165",
-    "@ocap/mcrypto": "1.18.165",
-    "@ocap/merkle-tree": "1.18.165",
-    "@ocap/message": "1.18.165",
-    "@ocap/state": "1.18.165",
-    "@ocap/tx-pipeline": "1.18.165",
-    "@ocap/util": "1.18.165",
-    "@ocap/wallet": "1.18.165",
+    "@arcblock/did": "1.19.0",
+    "@arcblock/did-util": "1.19.0",
+    "@arcblock/jwt": "1.19.0",
+    "@arcblock/validator": "1.19.0",
+    "@ocap/asset": "1.19.0",
+    "@ocap/mcrypto": "1.19.0",
+    "@ocap/merkle-tree": "1.19.0",
+    "@ocap/message": "1.19.0",
+    "@ocap/state": "1.19.0",
+    "@ocap/tx-pipeline": "1.19.0",
+    "@ocap/util": "1.19.0",
+    "@ocap/wallet": "1.19.0",
     "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": "e1a9e9e807ca049f67ffbb5ac556b014461cb7a1"
+  "gitHead": "1b6fac03988fb18507c8ef4c21de282762005f87"
 }