@ocap/tx-protocols 1.13.68 → 1.13.69

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

@@ -82,7 +82,7 @@ runner.use(
 );
 
 // 5. verify sender & signer & owner
-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' })); // 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' }));
@@ -152,7 +152,7 @@ runner.use(
       );
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
+    const isAlsoSigner = !!signerUpdates[tx.from];
     const owner = ownerState ? ownerState.address : itx.owner;
 
     // Factory updates
@@ -166,12 +166,12 @@ runner.use(
 
     const [newSenderState, newReceiverState, assetState, newSignerStates, newFactoryState, newAssetStates] =
       await Promise.all([
-        // Update sender state
-        statedb.account.update(
-          senderState.address,
-          account.update(
+        // update sender
+        statedb.account.updateOrCreate(
+          senderState,
+          account.updateOrCreate(
             senderState,
-            Object.assign({ nonce: tx.nonce, pk: tx.pk }, signerUpdates[senderState.address] || {}),
+            Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
             context
           ),
           context
@@ -192,7 +192,7 @@ runner.use(
         // Update signer state
         Promise.all(
           signerStates
-            .filter((x) => x.address !== senderState.address)
+            .filter((x) => x.address !== tx.from)
             .map((x) =>
               statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context)
             )

package/lib/protocols/governance/stake.js

@@ -64,9 +64,9 @@ runner.use(pipes.VerifyMultiSigV2({ signersKey: 'senders' }));
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'OK', table: 'stake' }));
 
 // 5. verify sender & signer & receiver
-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.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' }));
+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: 'itx.receiver', to: 'receiverState', status: 'INVALID_RECEIVER_STATE' })); // can by any type
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'signerStates', senderKey: 'senderState' }));
 
 // 6. verify token state and balance
@@ -115,15 +115,15 @@ runner.use(
       stakeUpdates.assets.push(...assetsList);
     });
 
-    const isAlsoSigner = !!signerUpdates[senderState.address];
+    const isAlsoSigner = !!signerUpdates[tx.from];
 
     const [newSenderState, newSignerStates, newStakeState, 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] || {}),
+          Object.assign({ address: tx.from, nonce: tx.nonce, pk: tx.pk }, signerUpdates[tx.from] || {}),
           context
         ),
         context
@@ -132,7 +132,7 @@ runner.use(
       // Update signer state
       Promise.all(
         signerStates
-          .filter((x) => x.address !== senderState.address)
+          .filter((x) => x.address !== tx.from)
           .map((x) => statedb.account.update(x.address, account.update(x, signerUpdates[x.address], context), context))
       ),
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.68",
+  "version": "1.13.69",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.13.68",
-    "@arcblock/did-util": "1.13.68",
-    "@ocap/asset": "1.13.68",
-    "@ocap/mcrypto": "1.13.68",
-    "@ocap/merkle-tree": "1.13.68",
-    "@ocap/message": "1.13.68",
-    "@ocap/state": "1.13.68",
-    "@ocap/tx-pipeline": "1.13.68",
-    "@ocap/util": "1.13.68",
-    "@ocap/validator": "1.13.68",
-    "@ocap/wallet": "1.13.68",
+    "@arcblock/did": "1.13.69",
+    "@arcblock/did-util": "1.13.69",
+    "@ocap/asset": "1.13.69",
+    "@ocap/mcrypto": "1.13.69",
+    "@ocap/merkle-tree": "1.13.69",
+    "@ocap/message": "1.13.69",
+    "@ocap/state": "1.13.69",
+    "@ocap/tx-pipeline": "1.13.69",
+    "@ocap/util": "1.13.69",
+    "@ocap/validator": "1.13.69",
+    "@ocap/wallet": "1.13.69",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "d84324870fe9dca3619df362ba09219dd420f274"
+  "gitHead": "7520d994d592dc4fe50612a665c94d7fa4d5b143"
 }