@leofcoin/chain 1.5.44 → 1.5.46

package/exports/browser/{messages-554d2a85-ce06f6eb.js → messages-cccb78db-116bfaa7.js}

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

package/exports/browser/{node-browser-77f8d4c5.js → node-browser-c75c189a.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
@@ -790,7 +794,7 @@ var _nodeResolve_empty$1 = /*#__PURE__*/Object.freeze({
   default: _nodeResolve_empty
 });
 
-var require$$0$1 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
+var require$$3 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
 
 (function (module) {
 	(function (module, exports) {
@@ -847,7 +851,7 @@ var require$$0$1 = /*@__PURE__*/getAugmentedNamespace(_nodeResolve_empty$1);
 	    if (typeof window !== 'undefined' && typeof window.Buffer !== 'undefined') {
 	      Buffer = window.Buffer;
 	    } else {
-	      Buffer = require$$0$1.Buffer;
+	      Buffer = require$$3.Buffer;
 	    }
 	  } catch (e) {
 	  }
@@ -13557,7 +13561,7 @@ var bn = {exports: {}};
 	    if (typeof window !== 'undefined' && typeof window.Buffer !== 'undefined') {
 	      Buffer = window.Buffer;
 	    } else {
-	      Buffer = require$$0$1.Buffer;
+	      Buffer = require$$3.Buffer;
 	    }
 	  } catch (e) {
 	  }
@@ -17201,7 +17205,7 @@ if (typeof self === 'object') {
 } else {
   // Node.js or Web worker with no crypto support
   try {
-    var crypto$1 = require$$0$1;
+    var crypto$1 = require$$3;
     if (typeof crypto$1.randomBytes !== 'function')
       throw new Error('Not supported');
 
@@ -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-81687e93-18fab48d.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-cccb78db-116bfaa7.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -27463,238 +27467,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = class Client {
-    #peerId;
-    #connections = {};
-    #stars = {};
-    #connectEvent = 'peer:connected';
-    id;
-    networkVersion;
-    starsConfig;
-    socketClient;
-    messageSize = 262144;
-    version;
-    #messagesToHandle = {};
-    get peerId() {
-        return this.#peerId;
-    }
-    get connections() {
-        return { ...this.#connections };
-    }
-    get peers() {
-        return Object.entries(this.#connections);
-    }
-    getPeer(peerId) {
-        return this.#connections[peerId];
-    }
-    /**
-     *
-     * @param options {object}
-     * @param options.peerId {string}
-     * @param options.networkVersion {string}
-     * @param options.version {string}
-     * @param options.stars {string[]}
-     * @param options.connectEvent {string} defaults to peer:connected, can be renamed to handle different protocols, like peer:discovered (setup peer props before fireing the connect event)
-     */
-    constructor(options) {
-        const { peerId, networkVersion, version, connectEvent, stars } = {
-            ...defaultOptions,
-            ...options
-        };
-        this.#peerId = peerId;
-        this.networkVersion = networkVersion;
-        this.version = version;
-        this.#connectEvent = connectEvent;
-        this.starsConfig = stars;
-        this._init();
-    }
-    async _init() {
-        // reconnectJob()
-        if (!globalThis.RTCPeerConnection)
-            globalThis.wrtc = (await import('./browser-2c73e2ef-2c73e2ef.js').then(function (n) { return n.b; })).default;
-        for (const star of this.starsConfig) {
-            try {
-                const client = new SocketRequestClient(star, this.networkVersion);
-                this.#stars[star] = await client.init();
-                this.setupStarListeners(this.#stars[star]);
-                this.#stars[star].send({
-                    url: 'join',
-                    params: { version: this.version, peerId: this.peerId }
-                });
-            }
-            catch (e) {
-                if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1 &&
-                    !this.socketClient)
-                    throw new Error(`No star available to connect`);
-            }
-        }
-        if (globalThis.navigator) {
-            globalThis.addEventListener('beforeunload', async () => this.close());
-        }
-        else {
-            process.on('SIGINT', async () => {
-                process.stdin.resume();
-                await this.close();
-                process.exit();
-            });
-        }
-    }
-    setupStarListeners(star) {
-        star.pubsub.subscribe('peer:joined', (id) => this.#peerJoined(id, star));
-        star.pubsub.subscribe('peer:left', (id) => this.#peerLeft(id, star));
-        star.pubsub.subscribe('star:joined', this.#starJoined);
-        star.pubsub.subscribe('star:left', this.#starLeft);
-        star.pubsub.subscribe('signal', (message) => this.#inComingSignal(message, star));
-    }
-    #starJoined = (id) => {
-        if (this.#stars[id]) {
-            this.#stars[id].close(0);
-            delete this.#stars[id];
-        }
-        console.log(`star ${id} joined`);
-    };
-    #starLeft = async (id) => {
-        if (this.#stars[id]) {
-            this.#stars[id].close(0);
-            delete this.#stars[id];
-        }
-        if (Object.keys(this.#stars).length === 0) {
-            for (const star of this.starsConfig) {
-                try {
-                    const socketClient = await new SocketRequestClient(star, this.networkVersion).init();
-                    if (!socketClient?.client?.OPEN)
-                        return;
-                    this.#stars[star] = socketClient;
-                    this.#stars[star].send({
-                        url: 'join',
-                        params: { peerId: this.peerId, version: this.version }
-                    });
-                    this.setupStarListeners(socketClient);
-                }
-                catch (e) {
-                    if (this.starsConfig.indexOf(star) === this.starsConfig.length - 1)
-                        throw new Error(`No star available to connect`);
-                }
-            }
-        }
-        globalThis.debug(`star ${id} left`);
-    };
-    #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,
-            from: this.peerId,
-            to: peerId,
-            version
-        });
-        peer.on('signal', (signal) => this.#peerSignal(peer, signal, star, this.version));
-        peer.on('connect', () => this.#peerConnect(peer));
-        peer.on('close', () => this.#peerClose(peer));
-        peer.on('data', (data) => this.#peerData(peer, data));
-        peer.on('error', (error) => this.#peerError(peer, error));
-        this.#connections[peerId] = peer;
-    };
-    #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();
-            delete this.#connections[peerId];
-        }
-        // RTCPeerConnection
-        this.#createRTCPeerConnection(peerId, star, version, true);
-        globalThis.debug(`peer ${peerId} joined`);
-    };
-    #inComingSignal = async ({ from, signal, channelName, version }, star) => {
-        if (version !== this.version) {
-            console.warn(`${from} joined using the wrong version.\nexpected: ${this.version} but got:${version}`);
-            return;
-        }
-        let peer = this.#connections[from];
-        if (!peer) {
-            this.#createRTCPeerConnection(from, star, version);
-            peer = this.#connections[from];
-        }
-        if (String(peer.channelName) !== String(channelName))
-            console.warn(`channelNames don't match: got ${peer.channelName}, expected: ${channelName}`);
-        peer.signal(signal);
-    };
-    #peerSignal = (peer, signal, star, version) => {
-        let client = this.#stars[star];
-        if (!client)
-            client = this.#stars[Object.keys(this.#stars)[0]];
-        client.send({
-            url: 'signal',
-            params: {
-                from: this.peerId,
-                to: peer.peerId,
-                channelName: peer.channelName,
-                version,
-                signal
-            }
-        });
-    };
-    #peerClose = (peer) => {
-        if (this.#connections[peer.peerId]) {
-            this.#connections[peer.peerId].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);
-    };
-    #noticeMessage = (message, id) => {
-        if (globalThis.pubsub.subscribers[id]) {
-            globalThis.pubsub.publish(id, new Uint8Array(message));
-        }
-        else {
-            globalThis.pubsub.publish('peer:data', new Uint8Array(message));
-        }
-    };
-    #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);
-        }
-        else {
-            if (!this.#messagesToHandle[id])
-                this.#messagesToHandle[id] = [];
-            this.#messagesToHandle[id] = [
-                ...this.#messagesToHandle[id],
-                ...Object.values(chunk)
-            ];
-            if (this.#messagesToHandle[id].length === Number(size)) {
-                this.#noticeMessage(this.#messagesToHandle[id], id);
-                delete this.#messagesToHandle[id];
-            }
-        }
-    };
-    #peerError = (peer, error) => {
-        console.warn(`Connection error: ${error.message}`);
-        peer.destroy();
-    };
-    async close() {
-        for (const star in this.#stars) {
-            if (this.#stars[star].connectionState() === 'open')
-                await this.#stars[star].send({ url: 'leave', params: this.peerId });
-        }
-        const promises = [
-            Object.values(this.#connections).map((connection) => connection.destroy()),
-            Object.values(this.#stars).map((connection) => connection.close(0))
-        ];
-        await Promise.allSettled(promises);
-    }
-};
+        const importee = await import('./client-f193279c-98f2aeaa.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -27725,9 +27498,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;
@@ -28213,4 +28000,4 @@ class Node {
     }
 }
 
-export { FormatInterface as F, MultiWallet as M, Node as N, base58$1 as b, encrypt as e };
+export { FormatInterface as F, LittlePubSub as L, MultiWallet as M, Node as N, base58$1 as b, commonjsGlobal as c, encrypt as e, getDefaultExportFromCjs as g, inherits_browserExports as i, require$$3 as r };

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-c75c189a.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.44",
+  "version": "1.5.46",
   "description": "Official javascript implementation",
   "exports": {
     "./node": {