@leofcoin/chain 1.5.69 → 1.6.0

package/exports/browser/chain.js

@@ -4432,7 +4432,6 @@ class State extends Contract {
             }
             this.#machine = await new Machine(this.#blocks);
             const lastBlock = await this.#machine.lastBlock;
-            console.log({ lastBlock });
             if (lastBlock.hash !== '0x0') {
                 this.updateState(new BlockMessage(lastBlock));
             }
@@ -4450,14 +4449,13 @@ class State extends Contract {
     async updateState(message) {
         try {
             const hash = await message.hash();
-            // await this.state.updateState(message)
             await globalThis.chainStore.put('lastBlock', hash);
             globalThis.pubsub.publish('lastBlock', message.encoded);
+            await this.#machine.updateState();
         }
         catch (error) {
             console.error(error);
         }
-        await this.#machine.updateState();
     }
     getLatestBlock() {
         // @ts-ignore
@@ -5067,17 +5065,17 @@ class Chain extends VersionControl {
         await Promise.all(blockMessage.decoded.transactions
             // @ts-ignore
             .map(async (transaction) => {
+            // @ts-ignore
             let hash = transaction.hash;
             if (!hash) {
                 hash = await new TransactionMessage(transaction).hash();
+                // @ts-ignore
                 transaction.hash = hash;
             }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
             return transaction;
         }));
         await globalThis.blockStore.put(hash, blockMessage.encoded);
-        if ((await this.lastBlock).index < Number(blockMessage.decoded.index))
-            await this.updateState(blockMessage);
         debug(`added block: ${hash}`);
         let promises = [];
         let contracts = [];
@@ -5098,13 +5096,10 @@ class Chain extends VersionControl {
                     globalThis.pubsub.publish('account-transaction-processed', transaction);
                 await globalThis.accountsStore.put(transaction.from, String(transaction.nonce));
             }
-            // todo finish state
-            // for (const contract of contracts) {
-            //   const state = await this.machine.get(contract, 'state')
-            //   // await stateStore.put(contract, state)
-            //   console.log(state);
-            // }
-            // await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() })
+            if ((await this.lastBlock).index < Number(blockMessage.decoded.index)) {
+                await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
+                await this.updateState(blockMessage);
+            }
             globalThis.pubsub.publish('block-processed', blockMessage.decoded);
         }
         catch (error) {
@@ -5259,15 +5254,13 @@ class Chain extends VersionControl {
             let blockMessage = await new BlockMessage(block);
             const hash = await blockMessage.hash();
             await globalThis.peernet.put(hash, blockMessage.encoded, 'block');
-            await this.updateState(blockMessage);
             await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
+            await this.updateState(blockMessage);
             debug(`created block: ${hash} @${block.index}`);
             globalThis.peernet.publish('add-block', blockMessage.encoded);
             globalThis.pubsub.publish('add-block', blockMessage.decoded);
         }
         catch (error) {
-            console.log(error);
-            console.log('eeeee');
             throw new Error(`invalid block ${block}`);
         }
         // data = await this.machine.execute(to, method, params)
@@ -5285,8 +5278,6 @@ class Chain extends VersionControl {
                 this.#runEpoch();
         }
         catch (e) {
-            console.log(e);
-            console.log('rrrrr');
             globalThis.peernet.publish('invalid-transaction', hash);
             throw new Error('invalid transaction');
         }

package/exports/chain.js

@@ -800,7 +800,6 @@ class State extends Contract {
             }
             this.#machine = await new Machine(this.#blocks);
             const lastBlock = await this.#machine.lastBlock;
-            console.log({ lastBlock });
             if (lastBlock.hash !== '0x0') {
                 this.updateState(new BlockMessage(lastBlock));
             }
@@ -818,14 +817,13 @@ class State extends Contract {
     async updateState(message) {
         try {
             const hash = await message.hash();
-            // await this.state.updateState(message)
             await globalThis.chainStore.put('lastBlock', hash);
             globalThis.pubsub.publish('lastBlock', message.encoded);
+            await this.#machine.updateState();
         }
         catch (error) {
             console.error(error);
         }
-        await this.#machine.updateState();
     }
     getLatestBlock() {
         // @ts-ignore
@@ -1435,17 +1433,17 @@ class Chain extends VersionControl {
         await Promise.all(blockMessage.decoded.transactions
             // @ts-ignore
             .map(async (transaction) => {
+            // @ts-ignore
             let hash = transaction.hash;
             if (!hash) {
                 hash = await new TransactionMessage(transaction).hash();
+                // @ts-ignore
                 transaction.hash = hash;
             }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
             return transaction;
         }));
         await globalThis.blockStore.put(hash, blockMessage.encoded);
-        if ((await this.lastBlock).index < Number(blockMessage.decoded.index))
-            await this.updateState(blockMessage);
         debug(`added block: ${hash}`);
         let promises = [];
         let contracts = [];
@@ -1466,13 +1464,10 @@ class Chain extends VersionControl {
                     globalThis.pubsub.publish('account-transaction-processed', transaction);
                 await globalThis.accountsStore.put(transaction.from, String(transaction.nonce));
             }
-            // todo finish state
-            // for (const contract of contracts) {
-            //   const state = await this.machine.get(contract, 'state')
-            //   // await stateStore.put(contract, state)
-            //   console.log(state);
-            // }
-            // await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() })
+            if ((await this.lastBlock).index < Number(blockMessage.decoded.index)) {
+                await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
+                await this.updateState(blockMessage);
+            }
             globalThis.pubsub.publish('block-processed', blockMessage.decoded);
         }
         catch (error) {
@@ -1627,15 +1622,13 @@ class Chain extends VersionControl {
             let blockMessage = await new BlockMessage(block);
             const hash = await blockMessage.hash();
             await globalThis.peernet.put(hash, blockMessage.encoded, 'block');
-            await this.updateState(blockMessage);
             await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
+            await this.updateState(blockMessage);
             debug(`created block: ${hash} @${block.index}`);
             globalThis.peernet.publish('add-block', blockMessage.encoded);
             globalThis.pubsub.publish('add-block', blockMessage.decoded);
         }
         catch (error) {
-            console.log(error);
-            console.log('eeeee');
             throw new Error(`invalid block ${block}`);
         }
         // data = await this.machine.execute(to, method, params)
@@ -1653,8 +1646,6 @@ class Chain extends VersionControl {
                 this.#runEpoch();
         }
         catch (e) {
-            console.log(e);
-            console.log('rrrrr');
             globalThis.peernet.publish('invalid-transaction', hash);
             throw new Error('invalid transaction');
         }

package/exports/state.d.ts

@@ -38,7 +38,7 @@ export default class State extends Contract {
      */
     clearAll(): Promise<void>;
     init(): Promise<void>;
-    updateState(message: any): Promise<void>;
+    updateState(message: BlockMessage): Promise<void>;
     getLatestBlock(): Promise<BlockMessage['decoded']>;
     getAndPutBlock(hash: string): Promise<BlockMessage>;
     resolveBlock(hash: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.5.69",
+  "version": "1.6.0",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -74,17 +74,17 @@
     "wireit": "^0.9.5"
   },
   "dependencies": {
-    "@leofcoin/addresses": "^1.0.19",
-    "@leofcoin/errors": "^1.0.3",
-    "@leofcoin/lib": "^1.2.39",
-    "@leofcoin/messages": "^1.4.9",
+    "@leofcoin/addresses": "^1.0.20",
+    "@leofcoin/errors": "^1.0.4",
+    "@leofcoin/lib": "^1.2.40",
+    "@leofcoin/messages": "^1.4.10",
     "@leofcoin/multi-wallet": "^2.1.1",
-    "@leofcoin/networks": "^1.1.2",
+    "@leofcoin/networks": "^1.1.3",
     "@leofcoin/peernet": "^1.1.73",
     "@leofcoin/peernet-swarm": "^1.0.0",
     "@leofcoin/storage": "^3.0.6",
-    "@leofcoin/utils": "^1.1.14",
-    "@leofcoin/workers": "^1.4.14",
+    "@leofcoin/utils": "^1.1.15",
+    "@leofcoin/workers": "^1.4.15",
     "@netpeer/p2pt-swarm": "^1.3.5",
     "@netpeer/swarm": "^0.8.9",
     "@vandeurenglenn/base32": "^1.1.0",