@ocap/tx-protocols 1.17.23 → 1.18.0

package/lib/protocols/factory/create.js

@@ -14,7 +14,8 @@ const { toFactoryAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-factory`);
 
 const { decodeAnySafe } = require('../../util');
-const ensureServiceFee = require('../rollup/pipes/ensure-service-fee');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -106,17 +107,18 @@ runner.use((context, next) => {
   return next(new Error('INVALID_FACTORY_INPUT', 'Not all input.assets exist on chain'));
 });
 
-runner.use(ensureServiceFee);
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // Create factory state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, vaultState, vaultUpdates, factoryProps } =
-      context;
+    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, factoryProps, updateVaults } = context;
     const tokens = { [context.config.token.address]: '0' };
     const owner = delegatorState ? delegatorState.address : senderState.address;
 
-    const [newSenderState, factoryState, newVaultState] = await Promise.all([
+    const [newSenderState, factoryState] = await Promise.all([
       // Update owner state
       statedb.account.update(
         senderState.address,
@@ -127,14 +129,11 @@ runner.use(
       // Create factory state
       statedb.factory.create(itx.address, factory.create({ ...factoryProps, tokens, owner }, context), context),
 
-      isEmpty(vaultUpdates)
-        ? vaultState
-        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;
     context.factoryState = factoryState;
-    context.vaultState = newVaultState;
 
     debug('createFactory', factoryState);
 

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

@@ -6,9 +6,11 @@ const { account, asset, stake, evidence } = require('@ocap/state');
 const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
+const debug = require('debug')(`${require('../../../package.json').name}:claim-stake`);
 
-const { applyTokenUpdates } = require('../../util');
+const { applyTokenUpdates, applyTokenChange } = require('../../util');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -132,10 +134,37 @@ runner.use(pipes.ExtractState({ from: 'assets', to: 'assetStates', status: 'OK',
 runner.use(pipes.VerifyTransferrable({ assets: 'assetStates' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'assetStates', ownerKey: 'stakeState' }));
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    const result = { create: 1, update: 2, payment: 0 };
+    if (context.receiverStates) {
+      result.update += context.receiverStates.length;
+    }
+    if (context.assetStates) {
+      result.update += context.assetStates.length;
+    }
+
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 8. update statedb
 runner.use(
   async (context, next) => {
-    const { tx, itx, outputs, statedb, senderState, stakeState, receiverStates, assetStates = [] } = context;
+    const {
+      tx,
+      itx,
+      outputs,
+      statedb,
+      senderState,
+      senderChange,
+      stakeState,
+      receiverStates,
+      updateVaults,
+      assetStates = [],
+    } = context;
 
     const receiverUpdates = {};
     const assetUpdates = {};
@@ -150,6 +179,9 @@ runner.use(
       // Update receiver balance
       const ownerState = receiverStates.find((s) => getRelatedAddresses(s).includes(owner));
       receiverUpdates[ownerState.address] = applyTokenUpdates(tokens, ownerState, 'add');
+      if (senderChange && ownerState.address === senderChange.address) {
+        receiverUpdates[ownerState.address] = applyTokenChange(receiverUpdates[ownerState.address], senderChange);
+      }
 
       // Update asset owner
       assets.forEach((a) => {
@@ -170,7 +202,10 @@ runner.use(
         senderState.address,
         account.update(
           senderState,
-          Object.assign({ nonce: tx.nonce }, receiverUpdates[senderState.address] || {}),
+          Object.assign(
+            { nonce: tx.nonce },
+            receiverUpdates[senderState.address] || (senderChange ? applyTokenChange(senderState, senderChange) : {})
+          ),
           context
         ),
         context
@@ -201,6 +236,8 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'claim-stake' }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

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

@@ -5,9 +5,11 @@ const { account, stake } = require('@ocap/state');
 const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
+const debug = require('debug')(`${require('../../../package.json').name}:revoke-stake`);
 
 const { applyTokenUpdates } = require('../../util');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -93,10 +95,14 @@ runner.use(pipes.ExtractState({ from: 'assets', to: 'assetStates', status: 'OK',
 runner.use(pipes.VerifyTransferrable({ assets: 'assetStates' }));
 runner.use(pipes.VerifyUpdater({ assetKey: 'assetStates', ownerKey: 'stakeState' }));
 
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 8. update statedb
 runner.use(
   async (context, next) => {
-    const { tx, itx, outputs, statedb, senderState, stakeState } = context;
+    const { tx, itx, outputs, statedb, senderState, senderUpdates, stakeState, updateVaults } = context;
 
     const stakeUpdates = {
       tokens: stakeState.tokens || {},
@@ -119,8 +125,13 @@ runner.use(
     });
 
     const [newSenderState, newStakeState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
       statedb.stake.update(stakeState.address, stake.update(stakeState, stakeUpdates, context), context),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/governance/stake.js

@@ -8,9 +8,12 @@ const { toStakeAddress } = require('@arcblock/did-util');
 const { account, asset, stake } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
+const debug = require('debug')(`${require('../../../package.json').name}:stake`);
 
-const { applyTokenUpdates } = require('../../util');
+const { applyTokenUpdates, applyTokenChange } = require('../../util');
+
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const verifyAssetOwner = promisify(pipes.VerifyUpdater({ assetKey: 'assets', ownerKey: 'owner' }));
 
@@ -94,10 +97,48 @@ runner.use(async (context, next) => {
   return next();
 });
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    // FIXME: payment check
+    const result = { create: 0, update: 0, payment: 0 };
+    if (context.senderState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+    if (context.stakeState) {
+      result.update += 1;
+    } else {
+      result.create += 1;
+    }
+    if (context.signerStates) {
+      result.update += context.signerStates.length;
+    }
+    if (context.assetStates) {
+      result.update += context.assetStates.length;
+    }
+
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // update statedb
 runner.use(
   async (context, next) => {
-    const { tx, itx, inputs, statedb, senderState, stakeState, signerStates, assetStates = [] } = context;
+    const {
+      tx,
+      itx,
+      inputs,
+      statedb,
+      senderState,
+      senderChange,
+      stakeState,
+      signerStates,
+      updateVaults,
+      assetStates = [],
+    } = context;
 
     const signerUpdates = {};
     const stakeUpdates = stakeState
@@ -111,6 +152,9 @@ runner.use(
         signerStates.find((s) => s.address === owner),
         'sub'
       );
+      if (senderChange && owner === senderChange.address) {
+        signerUpdates[owner] = applyTokenChange(signerUpdates[owner], senderChange);
+      }
       Object.assign(stakeUpdates, applyTokenUpdates(tokensList, stakeUpdates, 'add'));
       stakeUpdates.assets.push(...assetsList);
     });
@@ -123,7 +167,10 @@ runner.use(
         senderState,
         account.updateOrCreate(
           senderState,
-          Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
+          Object.assign(
+            { address: tx.from, nonce: tx.nonce, pk: tx.pk },
+            signerUpdates[tx.from] || (senderChange ? applyTokenChange(senderState, senderChange) : {})
+          ),
           context
         ),
         context
@@ -159,6 +206,8 @@ runner.use(
           statedb.asset.update(x.address, asset.update(x, { owner: itx.address }, context), context)
         )
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

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 EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 const { applyTokenChange, splitTxFee, getBNSum, getRewardLocker, RATE_BASE } = require('../../util');
 
 const runner = new Runner();
@@ -211,10 +213,40 @@ runner.use((context, next) => {
   return next();
 });
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    const result = { create: 2, update: 1, payment: 0 };
+
+    result.update += context.accountStates.length;
+    if (context.updates[context.lockerState.address]) {
+      result.update += 1;
+    }
+    if (context.updates[context.stakeState.address]) {
+      result.update += 1;
+    }
+
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 10. update state
 runner.use(
   async (context, next) => {
-    const { tx, itx, updates, statedb, senderState, blockState, lockerState, stakeState, accountStates } = context;
+    const {
+      tx,
+      itx,
+      updates,
+      statedb,
+      senderState,
+      blockState,
+      lockerState,
+      stakeState,
+      accountStates,
+      senderChange,
+      updateVaults,
+    } = context;
 
     const [newStakeStates, newAccountStates, newBlockState] = await Promise.all([
       // update stake states
@@ -232,20 +264,15 @@ runner.use(
 
       // update accounts(proposer, publisher, validator)
       Promise.all(
-        accountStates.map((x) =>
-          statedb.account.update(
-            x.address,
-            account.update(
-              x,
-              Object.assign(
-                x.address === senderState.address ? { nonce: tx.nonce } : {},
-                applyTokenChange(x, updates.account[x.address])
-              ),
-              context
-            ),
-            context
-          )
-        )
+        accountStates.map((x) => {
+          let updateSet = applyTokenChange(x, updates.account[x.address]);
+          if (x.address === senderState.address) {
+            updateSet.nonce = tx.nonce;
+            updateSet = Object.assign(updateSet, applyTokenChange(updateSet, senderChange));
+          }
+
+          return statedb.account.update(x.address, account.update(x, updateSet, context), context);
+        })
       ),
 
       // Update block state, just update the context
@@ -262,6 +289,8 @@ runner.use(
         evidence.create({ hash: itx.blockHash, data: 'rollup-claim-block-reward' }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     // to avoid this to be incorrectly indexed
@@ -271,7 +300,8 @@ runner.use(
     context.accountStates = newAccountStates;
     context.blockState = newBlockState;
 
-    context.updatedAccounts = cloneDeep([...Object.values(updates.account), ...Object.values(updates.stake)]);
+    context.updatedAccounts.push(...cloneDeep(Object.values(updates.account)));
+    context.updatedAccounts.push(...cloneDeep(Object.values(updates.stake)));
 
     debug('claim-block-reward', itx);
 

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

@@ -1,5 +1,6 @@
 /* eslint-disable indent */
 const pick = require('lodash/pick');
+const cloneDeep = require('lodash/cloneDeep');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const MerkleTree = require('@ocap/merkle-tree');
 const { Joi, schemas, patterns } = require('@arcblock/validator');
@@ -14,6 +15,9 @@ 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 EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
+
 const { applyTokenChange, ensureBlockReward, getRewardLocker } = require('../../util');
 
 const runner = new Runner();
@@ -246,10 +250,35 @@ runner.use((context, next) => {
 });
 runner.use(pipes.ExtractState({ from: 'senders', to: 'senderStates', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 
+// Ensure tx fee and gas
+runner.use(
+  EnsureTxGas((context) => {
+    const result = { create: 1, update: 2, payment: 0 };
+
+    result.update += context.stakeStates.filter((x) => context.stakeUpdates[x.address]).length;
+    result.update += context.txStates.length;
+    result.update += (context.senderStates || []).length;
+
+    return result;
+  })
+);
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 11. update state: mint tokens for deposits, burn tokens for withdraws
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, rollupState, senderState, stakeStates, txStates, formattedItx } = context;
+    const {
+      tx,
+      itx,
+      statedb,
+      rollupState,
+      senderState,
+      stakeStates,
+      txStates,
+      formattedItx,
+      senderUpdates,
+      updateVaults,
+    } = context;
     const senderStates = context.senderStates || [];
 
     const [newSenderState, newStakeStates, newSenderStates, newRollupState, rollupBlockState, newTxStates] =
@@ -257,7 +286,7 @@ runner.use(
         // update sender(proposer) account
         statedb.account.update(
           senderState.address,
-          account.update(senderState, Object.assign({ nonce: tx.nonce }), context),
+          account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
           context
         ),
 
@@ -312,6 +341,8 @@ runner.use(
         Promise.all(
           txStates.map((x) => statedb.tx.update(x.hash, Tx.update(x, { finalized: true, tx: x.tx }), context))
         ),
+
+        updateVaults(),
       ]);
 
     context.senderState = newSenderState;
@@ -321,7 +352,8 @@ runner.use(
     context.rollupBlockState = rollupBlockState;
     context.txStates = newTxStates;
 
-    context.updatedAccounts = [...Object.values(context.stakeUpdates), ...Object.values(context.accountUpdates)];
+    context.updatedAccounts.push(...cloneDeep(Object.values(context.stakeUpdates)));
+    context.updatedAccounts.push(...cloneDeep(Object.values(context.accountUpdates)));
 
     debug('create-rollup-block', { itx, updatedAccounts: context.updatedAccounts });
 

package/lib/protocols/rollup/create.js

@@ -12,7 +12,8 @@ const { toRollupAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-rollup`);
 
 const { decodeAnySafe } = require('../../util');
-const ensureServiceFee = require('./pipes/ensure-service-fee');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -108,25 +109,17 @@ runner.use(
   ])
 );
 
-runner.use(ensureServiceFee);
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
 
 // 5. create rollup state
 runner.use(
   async (context, next) => {
-    const {
-      tx,
-      formattedItx,
-      rollupData,
-      statedb,
-      senderState,
-      delegatorState,
-      senderUpdates,
-      vaultState,
-      vaultUpdates,
-    } = context;
+    const { tx, formattedItx, rollupData, statedb, senderState, delegatorState, senderUpdates, updateVaults } = context;
 
     const issuer = delegatorState ? delegatorState.address : senderState.address;
-    const [newSenderState, rollupState, newVaultState] = await Promise.all([
+    const [newSenderState, rollupState] = await Promise.all([
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
@@ -147,9 +140,7 @@ runner.use(
         context
       ),
 
-      isEmpty(vaultUpdates)
-        ? vaultState
-        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
+      updateVaults(),
     ]);
 
     // FIXME: create-rollup 的时候不能校验 stake，还是在这里创建 stake？如果在这里创建 stake，是否需要多签？
@@ -157,7 +148,6 @@ runner.use(
 
     context.senderState = newSenderState;
     context.rollupState = rollupState;
-    context.vaultState = newVaultState;
 
     debug('create-rollup', rollupState);
 

package/lib/protocols/rollup/join.js

@@ -15,6 +15,8 @@ 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 EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -110,14 +112,33 @@ runner.use(
 );
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 1, update: 3, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 8. update state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState, stakeState, newValidator, stakeAddress } = context;
+    const {
+      tx,
+      itx,
+      rollupState,
+      statedb,
+      senderState,
+      stakeState,
+      newValidator,
+      stakeAddress,
+      senderUpdates,
+      updateVaults,
+    } = context;
     const newValidators = rollupState.validators.concat([newValidator]);
 
     const [newSenderState, newRollupState, newStakeState, evidenceState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
 
       // persist new validators list
       statedb.rollup.update(
@@ -139,6 +160,8 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'rollup-join' }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/rollup/leave.js

@@ -12,6 +12,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 EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -85,14 +87,23 @@ runner.use(
 );
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
+// Ensure tx fee and gas
+runner.use(EnsureTxGas(() => ({ create: 1, update: 3, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 8. update state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState, stakeState, stakeAddress } = context;
+    const { tx, itx, rollupState, statedb, senderState, stakeState, stakeAddress, senderUpdates, updateVaults } =
+      context;
     const newValidators = rollupState.validators.filter((x) => x.address !== tx.from);
 
     const [newSenderState, newRollupState, newStakeState, evidenceState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
 
       // persist new validators list
       statedb.rollup.update(
@@ -110,6 +121,8 @@ runner.use(
         evidence.create({ hash: itx.evidence.hash, data: 'rollup-leave' }, context),
         context
       ),
+
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/rollup/migrate-contract.js

@@ -5,6 +5,8 @@ const { account, rollup } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
 const EnsureValidator = require('./pipes/ensure-validator');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -32,14 +34,23 @@ 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: 2, payment: 0 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 5. update rollup state
 runner.use(
   async (context, next) => {
-    const { tx, itx, rollupState, statedb, senderState } = context;
+    const { tx, itx, rollupState, statedb, senderState, senderUpdates, updateVaults } = context;
 
     const [newSenderState, newRollupState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
       statedb.rollup.update(itx.rollup, rollup.migrate(rollupState, itx.to, context), context),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;

package/lib/protocols/rollup/migrate-token.js

@@ -5,6 +5,8 @@ const { account } = require('@ocap/state');
 
 const VerifySigners = require('./pipes/verify-signers');
 const EnsureValidator = require('./pipes/ensure-validator');
+const EnsureTxGas = require('../../pipes/ensure-gas');
+const EnsureTxCost = require('../../pipes/ensure-cost');
 
 const runner = new Runner();
 
@@ -47,13 +49,22 @@ 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 })));
+runner.use(EnsureTxCost({ attachSenderChanges: true }));
+
 // 5. update state
 runner.use(
   async (context, next) => {
-    const { tx, statedb, senderState } = context;
+    const { tx, statedb, senderState, senderUpdates, updateVaults } = context;
 
     const [newSenderState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, ...senderUpdates }, context),
+        context
+      ),
+      updateVaults(),
     ]);
 
     context.senderState = newSenderState;