@ocap/tx-protocols 1.18.130 → 1.18.131

package/lib/protocols/account/delegate.js

@@ -101,6 +101,9 @@ runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: '
 runner.use(pipes.ExtractState({ from: 'itx.to', to: 'receiverState', status: 'OK', table: 'account' }));
 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/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' }));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.130",
+  "version": "1.18.131",
   "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.131",
+    "@arcblock/did-util": "1.18.131",
+    "@arcblock/jwt": "1.18.131",
+    "@arcblock/validator": "1.18.131",
+    "@ocap/asset": "1.18.131",
+    "@ocap/mcrypto": "1.18.131",
+    "@ocap/merkle-tree": "1.18.131",
+    "@ocap/message": "1.18.131",
+    "@ocap/state": "1.18.131",
+    "@ocap/tx-pipeline": "1.18.131",
+    "@ocap/util": "1.18.131",
+    "@ocap/wallet": "1.18.131",
     "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": "1e07d8baecba883a20db0a1ab44aeba211e97b30"
 }