@leofcoin/chain 1.3.1 → 1.3.4

package/demo/chain.browser.js

@@ -58565,8 +58565,8 @@ class Machine {
   #nonces = {}
   lastBlock = {index: 0, hash: '0x0', previousHash: '0x0'}
 
-  constructor() {
-    return this.#init()
+  constructor(blocks) {
+    return this.#init(blocks)
   }
 
   #createMessage(sender = peernet.selectedAccount) {
@@ -58603,7 +58603,7 @@ class Machine {
     
   }
 
-  async #init() {
+  async #init(blocks) {
     return new Promise(async (resolve) => {
       pubsub.subscribe('machine.ready', ()  => {
         resolve(this);
@@ -58612,7 +58612,7 @@ class Machine {
       this.worker = await new EasyWorker((0,path_browserify.join)(chain_dirname, './workers/machine-worker.js'), {serialization: 'advanced', type:'module'});
       this.worker.onmessage(this.#onmessage.bind(this));
 
-      const blocks = await blockStore.values();
+      // const blocks = await blockStore.values()
       const contracts = await Promise.all([
         contractStore.get(contractFactory$1),
         contractStore.get(nativeToken$1),
@@ -59052,7 +59052,7 @@ class Chain {
     const initialized = await contractStore.has(addresses.contractFactory);
     if (!initialized) await this.#setup();
 
-    this.#machine = await new Machine();
+   
     this.utils = { BigNumber: BigNumber, formatUnits: formatUnits, parseUnits: parseUnits };
     
     try {
@@ -59096,6 +59096,11 @@ class Chain {
     
     // load local blocks
     await this.resolveBlocks();
+    this.#machine = await new Machine(this.#blocks);
+    // for (const block of this.#blocks) {
+    //   block.loaded = true
+    // }
+    await this.#loadBlocks(this.#blocks);
     return this
   }
 
@@ -59122,8 +59127,8 @@ class Chain {
       debug(`synced ${blocksSynced} ${blocksSynced > 1 ? 'blocks' : 'block'}`);
 
       this.#blocks.length;
-      (this.#blocks.length) - blocksSynced;
-      await this.#loadBlocks(this.#blocks);
+      const start = (this.#blocks.length) - blocksSynced;
+      await this.#loadBlocks(this.blocks.slice(start));
       this.#lastBlock = this.#blocks[this.#blocks.length - 1];
       const message = await new BlockMessage(this.lastBlock);
       await blockStore.put(await message.hash, message.encoded);
@@ -59155,9 +59160,9 @@ 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};
-  if (this.#blocks[block.index]) throw `invalid block ${hash} @${block.index}`
+  if (this.#blocks[block.index] && this.#blocks[block.index].hash !== block.hash) throw `invalid block ${hash} @${block.index}`
   this.#blocks[block.index] = block;
-  console.log(`loaded block: ${hash} @${block.index} ${formatBytes(size)}`);
+  console.log(`resolved block: ${hash} @${block.index} ${formatBytes(size)}`);
   if (block.previousHash !== '0x0') {
     return this.resolveBlock(block.previousHash)
   }
@@ -59171,7 +59176,7 @@ async resolveBlock(hash) {
       if (hash && hash !== '0x0')
         await this.resolveBlock(hash);
         this.#lastBlock = this.#blocks[this.#blocks.length - 1];
-        await this.#loadBlocks(this.#blocks);
+        
     } catch (e) {
       await chainStore.put('lastBlock', new TextEncoder().encode('0x0'));
       return this.resolveBlocks()
@@ -59190,7 +59195,8 @@ async resolveBlock(hash) {
   console.log(e);
           }
         }
-        block.loaded = true;
+        this.#blocks[block.index].loaded = true;
+        console.log(`loaded block: ${block.hash} @${block.index}`);
         // let message = await peernet.get(block.hash, 'block')
 
         // const compressed = pako.deflate(message);
@@ -59242,8 +59248,6 @@ async resolveBlock(hash) {
     //   transaction = new TransactionMessage(transaction)
     //   return transaction
     // }
-
-    console.log(blockMessage);
     await Promise.all(blockMessage.decoded.transactions
       .map(async transaction => transactionPoolStore.delete(await transaction.hash)));
     const hash = await blockMessage.hash;

package/demo/peernet-swarm.browser.js

@@ -436,7 +436,7 @@ class Peer {
        this.#connection.ondatachannel = (message) => {
          message.channel.onopen = () => {
            this.#connected = true
-           debug(`peer:connected ${this}`)
+          //  debug(`peer:connected ${this}`)
            pubsub.publish('peer:connected', this)
          }
          message.channel.onclose = () => this.close.bind(this)
@@ -473,7 +473,7 @@ class Peer {
    }
 
    _handleMessage(peerId, message) {
-     debug(`incoming message from ${peerId}`)
+    //  debug(`incoming message from ${peerId}`)
 
      message = JSON.parse(new TextDecoder().decode(message.data))
      // allow sharding (multiple peers share data)
@@ -515,7 +515,7 @@ class Peer {
 
     
     if (message.candidate) {
-      debug(`incoming candidate ${this.#channelName}`)
+      // debug(`incoming candidate ${this.#channelName}`)
       // debug(message.candidate.candidate)
       this.remoteAddress = message.candidate.address
       this.remotePort = message.candidate.port
@@ -526,14 +526,14 @@ class Peer {
     try {
       if (message.sdp) {
         if (message.sdp.type === 'offer') {
-          debug(`incoming offer ${this.#channelName}`)
+          // debug(`incoming offer ${this.#channelName}`)
           await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp))
           const answer = await this.#connection.createAnswer();
           await this.#connection.setLocalDescription(answer)
           this._sendMessage({'sdp': this.#connection.localDescription})
         }
         if (message.sdp.type === 'answer') {
-          debug(`incoming answer ${this.#channelName}`)
+          // debug(`incoming answer ${this.#channelName}`)
           await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp))
         }
      }
@@ -543,7 +543,7 @@ class Peer {
  }
 
  close() {
-   debug(`closing ${this.peerId}`)
+  //  debug(`closing ${this.peerId}`)
    this.#connected = false
    this.#channel?.close()
    this.#connection?.close()
@@ -578,11 +578,10 @@ class Client {
     this.starJoined = this.starJoined.bind(this)
     this.networkVersion = networkVersion
 
-    this._init(network, stars)
+    this._init(stars)
   }
 
-  async _init(network, stars = [], networkVersion) {
-    this.network = network
+  async _init(stars = []) {
     this.starsConfig = stars
     // reconnectJob()
 

package/demo/workers/machine-worker.js

@@ -11723,6 +11723,11 @@ var __webpack_exports__ = {};
 // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
 !function() {
 
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "T": function() { return /* binding */ unique; }
+});
+
 ;// CONCATENATED MODULE: ./node_modules/@vandeurenglenn/base-x/src/base-x.js
 // base-x encoding / decoding
 // Copyright (c) 2018 base-x contributors
@@ -13722,6 +13727,9 @@ globalThis.BigNumber = BigNumber;
 globalThis.peernet = globalThis.peernet || {};
 globalThis.contracts = {};
 
+const unique = arr => arr.filter((el, pos, arr) => {
+  return arr.indexOf(el) == pos;
+});
 
 const get = (contract, method, params) => {
   let result;
@@ -13819,16 +13827,23 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   if (blocks?.length > 0) {
     const _worker = await new EasyWorker('./block-worker.js', {serialization: 'advanced', type: 'module' });
-    blocks = await _worker.once(blocks);
+    blocks = await _worker.once([blocks[blocks.length - 1]]);
     
-    for (const block of blocks) {
-      await Promise.all(block.decoded.transactions.map(async message => {
-        const {from, to, method, params} = message;
-        globalThis.msg = createMessage(from);
-      
-        await execute(to, method, params);
-      }));
-    }
+    // blocks = unique(globalThis.blocks ? globalThis : [], blocks)
+    // for (let i = 0; i < blocks.length; i++) {
+
+    // }
+    // for (const block of blocks) {
+    //   await Promise.all(block.decoded.transactions.map(async message => {
+    //     if (!block.loaded) {
+    //       const {from, to, method, params} = message;
+    //       globalThis.msg = createMessage(from);
+        
+    //       await execute(to, method, params);
+    //       block.loaded = true
+    //     }
+    //   }));
+    // }
     
     if (blocks.length > 0) {
       lastBlock = blocks[blocks.length - 1].decoded;    
@@ -13839,15 +13854,15 @@ const _init = async ({ contracts, blocks, peerid })=> {
         hash: await lastBlock.hash
       };
     }
+    globalThis.blocks = blocks;
   }
 
   
 
   
   worker.postMessage({type: 'machine-ready', lastBlock});
-  _worker.terminate(); 
   
-  worker.postMessage(blocks);
+  // worker.postMessage({blocks});
 };
 
 const tasks = async (e) => {
@@ -13901,4 +13916,8 @@ const tasks = async (e) => {
 
 worker.onmessage(data => tasks(data));
 
+
+
 }();
+var __webpack_exports__unique = __webpack_exports__.T;
+export { __webpack_exports__unique as unique };

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

@@ -13722,7 +13722,6 @@ globalThis.BigNumber = BigNumber;
 globalThis.peernet = globalThis.peernet || {};
 globalThis.contracts = {};
 
-
 const get = (contract, method, params) => {
   let result;
   if (params?.length > 0) {
@@ -13819,16 +13818,23 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   if (blocks?.length > 0) {
     const _worker = await new EasyWorker('./block-worker.js', {serialization: 'advanced', type: 'module' });
-    blocks = await _worker.once(blocks);
+    blocks = await _worker.once([blocks[blocks.length - 1]]);
     
-    for (const block of blocks) {
-      await Promise.all(block.decoded.transactions.map(async message => {
-        const {from, to, method, params} = message;
-        globalThis.msg = createMessage(from);
-      
-        await execute(to, method, params);
-      }));
-    }
+    // blocks = unique(globalThis.blocks ? globalThis : [], blocks)
+    // for (let i = 0; i < blocks.length; i++) {
+
+    // }
+    // for (const block of blocks) {
+    //   await Promise.all(block.decoded.transactions.map(async message => {
+    //     if (!block.loaded) {
+    //       const {from, to, method, params} = message;
+    //       globalThis.msg = createMessage(from);
+        
+    //       await execute(to, method, params);
+    //       block.loaded = true
+    //     }
+    //   }));
+    // }
     
     if (blocks.length > 0) {
       lastBlock = blocks[blocks.length - 1].decoded;    
@@ -13839,15 +13845,15 @@ const _init = async ({ contracts, blocks, peerid })=> {
         hash: await lastBlock.hash
       };
     }
+    globalThis.blocks = blocks;
   }
 
   
 
   
   worker.postMessage({type: 'machine-ready', lastBlock});
-  _worker.terminate(); 
   
-  worker.postMessage(blocks);
+  // worker.postMessage({blocks});
 };
 
 const tasks = async (e) => {