@leofcoin/chain 1.5.24 → 1.5.26

package/exports/browser/chain.js

@@ -1,4 +1,4 @@
-import { B as BigNumber, L as Logger, v as version$1, h as hexZeroPad, i as isBigNumberish, a as arrayify, b as isBytes, T as TransactionMessage, t as toBase58, C as ContractMessage, R as RawTransactionMessage, c as BlockMessage, d as BWMessage, e as BWRequestMessage } from './index-de7cd283.js';
+import { B as BigNumber, L as Logger, v as version$1, h as hexZeroPad, i as isBigNumberish, a as arrayify, b as isBytes, T as TransactionMessage, t as toBase58, C as ContractMessage, R as RawTransactionMessage, c as BlockMessage, d as BWMessage, e as BWRequestMessage } from './index-055d5584.js';
 
 const logger$1 = new Logger(version$1);
 const _constructorGuard = {};
@@ -410,15 +410,15 @@ var addresses$1 = {
 	validators: validators$1
 };
 
-const contractFactory$2 = addresses$1.contractFactory;
-const nameService$2 = addresses$1.nameService;
-const nativeToken$2 = addresses$1.nativeToken;
-const validators$2 = addresses$1.validators;
-var addresses = {
-  contractFactory: contractFactory$2,
-  nameService: nameService$2,
-  nativeToken: nativeToken$2,
-  validators: validators$2
+const contractFactory$2 = addresses$1.contractFactory;
+const nameService$2 = addresses$1.nameService;
+const nativeToken$2 = addresses$1.nativeToken;
+const validators$2 = addresses$1.validators;
+var addresses = {
+  contractFactory: contractFactory$2,
+  nameService: nameService$2,
+  nativeToken: nativeToken$2,
+  validators: validators$2
 };
 
 var contractFactory = "237,198,141,3,53,89,84,113,119,88,110,55,76,101,103,89,119,65,109,100,117,75,88,119,116,83,52,118,52,100,97,114,113,66,84,81,82,76,90,106,50,57,117,106,112,114,98,104,52,119,121,76,106,112,56,50,87,106,173,5,99,108,97,115,115,32,70,97,99,116,111,114,121,123,35,110,97,109,101,61,34,65,114,116,79,110,108,105,110,101,67,111,110,116,114,97,99,116,70,97,99,116,111,114,121,34,59,35,116,111,116,97,108,67,111,110,116,114,97,99,116,115,61,48,59,35,99,111,110,116,114,97,99,116,115,61,91,93,59,99,111,110,115,116,114,117,99,116,111,114,40,115,116,97,116,101,41,123,115,116,97,116,101,38,38,40,116,104,105,115,46,35,99,111,110,116,114,97,99,116,115,61,115,116,97,116,101,46,99,111,110,116,114,97,99,116,115,44,116,104,105,115,46,35,116,111,116,97,108,67,111,110,116,114,97,99,116,115,61,115,116,97,116,101,46,116,111,116,97,108,67,111,110,116,114,97,99,116,115,41,125,103,101,116,32,115,116,97,116,101,40,41,123,114,101,116,117,114,110,123,116,111,116,97,108,67,111,110,116,114,97,99,116,115,58,116,104,105,115,46,35,116,111,116,97,108,67,111,110,116,114,97,99,116,115,44,99,111,110,116,114,97,99,116,115,58,116,104,105,115,46,35,99,111,110,116,114,97,99,116,115,125,125,103,101,116,32,110,97,109,101,40,41,123,114,101,116,117,114,110,32,116,104,105,115,46,35,110,97,109,101,125,103,101,116,32,99,111,110,116,114,97,99,116,115,40,41,123,114,101,116,117,114,110,91,46,46,46,116,104,105,115,46,35,99,111,110,116,114,97,99,116,115,93,125,103,101,116,32,116,111,116,97,108,67,111,110,116,114,97,99,116,115,40,41,123,114,101,116,117,114,110,32,116,104,105,115,46,35,116,111,116,97,108,67,111,110,116,114,97,99,116,115,125,105,115,82,101,103,105,115,116,101,114,101,100,40,97,100,100,114,101,115,115,41,123,114,101,116,117,114,110,32,116,104,105,115,46,35,99,111,110,116,114,97,99,116,115,46,105,110,99,108,117,100,101,115,40,97,100,100,114,101,115,115,41,125,97,115,121,110,99,32,114,101,103,105,115,116,101,114,67,111,110,116,114,97,99,116,40,97,100,100,114,101,115,115,41,123,105,102,40,97,119,97,105,116,32,109,115,103,46,115,116,97,116,105,99,67,97,108,108,40,97,100,100,114,101,115,115,44,34,104,97,115,82,111,108,101,34,44,91,109,115,103,46,115,101,110,100,101,114,44,34,79,87,78,69,82,34,93,41,44,116,104,105,115,46,35,99,111,110,116,114,97,99,116,115,46,105,110,99,108,117,100,101,115,40,97,100,100,114,101,115,115,41,41,116,104,114,111,119,32,110,101,119,32,69,114,114,111,114,40,34,97,108,114,101,97,100,121,32,114,101,103,105,115,116,101,114,101,100,34,41,59,116,104,105,115,46,35,116,111,116,97,108,67,111,110,116,114,97,99,116,115,43,61,49,44,116,104,105,115,46,35,99,111,110,116,114,97,99,116,115,46,112,117,115,104,40,97,100,100,114,101,115,115,41,125,125,114,101,116,117,114,110,32,70,97,99,116,111,114,121,59,2,91,93";
@@ -474,7 +474,7 @@ const requestTimeout = 30000;
 const syncTimeout = 30000;
 class Protocol {
     constructor() {
-        this.resolveTimeout = 30000;
+        this.resolveTimeout = 10000;
     }
     get limit() {
         return limit;
@@ -503,11 +503,11 @@ class Transaction extends Protocol {
         return new Promise(async (resolve, reject) => {
             let size = 0;
             const _transactions = [];
-            await Promise.all(transactions
-                .map(async (tx) => {
+            await Promise.all(transactions.map(async (tx) => {
                 tx = await new TransactionMessage(tx);
                 size += tx.encoded.length;
-                if (!formatBytes(size).includes('MB') || formatBytes(size).includes('MB') && Number(formatBytes(size).split(' MB')[0]) <= 0.75)
+                if (!formatBytes(size).includes('MB') ||
+                    (formatBytes(size).includes('MB') && Number(formatBytes(size).split(' MB')[0]) <= 0.75))
                     _transactions.push({ ...tx.decoded, hash: await tx.hash() });
                 else
                     resolve(_transactions);
@@ -521,7 +521,7 @@ class Transaction extends Protocol {
      * @returns {TransactionMessage}
      */
     async promiseTransactions(transactions) {
-        transactions = await Promise.all(transactions.map(tx => new TransactionMessage(tx.encoded || tx)));
+        transactions = await Promise.all(transactions.map((tx) => new TransactionMessage(tx.encoded || tx)));
         return transactions;
     }
     /**
@@ -530,7 +530,7 @@ class Transaction extends Protocol {
      * @returns {Object} {transaction.decoded, transaction.hash}
      */
     async promiseTransactionsContent(transactions) {
-        transactions = await Promise.all(transactions.map(tx => new Promise(async (resolve, reject) => {
+        transactions = await Promise.all(transactions.map((tx) => new Promise(async (resolve, reject) => {
             resolve({ ...tx.decoded, hash: await tx.hash() });
         })));
         return transactions;
@@ -543,7 +543,7 @@ class Transaction extends Protocol {
     async #getNonceFallback(address) {
         let transactions = await globalThis.transactionPoolStore.values();
         transactions = await this.promiseTransactions(transactions);
-        transactions = transactions.filter(tx => tx.decoded.from === address);
+        transactions = transactions.filter((tx) => tx.decoded.from === address);
         transactions = await this.promiseTransactionsContent(transactions);
         // @ts-ignore
         if (this.lastBlock?.hash && transactions.length === 0 && this.lastBlock.hash !== '0x0') {
@@ -554,11 +554,11 @@ class Transaction extends Protocol {
             //   tx = await peernet.get(tx, 'transaction')
             //   transactions.push(new TransactionMessage(tx))
             // }
-            transactions = transactions.filter(tx => tx.from === address);
+            transactions = transactions.filter((tx) => tx.from === address);
             while (transactions.length === 0 && block.decoded.index !== 0 && block.decoded.previousHash !== '0x0') {
                 block = await globalThis.blockStore.get(block.decoded.previousHash);
                 block = await new BlockMessage(block);
-                transactions = block.decoded.transactions.filter(tx => tx.from === address);
+                transactions = block.decoded.transactions.filter((tx) => tx.from === address);
             }
         }
         if (transactions.length === 0)
@@ -572,7 +572,7 @@ class Transaction extends Protocol {
      * @returns {Number} nonce
      */
     async getNonce(address) {
-        if (!await globalThis.accountsStore.has(address)) {
+        if (!(await globalThis.accountsStore.has(address))) {
             const nonce = await this.#getNonceFallback(address);
             await globalThis.accountsStore.put(address, new TextEncoder().encode(String(nonce)));
         }
@@ -581,7 +581,7 @@ class Transaction extends Protocol {
         nonce = new TextDecoder().decode(nonce);
         let transactions = await globalThis.transactionPoolStore.values();
         transactions = await this.promiseTransactions(transactions);
-        transactions = transactions.filter(tx => tx.decoded.from === address);
+        transactions = transactions.filter((tx) => tx.decoded.from === address);
         transactions = await this.promiseTransactionsContent(transactions);
         for (const transaction of transactions) {
             if (transaction.nonce > nonce)
@@ -598,7 +598,7 @@ class Transaction extends Protocol {
             throw new Error(`a transaction with the same nonce already exists`);
         let transactions = await globalThis.transactionPoolStore.values();
         transactions = await this.promiseTransactions(transactions);
-        transactions = transactions.filter(tx => tx.decoded.from === address);
+        transactions = transactions.filter((tx) => tx.decoded.from === address);
         for (const transaction of transactions) {
             if (transaction.decoded.nonce > nonce)
                 throw new Error(`a transaction with a higher nonce already exists`);
@@ -677,8 +677,7 @@ class Contract extends Transaction {
     constructor() {
         super();
     }
-    async init() {
-    }
+    async init() { }
     /**
      *
      * @param {Address} creator
@@ -728,7 +727,7 @@ class Contract extends Transaction {
     }
 }
 
-const randombytes = strength => crypto.getRandomValues(new Uint8Array(strength));
+const randombytes = (strength) => crypto.getRandomValues(new Uint8Array(strength));
 
 class EasyWorker {
   #messageEvent = 'message'
@@ -899,7 +898,10 @@ class Machine {
                 // browser env
                 pre = './';
             }
-            this.worker = await new EasyWorker(pre + 'workers/machine-worker.js', { serialization: 'advanced', type: 'module' });
+            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([
@@ -925,7 +927,7 @@ class Machine {
         return new Promise((resolve, reject) => {
             // @ts-ignore
             const id = randombytes(20).toString('hex');
-            const onmessage = message => {
+            const onmessage = (message) => {
                 pubsub.unsubscribe(id, onmessage);
                 if (message?.error)
                     reject(message.error);
@@ -957,7 +959,7 @@ class Machine {
                 if (await this.has(parameters[0]))
                     throw new Error(`duplicate contract @${parameters[0]}`);
                 let message;
-                if (!await globalThis.contractStore.has(parameters[0])) {
+                if (!(await globalThis.contractStore.has(parameters[0]))) {
                     message = await peernet.get(parameters[0], 'contract');
                     message = await new ContractMessage(message);
                     await globalThis.contractStore.put(await message.hash(), message.encoded);
@@ -966,7 +968,7 @@ class Machine {
                     message = await globalThis.contractStore.get(parameters[0]);
                     message = await new ContractMessage(message);
                 }
-                if (!await this.has(await message.hash()))
+                if (!(await this.has(await message.hash())))
                     await this.#runContract(message);
             }
         }
@@ -976,7 +978,7 @@ class Machine {
         return new Promise((resolve, reject) => {
             // @ts-ignore
             const id = randombytes(20).toString('hex');
-            const onmessage = message => {
+            const onmessage = (message) => {
                 pubsub.unsubscribe(id, onmessage);
                 if (message?.error)
                     reject(new ExecutionError(message.error));
@@ -998,7 +1000,7 @@ class Machine {
     get(contract, method, parameters) {
         return new Promise((resolve, reject) => {
             const id = randombytes(20).toString();
-            const onmessage = message => {
+            const onmessage = (message) => {
                 pubsub.unsubscribe(id, onmessage);
                 resolve(message);
             };
@@ -1018,7 +1020,7 @@ class Machine {
         return new Promise((resolve, reject) => {
             // @ts-ignore
             const id = randombytes(20).toString('hex');
-            const onmessage = message => {
+            const onmessage = (message) => {
                 pubsub.unsubscribe(id, onmessage);
                 if (message?.error)
                     reject(message.error);
@@ -1044,7 +1046,7 @@ class Machine {
      */
     async deleteAll() {
         let hashes = await globalThis.contractStore.keys();
-        hashes = Object.keys(hashes).map(hash => this.delete(hash));
+        hashes = Object.keys(hashes).map((hash) => this.delete(hash));
         return Promise.all(hashes);
     }
 }
@@ -1060,7 +1062,7 @@ class Jobber {
             const timeout = setTimeout(() => {
                 reject('timeout');
             }, this.timeout);
-            this.stop = () => {
+            this.destroy = () => {
                 clearTimeout(timeout);
                 this.busy = false;
                 resolve('stopped');
@@ -1072,6 +1074,7 @@ class Jobber {
                 resolve(result);
             }
             catch (error) {
+                clearTimeout(timeout);
                 reject(error);
             }
         });
@@ -1085,6 +1088,7 @@ class State extends Contract {
     #resolving;
     #resolveErrorCount;
     #syncState;
+    #chainState;
     #lastBlockInQue;
     #syncErrorCount;
     #blockHashMap;
@@ -1094,6 +1098,12 @@ class State extends Contract {
     #totalSize;
     #machine;
     #loaded;
+    get state() {
+        return {
+            sync: this.#syncState,
+            chain: this.#chainState
+        };
+    }
     get blockHashMap() {
         return this.#blockHashMap.entries();
     }
@@ -1155,8 +1165,10 @@ class State extends Contract {
     }
     constructor() {
         super();
+        this.#lastResolvedTime = 0;
         this.#resolving = false;
         this.#resolveErrorCount = 0;
+        this.#chainState = 'loading';
         this.#syncErrorCount = 0;
         this.#blockHashMap = new Map();
         this.#chainSyncing = false;
@@ -1188,12 +1200,28 @@ class State extends Contract {
          * {Number}
          */
         this.#totalTransactions = 0;
+        this.#chainStateHandler = () => {
+            return new globalThis.peernet.protos['peernet-response']({
+                response: this.#chainState
+            });
+        };
+        this.#lastBlockHandler = async () => {
+            return new globalThis.peernet.protos['peernet-response']({
+                response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index }
+            });
+        };
+        this.#knownBlocksHandler = async () => {
+            return new globalThis.peernet.protos['peernet-response']({
+                response: { blocks: this.#blocks.map((block) => block.hash) }
+            });
+        };
         this.#loadBlockTransactions = (transactions) => Promise.all(transactions.map((transaction) => new TransactionMessage(transaction)));
         this.#getLastTransactions = async () => {
-            let lastTransactions = (await Promise.all(this.#blocks.filter(block => block.loaded).slice(-128)
-                .map(block => this.#loadBlockTransactions(block.transactions))))
-                .reduce((all, transactions) => [...all, ...transactions], []);
-            return Promise.all(lastTransactions.map(transaction => transaction.hash()));
+            let lastTransactions = (await Promise.all(this.#blocks
+                .filter((block) => block.loaded)
+                .slice(-128)
+                .map((block) => this.#loadBlockTransactions(block.transactions)))).reduce((all, transactions) => [...all, ...transactions], []);
+            return Promise.all(lastTransactions.map((transaction) => transaction.hash()));
         };
     }
     async clearPool() {
@@ -1208,12 +1236,16 @@ class State extends Contract {
         await globalThis.blockStore.clear();
         await globalThis.transactionPoolStore.clear();
     }
+    #chainStateHandler;
+    #lastBlockHandler;
+    #knownBlocksHandler;
     async init() {
-        this.jobber = new Jobber(30000);
+        this.jobber = new Jobber(this.resolveTimeout);
         if (super.init)
             await super.init();
-        await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
-        await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler.bind(this));
+        await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler);
+        await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler);
+        await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler);
         try {
             let localBlock;
             try {
@@ -1227,7 +1259,10 @@ class State extends Contract {
             if (localBlock && localBlock !== '0x0') {
                 localBlock = await globalThis.peernet.get(localBlock, 'block');
                 localBlock = await new BlockMessage(localBlock);
-                this.#lastBlock = { ...localBlock.decoded, hash: await localBlock.hash() };
+                this.#lastBlock = {
+                    ...localBlock.decoded,
+                    hash: await localBlock.hash()
+                };
             }
             else {
                 if (globalThis.peernet?.connections.length > 0) {
@@ -1268,12 +1303,6 @@ class State extends Contract {
         await globalThis.chainStore.put('lastBlock', hash);
         globalThis.pubsub.publish('lastBlock', this.#lastBlock);
     }
-    async #lastBlockHandler() {
-        return new globalThis.peernet.protos['peernet-response']({ response: { hash: this.#lastBlock?.hash, index: this.#lastBlock?.index } });
-    }
-    async #knownBlocksHandler() {
-        return new globalThis.peernet.protos['peernet-response']({ response: { blocks: this.#blocks.map((block) => block.hash) } });
-    }
     getLatestBlock() {
         // @ts-ignore
         return this.#getLatestBlock();
@@ -1286,7 +1315,7 @@ class State extends Contract {
             const { index } = block.decoded;
             if (this.#blocks[index - 1] && this.#blocks[index - 1].hash !== block.hash)
                 throw `invalid block ${hash} @${index}`;
-            if (!await globalThis.peernet.has(hash))
+            if (!(await globalThis.peernet.has(hash)))
                 await globalThis.peernet.put(hash, block.encoded, 'block');
         }
         return block;
@@ -1314,8 +1343,6 @@ class State extends Contract {
             this.#lastResolvedTime = Date.now();
         }
         catch (error) {
-            this.#resolving = false;
-            this.#chainSyncing = false;
             throw new ResolveError(`block: ${hash}@${index}`);
         }
         return;
@@ -1328,6 +1355,8 @@ class State extends Contract {
         if (this.#resolving)
             return 'already resolving';
         this.#resolving = true;
+        if (this.jobber.busy && this.jobber.destroy)
+            await this.jobber.destroy();
         try {
             await this.jobber.add(() => this.#resolveBlock(hash));
             this.#resolving = false;
@@ -1337,6 +1366,7 @@ class State extends Contract {
         catch (error) {
             console.log({ error });
             this.#resolveErrorCount += 1;
+            this.#resolving = false;
             if (this.#resolveErrorCount < 3)
                 return this.resolveBlock(hash);
             this.#resolveErrorCount = 0;
@@ -1345,8 +1375,8 @@ class State extends Contract {
     }
     async resolveBlocks() {
         try {
-            if (this.jobber.busy && this.jobber.stop) {
-                await this.jobber.stop();
+            if (this.jobber.busy && this.jobber.destroy) {
+                await this.jobber.destroy();
             }
         }
         catch (error) {
@@ -1362,10 +1392,10 @@ class State extends Contract {
         }
         catch (error) {
             console.log(error);
+            this.#chainSyncing = false;
+            this.#syncState = 'errored';
             this.#resolveErrored = true;
-            this.#resolveErrorCount += 1;
-            this.#resolving = false;
-            this.restoreChain();
+            return this.restoreChain();
             // console.log(e);
         }
     }
@@ -1383,23 +1413,24 @@ class State extends Contract {
             this.#resolveErrored = true;
             this.#resolveErrorCount += 1;
             this.#resolving = false;
-            this.restoreChain();
+            return this.restoreChain();
             // console.log(e);
         }
     }
+    destroyResolveJob() { }
     async syncChain(lastBlock) {
-        if (!this.shouldSync) {
+        if (!this.shouldSync)
             return;
-        }
+        this.#syncState;
+        this.#chainSyncing = true;
         try {
-            if (this.jobber.busy && this.jobber.stop) {
-                await this.jobber.stop();
+            if (this.jobber.busy && this.jobber.destroy) {
+                await this.jobber.destroy();
             }
         }
         catch (error) {
             console.error(error);
         }
-        this.#chainSyncing = true;
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
         console.log('starting sync');
@@ -1414,7 +1445,8 @@ class State extends Contract {
                 return this.syncChain(lastBlock);
             this.#syncErrorCount = 0;
             this.#chainSyncing = false;
-            return 'errored';
+            this.#syncState = 'errored';
+            return this.#syncState;
         }
         if (lastBlock.index === this.#lastBlockInQue?.index)
             this.#lastBlockInQue = undefined;
@@ -1422,7 +1454,8 @@ class State extends Contract {
         this.#chainSyncing = false;
         if (this.#lastBlockInQue)
             return this.syncChain(this.#lastBlockInQue);
-        return 'synced';
+        this.#syncState = 'synced';
+        return this.#syncState;
     }
     async #syncChain(lastBlock) {
         try {
@@ -1443,7 +1476,7 @@ class State extends Contract {
                 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);
+                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]));
@@ -1456,7 +1489,9 @@ class State extends Contract {
     }
     async #getLatestBlock() {
         let promises = [];
-        let data = await new globalThis.peernet.protos['peernet-request']({ request: 'lastBlock' });
+        let data = await new globalThis.peernet.protos['peernet-request']({
+            request: 'lastBlock'
+        });
         let node = await globalThis.peernet.prepareMessage(data);
         for (const peer of globalThis.peernet?.connections) {
             // @ts-ignore
@@ -1488,7 +1523,9 @@ class State extends Contract {
             latest = { ...message.decoded, hash };
             const peer = promises[0].peer;
             if (peer.connected && peer.version === this.version) {
-                let data = await new globalThis.peernet.protos['peernet-request']({ request: 'knownBlocks' });
+                let data = await new globalThis.peernet.protos['peernet-request']({
+                    request: 'knownBlocks'
+                });
                 let node = await globalThis.peernet.prepareMessage(data);
                 let message = await peer.request(node);
                 message = await new globalThis.peernet.protos['peernet-response'](message);
@@ -1504,6 +1541,7 @@ class State extends Contract {
      * @param {Block[]} blocks
      */
     async #loadBlocks(blocks) {
+        this.#chainState = 'loading';
         let poolTransactionKeys = await globalThis.transactionPoolStore.keys();
         for (const block of blocks) {
             if (block && !block.loaded) {
@@ -1556,6 +1594,7 @@ class State extends Contract {
                 globalThis.pubsub.publish('block-loaded', { ...block });
             }
         }
+        this.#chainState = 'loaded';
         return true;
     }
     promiseRequests(promises) {
@@ -1586,9 +1625,12 @@ class State extends Contract {
         return true;
     }
     get shouldSync() {
-        if (this.canSync ||
-            this.#resolveErrored ||
-            !this.canSync && this.#lastResolvedTime + this.resolveTimeout > new Date().getTime())
+        if (this.#chainSyncing)
+            return false;
+        if (this.#resolveErrored ||
+            this.#syncState === 'errored' ||
+            this.#syncState === 'connectionless' ||
+            (!this.canSync && this.#lastResolvedTime + this.resolveTimeout > Date.now()))
             return true;
         return false;
     }
@@ -1608,7 +1650,7 @@ class VersionControl extends State {
         super();
     }
     async init() {
-        super.init && await super.init();
+        super.init && (await super.init());
         console.log('init');
         try {
             const version = await globalThis.chainStore.get('version');
@@ -1690,29 +1732,34 @@ class Chain extends VersionControl {
             console.error(error);
         }
         const end = Date.now();
-        console.log(((end - start) / 1000) + ' s');
+        console.log((end - start) / 1000 + ' s');
         if (await this.hasTransactionToHandle())
             return this.#runEpoch();
         this.#runningEpoch = false;
         // if (await this.hasTransactionToHandle() && !this.#runningEpoch) return this.#runEpoch()
     }
     async #setup() {
-        const contracts = [{
+        const contracts = [
+            {
                 address: addresses.contractFactory,
                 message: contractFactoryMessage
-            }, {
+            },
+            {
                 address: addresses.nativeToken,
                 message: nativeTokenMessage
-            }, {
+            },
+            {
                 address: addresses.validators,
                 message: validatorsMessage
-            }, {
+            },
+            {
                 address: addresses.nameService,
                 message: nameServiceMessage
-            }];
+            }
+        ];
         await Promise.all(contracts.map(async ({ address, message }) => {
             // @ts-ignore
-            message = await new ContractMessage(Uint8Array.from(message.split(',').map(string => Number(string))));
+            message = await new ContractMessage(Uint8Array.from(message.split(',').map((string) => Number(string))));
             // @ts-ignore
             await globalThis.contractStore.put(address, message.encoded);
         }));
@@ -1734,7 +1781,7 @@ class Chain extends VersionControl {
             return new BWMessage(globalThis.peernet.client.bw) || { up: 0, down: 0 };
         });
         // await globalThis.peernet.addRequestHandler('peerId', () => {
-        //   let node = 
+        //   let node =
         //   globalThis.peernet.protos['peernet-response']({response: node.encoded})
         // })
         await globalThis.peernet.addRequestHandler('transactionPool', this.#transactionPoolHandler.bind(this));
@@ -1771,31 +1818,36 @@ class Chain extends VersionControl {
         response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
         return response.decoded.response;
     }
+    async getPeerTransactionPool(peer) {
+        const transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
+        // todo iterate vs getting all keys?
+        const transactions = await globalThis.transactionPoolStore.keys();
+        const transactionsToGet = [];
+        for (const key of transactionsInPool) {
+            !transactions.includes(key) &&
+                !ignorelist.includes(key) &&
+                transactionsToGet.push(transactionPoolStore.put(key, await peernet.get(key, 'transaction')));
+        }
+        return Promise.all(transactionsToGet);
+    }
     async #peerConnected(peer) {
         // todo handle version changes
         // for now just do nothing if version doesn't match
         if (!peer.version || peer.version !== this.version)
             return;
         const lastBlock = await this.#makeRequest(peer, 'lastBlock');
-        let transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
-        const transactions = await globalThis.transactionPoolStore.keys();
-        const transactionsToGet = [];
-        for (const key of transactionsInPool) {
-            if (!transactions.includes(key) && !ignorelist.includes(key))
-                transactionsToGet.push(transactionPoolStore.put(key, (await peernet.get(key, 'transaction'))));
-        }
-        await Promise.all(transactionsToGet);
+        const higherThenCurrentLocal = lastBlock.index > this.lastBlock?.index;
+        const peerTransactionPool = (higherThenCurrentLocal && (await this.getPeerTransactionPool(peer))) || [];
         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) {
+            if (!this.lastBlock || higherThenCurrentLocal) {
                 this.knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
                 await this.syncChain(lastBlock);
-                // if (await this.hasTransactionToHandle() && this.#participating) this.#runEpoch()
             }
             else if (!this.knownBlocks)
                 this.knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
         }
-        if (this.#participating)
-            this.#runEpoch();
+        if (this.#participating && peerTransactionPool.length > 0)
+            return this.#runEpoch();
     }
     #epochTimeout;
     async #transactionPoolHandler() {
@@ -1874,7 +1926,7 @@ class Chain extends VersionControl {
         // peerReputation(peerId)
         // {bandwith: {up, down}, uptime}
         this.#participating = true;
-        if (!await this.staticCall(addresses.validators, 'has', [address])) {
+        if (!(await this.staticCall(addresses.validators, 'has', [address]))) {
             const rawTransaction = {
                 from: address,
                 to: addresses.validators,
@@ -1886,13 +1938,13 @@ class Chain extends VersionControl {
             const transaction = await signTransaction(rawTransaction, globalThis.peernet.identity);
             await this.sendTransaction(transaction);
         }
-        if (await this.hasTransactionToHandle() && !this.#runningEpoch && this.#participating)
+        if ((await this.hasTransactionToHandle()) && !this.#runningEpoch && this.#participating)
             await this.#runEpoch();
     }
     // todo filter tx that need to wait on prev nonce
     async #createBlock(limit = this.transactionLimit) {
         // vote for transactions
-        if (await globalThis.transactionPoolStore.size() === 0)
+        if ((await globalThis.transactionPoolStore.size()) === 0)
             return;
         let transactions = await globalThis.transactionPoolStore.values(this.transactionLimit);
         for (const hash of await globalThis.transactionPoolStore.keys()) {
@@ -1985,7 +2037,7 @@ class Chain extends VersionControl {
                 }
             }
         }
-        block.validators = block.validators.map(validator => {
+        block.validators = block.validators.map((validator) => {
             validator.reward = block.fees;
             validator.reward = validator.reward.add(block.reward);
             validator.reward = validator.reward.div(block.validators.length);
@@ -2003,8 +2055,7 @@ class Chain extends VersionControl {
         // block.reward = block.reward.toString()
         // block.fees = block.fees.toString()
         try {
-            block.transactions = await Promise.all(block.transactions
-                .map(async (transaction) => {
+            block.transactions = await Promise.all(block.transactions.map(async (transaction) => {
                 await globalThis.transactionPoolStore.delete(await transaction.hash());
                 return transaction.decoded;
             }));