@ocap/tx-protocols 1.18.59 → 1.18.61

package/lib/protocols/account/declare.js

@@ -27,7 +27,7 @@ runner.use(({ itx }, next) => {
 // Ensure sender does not exist
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState' }));
 runner.use(pipes.VerifySender({ state: 'senderState' }));
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // The issuer must exist in the ledger
 runner.use(pipes.ExtractState({ from: 'itx.issuer', to: 'issuerState', status: 'INVALID_TX' }));

package/lib/protocols/account/delegate.js

@@ -64,12 +64,13 @@ runner.use(
   ])
 );
 
-// Ensure sender/receiver exist
-runner.use(
-  pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })
-);
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+// Ensure sender exist and not migrated
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
+
+// Ensure receiver exist and not migrated
 runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'receiverState', addressKey: 'itx.to' }));
 
 // Extract delegation
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', table: 'delegation', status: 'OK' }));

package/lib/protocols/account/migrate.js

@@ -40,7 +40,7 @@ runner.use(
 
 // Ensure sender exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(
@@ -88,7 +88,7 @@ runner.use(
         if (address === sender.address) {
           state = account.update(sender, { migratedTo: itx.address, nonce: tx.nonce }, context);
         } else {
-          const old = await statedb.account.get(address, { final: false, txn: context.txn });
+          const old = await statedb.account.get(address, { traceMigration: false, txn: context.txn });
           state = account.update(old, { migratedTo: itx.address }, context);
         }
 

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

@@ -60,7 +60,7 @@ runner.use(
 // Ensure sender/receiver/delegation exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));

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

@@ -58,12 +58,33 @@ runner.use(
 );
 
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK' }));
 runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
 
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER_STATE' , table: 'account'})); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryState.trustedIssuers', to: 'issuerStates', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'itx.issuer.id', to: 'issuerState', status: 'INVALID_ISSUER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'issuerState', addressKey: 'itx.issuer.id' }));
+
+runner.use(
+  pipes.VerifyInfo([
+    {
+      error: 'FORBIDDEN',
+      message: 'Only factory owner and trusted issuers are allowed',
+      fn: ({ issuerState, factoryOwnerState, issuerStates = [] }) => {
+        return (
+          factoryOwnerState.address === issuerState.address ||
+          issuerStates.find((x) => x.address === issuerState.address)
+        );
+      },
+      persist: true,
+    },
+  ])
+);
+
 runner.use(pipes.ExtractState({ from: 'itx.assetsList', to: 'assetStates', status: 'OK', table: 'asset' }));
 runner.use(
   pipes.ExtractState({

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

@@ -77,6 +77,25 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 
 // 4. verify against factory state
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_OWNER_STATE' , table: 'account'})); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryState.trustedIssuers', to: 'issuerStates', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'itx.issuer.id', to: 'issuerState', status: 'INVALID_ISSUER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'issuerState', addressKey: 'itx.issuer.id' }));
+runner.use(
+  pipes.VerifyInfo([
+    {
+      error: 'FORBIDDEN',
+      message: 'Only factory owner and trusted issuers are allowed',
+      fn: ({ issuerState, factoryOwnerState, issuerStates = [] }) => {
+        return (
+          factoryOwnerState.address === issuerState.address ||
+          issuerStates.find((x) => x.address === issuerState.address)
+        );
+      },
+      persist: true,
+    },
+  ])
+);
 runner.use(extractFactoryTokens);
 runner.use(verifyMintLimit);
 runner.use(verifyItxVariables);
@@ -117,7 +136,7 @@ runner.use(
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', 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' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 6. verify token state and balance
 runner.use(pipes.ExtractState({ from: 'tokens', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));

package/lib/protocols/asset/consume.js

@@ -31,7 +31,7 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'assetState', status: '
 
 // Ensure asset can be consumed
 runner.use((context, next) => {
-  const { issuer, owner, consumedTime } = context.assetState;
+  const { issuer, consumedTime } = context.assetState;
   if (!issuer) {
     return next(new Error('INVALID_TX', 'Asset without issuer can not be consumed'));
   }
@@ -39,16 +39,25 @@ runner.use((context, next) => {
     return next(new Error('INVALID_TX', `Asset already consumed on ${consumedTime}`));
   }
 
-  context.signers = [owner, issuer];
   return next();
 });
 
-// Ensure owner and issuer signed
-runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
-
 // Ensure sender exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
+
+// Ensure owner/issuer exist
+runner.use(pipes.ExtractState({ from: 'assetState.issuer', to: 'issuerState', status: 'INVALID_ISSUER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'assetState.owner', to: 'ownerState', status: 'INVALID_OWNER_STATE', table: 'account' })); // prettier-ignore
+runner.use((context, next) => {
+  context.signerStates = [context.ownerState, context.issuerState];
+  context.signers = [context.ownerState.address, context.issuerState.address];
+  return next();
+});
+
+// Ensure owner and issuer signed: and not migrated
+runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));

package/lib/protocols/asset/create.js

@@ -66,7 +66,7 @@ runner.use(pipes.VerifyAccountMigration({ signerKey: 'issuerState' }));
 
 // Ensure sender exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure delegation
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));

package/lib/protocols/asset/mint.js

@@ -51,10 +51,11 @@ runner.use(
 
 // Ensure sender exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure factory exist
 runner.use(pipes.ExtractState({ from: 'itx.factory', to: 'factoryState', status: 'INVALID_FACTORY_STATE', table: 'factory' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerState', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
 
 // Ensure issuer exist: read them here because some maybe migrated
 runner.use(pipes.ExtractState({ from: 'factoryState.trustedIssuers', to: 'issuerStates', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
@@ -66,8 +67,9 @@ runner.use(
     {
       error: 'FORBIDDEN',
       message: 'Only factory owner and trusted issuers are allowed to mint',
-      fn: ({ factoryState, senderState, issuerStates }) =>
-        senderState.address === factoryState.owner || issuerStates.find((x) => x.address === senderState.address),
+      fn: ({ factoryOwnerState, senderState, issuerStates }) =>
+        senderState.address === factoryOwnerState.address ||
+        issuerStates.find((x) => x.address === senderState.address),
       persist: true,
     },
   ])

package/lib/protocols/asset/update.js

@@ -42,7 +42,7 @@ runner.use(pipes.ExtractState({ from: 'assetState.issuer', to: 'issuerState', st
 
 // Ensure sender exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure asset owned by sender and can be modified
 runner.use(pipes.VerifyUpdater({ assetKey: 'assetState', ownerKey: 'senderState', updaterKey: ['owner', 'issuer'] }));

package/lib/protocols/factory/create.js

@@ -82,7 +82,7 @@ runner.use(
 
 // Ensure sender exist
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', table: 'account', status: 'INVALID_SENDER_STATE' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure delegation
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
@@ -107,8 +107,9 @@ runner.use((context, next) => {
   return next(new Error('INVALID_FACTORY_INPUT', 'Not all input.assets exist on chain'));
 });
 
-// ensure issuer exists
+// ensure issuer exists and not migrated
 runner.use(pipes.ExtractState({ from: 'factoryProps.trustedIssuers', to: 'issuerStates', table: 'account', status: 'INVALID_ISSUER_STATE' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'issuerStates', addressKey: 'factoryProps.trustedIssuers' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 1, update: 1, payment: 0 })));

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

@@ -32,7 +32,7 @@ runner.use(({ itx }, next) => {
 // 2. verify stake state & sender state
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'INVALID_STAKE_STATE', table: 'stake' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 runner.use(
   pipes.VerifyInfo([
     {

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

@@ -56,7 +56,7 @@ runner.use(pipes.VerifyListSize({ listKey: ['outputs', 'receivers', 'tokens', 'a
 // 4. verify sender & receiver
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'receivers', to: 'receiverStates', status: 'INVALID_RECEIVER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify stake state
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'INVALID_STAKE_STATE', table: 'stake' })); // prettier-ignore

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

@@ -62,17 +62,20 @@ runner.use(pipes.VerifyListSize({ listKey: ['outputs', 'receivers', 'tokens', 'a
 // 4. verify sender & receiver
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'receivers', to: 'receiverStates', status: 'INVALID_RECEIVER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify stake state
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'INVALID_STAKE_STATE', table: 'stake' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'stakeState.slashers', to: 'slasherStates', status: 'INVALID_SLASH_STATE', table: 'account' })); // prettier-ignore
 runner.use(
   pipes.VerifyInfo([
     {
       error: 'INVALID_TX',
       message: 'You are not allowed to slash from this stake',
-      fn: ({ tx, stakeState }) =>
-        (isEmpty(stakeState.slashers) ? [stakeState.receiver] : stakeState.slashers).includes(tx.from),
+      fn: ({ senderState, stakeState, slasherStates = [] }) =>
+        (isEmpty(slasherStates) ? [stakeState.receiver] : slasherStates.map((x) => x.address)).includes(
+          senderState.address
+        ),
     },
   ])
 );

package/lib/protocols/governance/stake.js

@@ -77,8 +77,9 @@ runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: '
 // 5. verify sender & signer & receiver
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
 runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 runner.use(pipes.ExtractState({ from: 'itx.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' })); // can by any type
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'receiverState', addressKey: 'itx.receiver' }));
 
 // 6. verify token state and balance
 runner.use(pipes.ExtractState({ from: 'tokens', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
@@ -105,6 +106,10 @@ runner.use(async (context, next) => {
   return next();
 });
 
+// ensure slashers exist and not migrated
+runner.use(pipes.ExtractState({ from: 'itx.slashersList', to: 'slasherStates', status: 'INVALID_SLASHER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ stateKey: 'slasherStates', addressKey: 'itx.slashersList' }));
+
 // 8. handle tx gas stakes
 runner.use(async (context, next) => {
   const { tx, itx, inputs, config } = context;

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

@@ -97,7 +97,7 @@ runner.use(pipes.ExtractState({ from: 'producerStake', to: 'stakeState', status:
 // 6. verify sender and signer states
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 7. verify token state
 runner.use(pipes.ExtractState({ from: 'rollupState.tokenAddress', to: 'tokenState', status: 'INVALID_TOKEN', table: 'token' })); // prettier-ignore

package/lib/protocols/rollup/close.js

@@ -39,7 +39,7 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
 // 4. verify sender and signer states
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. extract validator stake stakes
 runner.use((context, next) => {

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

@@ -134,13 +134,9 @@ runner.use(VerifySigners({ signersKey: 'tx.signaturesList', allowSender: true })
 runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
 
 // 4. verify sender and signer states
-runner.use(
-  pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })
-);
-runner.use(
-  pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })
-);
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify previous block
 runner.use(pipes.ExtractState({ from: 'itx.previousHash', to: 'previousBlock', status: 'OK', table: 'rollupBlock' }));

package/lib/protocols/rollup/create.js

@@ -70,7 +70,7 @@ runner.use(
 // 1. ensure sender, validators, delegation
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'seedValidators', to: 'validatorStates', status: 'INVALID_VALIDATOR_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'validatorStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'validatorStates', stateKey: 'senderState', addressKey: 'tx.from' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
 runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
 

package/lib/protocols/rollup/join.js

@@ -110,7 +110,7 @@ runner.use(
 runner.use(
   pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })
 );
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 1, update: 3, payment: 0 })));

package/lib/protocols/rollup/leave.js

@@ -87,7 +87,7 @@ runner.use(
 runner.use(
   pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })
 );
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 1, update: 3, payment: 0 })));

package/lib/protocols/rollup/migrate.js

@@ -36,7 +36,7 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
 // 4. verify sender and signer states
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));

package/lib/protocols/rollup/pause.js

@@ -33,7 +33,7 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
 // 4. verify sender and signer states
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));

package/lib/protocols/rollup/resume.js

@@ -33,7 +33,7 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'signers' }));
 // 4. verify sender and signer states
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));

package/lib/protocols/rollup/update.js

@@ -78,7 +78,7 @@ runner.use(
 runner.use(
   pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })
 );
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(EnsureTxGas(() => ({ create: 0, update: 2, payment: 0 })));

package/lib/protocols/token/create.js

@@ -61,7 +61,7 @@ runner.use(
 
 // Ensure sender exist
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure delegation
 runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));

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

@@ -158,10 +158,10 @@ runner.use((context, next) => {
   return next();
 });
 
-// 7. verify sender and signer states
+// 7. verify sender and signer exists and not migrated
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
 runner.use(pipes.ExtractState({ from: 'signers', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(

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

@@ -61,7 +61,7 @@ runner.use(pipes.ExtractState({ from: 'itx.token.address', to: 'tokenState', sta
 
 // 4. verify sender and signer states
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify amount
 runner.use((context, next) => {

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

@@ -105,7 +105,7 @@ runner.use(
 runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 
 runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState', signerKey: 'signerStates' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 runner.use((context, next) => {
   context.senderTokenConditions = {
     owner: context.senderState.address,

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

@@ -83,7 +83,7 @@ runner.use((context, next) => {
 });
 
 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.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 runner.use((context, next) => {

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

@@ -127,7 +127,7 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' }));
 runner.use(pipes.ExtractState({ from: 'senders', to: 'signerStates', status: 'INVALID_SIGNER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'receivers', to: 'receiverStates', status: 'OK', table: 'account' }));
-runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
+runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify token state and balance
 runner.use(pipes.ExtractState({ from: 'inputTokens', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.59",
+  "version": "1.18.61",
   "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.59",
-    "@arcblock/did-util": "1.18.59",
-    "@arcblock/jwt": "1.18.59",
-    "@arcblock/validator": "1.18.59",
-    "@ocap/asset": "1.18.59",
-    "@ocap/mcrypto": "1.18.59",
-    "@ocap/merkle-tree": "1.18.59",
-    "@ocap/message": "1.18.59",
-    "@ocap/state": "1.18.59",
-    "@ocap/tx-pipeline": "1.18.59",
-    "@ocap/util": "1.18.59",
-    "@ocap/wallet": "1.18.59",
+    "@arcblock/did": "1.18.61",
+    "@arcblock/did-util": "1.18.61",
+    "@arcblock/jwt": "1.18.61",
+    "@arcblock/validator": "1.18.61",
+    "@ocap/asset": "1.18.61",
+    "@ocap/mcrypto": "1.18.61",
+    "@ocap/merkle-tree": "1.18.61",
+    "@ocap/message": "1.18.61",
+    "@ocap/state": "1.18.61",
+    "@ocap/tx-pipeline": "1.18.61",
+    "@ocap/util": "1.18.61",
+    "@ocap/wallet": "1.18.61",
     "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": "0376830a7ee13815fc4428330418079387e1fc30"
+  "gitHead": "350ee5dcb48f4c335e13b59866fd1ad3f4189bfc"
 }