Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.

wasm bug fixing #49

Merged
merged 1 commit into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions lib/blockchain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
let callbackIndices = this.callbackIndices.get(block_hash);
let confirmations = this.confirmations.get(block_hash) || BigInt(-1);
console.log(
`running callbacks for ${block_hash}. callbacks : ${callbacks?.length} confirmations : ${confirmations}`
`running callbacks for ${block_hash}. callbacks : ${callbacks?.length} indexes : ${callbackIndices?.length} confirmations : ${confirmations} from_blocks_back : ${from_blocks_back}`
);
if (Number(confirmations) && callbacks && callbackIndices) {
for (let i = Number(confirmations) + 1; i < from_blocks_back; i++) {
for (let j = 0; j < callbacks.length; j++) {
try {
if (callbacks[j] && callbackIndices[j]) {
if (callbacks[j] !== undefined && callbackIndices[j] !== undefined) {
await callbacks[j](block, block.transactions[callbackIndices[j]], i);
} else {
console.log(
Expand Down Expand Up @@ -105,17 +105,17 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
block_id_to_run_callbacks_from = block_id_to_run_callbacks_from + BigInt(1);
}

//console.log("block_id_to_run_callbacks_from = " + block_id_to_run_callbacks_from);
//console.log(
// "block_id_in_which_to_delete_callbacks = " + block_id_in_which_to_delete_callbacks
// );

console.log("block_id_to_run_callbacks_from = " + block_id_to_run_callbacks_from);
console.log(
"block_id_in_which_to_delete_callbacks = " + block_id_in_which_to_delete_callbacks
);
console.log("block.id = " + block.id);
if (block_id_to_run_callbacks_from > BigInt(0)) {
for (let i = block_id_to_run_callbacks_from; i <= block.id; i++) {
for (let i = block_id_to_run_callbacks_from; i <= block.id; i += BigInt(1)) {
// for (let i = block_id_to_run_callbacks_from; Number(i) <= Number(block.id); i++) {
let confirmation_count = block.id - BigInt(i) + BigInt(1);
let run_callbacks = true;

// if bid is less than our last-bid but it is still
// if bid is less than our last-bid, but it is still
// the biggest BID we have, then we should avoid
// running callbacks as we will have already run
// them. We check TS as sanity check as well.
Expand All @@ -127,6 +127,7 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
}
}

console.log(`i = ${i} confirmations = ${confirmation_count}`);
if (run_callbacks) {
let callback_block_hash = await this.instance.get_longest_chain_hash_at(i);
if (callback_block_hash !== "" && callback_block_hash !== DefaultEmptyBlockHash) {
Expand All @@ -143,7 +144,11 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
let callback_block_hash = await this.instance.get_longest_chain_hash_at(
block_id_in_which_to_delete_callbacks + BigInt(1) // because block ring starts from 1
);
console.log(`deleting callbacks for : ${callback_block_hash}`);
console.log(
`deleting callbacks for ${
block_id_in_which_to_delete_callbacks + BigInt(1)
}: ${callback_block_hash}`
);
this.callbacks.delete(callback_block_hash);
this.callbackIndices.delete(callback_block_hash);
// this.confirmations.delete(callback_block_hash);
Expand All @@ -162,6 +167,7 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
);
}
} catch (error) {
console.error("failed running callbacks");
console.error(error);
}
}
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "saito-js",
"version": "0.0.46",
"version": "0.0.47",
"description": "js wrappings around saito-core using wasm",
"scripts": {
"test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --require ts-node/register 'tests/**/*.ts'",
Expand Down