Merge pull request #53 from SaitoTech/develop

merge

lib/block.ts

@@ -19,8 +19,27 @@ export default class Block extends WasmWrapper<WasmBlock> {
       block = new Block.Type();
     }
     super(block!);
+
+
+  }
+
+  public toJson(): string {
+
+    try {
+      return JSON.stringify({
+        id: JSON.stringify(this.id),
+        hash: this.hash,
+        type: JSON.stringify(this.block_type),
+        previous_block_hash: this.previousBlockHash,
+        transactions: this.transactions.map((tx) => tx.toJson()),
+      })
+    } catch (error) {
+      console.error(error);
+    }
+    return ""
   }
 
+
   public get transactions(): Array<Transaction> {
     try {
       return this.instance.transactions.map((tx) => {

lib/blockchain.ts

@@ -22,7 +22,7 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
     return this.instance.reset();
   }
 
-  public async affixCallbacks(block: Block) {}
+  public async affixCallbacks(block: Block) { }
 
   public async runCallbacks(block_hash: string, from_blocks_back: bigint) {
     if (block_hash === DefaultEmptyBlockHash) {
@@ -149,8 +149,7 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
               block_id_in_which_to_delete_callbacks + BigInt(1) // because block ring starts from 1
             );
             console.log(
-              `deleting callbacks for ${
-                block_id_in_which_to_delete_callbacks + BigInt(1)
+              `deleting callbacks for ${block_id_in_which_to_delete_callbacks + BigInt(1)
               }: ${callback_block_hash}`
             );
             this.callbacks.delete(callback_block_hash);
@@ -165,9 +164,9 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
       } else {
         console.log(
           "already have processed the callbacks. last_callback_block_id = " +
-            this.last_callback_block_id +
-            " block_id = " +
-            block_id
+          this.last_callback_block_id +
+          " block_id = " +
+          block_id
         );
       }
     } catch (error) {
@@ -176,7 +175,7 @@ export default class Blockchain extends WasmWrapper<WasmBlockchain> {
     }
   }
 
-  public async onNewBlock(block: Block, lc: boolean) {}
+  public async onNewBlock(block: Block, lc: boolean) { }
 
   public async getLatestBlockId() {
     return this.instance.get_latest_block_id();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "saito-js",
-  "version": "0.0.49",
+  "version": "0.0.50",
   "description": "js wrappings around saito-core using wasm",
   "scripts": {
     "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --require ts-node/register 'tests/**/*.ts'",