@ocap/tx-protocols 1.18.130 → 1.18.132

package/lib/execute.js

@@ -30,7 +30,7 @@ module.exports = ({ filter, runAsLambda }) => {
   // pipeline before executing the transaction
   const pre = new Runner();
   pre.use(pipes.DecodeTx);
-  pre.use(pipes.VerifyBlocked(filter));
+  pre.use(pipes.VerifyBlocked({ filter, stateKeys: ['tx.from'] }));
   pre.use(pipes.DecodeItx);
   pre.use(pipes.VerifyTx);
   pre.use(pipes.VerifyServiceFee);
@@ -127,7 +127,7 @@ module.exports = ({ filter, runAsLambda }) => {
       try {
         await runAsLambda((txn) => {
           // create a new context each time in case we are retrying
-          ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'extra']);
+          ctx = pick(context, ['txBase64', 'statedb', 'indexdb', 'config', 'states', 'filter', 'extra']);
           Object.defineProperty(ctx, 'txn', { value: txn });
           return execute(ctx, protocols, true);
         });

package/lib/protocols/account/delegate.js

@@ -99,8 +99,12 @@ runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: '
 
 // Ensure receiver exist and not migrated
 runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyBlocked({ stateKeys: ['receiverState'] }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'receiverState', addressKey: 'itx.to' }));
 
+// Ensure sender and receiver are not the same
+runner.use(pipes.AntiLandAttack({ senderState: 'senderState', receiverState: 'receiverState' }));
+
 // Extract delegation
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'delegationState', table: 'delegation', status: 'OK' }));
 

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

@@ -110,6 +110,7 @@ runner.use(pipes.ExtractState({ from: 'tokenAddress', to: 'tokenStates', status:
 runner.use(verifyMintLimit);
 runner.use(verifyItxVariables);
 runner.use(verifyItxAddress('acquire-v2'));
+runner.use(pipes.VerifyBlocked({ stateKeys: ['assetOwner'] }));
 runner.use(async (context, next) => {
   const { factoryTokens, senderState } = context;
   const condition = {

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

@@ -137,6 +137,7 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK'
 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', stateKey: 'senderState', addressKey: 'tx.from' }));
+runner.use(pipes.VerifyBlocked({ stateKeys: ['signerStates', 'ownerState'] }));
 
 // 6. verify token state and balance
 runner.use(pipes.ExtractState({ from: 'tokens', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));

package/lib/protocols/asset/mint.js

@@ -61,6 +61,7 @@ runner.use(pipes.ExtractState({ from: 'factoryState.owner', to: 'factoryOwnerSta
 runner.use(pipes.ExtractState({ from: 'factoryState.trustedIssuers', to: 'issuerStates', status: 'INVALID_ISSUER_STATE' , table: 'account'})); // prettier-ignore
 
 runner.use(pipes.ExtractState({ from: 'itx.owner', to: 'ownerState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyBlocked({ stateKeys: ['ownerState'] }));
 runner.use(
   pipes.VerifyInfo([
     {

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

@@ -57,6 +57,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.VerifyBlocked({ stateKeys: ['receiverStates'] }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify stake state

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

@@ -56,6 +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.VerifyBlocked({ stateKeys: ['receiverStates'] }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify stake state

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

@@ -57,6 +57,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.VerifyBlocked({ stateKeys: ['receiverStates'] }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify stake state

package/lib/protocols/governance/stake.js

@@ -81,6 +81,7 @@ runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK'
 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.VerifyBlocked({ stateKeys: ['signerStates', 'receiverState'] }));
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'receiverState', addressKey: 'itx.receiver' }));
 
 // 6. verify token state and balance

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

@@ -61,7 +61,6 @@ 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({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // 5. verify amount
 runner.use((context, next) => {
@@ -146,6 +145,10 @@ runner.use((context, next) => {
   verifyMultiSigV2(context, next);
 });
 
+// 7. verify signers (sender + proposer)
+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' }));
+
 // 8. verify staking: user withdraw is locked in stake
 runner.use((context, next) => {
   const { itx, senderState } = context;

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

@@ -87,8 +87,6 @@ runner.use(pipes.VerifySigner({ signer: 'itx.to' }));
 runner.use(pipes.VerifyListSize({ listKey: ['senderAssets', 'receiverAssets'] }));
 runner.use(pipes.VerifyListSize({ listKey: ['senderTokens', 'receiverTokens'] }));
 
-// TODO: anti-replay-exchange-attack
-
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // 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' }));
@@ -123,6 +121,7 @@ runner.use(pipes.VerifyTokenBalance({ ownerKey: 'senderState', conditionKey: 'se
 runner.use(pipes.VerifyTokenBalance({ ownerKey: 'receiverState', conditionKey: 'receiverTokenConditions' }));
 
 runner.use(pipes.AntiLandAttack({ senderState: 'senderState', receiverState: 'receiverState' }));
+runner.use(pipes.VerifyBlocked({ stateKeys: ['senderState', 'receiverState'] }));
 
 runner.use(pipes.ExtractState({ from: 'senderAssets', to: 'priv.senderAssets', status: 'INVALID_ASSET', table: 'asset' })); // prettier-ignore
 runner.use(pipes.VerifyTransferrable({ assets: 'priv.senderAssets' }));

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

@@ -112,6 +112,7 @@ runner.use(
 runner.use(pipes.ExtractReceiver({ from: 'itx.to', to: 'receiver' }));
 runner.use(pipes.ExtractState({ from: 'receiver', to: 'receiverState', status: 'OK', table: 'account' }));
 runner.use(pipes.AntiLandAttack({ senderState: 'senderState', receiverState: 'receiverState' }));
+runner.use(pipes.VerifyBlocked({ stateKeys: ['senderState', 'receiverState'] }));
 
 runner.use(pipes.ExtractState({ from: 'assets', to: 'assetStates', status: 'INVALID_ASSET', table: 'asset' }));
 runner.use(pipes.VerifyTransferrable({ assets: 'assetStates' }));

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

@@ -127,6 +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.VerifyBlocked({ stateKeys: ['signerStates', 'receiverStates'] }));
 runner.use(pipes.AntiLandAttack({ senderState: 'signerStates', receiverState: 'receiverStates' }));
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', stateKey: 'senderState', addressKey: 'tx.from' }));
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.130",
+  "version": "1.18.132",
   "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.130",
-    "@arcblock/did-util": "1.18.130",
-    "@arcblock/jwt": "1.18.130",
-    "@arcblock/validator": "1.18.130",
-    "@ocap/asset": "1.18.130",
-    "@ocap/mcrypto": "1.18.130",
-    "@ocap/merkle-tree": "1.18.130",
-    "@ocap/message": "1.18.130",
-    "@ocap/state": "1.18.130",
-    "@ocap/tx-pipeline": "1.18.130",
-    "@ocap/util": "1.18.130",
-    "@ocap/wallet": "1.18.130",
+    "@arcblock/did": "1.18.132",
+    "@arcblock/did-util": "1.18.132",
+    "@arcblock/jwt": "1.18.132",
+    "@arcblock/validator": "1.18.132",
+    "@ocap/asset": "1.18.132",
+    "@ocap/mcrypto": "1.18.132",
+    "@ocap/merkle-tree": "1.18.132",
+    "@ocap/message": "1.18.132",
+    "@ocap/state": "1.18.132",
+    "@ocap/tx-pipeline": "1.18.132",
+    "@ocap/util": "1.18.132",
+    "@ocap/wallet": "1.18.132",
     "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": "d4846249beb92ef45faad7a23781f631523f288e"
+  "gitHead": "6699d47364eb94f564e0fcf6ea55b6e7ea005d0d"
 }