@leofcoin/chain 1.1.11 → 1.1.13

package/dist/chain.js

@@ -68,7 +68,7 @@ class Machine {
     return this.#init()
   }
 
-  #createMessage(sender = peernet.id) {
+  #createMessage(sender = peernet.selectedAccount) {
     return {
       sender,
       call: this.execute,
@@ -93,7 +93,7 @@ class Machine {
       break
       case 'machine-ready':
         this.lastBlock = data.lastBlock;
-        pubsub.publish('machine.ready');
+        pubsub.publish('machine.ready', true);
       break
       case 'response':
         pubsub.publish(data.id, data.value);
@@ -214,6 +214,10 @@ class Machine {
     return contractStore.delete(hash)
   }
 
+  /**
+   * 
+   * @returns Promise
+   */
   async deleteAll() {
     let hashes = await contractStore.get();
     hashes = Object.keys(hashes).map(hash => this.delete(hash));
@@ -448,7 +452,7 @@ class Chain {
     console.log('epoch');
     const validators = await this.staticCall(addresses.validators, 'validators');
     console.log(validators);
-    if (!validators[peernet.id]?.active) return
+    if (!validators[peernet.selectedAccount]?.active) return
 
     const start = new Date().getTime();
     try {
@@ -534,8 +538,7 @@ class Chain {
     }, {index: 0, hash: '0x0'});
     // get lastblock
       if (promises.hash && promises.hash !== '0x0') {
-        let localBlock = await peernet.get(promises.hash);
-        console.log({localBlock});
+        await peernet.get(promises.hash);
       }
       
       
@@ -550,22 +553,7 @@ class Chain {
 
     this.#machine = await new Machine();
     this.utils = { BigNumber: utils.BigNumber, formatUnits: utils.formatUnits, parseUnits: utils.parseUnits };
-
-    await peernet.addRequestHandler('bw-request-message', () => {
-
-      return new BWMessage(peernet.client.bw) || { up: 0, down: 0 }
-    });
-
-    await peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
-
-    peernet.subscribe('add-block', this.#addBlock.bind(this));
-
-    peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
-
-    peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
-
-    pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
-
+    
     try {
       let localBlock;
       try {
@@ -575,17 +563,11 @@ class Chain {
         localBlock = await chainStore.get('lastBlock');
       }
       localBlock = new TextDecoder().decode(localBlock);
-
       if (localBlock && localBlock !== '0x0') {
-        localBlock = await peernet.get(localBlock);
+        localBlock = await peernet.get(localBlock, 'block');
         localBlock = await new BlockMessage(localBlock);
         this.#lastBlock = {...localBlock.decoded, hash: await localBlock.hash};
-      } else if (this.#machine.lastBlock?.hash) {
-        // todo remove when network is running
-        // recovering chain (not needed if multiple peers are online)
-        this.#lastBlock = this.#machine.lastBlock;
-        await chainStore.put('lastBlock', this.#lastBlock.hash);
-      } else  {
+      } else {
         await this.#sync();
       }      
     } catch (e) {
@@ -594,8 +576,25 @@ class Chain {
 
       // this.#setup()
     }
+
+    await peernet.addRequestHandler('bw-request-message', () => {
+
+      return new BWMessage(peernet.client.bw) || { up: 0, down: 0 }
+    });
+
+    await peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
+
+    peernet.subscribe('add-block', this.#addBlock.bind(this));
+
+    peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
+
+    peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
+
+    pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
+
+    
     // load local blocks
-    if (peernet.connections?.length > 1) await this.resolveBlocks();
+    await this.resolveBlocks();
     return this
   }
 
@@ -613,7 +612,7 @@ class Chain {
     response = await new globalThis.peernet.protos['peernet-response'](response);
     let lastBlock = response.decoded.response;
 
-    if (!this.lastBlock || this.lastBlock.index < lastBlock.index) {
+    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;
@@ -655,7 +654,8 @@ async resolveBlock(hash) {
   if (!await peernet.has(hash, 'block')) await peernet.put(hash, block.encoded, 'block');
   const size = block.encoded.length || block.encoded.byteLength;
   block = {...block.decoded, hash};
-  this.#blocks[block.index - 1] = block;
+  if (this.#blocks[block.index]) throw `invalid block ${hash} @${block.index}`
+  this.#blocks[block.index] = block;
   console.log(`loaded block: ${hash} @${block.index} ${formatBytes(size)}`);
   if (block.previousHash !== '0x0') {
     return this.resolveBlock(block.previousHash)
@@ -664,11 +664,11 @@ async resolveBlock(hash) {
 
   async resolveBlocks() {
     try {
-
       const localBlock = await chainStore.get('lastBlock');
       const hash = new TextDecoder().decode(localBlock);
+
       if (hash && hash !== '0x0')
-        await this.resolveBlock(localBlock);
+        await this.resolveBlock(hash);
         this.#lastBlock = this.#blocks[this.#blocks.length - 1];
         await this.#loadBlocks(this.#blocks);
     } catch (e) {
@@ -725,7 +725,7 @@ async resolveBlock(hash) {
   }
 
   async #addBlock(block) {
-    console.log(block);
+    // console.log(block);
     const blockMessage = await new BlockMessage(new Uint8Array(Object.values(block)));
     // if (!Buffer.isBuffer(block)) block = Buffer.from(block, 'hex')
     // const transactionJob = async transaction => {
@@ -751,7 +751,7 @@ async resolveBlock(hash) {
     
     await blockStore.put(hash, blockMessage.encoded);
     
-    if (this.lastBlock.index < blockMessage.decoded.index) this.#updateState(blockMessage);
+    if (this.lastBlock.index < blockMessage.decoded.index) await this.#updateState(blockMessage);
     debug(`added block: ${hash}`);
     let promises = [];
     let contracts = [];
@@ -790,7 +790,7 @@ async resolveBlock(hash) {
 
 
 
-  async participate() {
+  async participate(address) {
     // TODO: validate participant
     // hold min amount of 50k ART for 7 days
     // lock the 50k
@@ -798,7 +798,7 @@ async resolveBlock(hash) {
     // peerReputation(peerId)
     // {bandwith: {up, down}, uptime}
     this.participating = true;
-    if (!await this.staticCall(addresses.validators, 'has', [peernet.id])) await this.createTransactionFrom(peernet.id, addresses.validators, 'addValidator', [peernet.id]);
+    if (!await this.staticCall(addresses.validators, 'has', [address])) await this.createTransactionFrom(address, addresses.validators, 'addValidator', [address]);
     if (await this.hasTransactionToHandle() && !this.#runningEpoch) await this.#runEpoch();
     
     // const runEpoch = () => setTimeout(async () => {
@@ -887,7 +887,7 @@ async resolveBlock(hash) {
           const node = await peernet.prepareMessage(validator, data.encoded);
           try {
             const bw = await peer.request(node.encoded);
-            console.log(bw);
+            console.log({bw});
             block.validators.push({
               address: validator,
               bw: bw.up + bw.down
@@ -896,9 +896,9 @@ async resolveBlock(hash) {
 
           }
 
-        } else if (peernet.id === validator) {
+        } else if (peernet.selectedAccount === validator) {
           block.validators.push({
-            address: peernet.id,
+            address: peernet.selectedAccount,
             bw: peernet.bw.up + peernet.bw.down
           });
 
@@ -947,8 +947,8 @@ async resolveBlock(hash) {
       const hash = await blockMessage.hash;
       
       
-      await blockStore.put(hash, blockMessage.encoded);
-      this.#updateState(blockMessage);
+      await peernet.put(hash, blockMessage.encoded, 'block');
+      await this.#updateState(blockMessage);
       debug(`created block: ${hash}`);
 
       peernet.publish('add-block', blockMessage.encoded);
@@ -1024,7 +1024,7 @@ async resolveBlock(hash) {
    * @param {Number} nonce - total transaction count [optional]
    */
   async createTransaction(to, method, params, nonce, signature) {
-    return this.createTransactionFrom(peernet.id, to, method, params, nonce)
+    return this.createTransactionFrom(peernet.selectedAccount, to, method, params, nonce)
   }
 
   
@@ -1076,7 +1076,7 @@ async #signTransaction (transaction, wallet) {
    * @returns {Object} transaction
    */
   async createRawTransaction(transaction) {
-    if (!transaction.from) transaction.from = peernet.id;
+    if (!transaction.from) transaction.from = peernet.selectedAccount;
     transaction.timestamp = Date.now();
 
     if (transaction.nonce === undefined) {
@@ -1152,21 +1152,21 @@ async #signTransaction (transaction, wallet) {
    * @param {String} contract - a contract string (see plugins/deployContract)
    */
   async deployContract(contract, params = []) {
-    globalThis.msg = {sender: peernet.id, call: this.call};
+    globalThis.msg = {sender: peernet.selectedAccount, call: this.call};
 
     const hash = await this.createContractAddress(creator, contract, params);
 console.log(hash);
     try {
-      const tx = await this.createTransactionFrom(peernet.id, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
+      const tx = await this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
     } catch (e) {
       throw e
     }
     return this.#machine.addContract(message)
   }
 
-  #createMessage(sender = peernet.id) {
+  #createMessage(sender = peernet.selectedAccount) {
     return {
-      sender: peernet.id,
+      sender,
       call: this.call,
       staticCall: this.staticCall,
       delegate: this.delegate,

package/dist/module/chain.js

@@ -59,7 +59,7 @@ class Machine {
     return this.#init()
   }
 
-  #createMessage(sender = peernet.id) {
+  #createMessage(sender = peernet.selectedAccount) {
     return {
       sender,
       call: this.execute,
@@ -84,7 +84,7 @@ class Machine {
       break
       case 'machine-ready':
         this.lastBlock = data.lastBlock;
-        pubsub.publish('machine.ready');
+        pubsub.publish('machine.ready', true);
       break
       case 'response':
         pubsub.publish(data.id, data.value);
@@ -205,6 +205,10 @@ class Machine {
     return contractStore.delete(hash)
   }
 
+  /**
+   * 
+   * @returns Promise
+   */
   async deleteAll() {
     let hashes = await contractStore.get();
     hashes = Object.keys(hashes).map(hash => this.delete(hash));
@@ -439,7 +443,7 @@ class Chain {
     console.log('epoch');
     const validators = await this.staticCall(addresses.validators, 'validators');
     console.log(validators);
-    if (!validators[peernet.id]?.active) return
+    if (!validators[peernet.selectedAccount]?.active) return
 
     const start = new Date().getTime();
     try {
@@ -525,8 +529,7 @@ class Chain {
     }, {index: 0, hash: '0x0'});
     // get lastblock
       if (promises.hash && promises.hash !== '0x0') {
-        let localBlock = await peernet.get(promises.hash);
-        console.log({localBlock});
+        await peernet.get(promises.hash);
       }
       
       
@@ -541,22 +544,7 @@ class Chain {
 
     this.#machine = await new Machine();
     this.utils = { BigNumber, formatUnits, parseUnits };
-
-    await peernet.addRequestHandler('bw-request-message', () => {
-
-      return new BWMessage(peernet.client.bw) || { up: 0, down: 0 }
-    });
-
-    await peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
-
-    peernet.subscribe('add-block', this.#addBlock.bind(this));
-
-    peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
-
-    peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
-
-    pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
-
+    
     try {
       let localBlock;
       try {
@@ -566,17 +554,11 @@ class Chain {
         localBlock = await chainStore.get('lastBlock');
       }
       localBlock = new TextDecoder().decode(localBlock);
-
       if (localBlock && localBlock !== '0x0') {
-        localBlock = await peernet.get(localBlock);
+        localBlock = await peernet.get(localBlock, 'block');
         localBlock = await new BlockMessage(localBlock);
         this.#lastBlock = {...localBlock.decoded, hash: await localBlock.hash};
-      } else if (this.#machine.lastBlock?.hash) {
-        // todo remove when network is running
-        // recovering chain (not needed if multiple peers are online)
-        this.#lastBlock = this.#machine.lastBlock;
-        await chainStore.put('lastBlock', this.#lastBlock.hash);
-      } else  {
+      } else {
         await this.#sync();
       }      
     } catch (e) {
@@ -585,8 +567,25 @@ class Chain {
 
       // this.#setup()
     }
+
+    await peernet.addRequestHandler('bw-request-message', () => {
+
+      return new BWMessage(peernet.client.bw) || { up: 0, down: 0 }
+    });
+
+    await peernet.addRequestHandler('lastBlock', this.#lastBlockHandler.bind(this));
+
+    peernet.subscribe('add-block', this.#addBlock.bind(this));
+
+    peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
+
+    peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
+
+    pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
+
+    
     // load local blocks
-    if (peernet.connections?.length > 1) await this.resolveBlocks();
+    await this.resolveBlocks();
     return this
   }
 
@@ -604,7 +603,7 @@ class Chain {
     response = await new globalThis.peernet.protos['peernet-response'](response);
     let lastBlock = response.decoded.response;
 
-    if (!this.lastBlock || this.lastBlock.index < lastBlock.index) {
+    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;
@@ -646,7 +645,8 @@ async resolveBlock(hash) {
   if (!await peernet.has(hash, 'block')) await peernet.put(hash, block.encoded, 'block');
   const size = block.encoded.length || block.encoded.byteLength;
   block = {...block.decoded, hash};
-  this.#blocks[block.index - 1] = block;
+  if (this.#blocks[block.index]) throw `invalid block ${hash} @${block.index}`
+  this.#blocks[block.index] = block;
   console.log(`loaded block: ${hash} @${block.index} ${formatBytes(size)}`);
   if (block.previousHash !== '0x0') {
     return this.resolveBlock(block.previousHash)
@@ -655,11 +655,11 @@ async resolveBlock(hash) {
 
   async resolveBlocks() {
     try {
-
       const localBlock = await chainStore.get('lastBlock');
       const hash = new TextDecoder().decode(localBlock);
+
       if (hash && hash !== '0x0')
-        await this.resolveBlock(localBlock);
+        await this.resolveBlock(hash);
         this.#lastBlock = this.#blocks[this.#blocks.length - 1];
         await this.#loadBlocks(this.#blocks);
     } catch (e) {
@@ -716,7 +716,7 @@ async resolveBlock(hash) {
   }
 
   async #addBlock(block) {
-    console.log(block);
+    // console.log(block);
     const blockMessage = await new BlockMessage(new Uint8Array(Object.values(block)));
     // if (!Buffer.isBuffer(block)) block = Buffer.from(block, 'hex')
     // const transactionJob = async transaction => {
@@ -742,7 +742,7 @@ async resolveBlock(hash) {
     
     await blockStore.put(hash, blockMessage.encoded);
     
-    if (this.lastBlock.index < blockMessage.decoded.index) this.#updateState(blockMessage);
+    if (this.lastBlock.index < blockMessage.decoded.index) await this.#updateState(blockMessage);
     debug(`added block: ${hash}`);
     let promises = [];
     let contracts = [];
@@ -781,7 +781,7 @@ async resolveBlock(hash) {
 
 
 
-  async participate() {
+  async participate(address) {
     // TODO: validate participant
     // hold min amount of 50k ART for 7 days
     // lock the 50k
@@ -789,7 +789,7 @@ async resolveBlock(hash) {
     // peerReputation(peerId)
     // {bandwith: {up, down}, uptime}
     this.participating = true;
-    if (!await this.staticCall(addresses.validators, 'has', [peernet.id])) await this.createTransactionFrom(peernet.id, addresses.validators, 'addValidator', [peernet.id]);
+    if (!await this.staticCall(addresses.validators, 'has', [address])) await this.createTransactionFrom(address, addresses.validators, 'addValidator', [address]);
     if (await this.hasTransactionToHandle() && !this.#runningEpoch) await this.#runEpoch();
     
     // const runEpoch = () => setTimeout(async () => {
@@ -878,7 +878,7 @@ async resolveBlock(hash) {
           const node = await peernet.prepareMessage(validator, data.encoded);
           try {
             const bw = await peer.request(node.encoded);
-            console.log(bw);
+            console.log({bw});
             block.validators.push({
               address: validator,
               bw: bw.up + bw.down
@@ -887,9 +887,9 @@ async resolveBlock(hash) {
 
           }
 
-        } else if (peernet.id === validator) {
+        } else if (peernet.selectedAccount === validator) {
           block.validators.push({
-            address: peernet.id,
+            address: peernet.selectedAccount,
             bw: peernet.bw.up + peernet.bw.down
           });
 
@@ -938,8 +938,8 @@ async resolveBlock(hash) {
       const hash = await blockMessage.hash;
       
       
-      await blockStore.put(hash, blockMessage.encoded);
-      this.#updateState(blockMessage);
+      await peernet.put(hash, blockMessage.encoded, 'block');
+      await this.#updateState(blockMessage);
       debug(`created block: ${hash}`);
 
       peernet.publish('add-block', blockMessage.encoded);
@@ -1015,7 +1015,7 @@ async resolveBlock(hash) {
    * @param {Number} nonce - total transaction count [optional]
    */
   async createTransaction(to, method, params, nonce, signature) {
-    return this.createTransactionFrom(peernet.id, to, method, params, nonce)
+    return this.createTransactionFrom(peernet.selectedAccount, to, method, params, nonce)
   }
 
   
@@ -1067,7 +1067,7 @@ async #signTransaction (transaction, wallet) {
    * @returns {Object} transaction
    */
   async createRawTransaction(transaction) {
-    if (!transaction.from) transaction.from = peernet.id;
+    if (!transaction.from) transaction.from = peernet.selectedAccount;
     transaction.timestamp = Date.now();
 
     if (transaction.nonce === undefined) {
@@ -1143,21 +1143,21 @@ async #signTransaction (transaction, wallet) {
    * @param {String} contract - a contract string (see plugins/deployContract)
    */
   async deployContract(contract, params = []) {
-    globalThis.msg = {sender: peernet.id, call: this.call};
+    globalThis.msg = {sender: peernet.selectedAccount, call: this.call};
 
     const hash = await this.createContractAddress(creator, contract, params);
 console.log(hash);
     try {
-      const tx = await this.createTransactionFrom(peernet.id, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
+      const tx = await this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
     } catch (e) {
       throw e
     }
     return this.#machine.addContract(message)
   }
 
-  #createMessage(sender = peernet.id) {
+  #createMessage(sender = peernet.selectedAccount) {
     return {
-      sender: peernet.id,
+      sender,
       call: this.call,
       staticCall: this.staticCall,
       delegate: this.delegate,

package/dist/module/workers/machine-worker.js

@@ -1,7 +1,7 @@
 import { FormatInterface } from '@leofcoin/codec-format-interface';
 import { BigNumber } from '@ethersproject/bignumber';
 import '@ethersproject/units';
-import { join } from 'path';
+import 'path';
 import EasyWorker from '@vandeurenglenn/easy-worker';
 
 var proto$1 = `
@@ -199,7 +199,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
   let lastBlock = {hash: '0x0'}; 
 
   if (blocks?.length > 0) {
-    const _worker = await new EasyWorker(join(__dirname, './block-worker.js'), {serialization: 'advanced', type: 'module' });
+    const _worker = await new EasyWorker('./block-worker.js', {serialization: 'advanced', type: 'module' });
     blocks = await _worker.once(blocks);
     
     for (const block of blocks) {

package/dist/node.browser.js

@@ -8341,8 +8341,7 @@ module.exports = function (value) {
 /******/ 			script.parentNode && script.parentNode.removeChild(script);
 /******/ 			doneFns && doneFns.forEach(function(fn) { return fn(event); });
 /******/ 			if(prev) return prev(event);
-/******/ 		}
-/******/ 		;
+/******/ 		};
 /******/ 		var timeout = setTimeout(onScriptComplete.bind(null, undefined, { type: 'timeout', target: script }), 120000);
 /******/ 		script.onerror = onScriptComplete.bind(null, script.onerror);
 /******/ 		script.onload = onScriptComplete.bind(null, script.onload);
@@ -9133,7 +9132,8 @@ class Peernet {
       this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
       let accounts = await walletStore.get('accounts');
       accounts = new TextDecoder().decode(accounts);
-      
+      const selected = await walletStore.get('selected-account');
+      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
 
       // fixing account issue (string while needs to be a JSON)
       // TODO: remove when on mainnet
@@ -9151,15 +9151,17 @@ class Peernet {
       
       await walletStore.put('version', String(1));
       await walletStore.put('accounts', JSON.stringify(accounts));
+      await walletStore.put('selected-account', accounts[0][1]);
       await walletStore.put('identity', JSON.stringify(identity));
 
+      globalThis.peernet.selectedAccount = accounts[0][1];
       this.id = identity.walletId;
     }
     this._peerHandler = new PeerDiscovery(this.id);
     this.peerId = this.id;
 
     pubsub.subscribe('peer:connected', async (peer) => {
-      console.log(peer);
+      // console.log(peer);
       // console.log({connected: peer.id, as: this._getPeerId(peer.id) });
       // peer.on('peernet.data', async (message) => {
       //   const id = message.id
@@ -9269,7 +9271,6 @@ class Peernet {
     const walk = async peer => {
       const node = await this.prepareMessage(data);
       let result = await peer.request(node.encoded);
-      console.log({result});
       result = new Uint8Array(Object.values(result));
       const proto = await protoFor(result);
       if (proto.name !== 'peernet-dht-response') throw dhtError(proto.name)
@@ -9616,14 +9617,6 @@ class Peernet {
   get Buffer() {
     return Buffer
   }
-  // async block(index) {
-  //   const _values = []
-  //   for (const peer of this.peers) {
-  //     const value = await peer.request({type: 'block', index})
-  //     console.log(value);
-  //   }
-  //
-  // }
 }
 globalThis.Peernet = Peernet;