@leofcoin/chain 1.6.8 → 1.6.10

package/exports/chain.d.ts

@@ -1,4 +1,5 @@
 import '@vandeurenglenn/debug';
+import { BigNumber } from '@leofcoin/utils';
 import { BigNumberish } from '@ethersproject/bignumber';
 import { Address } from './types.js';
 import { VersionControl } from './version-control.js';
@@ -20,14 +21,14 @@ export default class Chain extends VersionControl {
     sendTransaction(transaction: any): Promise<{
         hash: any;
         data: any;
-        fee: any;
+        fee: string | number | BigNumber;
         wait: Promise<unknown>;
         message: any;
     }>;
     addContract(transaction: any, contractMessage: any): Promise<{
         hash: any;
         data: any;
-        fee: any;
+        fee: string | number | BigNumber;
         wait: Promise<unknown>;
         message: any;
     }>;

package/exports/chain.js

@@ -10,11 +10,11 @@ import { ContractDeploymentError, ExecutionError, isResolveError, ResolveError,
 
 const limit = 1800;
 const transactionLimit = 1000;
-const requestTimeout = 30000;
-const syncTimeout = 30000;
+const requestTimeout = 30_000;
+const syncTimeout = 30_000;
 class Protocol {
     constructor(config) {
-        this.resolveTimeout = 10000;
+        this.resolveTimeout = 10_000;
         if (config?.resolveTimeout)
             this.resolveTimeout = config.resolveTimeout;
     }
@@ -114,7 +114,13 @@ class Transaction extends Protocol {
      * @returns {Number} nonce
      */
     async getNonce(address) {
-        if (!(await globalThis.accountsStore.has(address))) {
+        try {
+            if (!(await globalThis.accountsStore.has(address))) {
+                const nonce = await this.#getNonceFallback(address);
+                await globalThis.accountsStore.put(address, new TextEncoder().encode(String(nonce)));
+            }
+        }
+        catch (error) {
             const nonce = await this.#getNonceFallback(address);
             await globalThis.accountsStore.put(address, new TextEncoder().encode(String(nonce)));
         }
@@ -132,8 +138,7 @@ class Transaction extends Protocol {
         return Number(nonce);
     }
     async validateNonce(address, nonce) {
-        let previousNonce = await globalThis.accountsStore.get(address);
-        previousNonce = Number(new TextDecoder().decode(previousNonce));
+        const previousNonce = await this.getNonce(address);
         if (previousNonce > nonce)
             throw new Error(`a transaction with a higher nonce already exists`);
         if (previousNonce === nonce)
@@ -191,7 +196,7 @@ class Transaction extends Protocol {
                         result.status === 'fulfilled' ? resolve(result.hash) : reject({ hash: result.hash, error: result.error });
                         setTimeout(async () => {
                             pubsub.unsubscribe(`transaction.completed.${hash}`, completed);
-                        }, 10000);
+                        }, 10_000);
                     };
                     pubsub.subscribe(`transaction.completed.${hash}`, completed);
                 }
@@ -276,7 +281,8 @@ class Machine {
             lastBlock: {
                 index: 0,
                 hash: ''
-            }
+            },
+            accounts: {}
         };
         // @ts-ignore
         return this.#init(blocks);
@@ -366,8 +372,14 @@ class Machine {
                     const value = await this.#askWorker('get', { contract, method: 'state', params: [] });
                     state[contract] = value;
                 }));
-                await stateStore.put('lastBlock', JSON.stringify(await this.lastBlock));
-                await stateStore.put('states', JSON.stringify(state));
+                const accounts = await Promise.all((await accountsStore.keys()).map((address) => accountsStore.get(address)));
+                const tasks = [
+                    stateStore.put('lastBlock', JSON.stringify(await this.lastBlock)),
+                    stateStore.put('states', JSON.stringify(state)),
+                    stateStore.put('accounts', JSON.stringify(accounts))
+                    // accountsStore.clear()
+                ];
+                await Promise.all(tasks);
             }
         }
         catch (error) {
@@ -401,6 +413,12 @@ class Machine {
             if (await stateStore.has('lastBlock')) {
                 this.states.lastBlock = JSON.parse(new TextDecoder().decode(await stateStore.get('lastBlock')));
                 this.states.states = JSON.parse(new TextDecoder().decode(await stateStore.get('states')));
+                try {
+                    this.states.accounts = JSON.parse(new TextDecoder().decode(await stateStore.get('accounts')));
+                }
+                catch {
+                    this.states.accounts = {};
+                }
                 console.log({ balances: this.states.states[addresses.nativeToken].balances });
             }
             const message = {
@@ -1392,7 +1410,6 @@ class Chain extends VersionControl {
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
         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) {
                 this.knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
@@ -1401,6 +1418,7 @@ class Chain extends VersionControl {
             else if (!this.knownBlocks)
                 this.knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
         }
+        const peerTransactionPool = (higherThenCurrentLocal && (await this.getPeerTransactionPool(peer))) || [];
         if (this.#participating && peerTransactionPool.length > 0)
             return this.#runEpoch();
     }

package/exports/contract.d.ts

@@ -13,7 +13,7 @@ export default class Contract extends Transaction {
      * @param {Array} constructorParameters
      * @returns lib.createContractMessage
      */
-    createContractMessage(creator: any, contract: any, constructorParameters?: any[]): Promise<any>;
+    createContractMessage(creator: any, contract: any, constructorParameters?: any[]): Promise<import("@leofcoin/messages").ContractMessage>;
     /**
      *
      * @param {Address} creator
@@ -31,14 +31,14 @@ export default class Contract extends Transaction {
     deployContract(signer: MultiWallet, contract: any, constructorParameters?: any[]): Promise<{
         hash: any;
         data: any;
-        fee: any;
+        fee: string | number | import("@ethersproject/bignumber").BigNumber;
         wait: Promise<unknown>;
         message: any;
     }>;
     deployContractMessage(signer: any, message: any): Promise<{
         hash: any;
         data: any;
-        fee: any;
+        fee: string | number | import("@ethersproject/bignumber").BigNumber;
         wait: Promise<unknown>;
         message: any;
     }>;

package/exports/machine.d.ts

@@ -8,6 +8,7 @@ export default class Machine {
             index: number;
             hash: string;
         };
+        accounts: {};
     };
     constructor(blocks: any);
     updateState(): Promise<void>;

package/exports/transaction.d.ts

@@ -34,7 +34,7 @@ export default class Transaction extends Protocol {
     sendTransaction(message: any): Promise<{
         hash: any;
         data: any;
-        fee: any;
+        fee: string | number | import("@leofcoin/utils").BigNumber;
         wait: Promise<unknown>;
         message: any;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.6.8",
+  "version": "1.6.10",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {