@dedot/api 0.18.0 → 0.18.1

package/cjs/json-rpc/group/ChainHead/ChainHead.js

@@ -192,10 +192,19 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
             }
             case 'finalized': {
                 const { finalizedBlockHashes, prunedBlockHashes } = result;
-                this.#finalizedHash = finalizedBlockHashes.at(-1);
-                const finalizedRuntime = this.#findRuntimeAt(this.#finalizedHash);
-                if (finalizedRuntime) {
-                    this.#finalizedRuntime = finalizedRuntime;
+                const currentFinalizedNumber = this.findBlock(this.#finalizedHash).number;
+                for (const hash of finalizedBlockHashes) {
+                    const block = this.findBlock(hash);
+                    // Skip if block not found OR blocks that are already finalized (block number <= previous finalized number)
+                    if (!block || block.number <= currentFinalizedNumber) {
+                        continue;
+                    }
+                    this.#finalizedHash = hash;
+                    const finalizedRuntime = this.#findRuntimeAt(hash);
+                    if (finalizedRuntime) {
+                        this.#finalizedRuntime = finalizedRuntime;
+                    }
+                    this.emit('finalizedBlock', block);
                 }
                 // push new finalized hashes into the queue, we'll adjust the size later if needed
                 finalizedBlockHashes.forEach((hash) => {
@@ -204,7 +213,6 @@ class ChainHead extends JsonRpcGroup_js_1.JsonRpcGroup {
                     this.#finalizedQueue.push(hash);
                 });
                 const currentFinalizedBlock = this.findBlock(this.#finalizedHash);
-                this.emit('finalizedBlock', currentFinalizedBlock);
                 // TODO account for operations that haven't received its operationId yet
                 Object.values(this.#handlers).forEach(({ defer, hash, operationId }) => {
                     if (prunedBlockHashes.includes(hash)) {

package/json-rpc/group/ChainHead/ChainHead.js

@@ -189,10 +189,19 @@ export class ChainHead extends JsonRpcGroup {
             }
             case 'finalized': {
                 const { finalizedBlockHashes, prunedBlockHashes } = result;
-                this.#finalizedHash = finalizedBlockHashes.at(-1);
-                const finalizedRuntime = this.#findRuntimeAt(this.#finalizedHash);
-                if (finalizedRuntime) {
-                    this.#finalizedRuntime = finalizedRuntime;
+                const currentFinalizedNumber = this.findBlock(this.#finalizedHash).number;
+                for (const hash of finalizedBlockHashes) {
+                    const block = this.findBlock(hash);
+                    // Skip if block not found OR blocks that are already finalized (block number <= previous finalized number)
+                    if (!block || block.number <= currentFinalizedNumber) {
+                        continue;
+                    }
+                    this.#finalizedHash = hash;
+                    const finalizedRuntime = this.#findRuntimeAt(hash);
+                    if (finalizedRuntime) {
+                        this.#finalizedRuntime = finalizedRuntime;
+                    }
+                    this.emit('finalizedBlock', block);
                 }
                 // push new finalized hashes into the queue, we'll adjust the size later if needed
                 finalizedBlockHashes.forEach((hash) => {
@@ -201,7 +210,6 @@ export class ChainHead extends JsonRpcGroup {
                     this.#finalizedQueue.push(hash);
                 });
                 const currentFinalizedBlock = this.findBlock(this.#finalizedHash);
-                this.emit('finalizedBlock', currentFinalizedBlock);
                 // TODO account for operations that haven't received its operationId yet
                 Object.values(this.#handlers).forEach(({ defer, hash, operationId }) => {
                     if (prunedBlockHashes.includes(hash)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dedot/api",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "A delightful JavaScript/TypeScript client for Polkadot & Substrate",
   "author": "Thang X. Vu <thang@dedot.dev>",
   "homepage": "https://dedot.dev",
@@ -13,13 +13,13 @@
   "type": "module",
   "sideEffects": false,
   "dependencies": {
-    "@dedot/codecs": "0.18.0",
-    "@dedot/providers": "0.18.0",
-    "@dedot/runtime-specs": "0.18.0",
-    "@dedot/shape": "0.18.0",
-    "@dedot/storage": "0.18.0",
-    "@dedot/types": "0.18.0",
-    "@dedot/utils": "0.18.0"
+    "@dedot/codecs": "0.18.1",
+    "@dedot/providers": "0.18.1",
+    "@dedot/runtime-specs": "0.18.1",
+    "@dedot/shape": "0.18.1",
+    "@dedot/storage": "0.18.1",
+    "@dedot/types": "0.18.1",
+    "@dedot/utils": "0.18.1"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
@@ -48,7 +48,7 @@
     "node": ">=18"
   },
   "license": "Apache-2.0",
-  "gitHead": "32395b356a4febaac0d52506742947c916ac9895",
+  "gitHead": "3ffda568232b50a3993d13c6ccac2894b0759dd7",
   "module": "./index.js",
   "types": "./index.d.ts"
 }