Merge pull request #39 from SaitoTech/develop

wasm bug fixing
SaitoTech · Aug 4, 2023 · a272c89 · a272c89
2 parents 743f120 + 4a8cb06
commit a272c89
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/lib/blockchain.ts b/lib/blockchain.ts
@@ -3,6 +3,7 @@ import WasmWrapper from "./wasm_wrapper";
 import Saito from "../saito";
 import Block from "./block";
 import Transaction from "./transaction";
+import { DefaultEmptyBlockHash } from "./wallet";
 
 export default class Blockchain extends WasmWrapper<WasmBlockchain> {
   public static Type: any;
@@ -24,6 +25,9 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
   public async affixCallbacks(block: Block) {}
 
   public async runCallbacks(block_hash: string, from_blocks_back: bigint) {
+    if (block_hash === DefaultEmptyBlockHash) {
+      return;
+    }
     let block = await Saito.getInstance().getBlock(block_hash);
     let callbacks = this.callbacks.get(block_hash);
     let callbackIndices = this.callbackIndices.get(block_hash);
@@ -93,7 +97,7 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
 
             if (run_callbacks) {
               let callback_block_hash = await this.instance.get_longest_chain_hash_at(i);
-              if (callback_block_hash !== "") {
+              if (callback_block_hash !== "" && callback_block_hash !== DefaultEmptyBlockHash) {
                 await this.runCallbacks(callback_block_hash, confirmation_count);
               }
             }

diff --git a/lib/wallet.ts b/lib/wallet.ts
@@ -5,9 +5,13 @@ import { fromBase58, toBase58 } from "./util";
 
 export const DefaultEmptyPrivateKey =
   "0000000000000000000000000000000000000000000000000000000000000000";
+
 export const DefaultEmptyPublicKey =
   "000000000000000000000000000000000000000000000000000000000000000000";
 
+export const DefaultEmptyBlockHash =
+  "0000000000000000000000000000000000000000000000000000000000000000";
+
 export default class Wallet extends WasmWrapper<WasmWallet> {
   public static Type: any;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "saito-js",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "description": "js wrappings around saito-core using wasm",
   "scripts": {
     "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --require ts-node/register 'tests/**/*.ts'",
@@ -36,7 +36,7 @@
     "morgan": "~1.10.0",
     "node-fetch": "^2.6.1",
     "process": "^0.11.10",
-    "saito-wasm": "^0.0.24",
+    "saito-wasm": "^0.0.25",
     "url": "^0.11.0",
     "util": "^0.12.5",
     "ws": "^8.13.0"