@leofcoin/chain 1.7.125 → 1.7.127

package/exports/browser/chain.js

@@ -4876,11 +4876,17 @@ class State extends Contract {
         let block = await globalThis.peernet.get(hash, 'block');
         if (block !== undefined) {
             block = await new BlockMessage(block);
+            const computedHash = await block.hash();
+            if (computedHash !== hash) {
+                throw new ResolveError(`block hash mismatch for ${hash}`, {
+                    cause: new Error('hash does not match payload')
+                });
+            }
             const { index } = block.decoded;
-            if (this.#blocks[index] && this.#blocks[index].hash !== block.hash)
-                throw `invalid block ${hash} @${index}`;
-            if (!(await globalThis.peernet.has(hash)))
-                await globalThis.peernet.put(hash, block.encoded, 'block');
+            if (this.#blocks[index] && this.#blocks[index].hash !== computedHash)
+                throw new ResolveError(`invalid block ${computedHash} @${index}`);
+            if (!(await globalThis.peernet.has(computedHash)))
+                await globalThis.peernet.put(computedHash, block.encoded, 'block');
         }
         return block;
     }
@@ -4890,7 +4896,7 @@ class State extends Contract {
             // Block already exists, check if we need to resolve previous blocks
             const localHash = await globalThis.stateStore.get('lastBlock');
             const previousHash = this.#blocks[index].previousHash;
-            if (hash === localHash)
+            if (previousHash === localHash)
                 return;
             if (previousHash !== '0x0' && !this.#blocks[this.#blockHashMap.get(previousHash)]) {
                 // Previous block not in memory, recursively resolve it

package/exports/chain.js

@@ -1003,11 +1003,17 @@ class State extends Contract {
         let block = await globalThis.peernet.get(hash, 'block');
         if (block !== undefined) {
             block = await new BlockMessage(block);
+            const computedHash = await block.hash();
+            if (computedHash !== hash) {
+                throw new ResolveError(`block hash mismatch for ${hash}`, {
+                    cause: new Error('hash does not match payload')
+                });
+            }
             const { index } = block.decoded;
-            if (this.#blocks[index] && this.#blocks[index].hash !== block.hash)
-                throw `invalid block ${hash} @${index}`;
-            if (!(await globalThis.peernet.has(hash)))
-                await globalThis.peernet.put(hash, block.encoded, 'block');
+            if (this.#blocks[index] && this.#blocks[index].hash !== computedHash)
+                throw new ResolveError(`invalid block ${computedHash} @${index}`);
+            if (!(await globalThis.peernet.has(computedHash)))
+                await globalThis.peernet.put(computedHash, block.encoded, 'block');
         }
         return block;
     }
@@ -1017,7 +1023,7 @@ class State extends Contract {
             // Block already exists, check if we need to resolve previous blocks
             const localHash = await globalThis.stateStore.get('lastBlock');
             const previousHash = this.#blocks[index].previousHash;
-            if (hash === localHash)
+            if (previousHash === localHash)
                 return;
             if (previousHash !== '0x0' && !this.#blocks[this.#blockHashMap.get(previousHash)]) {
                 // Previous block not in memory, recursively resolve it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.7.125",
+  "version": "1.7.127",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {