@ocap/tx-protocols 1.13.63 → 1.13.67

package/lib/execute.js

@@ -29,7 +29,7 @@ module.exports = ({ filter, runAsLambda }) => {
       // Since bloom-filters may give false positive, we need to check for statedb if replay detected
       const exist = await context.statedb.tx.get(context.txHash, context);
       if (exist) {
-        return next(new Error('FORBIDDEN', 'Can not execute duplicate transaction'));
+        return next(new Error('DUPLICATE_TX', 'Can not execute duplicate transaction'));
       }
     }
 

package/lib/protocols/account/declare.js

@@ -1,6 +1,7 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, Joi } = require('@ocap/state');
+const { account } = require('@ocap/state');
 const { toBase58 } = require('@ocap/util');
 
 const runner = new Runner();

package/lib/protocols/account/delegate.js

@@ -1,8 +1,9 @@
 /* eslint-disable max-len */
 const get = require('lodash/get');
+const Joi = require('@ocap/validator');
 const Error = require('@ocap/util/lib/error');
 const getListField = require('@ocap/util/lib/get-list-field');
-const { delegation, account, Joi } = require('@ocap/state');
+const { delegation, account } = require('@ocap/state');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { toDelegateAddress } = require('@arcblock/did-util');
 
@@ -61,9 +62,9 @@ runner.use(
 );
 
 // Ensure sender/receiver exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
-runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'OK', table: 'account' }));
 
 // Extract delegation
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', table: 'delegation', status: 'OK' }));
@@ -71,7 +72,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', tabl
 // Create delegation state
 runner.use(
   async (context, next) => {
-    const { tx, itx, ops, statedb, senderState, delegationState } = context;
+    const { tx, itx, ops, statedb, senderState, receiverState, delegationState } = context;
 
     const opsObj = ops.reduce(
       (acc, x) => {
@@ -86,8 +87,23 @@ runner.use(
       delegationState ? delegationState.ops : {}
     );
 
-    const [newSenderState, newDelegationState] = await Promise.all([
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+    const sender = senderState ? senderState.address : tx.from;
+    const receiver = receiverState ? receiverState.address : itx.to;
+
+    const [newSenderState, newReceiverState, newDelegationState] = await Promise.all([
+      // update sender
+      statedb.account.updateOrCreate(
+        senderState,
+        account.updateOrCreate(senderState, { address: sender, nonce: tx.nonce, pk: tx.pk }, context),
+        context
+      ),
+
+      // update receiver
+      receiverState
+        ? 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),
@@ -97,6 +113,7 @@ runner.use(
 
     // Update context
     context.senderState = newSenderState;
+    context.receiverState = newReceiverState;
     context.delegationState = newDelegationState;
 
     return next();

package/lib/protocols/account/migrate.js

@@ -1,8 +1,9 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { fromPublicKey, toTypeInfo } = require('@arcblock/did');
-const { account, Joi } = require('@ocap/state');
+const { account } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:migrate`);
@@ -35,7 +36,7 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Create account state, and update old accounts
@@ -48,7 +49,7 @@ runner.use(
 
     // Ensure receiver does not exist
     if (receiver) {
-      return next(new Error('INVALID_SENDER_STATE', 'Can not migrate to an existing account'));
+      return next(new Error('INVALID_RECEIVER_STATE', 'Can not migrate to an existing account'));
     }
 
     // Create new account

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

@@ -1,8 +1,9 @@
 const get = require('lodash/get');
 const cloneDeep = require('lodash/cloneDeep');
+const Joi = require('@ocap/validator');
 const getListField = require('@ocap/util/lib/get-list-field');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { delegation, account, Joi } = require('@ocap/state');
+const { delegation, account } = require('@ocap/state');
 const { toDelegateAddress } = require('@arcblock/did-util');
 
 // eslint-disable-next-line global-require
@@ -53,10 +54,9 @@ runner.use(
 );
 
 // Ensure sender/receiver/delegation exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', status: 'INVALID_DELEGATION', table: 'delegation' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
-runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', status: 'INVALID_DELEGATION' }));
 
 // Update delegation state
 runner.use(

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

@@ -24,7 +24,7 @@ const runner = new Runner();
 runner.use(pipes.VerifyMultiSig(0));
 runner.use(verifyAcquireParams('acquire-v2'));
 
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK' }));
@@ -43,7 +43,7 @@ runner.use(
 
 // Though tokens are verified on factory creating phase, we need them here to construct tokenSymbols
 runner.use(extractFactoryTokens);
-runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN' }));
+runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 
 // Verify itx
 runner.use(verifyMintLimit);
@@ -86,6 +86,7 @@ runner.use(
     // Sender updates
     const senderUpdates = {
       nonce: tx.nonce,
+      pk: tx.pk,
       ...applyTokenUpdates(factoryTokens, senderState, 'sub'),
     };
 

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

@@ -82,9 +82,9 @@ runner.use(
 );
 
 // 5. verify sender & signer & owner
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE' }));
-runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'INVALID_RECEIVER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
 // 6. verify token state and balance
@@ -153,6 +153,7 @@ runner.use(
     });
 
     const isAlsoSigner = !!signerUpdates[senderState.address];
+    const owner = ownerState ? ownerState.address : itx.owner;
 
     // Factory updates
     const factoryUpdates = { numMinted: factoryState.numMinted + 1 };
@@ -163,44 +164,53 @@ runner.use(
       context.tokenUpdates = applyTokenUpdates(factoryTokens, { tokens: {} }, 'add');
     }
 
-    const [newSenderState, assetState, newSignerStates, newFactoryState, newAssetStates] = await Promise.all([
-      // Update sender state
-      statedb.account.update(
-        senderState.address,
-        account.update(
-          senderState,
-          Object.assign({ nonce: tx.nonce }, signerUpdates[senderState.address] || {}),
+    const [newSenderState, newReceiverState, assetState, newSignerStates, newFactoryState, newAssetStates] =
+      await Promise.all([
+        // Update sender state
+        statedb.account.update(
+          senderState.address,
+          account.update(
+            senderState,
+            Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+            context
+          ),
           context
         ),
-        context
-      ),
-
-      // Create asset
-      statedb.asset.create(
-        itx.address,
-        asset.create({ ...mintedAsset, owner: ownerState.address, address: mintedAddress }, context),
-        context
-      ),
-
-      // Update signer state
-      Promise.all(
-        signerStates
-          .filter((x) => x.address !== senderState.address)
-          .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
-      ),
-
-      // Update factory state
-      statedb.factory.update(factoryState.address, factory.update(factoryState, factoryUpdates, context), context),
-
-      // Mark asset as consumed
-      Promise.all(
-        assetStates.map((x) =>
-          statedb.asset.update(x.address, asset.update(x, { consumedTime: txTime }, context), context)
-        )
-      ),
-    ]);
+
+        // create receiver if not exist: asset owner
+        ownerState
+          ? Promise.resolve(ownerState)
+          : statedb.account.create(owner, account.create({ address: owner }, context), context),
+
+        // Create asset
+        statedb.asset.create(
+          itx.address,
+          asset.create({ ...mintedAsset, owner, address: mintedAddress }, context),
+          context
+        ),
+
+        // Update signer state
+        Promise.all(
+          signerStates
+            .filter((x) => x.address !== senderState.address)
+            .map((x) =>
+              statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context)
+            )
+        ),
+
+        // Update factory state
+        statedb.factory.update(factoryState.address, factory.update(factoryState, factoryUpdates, context), context),
+
+        // Mark asset as consumed
+        Promise.all(
+          assetStates.map((x) =>
+            statedb.asset.update(x.address, asset.update(x, { consumedTime: txTime }, context), context)
+          )
+        ),
+      ]);
 
     context.senderState = newSenderState;
+    context.receiverState = newReceiverState;
     context.signerStates = isAlsoSigner ? newSignerStates.concat(newSenderState) : newSignerStates;
     context.assetState = assetState;
     context.factoryState = newFactoryState;

package/lib/protocols/asset/create.js

@@ -1,14 +1,17 @@
 /* eslint-disable indent */
 const Error = require('@ocap/util/lib/error');
+const isEmpty = require('lodash/isEmpty');
 const cloneDeep = require('lodash/cloneDeep');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, Joi } = require('@ocap/state');
+const { account, asset } = require('@ocap/state');
 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 ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
 
 const runner = new Runner();
 
@@ -64,7 +67,7 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Check if parent is a factory
@@ -74,7 +77,7 @@ runner.use(
     // For security consideration, user can not create fake assets from a factory
     // https://github.com/ArcBlock/asset-chain/issues/97
     {
-      error: 'FORBIDDEN',
+      error: 'CREATE_FROM_FACTORY',
       message: 'You can only get asset from factory from acquire or mint',
       fn: ({ itx, factoryState }) => !(itx.parent && factoryState),
       persist: true,
@@ -83,26 +86,36 @@ runner.use(
 );
 
 // Ensure parent exist
-runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'parentAsset', status: 'INVALID_ASSET' }));
+runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'parentAsset', status: 'INVALID_ASSET', table: 'asset' }));
+
+runner.use(ensureTxFee);
 
 // Update asset state
 runner.use(
   async (context, next) => {
-    const { tx, itx, assetData, statedb, senderState } = context;
+    const { tx, itx, assetData, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
+
+    const [newSenderState, assetState, newVaultState] = await Promise.all([
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
+        context
+      ),
 
-    const [newSenderState, assetState] = await Promise.all([
-      // Update owner state
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
-      // Create asset state
       statedb.asset.create(
         itx.address,
         asset.create({ ...itx, data: assetData, owner: senderState.address }, context),
         context
       ),
+
+      isEmpty(vaultUpdates)
+        ? vaultState
+        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
     ]);
 
     context.senderState = newSenderState;
     context.assetState = assetState;
+    context.vaultState = newVaultState;
 
     debug('createAsset', assetState);
 

package/lib/protocols/asset/mint.js

@@ -17,21 +17,21 @@ runner.use(pipes.VerifyMultiSig(0));
 runner.use(verifyAcquireParams('mint'));
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // Ensure factory exist
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
 
 // Used to assemble issuer object
-runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER' }));
+runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER', table: 'account' })); // prettier-ignore
 
 // Ensure factory owner exist and equal to sender
-runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'INVALID_OWNER' }));
+runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'OWNER_ONLY_OPERATION',
       message: 'Only factory owner is allowed to mint',
       fn: ({ factoryState, senderState }) => factoryState.owner === senderState.address,
       persist: true,
@@ -72,20 +72,30 @@ runner.use(
       assetStates = [],
     } = context;
 
-    // account updates
-    const senderUpdates = { nonce: tx.nonce };
+    const owner = ownerState ? ownerState.address : itx.owner;
 
-    // Factory updates
+    const senderUpdates = { nonce: tx.nonce, pk: tx.pk };
     const factoryUpdates = { numMinted: factoryState.numMinted + 1 };
 
-    const [newSenderState, assetState, newFactoryState, newAssetStates] = await Promise.all([
+    const [newSenderState, newReceiverState, assetState, newFactoryState, newAssetStates] = await Promise.all([
+      // update sender
       statedb.account.update(senderState.address, account.update(senderState, senderUpdates, context), context),
+
+      // create receiver if not exist: asset owner
+      ownerState
+        ? Promise.resolve(ownerState)
+        : statedb.account.create(owner, account.create({ address: owner }, context), context),
+
+      // create asset
       statedb.asset.create(
         itx.address,
-        asset.create({ ...mintedAsset, owner: ownerState.address, address: mintedAddress }, context),
+        asset.create({ ...mintedAsset, owner, address: mintedAddress }, context),
         context
       ),
+
+      // update factory
       statedb.factory.update(factoryState.address, factory.update(factoryState, factoryUpdates, context), context),
+
       // mark input assets as consumed
       Promise.all(
         assetStates.map((x) =>
@@ -95,6 +105,7 @@ runner.use(
     ]);
 
     context.senderState = newSenderState;
+    context.receiverState = newReceiverState;
     context.assetState = assetState;
     context.factoryState = newFactoryState;
     context.assetStates = newAssetStates;

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

@@ -10,11 +10,12 @@ module.exports = (mode) => (context, next) => {
   if (mode === 'acquire-v2') {
     owner = delegatorState || senderState;
     issuer = itx.issuer;
+    context.assetOwner = owner;
   } else if (mode === 'acquire-v3') {
-    owner = ownerState;
+    owner = ownerState || { address: itx.owner };
     issuer = itx.issuer;
   } else if (mode === 'mint') {
-    owner = ownerState;
+    owner = ownerState || { address: itx.owner };
     issuer = {
       id: factoryOwnerState.address,
       pk: factoryOwnerState.pk,
@@ -33,7 +34,6 @@ module.exports = (mode) => (context, next) => {
     return next(new Error('INVALID_ASSET', 'Invalid itx.address: does not match with minted asset address'));
   }
 
-  context.assetOwner = owner;
   context.mintedAsset = minted.asset;
   context.mintedAddress = minted.address;
 

package/lib/protocols/asset/pipes/verify-mint-limit.js

@@ -9,5 +9,5 @@ module.exports = ({ factoryState }, next) => {
     return next();
   }
 
-  return next(new Error('FORBIDDEN', 'This request will exceed factory mint limit'));
+  return next(new Error('EXCEED_MINT_LIMIT', 'This request will exceed factory mint limit'));
 };

package/lib/protocols/asset/update.js

@@ -1,6 +1,7 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, Joi } = require('@ocap/state');
+const { account, asset } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:update-asset`);
@@ -52,7 +53,11 @@ runner.use(
 
     const [newSenderState, newAssetState] = await Promise.all([
       // update owner state
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk }, context),
+        context
+      ),
 
       // update asset state
       statedb.asset.update(

package/lib/protocols/factory/create.js

@@ -14,6 +14,7 @@ const { toFactoryAddress } = require('@arcblock/did-util');
 const debug = require('debug')(`${require('../../../package.json').name}:create-factory`);
 
 const { decodeAnySafe } = require('../../util');
+const ensureTxFee = require('../rollup/pipes/ensure-tx-fee');
 
 const runner = new Runner();
 
@@ -71,7 +72,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'factoryState', status:
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'DUPLICATE_FACTORY',
       message: 'This asset factory already exist on chain',
       fn: (context) => isEmpty(context.factoryState),
     },
@@ -79,23 +80,15 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(
-  pipes.ExtractState({ from: 'tx.from', to: 'senderState', table: 'account', status: 'INVALID_SENDER_STATE' })
-);
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', table: 'account', status: 'INVALID_SENDER_STATE' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // 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' })
-);
+runner.use(pipes.ExtractState({ from: 'factoryTokens', to: 'tokenStates', table: 'token', status: 'INVALID_FACTORY_INPUT' })); // prettier-ignore
 
 // ensure input.assets all exist on chain
-runner.use(
-  pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputAssetStates', table: 'asset', status: 'OK' })
-);
-runner.use(
-  pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputFactoryStates', table: 'factory', status: 'OK' })
-);
+runner.use(pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputAssetStates', table: 'asset', status: 'OK' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryProps.input.assets', to: 'inputFactoryStates', table: 'factory', status: 'OK' })); // prettier-ignore
 runner.use((context, next) => {
   const { inputAssetStates = [], inputFactoryStates = [], factoryProps } = context;
   if (inputAssetStates.some((x) => !!x.consumedTime)) {
@@ -109,26 +102,37 @@ runner.use((context, next) => {
   return next(new Error('INVALID_FACTORY_INPUT', 'Not all input.assets exist on chain'));
 });
 
+runner.use(ensureTxFee);
+
 // Create factory state
-// TODO: we need to support charging when creating new nft-factory
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, factoryProps } = context;
+    const { tx, itx, statedb, senderState, senderUpdates, vaultState, vaultUpdates, factoryProps } = context;
     const tokens = { [context.config.token.address]: '0' };
 
-    const [newSenderState, factoryState] = await Promise.all([
+    const [newSenderState, factoryState, newVaultState] = await Promise.all([
       // Update owner state
-      statedb.account.update(senderState.address, account.update(senderState, { nonce: tx.nonce }, context), context),
+      statedb.account.update(
+        senderState.address,
+        account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
+        context
+      ),
+
       // Create factory state
       statedb.factory.create(
         itx.address,
         factory.create({ ...factoryProps, tokens, owner: senderState.address }, context),
         context
       ),
+
+      isEmpty(vaultUpdates)
+        ? vaultState
+        : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
     ]);
 
     context.senderState = newSenderState;
     context.factoryState = factoryState;
+    context.vaultState = newVaultState;
 
     debug('createFactory', factoryState);
 

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

@@ -1,7 +1,8 @@
 const Error = require('@ocap/util/lib/error');
+const Joi = require('@ocap/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account, asset, stake, evidence, Joi } = require('@ocap/state');
+const { account, asset, stake, evidence } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
@@ -16,7 +17,7 @@ runner.use(pipes.VerifyMultiSig(0));
 const schema = Joi.object({
   address: Joi.DID().role('ROLE_STAKE').required(),
   evidence: Joi.object({
-    hash: Joi.string().regex(Joi.hashRegexp).required(),
+    hash: Joi.string().regex(Joi.patterns.txHash).required(),
   }).required(),
   data: Joi.any().optional(),
 }).options({ stripUnknown: true, noDefaults: false });
@@ -30,7 +31,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: '
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to claim stake from this address',
       fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
     },
@@ -42,7 +43,7 @@ runner.use(pipes.ExtractState({ from: 'itx.evidence.hash', to: 'evidenceState',
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'ALREADY_CLAIMED',
       message: 'Revoke evidence already seen on this chain',
       fn: ({ evidenceState }) => !evidenceState,
     },
@@ -69,7 +70,7 @@ runner.use(
       fn: ({ txState, itx }) => txState.tx.itxJson.address === itx.address,
     },
     {
-      error: 'FORBIDDEN',
+      error: 'WITHIN_WAITING_PERIOD',
       message: 'You can not claim stake before waiting period ends',
       fn: ({ txState, stakeState, txTime }) => {
         const end = +new Date(txState.time) + (stakeState.revokeWaitingPeriod || 0) * 1000;

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

@@ -49,12 +49,12 @@ runner.use(
 runner.use(
   pipes.VerifyInfo([
     {
-      error: 'FORBIDDEN',
+      error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to revoke stake from this address',
       fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
     },
     {
-      error: 'FORBIDDEN',
+      error: 'STAKE_NOT_REVOCABLE',
       message: 'This stake address is not revocable',
       fn: ({ stakeState }) => stakeState.revocable,
     },

package/lib/protocols/governance/stake.js

@@ -1,10 +1,11 @@
 const pick = require('lodash/pick');
 const { promisify } = require('util');
 const isEmpty = require('empty-value');
+const Joi = require('@ocap/validator');
 const Error = require('@ocap/util/lib/error');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { toStakeAddress } = require('@arcblock/did-util');
-const { account, asset, stake, Joi } = require('@ocap/state');
+const { account, asset, stake } = require('@ocap/state');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
@@ -122,7 +123,7 @@ runner.use(
         senderState.address,
         account.update(
           senderState,
-          Object.assign({ nonce: tx.nonce }, signerUpdates[senderState.address] || {}),
+          Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
           context
         ),
         context