From 4a8cb065786d647b287767d629726902cf41d308 Mon Sep 17 00:00:00 2001 From: Sanka Darshana Date: Fri, 4 Aug 2023 20:30:04 +0530 Subject: [PATCH] wasm bug fixing --- lib/blockchain.ts | 6 +++++- lib/wallet.ts | 4 ++++ package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/blockchain.ts b/lib/blockchain.ts index af5923b..78d1cca 100644 --- 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 { public static Type: any; @@ -24,6 +25,9 @@ export default class Blockchain extends WasmWrapper { 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 { 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 index 8b9a390..2cc8682 100644 --- 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 { public static Type: any; diff --git a/package-lock.json b/package-lock.json index f2c3cc8..0c9799a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "saito-js", - "version": "0.0.36", + "version": "0.0.37", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "saito-js", - "version": "0.0.36", + "version": "0.0.37", "license": "ISC", "dependencies": { "base-58": "^0.0.1", @@ -18,7 +18,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" @@ -4157,9 +4157,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/saito-wasm": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/saito-wasm/-/saito-wasm-0.0.24.tgz", - "integrity": "sha512-LoXu9Lo0nUlMi+WELLqbFOml+MOf09Eluzl8IHBKxmKi7kmQb6UKMxBjJUHISyL1lMvbW10jWvrk6HukZFQupA==", + "version": "0.0.25", + "resolved": "https://registry.npmjs.org/saito-wasm/-/saito-wasm-0.0.25.tgz", + "integrity": "sha512-nlc6nl5h0spYj4KA0TYSeg5a0prHxz3aClwLGOLGDOfep0i1W34sR+Ey1vIyTDQXK5W7M43UrNNVhQHRG7MNVA==", "dependencies": { "cross-env": "^7.0.3", "node-fetch": "^3.3.0" @@ -8206,9 +8206,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "saito-wasm": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/saito-wasm/-/saito-wasm-0.0.24.tgz", - "integrity": "sha512-LoXu9Lo0nUlMi+WELLqbFOml+MOf09Eluzl8IHBKxmKi7kmQb6UKMxBjJUHISyL1lMvbW10jWvrk6HukZFQupA==", + "version": "0.0.25", + "resolved": "https://registry.npmjs.org/saito-wasm/-/saito-wasm-0.0.25.tgz", + "integrity": "sha512-nlc6nl5h0spYj4KA0TYSeg5a0prHxz3aClwLGOLGDOfep0i1W34sR+Ey1vIyTDQXK5W7M43UrNNVhQHRG7MNVA==", "requires": { "cross-env": "^7.0.3", "node-fetch": "^3.3.0" diff --git a/package.json b/package.json index 83800a8..92342bc 100644 --- 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"