@leofcoin/chain 1.5.57 → 1.5.58

package/exports/chain.js

@@ -271,12 +271,9 @@ class Contract extends Transaction {
 
 // import State from './state'
 class Machine {
-    #contracts;
-    #nonces;
+    #contracts = {};
+    #nonces = {};
     constructor(blocks) {
-        this.#contracts = {};
-        this.#nonces = {};
-        this.lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
         // @ts-ignore
         return this.#init(blocks);
     }
@@ -320,7 +317,6 @@ class Machine {
                 break;
             }
             case 'machine-ready': {
-                this.lastBlock = data.lastBlock;
                 pubsub.publish('machine.ready', true);
                 break;
             }
@@ -506,21 +502,44 @@ class Machine {
             });
         });
     }
-    async nativeCalls() {
+    get nativeCalls() {
         return this.#askWorker('nativeCalls');
     }
-    async nativeMints() {
+    get nativeMints() {
         return this.#askWorker('nativeMints');
     }
-    async nativeBurns() {
+    get nativeBurns() {
         return this.#askWorker('nativeBurns');
     }
-    async nativeTransfers() {
+    get nativeTransfers() {
         return this.#askWorker('nativeTransfers');
     }
-    async totalTransactions() {
+    get totalTransactions() {
         return this.#askWorker('totalTransactions');
     }
+    get blocks() {
+        return this.getBlocks();
+    }
+    get lastBlock() {
+        return this.#askWorker('lastBlock');
+    }
+    get totalBlocks() {
+        return this.#askWorker('totalBlocks');
+    }
+    getBlocks(from, to) {
+        return this.#askWorker('blocks', { from, to });
+    }
+    getBlock(index) {
+        return this.#askWorker('block', index);
+    }
+    async addLoadedBlock(block) {
+        if (block.decoded)
+            block = { ...block.decoded, hahs: await block.hash() };
+        return this.#askWorker('addLoadedBlock', block);
+    }
+    async latestTransactions() {
+        return this.#askWorker('latestTransactions');
+    }
     async delete(hash) {
         return globalThis.contractStore.delete(hash);
     }
@@ -577,7 +596,6 @@ class State extends Contract {
     #syncErrorCount;
     #blockHashMap;
     #chainSyncing;
-    #lastBlock;
     #blocks;
     #totalSize;
     #machine;
@@ -598,25 +616,31 @@ class State extends Contract {
         return this.#resolving;
     }
     get nativeMints() {
-        return this.#machine.nativeMints();
+        return this.#machine.nativeMints;
     }
     get nativeBurns() {
-        return this.#machine.nativeBurns();
+        return this.#machine.nativeBurns;
     }
     get nativeTransfers() {
-        return this.#machine.nativeTransfers();
+        return this.#machine.nativeTransfers;
     }
     get totalTransactions() {
-        return this.#machine.totalTransactions();
+        return this.#machine.totalTransactions;
     }
     get nativeCalls() {
-        return this.#machine.nativeCalls();
+        return this.#machine.nativeCalls;
     }
     get blocks() {
-        return [...this.#blocks];
+        return this.getBlocks();
     }
     get lastBlock() {
-        return this.#lastBlock;
+        return this.#machine ? this.#machine.lastBlock : { index: 0, hash: '0x0', previousHash: '0x0' };
+    }
+    getBlock(index) {
+        return this.#machine.getBlock(index);
+    }
+    getBlocks(from, to) {
+        return this.#machine.getBlocks(from, to);
     }
     get totalSize() {
         return this.#totalSize;
@@ -633,7 +657,6 @@ class State extends Contract {
         this.#syncErrorCount = 0;
         this.#blockHashMap = new Map();
         this.#chainSyncing = false;
-        this.#lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
         this.#blocks = [];
         this.knownBlocks = [];
         this.#totalSize = 0;
@@ -645,7 +668,7 @@ class State extends Contract {
         };
         this.#lastBlockHandler = async () => {
             return new globalThis.peernet.protos['peernet-response']({
-                response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index }
+                response: await this.lastBlock
             });
         };
         this.#knownBlocksHandler = async () => {
@@ -655,7 +678,7 @@ class State extends Contract {
         };
         this.#loadBlockTransactions = (transactions) => Promise.all(transactions.map((transaction) => new TransactionMessage(transaction)));
         this.#getLastTransactions = async () => {
-            let lastTransactions = (await Promise.all(this.#blocks
+            let lastTransactions = (await Promise.all((await this.blocks)
                 .filter((block) => block.loaded)
                 .slice(-128)
                 .map((block) => this.#loadBlockTransactions(block.transactions)))).reduce((all, transactions) => [...all, ...transactions], []);
@@ -685,35 +708,12 @@ class State extends Contract {
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler);
         await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler);
         try {
-            let localBlock;
-            try {
-                localBlock = await globalThis.chainStore.get('lastBlock');
-            }
-            catch {
-                await globalThis.chainStore.put('lastBlock', '0x0');
-                localBlock = await globalThis.chainStore.get('lastBlock');
-            }
-            localBlock = new TextDecoder().decode(localBlock);
-            if (localBlock && localBlock !== '0x0') {
-                localBlock = await globalThis.peernet.get(localBlock, 'block');
-                localBlock = await new BlockMessage(localBlock);
-                this.#lastBlock = {
-                    ...localBlock.decoded,
-                    hash: await localBlock.hash()
-                };
-            }
-            else {
-                if (globalThis.peernet?.connections.length > 0) {
-                    const latestBlock = await this.#getLatestBlock();
-                    await this.#syncChain(latestBlock);
-                }
-            }
+            await globalThis.chainStore.has('lastBlock');
         }
-        catch (error) {
-            console.log({ e: error });
-            console.log({ e: error });
+        catch {
+            await globalThis.chainStore.put('lastBlock', '0x0');
         }
-        globalThis.pubsub.publish('lastBlock', this.lastBlock);
+        globalThis.pubsub.publish('lastBlock', await this.lastBlock);
         // load local blocks
         try {
             this.knownBlocks = await blockStore.keys();
@@ -725,6 +725,9 @@ class State extends Contract {
         try {
             await this.resolveBlocks();
             this.#machine = await new Machine(this.#blocks);
+            const lastBlock = await this.#machine.lastBlock;
+            this.updateState(new BlockMessage(lastBlock));
+            this.#loaded = true;
             // await this.#loadBlocks(this.#blocks)
         }
         catch (error) {
@@ -736,10 +739,9 @@ class State extends Contract {
     }
     async updateState(message) {
         const hash = await message.hash();
-        this.#lastBlock = { hash, ...message.decoded };
         // await this.state.updateState(message)
         await globalThis.chainStore.put('lastBlock', hash);
-        globalThis.pubsub.publish('lastBlock', this.#lastBlock);
+        globalThis.pubsub.publish('lastBlock', message.encoded);
     }
     getLatestBlock() {
         // @ts-ignore
@@ -825,7 +827,6 @@ class State extends Contract {
             const hash = new TextDecoder().decode(localBlock);
             if (hash && hash !== '0x0') {
                 await this.resolveBlock(hash);
-                this.#lastBlock = this.#blocks[this.#blocks.length - 1];
             }
         }
         catch (error) {
@@ -843,7 +844,6 @@ class State extends Contract {
             await globalThis.chainStore.put('lastBlock', hash);
             if (hash && hash !== '0x0') {
                 await this.resolveBlock(hash);
-                this.#lastBlock = this.#blocks[this.#blocks.length - 1];
             }
         }
         catch (error) {
@@ -873,7 +873,7 @@ class State extends Contract {
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
         console.log('starting sync');
-        if (globalThis.peernet.connections.length === 0)
+        if (globalThis.peernet.peers.length === 0)
             return 'connectionless';
         try {
             await this.#syncChain(lastBlock);
@@ -907,18 +907,21 @@ class State extends Contract {
                 promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has);
                 await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)));
             }
-            if (!this.#lastBlock || Number(this.#lastBlock.index) < Number(lastBlock.index)) {
+            const localBlock = await this.lastBlock;
+            if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
                 // TODO: check if valid
-                const localIndex = this.#lastBlock ? this.lastBlock.index : 0;
+                const localIndex = localBlock ? localBlock.index : 0;
                 const index = lastBlock.index;
                 await this.resolveBlock(lastBlock.hash);
                 console.log('ok');
                 let blocksSynced = localIndex > 0 ? (localIndex > index ? localIndex - index : index + -localIndex) : index;
                 globalThis.debug(`synced ${blocksSynced} ${blocksSynced > 1 ? 'blocks' : 'block'}`);
-                const start = this.#blocks.length - blocksSynced;
-                if (this.#machine)
-                    await this.#loadBlocks(this.blocks.slice(start));
-                await this.updateState(new BlockMessage(this.#blocks[this.#blocks.length - 1]));
+                const blocks = this.#blocks;
+                const start = blocks.length - blocksSynced;
+                if (this.#machine) {
+                    await this.#loadBlocks(blocks.slice(start));
+                }
+                await this.updateState(new BlockMessage(blocks[blocks.length - 1]));
             }
         }
         catch (error) {
@@ -932,8 +935,6 @@ class State extends Contract {
             request: 'lastBlock'
         });
         let node = await globalThis.peernet.prepareMessage(data);
-        console.log(node.encoded);
-        console.log(node.encode());
         for (const id in globalThis.peernet.connections) {
             // @ts-ignore
             const peer = globalThis.peernet.connections[id];
@@ -996,11 +997,12 @@ class State extends Contract {
             await globalThis.transactionPoolStore.delete(await transaction.hash());
             console.log('removing invalid transaction');
             if (isExecutionError(error)) {
-                console.log(`removing invalid block ${block.index}`);
-                await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
-                const deletedBlock = blocks.splice(block.index, 1);
-                console.log(`removed block ${deletedBlock[0].index}`);
-                return this.#loadBlocks(blocks);
+                console.log(error);
+                // console.log(`removing invalid block ${block.index}`)
+                // await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash())
+                // const deletedBlock = blocks.splice(block.index, 1)
+                // console.log(`removed block ${deletedBlock[0].index}`)
+                // return this.#loadBlocks(blocks)
             }
             console.log(error);
             return false;
@@ -1043,6 +1045,7 @@ class State extends Contract {
                 transactions = transactions.filter((transaction) => !transaction.decoded.priority);
                 await Promise.all(transactions.map((transaction) => this.#_executeTransaction(transaction)));
                 this.#blocks[block.index - 1].loaded = true;
+                await this.#machine.addLoadedBlock(block);
                 // @ts-ignore
                 globalThis.debug(`loaded block: ${block.hash} @${block.index}`);
                 globalThis.pubsub.publish('block-loaded', { ...block });
@@ -1302,7 +1305,8 @@ class Chain extends VersionControl {
         if (!peer.version || peer.version !== this.version)
             return;
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
-        const higherThenCurrentLocal = !this.lastBlock?.index ? true : lastBlock.index > this.lastBlock?.index;
+        const localBlock = await this.lastBlock;
+        const higherThenCurrentLocal = !localBlock.index ? true : lastBlock.index > localBlock.index;
         const peerTransactionPool = (higherThenCurrentLocal && (await this.getPeerTransactionPool(peer))) || [];
         if (Object.keys(lastBlock).length > 0) {
             if (!this.lastBlock || higherThenCurrentLocal) {
@@ -1351,7 +1355,7 @@ class Chain extends VersionControl {
         }));
         const hash = await blockMessage.hash();
         await globalThis.blockStore.put(hash, blockMessage.encoded);
-        if (this.lastBlock.index < Number(blockMessage.decoded.index))
+        if ((await this.lastBlock).index < Number(blockMessage.decoded.index))
             await this.updateState(blockMessage);
         globalThis.debug(`added block: ${hash}`);
         let promises = [];
@@ -1381,6 +1385,7 @@ class Chain extends VersionControl {
             //   // await stateStore.put(contract, state)
             //   console.log(state);
             // }
+            // await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() })
             globalThis.pubsub.publish('block-processed', blockMessage.decoded);
         }
         catch (error) {
@@ -1437,15 +1442,12 @@ class Chain extends VersionControl {
         // exclude failing tx
         transactions = await this.promiseTransactions(transactions);
         transactions = transactions.sort((a, b) => a.nonce - b.nonce);
+        const latestTransactions = await this.machine.latestTransactions();
         for (let transaction of transactions) {
             const hash = await transaction.hash();
             const doubleTransactions = [];
-            for (const block of this.blocks) {
-                for (const transaction of block.transactions) {
-                    if (transaction.hash === hash) {
-                        doubleTransactions.push(hash);
-                    }
-                }
+            if (latestTransactions.includes(hash)) {
+                doubleTransactions.push(hash);
             }
             if (doubleTransactions.length > 0) {
                 await globalThis.transactionPoolStore.delete(hash);
@@ -1516,12 +1518,13 @@ class Chain extends VersionControl {
             return validator;
         });
         // block.validators = calculateValidatorReward(block.validators, block.fees)
-        block.index = this.lastBlock?.index;
+        const localBlock = await this.lastBlock;
+        block.index = localBlock.index;
         if (block.index === undefined)
             block.index = 0;
         else
             block.index += 1;
-        block.previousHash = this.lastBlock?.hash || '0x0';
+        block.previousHash = localBlock.hash || '0x0';
         // block.timestamp = Date.now()
         // block.reward = block.reward.toString()
         // block.fees = block.fees.toString()
@@ -1534,7 +1537,8 @@ class Chain extends VersionControl {
             const hash = await blockMessage.hash();
             await globalThis.peernet.put(hash, blockMessage.encoded, 'block');
             await this.updateState(blockMessage);
-            globalThis.debug(`created block: ${hash}`);
+            await this.machine.addLoadedBlock({ ...blockMessage.decoded, loaded: true, hash: await blockMessage.hash() });
+            globalThis.debug(`created block: ${hash} @${block.index}`);
             globalThis.peernet.publish('add-block', blockMessage.encoded);
             globalThis.pubsub.publish('add-block', blockMessage.decoded);
         }

package/exports/machine.d.ts

@@ -2,11 +2,6 @@ import EasyWorker from '@vandeurenglenn/easy-worker';
 export default class Machine {
     #private;
     worker: EasyWorker;
-    lastBlock: {
-        index: number;
-        hash: string;
-        previousHash: string;
-    };
     constructor(blocks: any);
     /**
      *
@@ -18,11 +13,18 @@ export default class Machine {
     execute(contract: any, method: any, parameters: any): Promise<any>;
     get(contract: any, method: any, parameters?: any): Promise<any>;
     has(address: any): Promise<unknown>;
-    nativeCalls(): Promise<unknown>;
-    nativeMints(): Promise<unknown>;
-    nativeBurns(): Promise<unknown>;
-    nativeTransfers(): Promise<unknown>;
-    totalTransactions(): Promise<unknown>;
+    get nativeCalls(): Promise<any>;
+    get nativeMints(): Promise<any>;
+    get nativeBurns(): Promise<any>;
+    get nativeTransfers(): Promise<any>;
+    get totalTransactions(): Promise<any>;
+    get blocks(): Promise<[]>;
+    get lastBlock(): Promise<any>;
+    get totalBlocks(): Promise<any>;
+    getBlocks(from?: any, to?: any): Promise<[]>;
+    getBlock(index: any): Promise<any>;
+    addLoadedBlock(block: any): Promise<any>;
+    latestTransactions(): Promise<any>;
     delete(hash: any): Promise<void>;
     /**
      *

package/exports/state.d.ts

@@ -16,17 +16,19 @@ export default class State extends Contract {
     get blockHashMap(): IterableIterator<[any, any]>;
     get loaded(): boolean;
     get resolving(): boolean;
-    get nativeMints(): Promise<unknown>;
-    get nativeBurns(): Promise<unknown>;
-    get nativeTransfers(): Promise<unknown>;
-    get totalTransactions(): Promise<unknown>;
-    get nativeCalls(): Promise<unknown>;
-    get blocks(): any[];
-    get lastBlock(): {
+    get nativeMints(): Promise<any>;
+    get nativeBurns(): Promise<any>;
+    get nativeTransfers(): Promise<any>;
+    get totalTransactions(): Promise<any>;
+    get nativeCalls(): Promise<any>;
+    get blocks(): Promise<[]>;
+    get lastBlock(): Promise<any> | {
         index: number;
         hash: string;
         previousHash: string;
     };
+    getBlock(index: any): Promise<any>;
+    getBlocks(from?: any, to?: any): Promise<[]>;
     get totalSize(): number;
     get machine(): Machine;
     constructor(config: any);

package/exports/types.d.ts

@@ -0,0 +1,33 @@
+import { base58String } from '@vandeurenglenn/base58';
+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 interface globalMessage {
+    sender: Address;
+    call: Function;
+    staticCall: Function;
+    delegate: Function;
+    staticDelegate: Function;
+}
+export declare type BlockInMemory = {
+    index: number;
+    transactions: RawTransaction[];
+    loaded?: Boolean;
+};
+export declare type RawBlock = {
+    index: number;
+    transactions: RawTransaction[];
+};
+export declare type ChainConfig = {
+    resolveTimeout?: number;
+};
+export {};

package/exports/workers/block-worker.js

@@ -21,7 +21,7 @@ const run = async (blocks) => {
           console.log(`loaded block: ${hash} @${index} ${formatBytes(size)}`);
           // todo we don't want this, need shared state
           block.decoded.transactions = block.decoded.transactions.sort((a, b) => a.nonce - b.nonce);
-          resolve({ ...block.decoded, blockInfo: { hash, size, index } });
+          resolve({ ...block.decoded, hash, blockInfo: { hash, size, index } });
         })
     )
   );