@acala-network/chopsticks-core 0.13.0-1 → 0.13.1

package/dist/cjs/blockchain/block-builder.js

@@ -27,6 +27,7 @@ _export(exports, {
 });
 const _block = require("./block.js");
 const _storagelayer = require("./storage-layer.js");
+const _utilcrypto = require("@polkadot/util-crypto");
 const _util = require("@polkadot/util");
 const _index = require("../utils/index.js");
 const _logger = require("../logger.js");
@@ -345,9 +346,14 @@ const buildBlock = async (head, inherentProviders, params, callbacks)=>{
         newBlock.pushStorageLayer().setAll(resp.storageDiff);
         callbacks?.onPhaseApplied?.('finalize', resp);
     }
-    const blockData = registry.createType('Block', {
-        header,
-        extrinsics: includedExtrinsic
+    const allExtrinsics = [
+        ...inherents,
+        ...includedExtrinsic
+    ];
+    const mockExtrinsicRoot = (0, _utilcrypto.blake2AsU8a)((0, _util.u8aConcat)(...allExtrinsics), 256);
+    const finalHeader = registry.createType('Header', {
+        ...header.toJSON(),
+        extrinsicsRoot: mockExtrinsicRoot
     });
     const storageDiff = await newBlock.storageDiff();
     if (logger.level.toLowerCase() === 'trace') {
@@ -356,12 +362,9 @@ const buildBlock = async (head, inherentProviders, params, callbacks)=>{
                 (0, _logger.truncate)(value)
             ]), 'Final block');
     }
-    const finalBlock = new _block.Block(head.chain, newBlock.number, blockData.hash.toHex(), head, {
-        header,
-        extrinsics: [
-            ...inherents,
-            ...includedExtrinsic
-        ],
+    const finalBlock = new _block.Block(head.chain, newBlock.number, finalHeader.hash.toHex(), head, {
+        header: finalHeader,
+        extrinsics: allExtrinsics,
         storage: head.storage,
         storageDiff
     });

package/dist/esm/blockchain/block-builder.js

@@ -1,5 +1,6 @@
 import { Block } from './block.js';
 import { StorageLayer, StorageValueKind } from './storage-layer.js';
+import { blake2AsU8a } from '@polkadot/util-crypto';
 import { compactAddLength, hexToU8a, stringToHex, u8aConcat } from '@polkadot/util';
 import { compactHex, getCurrentSlot } from '../utils/index.js';
 import { defaultLogger, truncate } from '../logger.js';
@@ -318,9 +319,14 @@ export const buildBlock = async (head, inherentProviders, params, callbacks)=>{
         newBlock.pushStorageLayer().setAll(resp.storageDiff);
         callbacks?.onPhaseApplied?.('finalize', resp);
     }
-    const blockData = registry.createType('Block', {
-        header,
-        extrinsics: includedExtrinsic
+    const allExtrinsics = [
+        ...inherents,
+        ...includedExtrinsic
+    ];
+    const mockExtrinsicRoot = blake2AsU8a(u8aConcat(...allExtrinsics), 256);
+    const finalHeader = registry.createType('Header', {
+        ...header.toJSON(),
+        extrinsicsRoot: mockExtrinsicRoot
     });
     const storageDiff = await newBlock.storageDiff();
     if (logger.level.toLowerCase() === 'trace') {
@@ -329,12 +335,9 @@ export const buildBlock = async (head, inherentProviders, params, callbacks)=>{
                 truncate(value)
             ]), 'Final block');
     }
-    const finalBlock = new Block(head.chain, newBlock.number, blockData.hash.toHex(), head, {
-        header,
-        extrinsics: [
-            ...inherents,
-            ...includedExtrinsic
-        ],
+    const finalBlock = new Block(head.chain, newBlock.number, finalHeader.hash.toHex(), head, {
+        header: finalHeader,
+        extrinsics: allExtrinsics,
         storage: head.storage,
         storageDiff
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acala-network/chopsticks-core",
-  "version": "0.13.0-1",
+  "version": "0.13.1",
   "author": "Acala Developers <hello@acala.network>",
   "license": "Apache-2.0",
   "type": "module",
@@ -11,7 +11,7 @@
     "depcheck": "npx depcheck"
   },
   "dependencies": {
-    "@acala-network/chopsticks-executor": "0.13.0-1",
+    "@acala-network/chopsticks-executor": "0.13.1",
     "@polkadot/rpc-provider": "^12.1.1",
     "@polkadot/types": "^12.1.1",
     "@polkadot/types-codec": "^12.1.1",