@leofcoin/chain 1.4.82 → 1.4.84

package/exports/chain.js

@@ -158,7 +158,7 @@ class Transaction extends Protocol {
     }
     async sendTransaction(message) {
         if (!this.isTransactionMessage(message))
-            message = new TransactionMessage(message);
+            message = await new TransactionMessage(message);
         if (!message.decoded.signature)
             throw new Error(`transaction not signed`);
         if (message.decoded.nonce === undefined)
@@ -254,13 +254,16 @@ class Contract extends Transaction {
 
 // import State from './state'
 class Machine {
+    worker;
     #contracts = {};
     #nonces = {};
     lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
     constructor(blocks) {
+        // @ts-ignore
         return this.#init(blocks);
     }
-    #createMessage(sender = peernet.selectedAccount) {
+    // @ts-ignore
+    #createMessage(sender = globalThis.peernet.selectedAccount) {
         return {
             sender,
             call: this.execute,
@@ -271,6 +274,7 @@ class Machine {
         switch (data.type) {
             case 'contractError': {
                 console.warn(`removing contract ${await data.hash()}`);
+                // @ts-ignore
                 await contractStore.delete(await data.hash());
                 break;
             }
@@ -285,7 +289,7 @@ class Machine {
             }
             case 'debug': {
                 for (const message of data.messages)
-                    debug(message);
+                    globalThis.debug(message);
                 break;
             }
             case 'machine-ready': {
@@ -306,20 +310,32 @@ class Machine {
                 resolve(this);
             };
             pubsub.subscribe('machine.ready', machineReady);
-            this.worker = await new EasyWorker('node_modules/@leofcoin/workers/src/machine-worker.js', { serialization: 'advanced', type: 'module' });
+            let pre;
+            try {
+                const importee = await import('url');
+                const url = importee.default;
+                if (url)
+                    pre = url.fileURLToPath(new URL('.', import.meta.url));
+            }
+            catch {
+                // browser env
+                pre = './';
+            }
+            this.worker = await new EasyWorker(pre + 'workers/machine-worker.js', { serialization: 'advanced', type: 'module' });
             this.worker.onmessage(this.#onmessage.bind(this));
             // const blocks = await blockStore.values()
             const contracts = await Promise.all([
-                contractStore.get(contractFactory),
-                contractStore.get(nativeToken),
-                contractStore.get(validators),
-                contractStore.get(nameService)
+                globalThis.contractStore.get(contractFactory),
+                globalThis.contractStore.get(nativeToken),
+                globalThis.contractStore.get(validators),
+                globalThis.contractStore.get(nameService)
             ]);
             const message = {
                 type: 'init',
                 input: {
                     contracts,
                     blocks,
+                    // @ts-ignore
                     peerid: peernet.peerId
                 }
             };
@@ -329,6 +345,7 @@ class Machine {
     async #runContract(contractMessage) {
         const hash = await contractMessage.hash();
         return new Promise((resolve, reject) => {
+            // @ts-ignore
             const id = randombytes(20).toString('hex');
             const onmessage = message => {
                 pubsub.unsubscribe(id, onmessage);
@@ -362,13 +379,13 @@ class Machine {
                 if (await this.has(parameters[0]))
                     throw new Error(`duplicate contract @${parameters[0]}`);
                 let message;
-                if (!await contractStore.has(parameters[0])) {
+                if (!await globalThis.contractStore.has(parameters[0])) {
                     message = await peernet.get(parameters[0], 'contract');
                     message = await new ContractMessage(message);
-                    await contractStore.put(await message.hash(), message.encoded);
+                    await globalThis.contractStore.put(await message.hash(), message.encoded);
                 }
                 if (!message) {
-                    message = await contractStore.get(parameters[0]);
+                    message = await globalThis.contractStore.get(parameters[0]);
                     message = await new ContractMessage(message);
                 }
                 if (!await this.has(await message.hash()))
@@ -379,6 +396,7 @@ class Machine {
             throw new Error(`contract deployment failed for ${parameters[0]}\n${error.message}`);
         }
         return new Promise((resolve, reject) => {
+            // @ts-ignore
             const id = randombytes(20).toString('hex');
             const onmessage = message => {
                 pubsub.unsubscribe(id, onmessage);
@@ -420,6 +438,7 @@ class Machine {
     }
     async has(address) {
         return new Promise((resolve, reject) => {
+            // @ts-ignore
             const id = randombytes(20).toString('hex');
             const onmessage = message => {
                 pubsub.unsubscribe(id, onmessage);
@@ -439,14 +458,14 @@ class Machine {
         });
     }
     async delete(hash) {
-        return contractStore.delete(hash);
+        return globalThis.contractStore.delete(hash);
     }
     /**
      *
      * @returns Promise
      */
     async deleteAll() {
-        let hashes = await contractStore.get();
+        let hashes = await globalThis.contractStore.get();
         hashes = Object.keys(hashes).map(hash => this.delete(hash));
         return Promise.all(hashes);
     }
@@ -621,7 +640,7 @@ class State extends Contract {
         if (block !== undefined) {
             block = await new BlockMessage(block);
             const { index } = block.decoded;
-            if (this.#blocks[index] && this.#blocks[index].hash !== block.hash)
+            if (this.#blocks[index - 1] && this.#blocks[index - 1].hash !== block.hash)
                 throw `invalid block ${hash} @${index}`;
             if (!await globalThis.peernet.has(hash, 'block'))
                 await globalThis.peernet.put(hash, block.encoded, 'block');
@@ -630,9 +649,9 @@ class State extends Contract {
     }
     async #resolveBlock(hash) {
         let index = this.#blockHashMap.get(hash);
-        if (this.#blocks[index]) {
-            if (this.#blocks[index].previousHash !== '0x0') {
-                return this.resolveBlock(this.#blocks[index].previousHash);
+        if (this.#blocks[index - 1]) {
+            if (this.#blocks[index - 1].previousHash !== '0x0') {
+                return this.resolveBlock(this.#blocks[index - 1].previousHash);
             }
             else {
                 return;
@@ -643,11 +662,11 @@ class State extends Contract {
             index = block.decoded.index;
             const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
             this.#totalSize += size;
-            this.#blocks[index] = { hash, ...block.decoded };
+            this.#blocks[index - 1] = { hash, ...block.decoded };
             this.#blockHashMap.set(hash, index);
             globalThis.debug(`resolved block: ${hash} @${index} ${formatBytes(size)}`);
             globalThis.pubsub.publish('block-resolved', { hash, index });
-            this.#lastResolved = this.#blocks[index];
+            this.#lastResolved = this.#blocks[index - 1];
             this.#lastResolvedTime = Date.now();
         }
         catch (error) {
@@ -757,12 +776,12 @@ class State extends Contract {
             if (!this.#lastBlock || Number(this.#lastBlock.index) < Number(lastBlock.index)) {
                 // TODO: check if valid
                 const localIndex = this.#lastBlock ? this.lastBlock.index : 0;
-                const index = lastBlock.index;
+                const index = lastBlock.index - 1;
                 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) - 1;
+                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]));
@@ -847,7 +866,7 @@ class State extends Contract {
                         return false;
                     }
                 }
-                this.#blocks[block.index].loaded = true;
+                this.#blocks[block.index - 1].loaded = true;
                 globalThis.debug(`loaded block: ${block.hash} @${block.index}`);
                 globalThis.pubsub.publish('block-loaded', { ...block });
             }
@@ -902,7 +921,7 @@ class Chain extends State {
     #state;
     #slotTime = 10000;
     id;
-    utils;
+    utils = {};
     /** {Address[]} */
     #validators = [];
     /** {Boolean} */
@@ -912,6 +931,7 @@ class Chain extends State {
     #jail = [];
     constructor() {
         super();
+        // @ts-ignore
         return this.#init();
     }
     get nativeToken() {
@@ -939,7 +959,6 @@ class Chain extends State {
         }
         catch (error) {
             console.error(error);
-            console.log('ttttt');
         }
         const end = Date.now();
         console.log(((end - start) / 1000) + ' s');
@@ -963,7 +982,6 @@ class Chain extends State {
                 message: nameServiceMessage
             }];
         await Promise.all(contracts.map(async ({ address, message }) => {
-            // console.log({message});
             message = await new ContractMessage(Uint8Array.from(message.split(',').map(string => Number(string))));
             await globalThis.contractStore.put(address, message.encoded);
         }));
@@ -1033,7 +1051,7 @@ class Chain extends State {
         this.#jail.push(validatorInfo.address);
     }
     #addTransaction(message) {
-        console.log(message);
+        console.log({ message });
     }
     async #prepareRequest(request) {
         let node = await new globalThis.peernet.protos['peernet-request']({ request });
@@ -1051,13 +1069,11 @@ class Chain extends State {
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
         let transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
         const transactions = await globalThis.transactionPoolStore.keys();
-        console.log({ transactionsInPool });
         const transactionsToGet = [];
         for (const key of transactionsInPool) {
             if (!transactions.includes(key) && !ignorelist.includes(key))
                 transactionsToGet.push(transactionPoolStore.put(key, (await peernet.get(key, 'transaction'))));
         }
-        console.log(await transactionPoolStore.keys());
         await Promise.all(transactionsToGet);
         if (Object.keys(lastBlock).length > 0) {
             if (!this.lastBlock || !this.blocks[this.blocks.length - 1]?.loaded || lastBlock && lastBlock.index > this.lastBlock?.index || !this.loaded && !this.resolving) {
@@ -1132,7 +1148,6 @@ class Chain extends State {
             console.log(error.hash);
             console.log('errrrr');
             await transactionPoolStore.delete(error.hash);
-            console.log({ e: error });
         }
     }
     async participate(address) {
@@ -1183,7 +1198,6 @@ class Chain extends State {
         // exclude failing tx
         transactions = await this.promiseTransactions(transactions);
         transactions = transactions.sort((a, b) => a.nonce - b.nonce);
-        console.log({ transactions });
         for (let transaction of transactions) {
             const hash = await transaction.hash();
             const doubleTransactions = [];
@@ -1202,7 +1216,6 @@ class Chain extends State {
             // if (timestamp + this.#slotTime > Date.now()) {
             try {
                 const result = await this.#executeTransaction({ ...transaction.decoded, hash });
-                console.log({ result });
                 block.transactions.push(transaction);
                 block.fees = block.fees.add(await calculateFee(transaction.decoded));
                 await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
@@ -1296,7 +1309,7 @@ class Chain extends State {
         // transactionStore.put(message.hash, message.encoded)
     }
     async #sendTransaction(transaction) {
-        transaction = await new TransactionMessage(transaction.encoded);
+        transaction = await new TransactionMessage(transaction.encoded || transaction);
         const hash = await transaction.hash();
         try {
             const has = await globalThis.transactionPoolStore.has(hash);
@@ -1319,9 +1332,10 @@ class Chain extends State {
      * error is thrown on error so undefined data doesn't mean there is an error...
      **/
     async sendTransaction(transaction) {
-        const event = await super.sendTransaction(transaction);
-        this.#sendTransaction(await new TransactionMessage(event.message.encoded));
-        globalThis.peernet.publish('send-transaction', event.message.encoded);
+        const transactionMessage = await new TransactionMessage({ ...transaction });
+        const event = await super.sendTransaction(transactionMessage);
+        this.#sendTransaction(transactionMessage.encoded);
+        globalThis.peernet.publish('send-transaction', transactionMessage.encoded);
         return event;
     }
     async addContract(transaction, contractMessage) {

package/exports/types/config/main.d.ts

@@ -0,0 +1,5 @@
+declare namespace _default {
+    let datadir: string;
+    let configPath: string;
+}
+export default _default;

package/exports/{typings → types}/config/protocol.d.ts

@@ -1,6 +1,6 @@
 declare namespace _default {
     namespace block {
-        const size: number;
+        let size: number;
     }
 }
 export default _default;

package/exports/{typings → types}/contract.d.ts

@@ -10,7 +10,7 @@ export default class Contract extends Transaction {
      * @param {Array} constructorParameters
      * @returns lib.createContractMessage
      */
-    createContractMessage(creator: Address, contract: string, constructorParameters?: any[]): Promise<import("@leofcoin/messages").ContractMessage>;
+    createContractMessage(creator: Address, contract: string, constructorParameters?: any[]): Promise<any>;
     /**
      *
      * @param {Address} creator

package/exports/{typings → types}/fee/config.d.ts

@@ -1,4 +1,4 @@
 declare namespace _default {
-    const deployment: number;
+    let deployment: number;
 }
 export default _default;

package/exports/{typings → types}/machine.d.ts

@@ -1,11 +1,13 @@
+import EasyWorker from '@vandeurenglenn/easy-worker';
 export default class Machine {
-    constructor(blocks: any);
+    #private;
+    worker: EasyWorker;
     lastBlock: {
         index: number;
         hash: string;
         previousHash: string;
     };
-    worker: any;
+    constructor(blocks: any);
     /**
      *
      * @param {Address} contract
@@ -13,14 +15,13 @@ export default class Machine {
      * @param {Array} parameters
      * @returns Promise<message>
      */
-    execute(contract: Address, method: string, parameters: any[]): Promise<any>;
-    get(contract: any, method: any, parameters: any): Promise<any>;
-    has(address: any): Promise<any>;
+    execute(contract: any, method: any, parameters: any): Promise<unknown>;
+    get(contract: any, method: any, parameters?: any): Promise<unknown>;
+    has(address: any): Promise<unknown>;
     delete(hash: any): Promise<any>;
     /**
      *
      * @returns Promise
      */
-    deleteAll(): Promise<any>;
-    #private;
+    deleteAll(): Promise<any[]>;
 }

package/exports/{typings → types}/node-browser.d.ts

@@ -5,6 +5,6 @@ export default class Node {
         network: string;
         networkName: string;
         networkVersion: string;
-        stars: any;
+        stars: string[];
     }, password: string): Promise<this>;
 }

package/exports/{typings → types}/node.d.ts

@@ -1,11 +1,11 @@
 export default class Node {
     #private;
-    constructor(config: any, password: string);
+    constructor(config: any, password: any);
     _init(config: {
         network: string;
         networkName: string;
         networkVersion: string;
-        stars: any;
+        stars: string[];
         autoStart: boolean;
-    }, password: string): Promise<this>;
+    }, password: any): Promise<this>;
 }