@leofcoin/chain 1.7.118 → 1.7.120

package/exports/browser/chain.js

@@ -1129,7 +1129,7 @@ var hasRequiredRe;
 function requireRe () {
 	if (hasRequiredRe) return re.exports;
 	hasRequiredRe = 1;
-	(function (module, exports) {
+	(function (module, exports$1) {
 
 		const {
 		  MAX_SAFE_COMPONENT_LENGTH,
@@ -1137,14 +1137,14 @@ function requireRe () {
 		  MAX_LENGTH,
 		} = requireConstants();
 		const debug = requireDebug();
-		exports = module.exports = {};
+		exports$1 = module.exports = {};
 
 		// The actual regexps go on exports.re
-		const re = exports.re = [];
-		const safeRe = exports.safeRe = [];
-		const src = exports.src = [];
-		const safeSrc = exports.safeSrc = [];
-		const t = exports.t = {};
+		const re = exports$1.re = [];
+		const safeRe = exports$1.safeRe = [];
+		const src = exports$1.src = [];
+		const safeSrc = exports$1.safeSrc = [];
+		const t = exports$1.t = {};
 		let R = 0;
 
 		const LETTERDASHNUMBER = '[a-zA-Z0-9-]';
@@ -1308,7 +1308,7 @@ function requireRe () {
 		createToken('LONETILDE', '(?:~>?)');
 
 		createToken('TILDETRIM', `(\\s*)${src[t.LONETILDE]}\\s+`, true);
-		exports.tildeTrimReplace = '$1~';
+		exports$1.tildeTrimReplace = '$1~';
 
 		createToken('TILDE', `^${src[t.LONETILDE]}${src[t.XRANGEPLAIN]}$`);
 		createToken('TILDELOOSE', `^${src[t.LONETILDE]}${src[t.XRANGEPLAINLOOSE]}$`);
@@ -1318,7 +1318,7 @@ function requireRe () {
 		createToken('LONECARET', '(?:\\^)');
 
 		createToken('CARETTRIM', `(\\s*)${src[t.LONECARET]}\\s+`, true);
-		exports.caretTrimReplace = '$1^';
+		exports$1.caretTrimReplace = '$1^';
 
 		createToken('CARET', `^${src[t.LONECARET]}${src[t.XRANGEPLAIN]}$`);
 		createToken('CARETLOOSE', `^${src[t.LONECARET]}${src[t.XRANGEPLAINLOOSE]}$`);
@@ -1331,7 +1331,7 @@ function requireRe () {
 		// it modifies, so that `> 1.2.3` ==> `>1.2.3`
 		createToken('COMPARATORTRIM', `(\\s*)${src[t.GTLT]
 		}\\s*(${src[t.LOOSEPLAIN]}|${src[t.XRANGEPLAIN]})`, true);
-		exports.comparatorTrimReplace = '$1$2$3';
+		exports$1.comparatorTrimReplace = '$1$2$3';
 
 		// Something like `1.2.3 - 1.2.4`
 		// Note that these all use the loose form, because they'll be
@@ -3993,7 +3993,6 @@ class Contract extends Transaction {
     constructor(config) {
         super(config);
     }
-    async init() { }
     /**
      *
      * @param {Address} creator
@@ -4794,19 +4793,27 @@ class State extends Contract {
     #knownBlocksHandler;
     async init() {
         this.jobber = new Jobber(this.resolveTimeout);
-        if (super.init)
-            await super.init();
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler);
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler);
         await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler);
+        let localBlockHash;
+        let blockMessage;
+        let localBlock;
         try {
-            await globalThis.chainStore.has('lastBlock');
+            const rawBlock = await globalThis.chainStore.has('lastBlock');
+            if (rawBlock) {
+                localBlockHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
+                blockMessage = await globalThis.peernet.get(localBlockHash, 'block');
+                blockMessage = await new BlockMessage(blockMessage);
+                localBlock = { ...blockMessage.decoded, hash: localBlockHash };
+            }
+            else {
+                localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
+            }
         }
         catch {
-            await globalThis.chainStore.put('lastBlock', '0x0');
+            localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
         }
-        globalThis.pubsub.publish('lastBlock', await this.lastBlock);
-        // load local blocks
         try {
             this.knownBlocks = await blockStore.keys();
         }
@@ -4815,14 +4822,7 @@ class State extends Contract {
             throw error;
         }
         try {
-            let localBlockHash;
-            try {
-                const localBlock = await globalThis.chainStore.get('lastBlock');
-                localBlockHash = new TextDecoder().decode(localBlock);
-            }
-            catch (error) { }
-            if (localBlockHash && localBlockHash !== '0x0') {
-                const blockMessage = new BlockMessage(await peernet.get(localBlockHash, 'block'));
+            if (localBlock.hash && localBlock.hash !== '0x0') {
                 try {
                     const states = {
                         lastBlock: JSON.parse(new TextDecoder().decode(await globalThis.stateStore.get('lastBlock')))
@@ -5032,15 +5032,17 @@ class State extends Contract {
     }
     async #syncChain(lastBlock) {
         try {
-            if (this.knownBlocks?.length === Number(lastBlock.index) + 1) {
-                let promises = [];
-                promises = await Promise.allSettled(this.knownBlocks.map(async (address) => {
-                    const has = await globalThis.peernet.has(address);
-                    return { has, address };
-                }));
-                promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has);
-                await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)));
-            }
+            // if (this.knownBlocks?.length === Number(lastBlock.index) + 1) {
+            //   let promises = []
+            //   promises = await Promise.allSettled(
+            //     this.knownBlocks.map(async (address) => {
+            //       const has = await globalThis.peernet.has(address)
+            //       return { has, address }
+            //     })
+            //   )
+            //   promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has)
+            //   await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)))
+            // }
             const localBlock = await this.lastBlock;
             if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
                 // TODO: check if valid

package/exports/chain.js

@@ -222,7 +222,6 @@ class Contract extends Transaction {
     constructor(config) {
         super(config);
     }
-    async init() { }
     /**
      *
      * @param {Address} creator
@@ -921,19 +920,27 @@ class State extends Contract {
     #knownBlocksHandler;
     async init() {
         this.jobber = new Jobber(this.resolveTimeout);
-        if (super.init)
-            await super.init();
         await globalThis.peernet.addRequestHandler('lastBlock', this.#lastBlockHandler);
         await globalThis.peernet.addRequestHandler('knownBlocks', this.#knownBlocksHandler);
         await globalThis.peernet.addRequestHandler('chainState', this.#chainStateHandler);
+        let localBlockHash;
+        let blockMessage;
+        let localBlock;
         try {
-            await globalThis.chainStore.has('lastBlock');
+            const rawBlock = await globalThis.chainStore.has('lastBlock');
+            if (rawBlock) {
+                localBlockHash = new TextDecoder().decode(await globalThis.chainStore.get('lastBlock'));
+                blockMessage = await globalThis.peernet.get(localBlockHash, 'block');
+                blockMessage = await new BlockMessage(blockMessage);
+                localBlock = { ...blockMessage.decoded, hash: localBlockHash };
+            }
+            else {
+                localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
+            }
         }
         catch {
-            await globalThis.chainStore.put('lastBlock', '0x0');
+            localBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
         }
-        globalThis.pubsub.publish('lastBlock', await this.lastBlock);
-        // load local blocks
         try {
             this.knownBlocks = await blockStore.keys();
         }
@@ -942,14 +949,7 @@ class State extends Contract {
             throw error;
         }
         try {
-            let localBlockHash;
-            try {
-                const localBlock = await globalThis.chainStore.get('lastBlock');
-                localBlockHash = new TextDecoder().decode(localBlock);
-            }
-            catch (error) { }
-            if (localBlockHash && localBlockHash !== '0x0') {
-                const blockMessage = new BlockMessage(await peernet.get(localBlockHash, 'block'));
+            if (localBlock.hash && localBlock.hash !== '0x0') {
                 try {
                     const states = {
                         lastBlock: JSON.parse(new TextDecoder().decode(await globalThis.stateStore.get('lastBlock')))
@@ -1159,15 +1159,17 @@ class State extends Contract {
     }
     async #syncChain(lastBlock) {
         try {
-            if (this.knownBlocks?.length === Number(lastBlock.index) + 1) {
-                let promises = [];
-                promises = await Promise.allSettled(this.knownBlocks.map(async (address) => {
-                    const has = await globalThis.peernet.has(address);
-                    return { has, address };
-                }));
-                promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has);
-                await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)));
-            }
+            // if (this.knownBlocks?.length === Number(lastBlock.index) + 1) {
+            //   let promises = []
+            //   promises = await Promise.allSettled(
+            //     this.knownBlocks.map(async (address) => {
+            //       const has = await globalThis.peernet.has(address)
+            //       return { has, address }
+            //     })
+            //   )
+            //   promises = promises.filter(({ status, value }) => status === 'fulfilled' && !value.has)
+            //   await Promise.allSettled(promises.map(({ value }) => this.getAndPutBlock(value.address)))
+            // }
             const localBlock = await this.lastBlock;
             if (!localBlock || Number(localBlock.index) < Number(lastBlock.index)) {
                 // TODO: check if valid

package/exports/contract.d.ts

@@ -5,7 +5,6 @@ import type MultiWallet from '@leofcoin/multi-wallet';
  */
 export default class Contract extends Transaction {
     constructor(config: any);
-    init(): Promise<void>;
     /**
      *
      * @param {Address} creator

package/package.json

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