@ocap/tx-protocols 1.13.69 → 1.13.70

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

@@ -252,70 +252,74 @@ runner.use(
     const { tx, itx, statedb, rollupState, senderState, stakeStates, txStates, formattedItx } = context;
     const senderStates = context.senderStates || [];
 
-    const [newSenderState, newStakeStates, newSenderStates, newRollupState, rollupBlockState] = await Promise.all([
-      // update sender(proposer) account
-      statedb.account.update(
-        senderState.address,
-        account.update(senderState, Object.assign({ nonce: tx.nonce }), context),
-        context
-      ),
-
-      // update stake states
-      Promise.all(
-        stakeStates.map((x) =>
-          context.stakeUpdates[x.address]
-            ? statedb.stake.update(
-                x.address,
-                stake.update(x, applyTokenChange(x, context.stakeUpdates[x.address]), context),
-                context
-              )
-            : Promise.resolve(x)
-        )
-      ),
-
-      // update tx owner states: those may get refund
-      Promise.all(
-        senderStates.map((x) =>
-          statedb.account.update(
-            x.address,
-            account.update(x, applyTokenChange(x, context.accountUpdates[x.address]), context),
-            context
+    const [newSenderState, newStakeStates, newSenderStates, newRollupState, rollupBlockState, newTxStates] =
+      await Promise.all([
+        // update sender(proposer) account
+        statedb.account.update(
+          senderState.address,
+          account.update(senderState, Object.assign({ nonce: tx.nonce }), context),
+          context
+        ),
+
+        // update stake states
+        Promise.all(
+          stakeStates.map((x) =>
+            context.stakeUpdates[x.address]
+              ? statedb.stake.update(
+                  x.address,
+                  stake.update(x, applyTokenChange(x, context.stakeUpdates[x.address]), context),
+                  context
+                )
+              : Promise.resolve(x)
           )
-        )
-      ),
-
-      // Update rollup state
-      statedb.rollup.update(
-        rollupState.address,
-        rollup.update(rollupState, { blockHeight: itx.height, blockHash: itx.hash }, context),
-        context
-      ),
-
-      // Create rollup block
-      statedb.rollupBlock.create(
-        itx.hash,
-        rollupBlock.create(
-          {
-            ...formattedItx,
-            ...['rewardAmount', 'mintedAmount', 'burnedAmount'].reduce((acc, x) => {
-              acc[x] = context[x].toString(10);
-              return acc;
-            }, {}),
-          },
+        ),
+
+        // update tx owner states: those may get refund
+        Promise.all(
+          senderStates.map((x) =>
+            statedb.account.update(
+              x.address,
+              account.update(x, applyTokenChange(x, context.accountUpdates[x.address]), context),
+              context
+            )
+          )
+        ),
+
+        // Update rollup state
+        statedb.rollup.update(
+          rollupState.address,
+          rollup.update(rollupState, { blockHeight: itx.height, blockHash: itx.hash }, context),
+          context
+        ),
+
+        // Create rollup block
+        statedb.rollupBlock.create(
+          itx.hash,
+          rollupBlock.create(
+            {
+              ...formattedItx,
+              ...['rewardAmount', 'mintedAmount', 'burnedAmount'].reduce((acc, x) => {
+                acc[x] = context[x].toString(10);
+                return acc;
+              }, {}),
+            },
+            context
+          ),
           context
         ),
-        context
-      ),
 
-      // Update tx states: mark as finalized
-      Promise.all(txStates.map((x) => statedb.tx.update(x.hash, Tx.update(x, { finalized: true, tx: x.tx }), context))),
-    ]);
+        // Update tx states: mark as finalized
+        Promise.all(
+          txStates.map((x) => statedb.tx.update(x.hash, Tx.update(x, { finalized: true, tx: x.tx }), context))
+        ),
+      ]);
 
     context.senderState = newSenderState;
     context.stakeStates = newStakeStates.filter((x) => context.stakeUpdates[x.address]);
     context.newSenderStates = newSenderStates;
     context.rollupState = newRollupState;
     context.rollupBlockState = rollupBlockState;
+    context.txStates = newTxStates;
 
     context.updatedAccounts = [...Object.values(context.stakeUpdates), ...Object.values(context.accountUpdates)];
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.69",
+  "version": "1.13.70",
   "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.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",
+    "@arcblock/did": "1.13.70",
+    "@arcblock/did-util": "1.13.70",
+    "@ocap/asset": "1.13.70",
+    "@ocap/mcrypto": "1.13.70",
+    "@ocap/merkle-tree": "1.13.70",
+    "@ocap/message": "1.13.70",
+    "@ocap/state": "1.13.70",
+    "@ocap/tx-pipeline": "1.13.70",
+    "@ocap/util": "1.13.70",
+    "@ocap/validator": "1.13.70",
+    "@ocap/wallet": "1.13.70",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "7520d994d592dc4fe50612a665c94d7fa4d5b143"
+  "gitHead": "17d673049138356f4cce9ca3d59e2f531b479c2d"
 }