@leofcoin/chain 1.5.43 → 1.5.45

package/exports/browser/chain.js

@@ -3688,7 +3688,8 @@ class Transaction extends Protocol {
             await globalThis.transactionPoolStore.put(hash, message.encoded);
             // debug(`Added ${hash} to the transaction pool`)
             peernet.publish('add-transaction', message.encoded);
-            return { hash, data, fee: await calculateFee(message.decoded), wait, message };
+            const fee = await calculateFee(message.decoded);
+            return { hash, data, fee, wait, message };
         }
         catch (error) {
             console.log('remo');
@@ -3893,8 +3894,11 @@ class Machine {
                 break;
             }
             case 'debug': {
-                for (const message of data.messages)
-                    globalThis.debug(message);
+                globalThis.debug(data.message);
+                break;
+            }
+            case 'error': {
+                console.error(data.message);
                 break;
             }
             case 'machine-ready': {
@@ -4315,7 +4319,7 @@ class State extends Contract {
         try {
             await this.resolveBlocks();
             this.#machine = await new Machine(this.#blocks);
-            await this.#loadBlocks(this.#blocks);
+            // await this.#loadBlocks(this.#blocks)
         }
         catch (error) {
             if (isResolveError(error)) {
@@ -4754,6 +4758,13 @@ class Chain extends VersionControl {
         this.#participants = [];
         this.#participating = false;
         this.#jail = [];
+        this.#addTransaction = async (message) => {
+            const transaction = new TransactionMessage(message);
+            const hash = await transaction.hash();
+            if (await transactionPool.has(hash))
+                await transactionPool.delete(hash);
+            console.log(transaction);
+        };
         // @ts-ignore
         return this.#init();
     }
@@ -4857,9 +4868,7 @@ class Chain extends VersionControl {
         }, validatorInfo.timeout);
         this.#jail.push(validatorInfo.address);
     }
-    #addTransaction(message) {
-        console.log({ message });
-    }
+    #addTransaction;
     async #prepareRequest(request) {
         let node = await new globalThis.peernet.protos['peernet-request']({ request });
         return globalThis.peernet.prepareMessage(node);
@@ -4884,7 +4893,6 @@ class Chain extends VersionControl {
     }
     async #peerConnected(peerId) {
         const peer = peernet.getConnection(peerId);
-        console.log({ peer });
         // todo handle version changes
         // for now just do nothing if version doesn't match
         console.log(`${peer.version}, ${this.version}`);

package/exports/browser/{index-2836cc96-40ed5df4.js → index-687f692b-bcdff490.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-77f8d4c5.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-2c421007.js';
 import './index-c3bd3090.js';
 
 /**

package/exports/browser/{messages-554d2a85-ce06f6eb.js → messages-1c117282-a35a5fbc.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-77f8d4c5.js';
+import { F as FormatInterface } from './node-browser-2c421007.js';
 import './index-c3bd3090.js';
 
 var proto$b = {

package/exports/browser/{node-browser-77f8d4c5.js → node-browser-2c421007.js}

@@ -102,58 +102,62 @@ globalThis.debug = text => {
   if (globalThis.DEBUG) console.log('\x1b[34m\x1b[1m%s', text, '\x1b[0m'); // bright blue
 };
 
-class LittlePubSub {
-    subscribers = {};
-    verbose;
-    constructor(verbose) {
-        this.verbose = verbose;
-    }
-    _handleContext(handler, context) {
-        if (typeof context === 'undefined') {
-            context = handler;
-        }
-        return context;
-    }
-    hasSubscribers(event) {
-        return this.subscribers[event] ? true : false;
-    }
-    subscribe(event, handler, context) {
-        if (!this.hasSubscribers(event))
-            this.subscribers[event] = { handlers: [], value: undefined };
-        context = this._handleContext(handler, context);
-        this.subscribers[event].handlers.push(handler.bind(context));
-    }
-    unsubscribe(event, handler, context) {
-        if (!this.hasSubscribers(event))
-            return;
-        context = this._handleContext(handler, context);
-        const index = this.subscribers[event].handlers.indexOf(handler.bind(context));
-        this.subscribers[event].handlers.splice(index);
-        if (this.subscribers[event].handlers.length === 0)
-            delete this.subscribers[event];
-    }
-    publish(event, value) {
-        // always set value even when having no subscribers
-        if (!this.hasSubscribers(event))
-            this.subscribers[event] = {
-                handlers: []
-            };
-        const oldValue = this.subscribers[event]?.value;
-        this.subscribers[event].value = value;
-        if (this.verbose || oldValue !== value)
-            for (const handler of this.subscribers[event].handlers) {
-                handler(value, oldValue);
-            }
-    }
-    once(event) {
-        return new Promise((resolve) => {
-            const cb = (value) => {
-                this.unsubscribe(event, cb);
-                resolve(value);
-            };
-            this.subscribe(event, cb);
-        });
-    }
+class LittlePubSub {
+    subscribers = {};
+    verbose;
+    constructor(verbose) {
+        this.verbose = verbose;
+    }
+    _handleContext(handler, context) {
+        if (typeof context === 'undefined') {
+            context = handler;
+        }
+        return context;
+    }
+    hasSubscribers(event) {
+        return this.subscribers[event] ? true : false;
+    }
+    subscribe(event, handler, context) {
+        if (!this.hasSubscribers(event))
+            this.subscribers[event] = { handlers: [], value: undefined };
+        context = this._handleContext(handler, context);
+        this.subscribers[event].handlers.push(handler.bind(context));
+    }
+    unsubscribe(event, handler, context) {
+        if (!this.hasSubscribers(event))
+            return;
+        context = this._handleContext(handler, context);
+        const index = this.subscribers[event].handlers.indexOf(handler.bind(context));
+        this.subscribers[event].handlers.splice(index);
+        if (this.subscribers[event].handlers.length === 0)
+            delete this.subscribers[event];
+    }
+    publish(event, value, verbose) {
+        // always set value even when having no subscribers
+        if (!this.hasSubscribers(event))
+            this.subscribers[event] = {
+                handlers: []
+            };
+        const oldValue = this.subscribers[event]?.value;
+        if (this.verbose || verbose || oldValue !== value) {
+            this.subscribers[event].value = value;
+            for (const handler of this.subscribers[event].handlers) {
+                handler(value, oldValue);
+            }
+        }
+    }
+    publishVerbose(event, value) {
+        this.publish(event, value, true);
+    }
+    once(event) {
+        return new Promise((resolve) => {
+            const cb = (value) => {
+                resolve(value);
+                this.unsubscribe(event, cb);
+            };
+            this.subscribe(event, cb);
+        });
+    }
 }
 
 // base-x encoding / decoding
@@ -27178,7 +27182,7 @@ class Identity {
             this.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-2836cc96-40ed5df4.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-687f692b-bcdff490.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));
@@ -27369,7 +27373,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-554d2a85-ce06f6eb.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-1c117282-a35a5fbc.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -27579,14 +27583,14 @@ class Peernet {
         }
         globalThis.debug(`star ${id} left`);
     };
-    #peerLeft(peer, star) {
+    #peerLeft = (peer, star) => {
         const id = peer.peerId || peer;
         if (this.#connections[id]) {
             this.#connections[id].destroy();
             delete this.#connections[id];
         }
         globalThis.debug(`peer ${id} left`);
-    }
+    };
     #createRTCPeerConnection = (peerId, star, version, initiator = false) => {
         const peer = new Peer({
             initiator: initiator,
@@ -27604,8 +27608,7 @@ class Peernet {
     #peerJoined = async ({ peerId, version }, star) => {
         // check if peer rejoined before the previous connection closed
         if (this.#connections[peerId]) {
-            if (this.#connections[peerId].connected)
-                this.#connections[peerId].destroy();
+            this.#connections[peerId].destroy();
             delete this.#connections[peerId];
         }
         // RTCPeerConnection
@@ -27643,28 +27646,38 @@ class Peernet {
     };
     #peerClose = (peer) => {
         if (this.#connections[peer.peerId]) {
-            this.#connections[peer.peerId].destroy();
+            peer.destroy();
             delete this.#connections[peer.peerId];
         }
         globalThis.debug(`closed ${peer.peerId}'s connection`);
     };
     #peerConnect = (peer) => {
         globalThis.debug(`${peer.peerId} connected`);
-        globalThis.pubsub.publish(this.#connectEvent, peer.peerId);
+        globalThis.pubsub.publishVerbose(this.#connectEvent, peer.peerId);
     };
-    #noticeMessage = (message, id) => {
+    #noticeMessage = (message, id, from, peer) => {
         if (globalThis.pubsub.subscribers[id]) {
-            globalThis.pubsub.publish(id, new Uint8Array(message));
+            globalThis.pubsub.publish(id, {
+                data: new Uint8Array(Object.values(message)),
+                id,
+                from,
+                peer
+            });
         }
         else {
-            globalThis.pubsub.publish('peer:data', new Uint8Array(message));
+            globalThis.pubsub.publish('peer:data', {
+                data: new Uint8Array(Object.values(message)),
+                id,
+                from,
+                peer
+            });
         }
     };
     #peerData = (peer, data) => {
         const { id, size, chunk } = JSON.parse(new TextDecoder().decode(data));
         peer.bw.down += size;
         if (size <= MAX_MESSAGE_SIZE) {
-            this.#noticeMessage(chunk, id);
+            this.#noticeMessage(chunk, id, peer.peerId, peer);
         }
         else {
             if (!this.#messagesToHandle[id])
@@ -27674,7 +27687,7 @@ class Peernet {
                 ...Object.values(chunk)
             ];
             if (this.#messagesToHandle[id].length === Number(size)) {
-                this.#noticeMessage(this.#messagesToHandle[id], id);
+                this.#noticeMessage(this.#messagesToHandle[id], id, peer.peerId, peer);
                 delete this.#messagesToHandle[id];
             }
         }
@@ -27692,7 +27705,7 @@ class Peernet {
             Object.values(this.#connections).map((connection) => connection.destroy()),
             Object.values(this.#stars).map((connection) => connection.close(0))
         ];
-        await Promise.allSettled(promises);
+        return Promise.allSettled(promises);
     }
 };
         /**
@@ -27725,9 +27738,23 @@ class Peernet {
         if (peer.connected) {
             await peer.send(data, id);
             this.bw.up += data.length;
+            return id;
+        }
+        else {
+            return new Promise((resolve, reject) => {
+                const onError = (error) => {
+                    this.removePeer(peer);
+                    reject(error);
+                };
+                peer.once('error', onError);
+                peer.once('connect', async () => {
+                    await peer.send(data, id);
+                    this.bw.up += data.length;
+                    peer.removeListener('error', onError);
+                    resolve(id);
+                });
+            });
         }
-        else
-            this.removePeer(peer);
     }
     async handleDHT(peer, id, proto) {
         let { hash, store } = proto.decoded;

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-77f8d4c5.js';
+export { N as default } from './node-browser-2c421007.js';
 import './index-c3bd3090.js';

package/exports/browser/workers/block-worker.js

@@ -16,9 +16,11 @@ const run = async (blocks) => {
           // todo: tx worker or nah?
           await block.encode();
           const size = block.encoded.length || block.encoded.byteLength;
-          console.log(`loaded block: ${await block.hash()} @${block.decoded.index} ${formatBytes(size)}`);
+          const hash = await block.hash();
+          const index = block.decoded.index;
+          console.log(`loaded block: ${hash} @${index} ${formatBytes(size)}`);
           // todo we don't want this, need shared state
-          resolve(block.decoded);
+          resolve({ ...block.decoded, blockInfo: { hash, size, index } });
         })
     )
   );

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

@@ -112,27 +112,47 @@ const _init = async ({ contracts, blocks, peerid }) => {
       pre = './';
     }
 
-    const _worker = await new EasyWorker(pre + './block-worker.js', {
+    let _worker = await new EasyWorker(pre + './block-worker.js', {
       serialization: 'advanced',
       type: 'module'
     });
-    blocks = await _worker.once([blocks[blocks.length - 1]]);
-
+    blocks = await _worker.once(blocks);
+    console.log({ blocks });
+    _worker = null;
     // 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
-    //     }
-    //   }));
-    // }
+    for (const block of blocks) {
+      try {
+        await Promise.all(
+          block.transactions.map(async (message) => {
+            if (!block.loaded) {
+              const { from, to, method, params } = message;
+              globalThis.msg = createMessage(from);
+
+              try {
+                await execute(to, method, params);
+              } catch (error) {
+                throw error
+              }
+            }
+          })
+        );
+        block.loaded = true;
+        worker.postMessage({
+          type: 'debug',
+          message: `loaded transactions for block: ${block.blockInfo.hash} @${block.blockInfo.index} ${formatBytes(
+            block.blockInfo.size
+          )}`
+        });
+      } catch (error) {
+        worker.postMessage({
+          type: 'error',
+          message: error.message
+        });
+      }
+    }
 
     if (blocks.length > 0) {
       lastBlock = blocks[blocks.length - 1];

package/exports/chain.js

@@ -201,7 +201,8 @@ class Transaction extends Protocol {
             await globalThis.transactionPoolStore.put(hash, message.encoded);
             // debug(`Added ${hash} to the transaction pool`)
             peernet.publish('add-transaction', message.encoded);
-            return { hash, data, fee: await calculateFee(message.decoded), wait, message };
+            const fee = await calculateFee(message.decoded);
+            return { hash, data, fee, wait, message };
         }
         catch (error) {
             console.log('remo');
@@ -304,8 +305,11 @@ class Machine {
                 break;
             }
             case 'debug': {
-                for (const message of data.messages)
-                    globalThis.debug(message);
+                globalThis.debug(data.message);
+                break;
+            }
+            case 'error': {
+                console.error(data.message);
                 break;
             }
             case 'machine-ready': {
@@ -726,7 +730,7 @@ class State extends Contract {
         try {
             await this.resolveBlocks();
             this.#machine = await new Machine(this.#blocks);
-            await this.#loadBlocks(this.#blocks);
+            // await this.#loadBlocks(this.#blocks)
         }
         catch (error) {
             if (isResolveError(error)) {
@@ -1165,6 +1169,13 @@ class Chain extends VersionControl {
         this.#participants = [];
         this.#participating = false;
         this.#jail = [];
+        this.#addTransaction = async (message) => {
+            const transaction = new TransactionMessage(message);
+            const hash = await transaction.hash();
+            if (await transactionPool.has(hash))
+                await transactionPool.delete(hash);
+            console.log(transaction);
+        };
         // @ts-ignore
         return this.#init();
     }
@@ -1268,9 +1279,7 @@ class Chain extends VersionControl {
         }, validatorInfo.timeout);
         this.#jail.push(validatorInfo.address);
     }
-    #addTransaction(message) {
-        console.log({ message });
-    }
+    #addTransaction;
     async #prepareRequest(request) {
         let node = await new globalThis.peernet.protos['peernet-request']({ request });
         return globalThis.peernet.prepareMessage(node);
@@ -1295,7 +1304,6 @@ class Chain extends VersionControl {
     }
     async #peerConnected(peerId) {
         const peer = peernet.getConnection(peerId);
-        console.log({ peer });
         // todo handle version changes
         // for now just do nothing if version doesn't match
         console.log(`${peer.version}, ${this.version}`);

package/exports/workers/block-worker.js

@@ -16,9 +16,11 @@ const run = async (blocks) => {
           // todo: tx worker or nah?
           await block.encode();
           const size = block.encoded.length || block.encoded.byteLength;
-          console.log(`loaded block: ${await block.hash()} @${block.decoded.index} ${formatBytes(size)}`);
+          const hash = await block.hash();
+          const index = block.decoded.index;
+          console.log(`loaded block: ${hash} @${index} ${formatBytes(size)}`);
           // todo we don't want this, need shared state
-          resolve(block.decoded);
+          resolve({ ...block.decoded, blockInfo: { hash, size, index } });
         })
     )
   );

package/exports/workers/machine-worker.js

@@ -112,27 +112,47 @@ const _init = async ({ contracts, blocks, peerid }) => {
       pre = './';
     }
 
-    const _worker = await new EasyWorker(pre + 'block-worker.js', {
+    let _worker = await new EasyWorker(pre + 'block-worker.js', {
       serialization: 'advanced',
       type: 'module'
     });
-    blocks = await _worker.once([blocks[blocks.length - 1]]);
-
+    blocks = await _worker.once(blocks);
+    console.log({ blocks });
+    _worker = null;
     // 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
-    //     }
-    //   }));
-    // }
+    for (const block of blocks) {
+      try {
+        await Promise.all(
+          block.transactions.map(async (message) => {
+            if (!block.loaded) {
+              const { from, to, method, params } = message;
+              globalThis.msg = createMessage(from);
+
+              try {
+                await execute(to, method, params);
+              } catch (error) {
+                throw error
+              }
+            }
+          })
+        );
+        block.loaded = true;
+        worker.postMessage({
+          type: 'debug',
+          message: `loaded transactions for block: ${block.blockInfo.hash} @${block.blockInfo.index} ${formatBytes(
+            block.blockInfo.size
+          )}`
+        });
+      } catch (error) {
+        worker.postMessage({
+          type: 'error',
+          message: error.message
+        });
+      }
+    }
 
     if (blocks.length > 0) {
       lastBlock = blocks[blocks.length - 1];

package/package.json

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