@leofcoin/chain 1.7.26 → 1.7.27

package/exports/browser/chain.js

@@ -1466,6 +1466,8 @@ var hasRequiredRange;
 function requireRange () {
 	if (hasRequiredRange) return range;
 	hasRequiredRange = 1;
+	const SPACE_CHARACTERS = /\s+/g;
+
 	// hoisted class for cyclic dependency
 	class Range {
 	  constructor (range, options) {
@@ -1486,7 +1488,7 @@ function requireRange () {
 	      // just put it in the set and return
 	      this.raw = range.value;
 	      this.set = [[range]];
-	      this.format();
+	      this.formatted = undefined;
 	      return this
 	    }
 
@@ -1497,10 +1499,7 @@ function requireRange () {
 	    // First reduce all whitespace as much as possible so we do not have to rely
 	    // on potentially slow regexes like \s*. This is then stored and used for
 	    // future error messages as well.
-	    this.raw = range
-	      .trim()
-	      .split(/\s+/)
-	      .join(' ');
+	    this.raw = range.trim().replace(SPACE_CHARACTERS, ' ');
 
 	    // First, split on ||
 	    this.set = this.raw
@@ -1534,14 +1533,29 @@ function requireRange () {
 	      }
 	    }
 
-	    this.format();
+	    this.formatted = undefined;
+	  }
+
+	  get range () {
+	    if (this.formatted === undefined) {
+	      this.formatted = '';
+	      for (let i = 0; i < this.set.length; i++) {
+	        if (i > 0) {
+	          this.formatted += '||';
+	        }
+	        const comps = this.set[i];
+	        for (let k = 0; k < comps.length; k++) {
+	          if (k > 0) {
+	            this.formatted += ' ';
+	          }
+	          this.formatted += comps[k].toString().trim();
+	        }
+	      }
+	    }
+	    return this.formatted
 	  }
 
 	  format () {
-	    this.range = this.set
-	      .map((comps) => comps.join(' ').trim())
-	      .join('||')
-	      .trim();
 	    return this.range
 	  }
 
@@ -3278,7 +3292,13 @@ class Machine {
                     const value = await this.#askWorker('get', { contract, method: 'state', params: [] });
                     state[contract] = value;
                 }));
-                const accounts = await Promise.all((await accountsStore.keys()).map((address) => accountsStore.get(address)));
+                let accounts;
+                try {
+                    accounts = await Promise.all((await accountsStore.keys()).map((address) => accountsStore.get(address)));
+                }
+                catch (error) {
+                    accounts = [];
+                }
                 const tasks = [
                     stateStore.put('lastBlock', JSON.stringify(await this.lastBlock)),
                     stateStore.put('states', JSON.stringify(state)),
@@ -4460,7 +4480,10 @@ class Chain extends VersionControl {
         //   // await transactionStore.put(transaction.hash, transaction.encoded)
         //   if (!contracts.includes(transaction.to)) {
         //     contracts.push(transaction.to)
-        //   }
+        //   // Todo: go trough all accounts
+        //   //@ts-ignore
+        //   promises.push(this.#executeTransaction(transaction))
+        // }
         //   // Todo: go trough all accounts
         //   //@ts-ignore
         //   promises.push(this.#executeTransaction(transaction))

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

@@ -44,62 +44,67 @@ var bytecodes = {
 	validators: validators
 };
 
-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);
-        });
-    }
+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;
+    }
+    getValue(event) {
+        if (this.subscribers[event])
+            return this.subscribers[event].value;
+        return undefined;
+    }
+    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);
+        });
+    }
 }
 
 const pubsub = new LittlePubSub();

package/exports/chain.js

@@ -393,7 +393,13 @@ class Machine {
                     const value = await this.#askWorker('get', { contract, method: 'state', params: [] });
                     state[contract] = value;
                 }));
-                const accounts = await Promise.all((await accountsStore.keys()).map((address) => accountsStore.get(address)));
+                let accounts;
+                try {
+                    accounts = await Promise.all((await accountsStore.keys()).map((address) => accountsStore.get(address)));
+                }
+                catch (error) {
+                    accounts = [];
+                }
                 const tasks = [
                     stateStore.put('lastBlock', JSON.stringify(await this.lastBlock)),
                     stateStore.put('states', JSON.stringify(state)),
@@ -1575,7 +1581,10 @@ class Chain extends VersionControl {
         //   // await transactionStore.put(transaction.hash, transaction.encoded)
         //   if (!contracts.includes(transaction.to)) {
         //     contracts.push(transaction.to)
-        //   }
+        //   // Todo: go trough all accounts
+        //   //@ts-ignore
+        //   promises.push(this.#executeTransaction(transaction))
+        // }
         //   // Todo: go trough all accounts
         //   //@ts-ignore
         //   promises.push(this.#executeTransaction(transaction))

package/exports/workers/machine-worker.js

@@ -44,62 +44,67 @@ var bytecodes = {
 	validators: validators
 };
 
-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);
-        });
-    }
+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;
+    }
+    getValue(event) {
+        if (this.subscribers[event])
+            return this.subscribers[event].value;
+        return undefined;
+    }
+    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);
+        });
+    }
 }
 
 const pubsub = new LittlePubSub();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.7.26",
+  "version": "1.7.27",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {