@leofcoin/chain 1.4.90 → 1.4.92

package/exports/browser/chain.js

@@ -2219,7 +2219,7 @@ class State extends Contract {
     #loadBlockTransactions = (transactions) => Promise.all(transactions.map((transaction) => new TransactionMessage(transaction)));
     #getLastTransactions = async () => {
         let lastTransactions = (await Promise.all(this.#blocks.filter(block => block.loaded).slice(-128)
-            .map(block => this.#loadBlockTransactions(block))))
+            .map(block => this.#loadBlockTransactions(block.transactions))))
             .reduce((all, transactions) => [...all, ...transactions], []);
         return Promise.all(lastTransactions.map(transaction => transaction.hash()));
     };
@@ -2233,8 +2233,8 @@ class State extends Contract {
             if (block && !block.loaded) {
                 if (block.index === 0)
                     this.#loaded = true;
-                block.transactions = await this.#loadBlockTransactions(block.transactions);
-                for (const transaction of block.transactions) {
+                const transactions = await this.#loadBlockTransactions([...block.transactions] || []);
+                for (const transaction of transactions) {
                     const lastTransactions = await this.#getLastTransactions();
                     const hash = await transaction.hash();
                     if (poolTransactionKeys.includes(hash))
@@ -2242,23 +2242,25 @@ class State extends Contract {
                     if (lastTransactions.includes(hash)) {
                         console.log('removing invalid block');
                         await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
+                        blocks.splice(block.index - 1);
                         return this.#loadBlocks(blocks);
                     }
                     try {
-                        await this.#machine.execute(transaction.to, transaction.method, transaction.params);
-                        if (transaction.to === nativeToken$2) {
+                        await this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params);
+                        if (transaction.decoded.to === nativeToken$2) {
                             this.#nativeCalls += 1;
-                            if (transaction.method === 'burn')
+                            if (transaction.decoded.method === 'burn')
                                 this.#nativeBurns += 1;
-                            if (transaction.method === 'mint')
+                            if (transaction.decoded.method === 'mint')
                                 this.#nativeMints += 1;
-                            if (transaction.method === 'transfer')
+                            if (transaction.decoded.method === 'transfer')
                                 this.#nativeTransfers += 1;
                         }
                         this.#totalTransactions += 1;
                     }
                     catch (error) {
-                        await globalThis.transactionPoolStore.delete(transaction.hash ? transaction.hash : await (new TransactionMessage(transaction)).hash());
+                        console.log(error);
+                        await globalThis.transactionPoolStore.delete(hash);
                         console.log('removing invalid transaction');
                         console.log(error);
                         return false;
@@ -2282,7 +2284,6 @@ class State extends Contract {
             clearTimeout(timeout);
             if (promises.length > 0) {
                 promises = promises.map(async ({ value }) => {
-                    console.log(value);
                     const node = await new globalThis.peernet.protos['peernet-response'](value.result);
                     return { value: node.decoded.response, peer: value.peer };
                 });
@@ -2685,7 +2686,6 @@ class Chain extends State {
         // block.reward = block.reward.toString()
         // block.fees = block.fees.toString()
         try {
-            console.log(block.transactions);
             block.transactions = await Promise.all(block.transactions
                 .map(async (transaction) => {
                 await globalThis.transactionPoolStore.delete(await transaction.hash());

package/exports/chain.js

@@ -839,7 +839,7 @@ class State extends Contract {
     #loadBlockTransactions = (transactions) => Promise.all(transactions.map((transaction) => new TransactionMessage(transaction)));
     #getLastTransactions = async () => {
         let lastTransactions = (await Promise.all(this.#blocks.filter(block => block.loaded).slice(-128)
-            .map(block => this.#loadBlockTransactions(block))))
+            .map(block => this.#loadBlockTransactions(block.transactions))))
             .reduce((all, transactions) => [...all, ...transactions], []);
         return Promise.all(lastTransactions.map(transaction => transaction.hash()));
     };
@@ -853,8 +853,8 @@ class State extends Contract {
             if (block && !block.loaded) {
                 if (block.index === 0)
                     this.#loaded = true;
-                block.transactions = await this.#loadBlockTransactions(block.transactions);
-                for (const transaction of block.transactions) {
+                const transactions = await this.#loadBlockTransactions([...block.transactions] || []);
+                for (const transaction of transactions) {
                     const lastTransactions = await this.#getLastTransactions();
                     const hash = await transaction.hash();
                     if (poolTransactionKeys.includes(hash))
@@ -862,23 +862,25 @@ class State extends Contract {
                     if (lastTransactions.includes(hash)) {
                         console.log('removing invalid block');
                         await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
+                        blocks.splice(block.index - 1);
                         return this.#loadBlocks(blocks);
                     }
                     try {
-                        await this.#machine.execute(transaction.to, transaction.method, transaction.params);
-                        if (transaction.to === nativeToken) {
+                        await this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params);
+                        if (transaction.decoded.to === nativeToken) {
                             this.#nativeCalls += 1;
-                            if (transaction.method === 'burn')
+                            if (transaction.decoded.method === 'burn')
                                 this.#nativeBurns += 1;
-                            if (transaction.method === 'mint')
+                            if (transaction.decoded.method === 'mint')
                                 this.#nativeMints += 1;
-                            if (transaction.method === 'transfer')
+                            if (transaction.decoded.method === 'transfer')
                                 this.#nativeTransfers += 1;
                         }
                         this.#totalTransactions += 1;
                     }
                     catch (error) {
-                        await globalThis.transactionPoolStore.delete(transaction.hash ? transaction.hash : await (new TransactionMessage(transaction)).hash());
+                        console.log(error);
+                        await globalThis.transactionPoolStore.delete(hash);
                         console.log('removing invalid transaction');
                         console.log(error);
                         return false;
@@ -902,7 +904,6 @@ class State extends Contract {
             clearTimeout(timeout);
             if (promises.length > 0) {
                 promises = promises.map(async ({ value }) => {
-                    console.log(value);
                     const node = await new globalThis.peernet.protos['peernet-response'](value.result);
                     return { value: node.decoded.response, peer: value.peer };
                 });
@@ -1305,7 +1306,6 @@ class Chain extends State {
         // block.reward = block.reward.toString()
         // block.fees = block.fees.toString()
         try {
-            console.log(block.transactions);
             block.transactions = await Promise.all(block.transactions
                 .map(async (transaction) => {
                 await globalThis.transactionPoolStore.delete(await transaction.hash());

package/exports/types/types.d.ts

@@ -1,2 +1,22 @@
 export type Address = base58String;
 export type BlockHash = base58String;
+interface Transaction {
+    to: Address;
+    from: Address;
+    method: String;
+    params: string[];
+    nonce: Number;
+}
+interface RawTransaction extends Transaction {
+    timestamp: Number;
+}
+export declare type BlockInMemory = {
+    index: number;
+    transactions: RawTransaction[];
+    loaded?: Boolean;
+};
+export declare type RawBlock = {
+    index: number;
+    transactions: RawTransaction[];
+};
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.90",
+  "version": "1.4.92",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",