@leofcoin/chain 1.4.44 → 1.4.46

package/exports/browser/chain.js

@@ -7861,6 +7861,8 @@ globalThis.BigNumber = BigNumber;
 // check if browser or local
 class Chain extends Contract {
     #state;
+    #lastResolved;
+    #slotTime = 10000;
     id;
     utils;
     /** {Address[]} */
@@ -8137,6 +8139,19 @@ class Chain extends Contract {
         return 'synced';
     }
     async #syncChain(lastBlock) {
+        let current;
+        const timeout = () => current = setTimeout(() => {
+            if (this.#chainSyncing) {
+                if (this.#lastResolved + 10000 > Date.now())
+                    timeout();
+                else {
+                    this.#chainSyncing = false;
+                    console.log('resyncing');
+                    this.#syncChain(lastBlock);
+                }
+            }
+        }, 10000);
+        timeout();
         if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
             return;
         this.#chainSyncing = true;
@@ -8161,6 +8176,7 @@ class Chain extends Contract {
                 await this.#loadBlocks(this.blocks.slice(start));
             await this.#updateState(new BlockMessage(this.#blocks[this.#blocks.length - 1]));
         }
+        clearTimeout(current);
         this.#chainSyncing = false;
     }
     async #prepareRequest(request) {
@@ -8236,6 +8252,7 @@ class Chain extends Contract {
             this.#blocks[index] = { hash, ...block.decoded };
             this.#blockHashMap.set(hash, index);
             console.log(`resolved block: ${hash} @${index} ${formatBytes(size)}`);
+            this.#lastResolved = Date.now();
             if (previousHash !== '0x0') {
                 return this.resolveBlock(previousHash);
             }
@@ -8300,7 +8317,7 @@ class Chain extends Contract {
         }
         catch (error) {
             console.log({ error });
-            globalThis.peernet.pubsub.publish('invalid-transaction', hash);
+            globalThis.peernet.publish('invalid-transaction', hash);
             globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: 'fail', hash, error: error });
             throw { error, hash, from, to, params, nonce };
         }
@@ -8382,11 +8399,12 @@ class Chain extends Contract {
         if (Object.keys(transactions)?.length === 0)
             return;
         const keys = await globalThis.transactionPoolStore.keys();
+        const timestamp = Date.now();
         let block = {
             transactions: [],
             validators: [],
             fees: BigNumber.from(0),
-            timestamp: Date.now(),
+            timestamp,
             previousHash: '',
             reward: parseUnits('150'),
             index: 0
@@ -8396,24 +8414,34 @@ class Chain extends Contract {
         transactions = transactions.sort((a, b) => a.nonce - b.nonce);
         for (let transaction of transactions) {
             const hash = await transaction.hash();
-            const doubleTransaction = this.#blocks.filter(({ transaction }) => transaction.hash === hash);
-            if (doubleTransaction.length > 0) {
+            const doubleTransactions = [];
+            for (const block of this.#blocks) {
+                for (const transaction of block.transactions) {
+                    if (transaction.hash === hash) {
+                        doubleTransactions.push(hash);
+                    }
+                }
+            }
+            console.log();
+            if (doubleTransactions.length > 0) {
                 await globalThis.transactionPoolStore.delete(hash);
                 await globalThis.peernet.publish('invalid-transaction', hash);
             }
             else {
-                try {
-                    const result = await this.#executeTransaction({ ...transaction.decoded, hash });
-                    console.log({ result });
-                    block.transactions.push({ hash, ...transaction.decoded });
-                    block.fees = block.fees.add(await calculateFee(transaction.decoded));
-                    await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
-                }
-                catch (e) {
-                    console.log(keys.includes(hash));
-                    console.log({ e });
-                    console.log(hash);
-                    await globalThis.transactionPoolStore.delete(hash);
+                if (timestamp + this.#slotTime > Date.now()) {
+                    try {
+                        const result = await this.#executeTransaction({ ...transaction.decoded, hash });
+                        console.log({ result });
+                        block.transactions.push({ hash, ...transaction.decoded });
+                        block.fees = block.fees.add(await calculateFee(transaction.decoded));
+                        await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
+                    }
+                    catch (e) {
+                        console.log(keys.includes(hash));
+                        console.log({ e });
+                        console.log(hash);
+                        await globalThis.transactionPoolStore.delete(hash);
+                    }
                 }
             }
         }
@@ -8496,17 +8524,21 @@ class Chain extends Contract {
         // transactionStore.put(message.hash, message.encoded)
     }
     async #addTransaction(transaction) {
+        transaction = await new TransactionMessage(transaction);
+        const hash = await transaction.hash();
         try {
-            transaction = await new TransactionMessage(transaction);
-            const hash = await transaction.hash();
             const has = await globalThis.transactionPoolStore.has(hash);
-            if (!has)
+            if (!has) {
                 await globalThis.transactionPoolStore.put(hash, transaction.encoded);
-            if (this.#participating && !this.#runningEpoch)
-                this.#runEpoch();
+                if (this.#participating && !this.#runningEpoch)
+                    this.#runEpoch();
+            }
+            else
+                globalThis.peernet.publish('invalid-transaction', hash);
         }
         catch (e) {
             console.log(e);
+            globalThis.peernet.publish('invalid-transaction', hash);
             throw new Error('invalid transaction');
         }
     }

package/exports/browser/{client-91364a04-457da758.js → client-31b62450-447815f7.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-cf761de2.js';
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from './node-browser-5de1f022.js';
 import './contract-f76383c3.js';
 
 function commonjsRequire(path) {

package/exports/browser/{index-2c7d7136-ba66b864.js → index-e407f1a3-a07c9df0.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-cf761de2.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-5de1f022.js';
 import './contract-f76383c3.js';
 
 /**

package/exports/browser/{messages-bcb7873b-22fd727d.js → messages-2465e07d-6cd91c3d.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-cf761de2.js';
+import { F as FormatInterface } from './node-browser-5de1f022.js';
 import './contract-f76383c3.js';
 
 var proto$b = {

package/exports/browser/{node-browser-cf761de2.js → node-browser-5de1f022.js}

@@ -4868,12 +4868,13 @@ const isUint8Array$1 = (type) => type === 'uint8Array';
 const isBigNumber = (type) => type === 'bigNumber';
 const tokenize = (key, value) => {
     const optional = key.endsWith('?');
-    let type = value;
-    type = Array.isArray(type) ? 'array' : typeof type;
-    if (value instanceof Uint8Array)
+    let type = value === undefined ? key : value;
+    if (type instanceof Uint8Array)
         type = 'uint8Array';
-    else if (value._isBigNumber)
+    else if (type?._isBigNumber || type.isBigNumber)
         type = 'bigNumber';
+    else
+        type = Array.isArray(type) ? 'array' : typeof type;
     const parts = key.split('?');
     const minimumLength = parts[2]?.includes('min') ? parts[2].split['min:'][1] : 0;
     return { type, optional, key: parts[0], minimumLength };
@@ -4885,6 +4886,7 @@ const toType = (data) => {
     // returns the ArrayBuffer as a UintArray
     if (data instanceof ArrayBuffer)
         return new Uint8Array(data);
+    // returns the bigNumbers hex as a UintArray
     if (data._isBigNumber)
         return new TextEncoder().encode(data._hex || data.toHexString());
     // returns the string as a UintArray
@@ -4898,11 +4900,11 @@ const toType = (data) => {
         return new TextEncoder().encode(data.toString());
     throw new Error(`unsuported type ${typeof data || data}`);
 };
-const encode$3 = (proto, input) => {
+const encode$3 = (proto, input, compress) => {
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     const set = [];
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         const data = input[token.key];
         if (!token.optional && data === undefined)
@@ -4915,14 +4917,14 @@ const encode$3 = (proto, input) => {
     }
     return index$6(set);
 };
-const decode$4 = (proto, uint8Array) => {
+const decode$4 = (proto, uint8Array, compressed) => {
     let deconcated = index$5(uint8Array);
     const output = {};
     const keys = Object.keys(proto);
     const values = Object.values(proto);
     if (keys.length !== deconcated.length)
         console.warn(`length mismatch: expected  ${keys.length} got ${uint8Array.length}`);
-    for (let i = 0; i < keys.length; i++) {
+    for (let i = 0; i < values.length; i++) {
         const token = tokenize(keys[i], values[i]);
         if (isUint8Array$1(token.type))
             output[token.key] = deconcated[i];
@@ -6009,7 +6011,7 @@ let FormatInterface$1 = class FormatInterface extends BasicInterface$1 {
             this.fromUint8Array(buffer);
         else if (buffer instanceof ArrayBuffer)
             this.fromArrayBuffer(buffer);
-        else if (buffer instanceof FormatInterface$1 && buffer?.name === this.name)
+        else if (buffer instanceof FormatInterface && buffer?.name === this.name)
             return buffer;
         else if (typeof buffer === 'string') {
             if (this.isHex(buffer))
@@ -6281,6 +6283,7 @@ const lastFetched = {
         timestamp: 0,
     },
 };
+const fetchedCoordinates = {};
 const getAddress = async () => {
     const { address } = lastFetched;
     const now = Math.round(new Date().getTime() / 1000);
@@ -6318,12 +6321,14 @@ class DhtEarth {
      * @return {Object} {latitude: lat, longitude: lon}
      */
     async getCoordinates(address) {
-        // const {address} = parseAddress(provider)
-        const request = `https://whereis.leofcoin.org/?ip=${address}`;
-        let response = await fetch(request);
-        response = await response.json();
-        const { lat, lon } = response;
-        return { latitude: lat, longitude: lon };
+        if (!fetchedCoordinates[address]) {
+            const request = `https://whereis.leofcoin.org/?ip=${address}`;
+            let response = await fetch(request);
+            response = await response.json();
+            const { lat, lon } = response;
+            fetchedCoordinates[address] = { latitude: lat, longitude: lon };
+        }
+        return fetchedCoordinates[address];
     }
     /**
      * @param {Object} peer
@@ -20263,7 +20268,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-2c7d7136-ba66b864.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-e407f1a3-a07c9df0.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -20434,7 +20439,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-bcb7873b-22fd727d.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-2465e07d-6cd91c3d.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20506,7 +20511,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-91364a04-457da758.js');
+        const importee = await import('./client-31b62450-447815f7.js');
         /**
          * @access public
          * @type {PeernetClient}

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-cf761de2.js';
+export { N as default } from './node-browser-5de1f022.js';
 import './contract-f76383c3.js';

package/exports/chain.js

@@ -456,6 +456,8 @@ globalThis.BigNumber = BigNumber;
 // check if browser or local
 class Chain extends Contract {
     #state;
+    #lastResolved;
+    #slotTime = 10000;
     id;
     utils;
     /** {Address[]} */
@@ -732,6 +734,19 @@ class Chain extends Contract {
         return 'synced';
     }
     async #syncChain(lastBlock) {
+        let current;
+        const timeout = () => current = setTimeout(() => {
+            if (this.#chainSyncing) {
+                if (this.#lastResolved + 10000 > Date.now())
+                    timeout();
+                else {
+                    this.#chainSyncing = false;
+                    console.log('resyncing');
+                    this.#syncChain(lastBlock);
+                }
+            }
+        }, 10000);
+        timeout();
         if (this.#chainSyncing || !lastBlock || !lastBlock.hash || !lastBlock.hash)
             return;
         this.#chainSyncing = true;
@@ -756,6 +771,7 @@ class Chain extends Contract {
                 await this.#loadBlocks(this.blocks.slice(start));
             await this.#updateState(new BlockMessage(this.#blocks[this.#blocks.length - 1]));
         }
+        clearTimeout(current);
         this.#chainSyncing = false;
     }
     async #prepareRequest(request) {
@@ -831,6 +847,7 @@ class Chain extends Contract {
             this.#blocks[index] = { hash, ...block.decoded };
             this.#blockHashMap.set(hash, index);
             console.log(`resolved block: ${hash} @${index} ${formatBytes(size)}`);
+            this.#lastResolved = Date.now();
             if (previousHash !== '0x0') {
                 return this.resolveBlock(previousHash);
             }
@@ -895,7 +912,7 @@ class Chain extends Contract {
         }
         catch (error) {
             console.log({ error });
-            globalThis.peernet.pubsub.publish('invalid-transaction', hash);
+            globalThis.peernet.publish('invalid-transaction', hash);
             globalThis.pubsub.publish(`transaction.completed.${hash}`, { status: 'fail', hash, error: error });
             throw { error, hash, from, to, params, nonce };
         }
@@ -977,11 +994,12 @@ class Chain extends Contract {
         if (Object.keys(transactions)?.length === 0)
             return;
         const keys = await globalThis.transactionPoolStore.keys();
+        const timestamp = Date.now();
         let block = {
             transactions: [],
             validators: [],
             fees: BigNumber.from(0),
-            timestamp: Date.now(),
+            timestamp,
             previousHash: '',
             reward: parseUnits('150'),
             index: 0
@@ -991,24 +1009,34 @@ class Chain extends Contract {
         transactions = transactions.sort((a, b) => a.nonce - b.nonce);
         for (let transaction of transactions) {
             const hash = await transaction.hash();
-            const doubleTransaction = this.#blocks.filter(({ transaction }) => transaction.hash === hash);
-            if (doubleTransaction.length > 0) {
+            const doubleTransactions = [];
+            for (const block of this.#blocks) {
+                for (const transaction of block.transactions) {
+                    if (transaction.hash === hash) {
+                        doubleTransactions.push(hash);
+                    }
+                }
+            }
+            console.log();
+            if (doubleTransactions.length > 0) {
                 await globalThis.transactionPoolStore.delete(hash);
                 await globalThis.peernet.publish('invalid-transaction', hash);
             }
             else {
-                try {
-                    const result = await this.#executeTransaction({ ...transaction.decoded, hash });
-                    console.log({ result });
-                    block.transactions.push({ hash, ...transaction.decoded });
-                    block.fees = block.fees.add(await calculateFee(transaction.decoded));
-                    await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
-                }
-                catch (e) {
-                    console.log(keys.includes(hash));
-                    console.log({ e });
-                    console.log(hash);
-                    await globalThis.transactionPoolStore.delete(hash);
+                if (timestamp + this.#slotTime > Date.now()) {
+                    try {
+                        const result = await this.#executeTransaction({ ...transaction.decoded, hash });
+                        console.log({ result });
+                        block.transactions.push({ hash, ...transaction.decoded });
+                        block.fees = block.fees.add(await calculateFee(transaction.decoded));
+                        await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
+                    }
+                    catch (e) {
+                        console.log(keys.includes(hash));
+                        console.log({ e });
+                        console.log(hash);
+                        await globalThis.transactionPoolStore.delete(hash);
+                    }
                 }
             }
         }
@@ -1091,17 +1119,21 @@ class Chain extends Contract {
         // transactionStore.put(message.hash, message.encoded)
     }
     async #addTransaction(transaction) {
+        transaction = await new TransactionMessage(transaction);
+        const hash = await transaction.hash();
         try {
-            transaction = await new TransactionMessage(transaction);
-            const hash = await transaction.hash();
             const has = await globalThis.transactionPoolStore.has(hash);
-            if (!has)
+            if (!has) {
                 await globalThis.transactionPoolStore.put(hash, transaction.encoded);
-            if (this.#participating && !this.#runningEpoch)
-                this.#runEpoch();
+                if (this.#participating && !this.#runningEpoch)
+                    this.#runEpoch();
+            }
+            else
+                globalThis.peernet.publish('invalid-transaction', hash);
         }
         catch (e) {
             console.log(e);
+            globalThis.peernet.publish('invalid-transaction', hash);
             throw new Error('invalid transaction');
         }
     }

package/package.json

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