@ocap/tx-protocols 1.15.2 → 1.15.3

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

@@ -109,7 +109,7 @@ runner.use(
 runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 
 // 4. verify sender & signer & receiver
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+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' }));
@@ -174,21 +174,22 @@ runner.use(
       });
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
-    const isAlsoReceiver = !!receiverUpdates[senderState.address];
+    const sender = senderState ? senderState.address : tx.from;
+    const isAlsoSigner = !!signerUpdates[sender];
+    const isAlsoReceiver = !!receiverUpdates[sender];
 
     debug('transfer-v3', { signerUpdates, receiverUpdates, assetUpdates, isAlsoSigner, isAlsoReceiver });
 
     const [newSenderState, newSignerStates, newReceiverStates, newAssetStates] = await Promise.all([
       // Update sender state
-      statedb.account.update(
-        senderState.address,
-        account.update(
+      statedb.account.updateOrCreate(
+        senderState,
+        account.updateOrCreate(
           senderState,
           Object.assign(
-            { nonce: tx.nonce, pk: tx.pk },
-            signerUpdates[senderState.address] || {},
-            receiverUpdates[senderState.address] || {}
+            { address: sender, nonce: tx.nonce, pk: tx.pk },
+            signerUpdates[sender] || {},
+            receiverUpdates[sender] || {}
           ),
           context
         ),
@@ -198,14 +199,14 @@ runner.use(
       // Update signer state
       Promise.all(
         signerStates
-          .filter((x) => x.address !== senderState.address)
+          .filter((x) => x.address !== sender)
           .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
       ),
 
       // UpdateOrCreate receiver state
       Promise.all(
         receivers
-          .filter((x) => x !== senderState.address)
+          .filter((x) => x !== sender)
           .map((x) => {
             const receiverState = receiverStates.find((s) => getRelatedAddresses(s).includes(x));
             const owner = receiverState ? receiverState.address : x;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.15.2",
+  "version": "1.15.3",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,17 +21,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.15.2",
-    "@arcblock/did-util": "1.15.2",
-    "@arcblock/validator": "1.15.2",
-    "@ocap/asset": "1.15.2",
-    "@ocap/mcrypto": "1.15.2",
-    "@ocap/merkle-tree": "1.15.2",
-    "@ocap/message": "1.15.2",
-    "@ocap/state": "1.15.2",
-    "@ocap/tx-pipeline": "1.15.2",
-    "@ocap/util": "1.15.2",
-    "@ocap/wallet": "1.15.2",
+    "@arcblock/did": "1.15.3",
+    "@arcblock/did-util": "1.15.3",
+    "@arcblock/validator": "1.15.3",
+    "@ocap/asset": "1.15.3",
+    "@ocap/mcrypto": "1.15.3",
+    "@ocap/merkle-tree": "1.15.3",
+    "@ocap/message": "1.15.3",
+    "@ocap/state": "1.15.3",
+    "@ocap/tx-pipeline": "1.15.3",
+    "@ocap/util": "1.15.3",
+    "@ocap/wallet": "1.15.3",
     "debug": "^4.3.3",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -46,5 +46,5 @@
     "jest": "^27.3.1",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "6e4795801681ed248202e1d0f0d9ef4e8b852b0d"
+  "gitHead": "190142943c7dc11da5c64e3fa0ed4f0282dec0c5"
 }