@leofcoin/chain 1.7.117 → 1.7.119

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,28 @@ 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');
+            console.log({ rawBlock });
+            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 +4823,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')))

package/exports/browser/{client-icdGX62_-D7-443eN.js → client-Lwke64Zq-DO2uqAHA.js}

@@ -1,4 +1,4 @@
-import { L as LittlePubSub } from './node-browser-CUMhie0d.js';
+import { L as LittlePubSub } from './node-browser-C5GuLP_b.js';
 import './identity-nIyW_Xm8-BU8xakCv.js';
 import './index-DUfUgiQY.js';
 import './networks-BdMfU1ag.js';

package/exports/browser/{messages-BzsDq0Y4-ZkUqf4eM.js → messages-C22qRxnF-tW3z5FMF.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-CUMhie0d.js';
+import { F as FormatInterface } from './node-browser-C5GuLP_b.js';
 import './identity-nIyW_Xm8-BU8xakCv.js';
 import './index-DUfUgiQY.js';
 import './networks-BdMfU1ag.js';

package/exports/browser/{node-browser-CUMhie0d.js → node-browser-C5GuLP_b.js}

@@ -8491,7 +8491,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-BzsDq0Y4-ZkUqf4eM.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-C22qRxnF-tW3z5FMF.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8585,7 +8585,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-icdGX62_-D7-443eN.js');
+        const importee = await import('./client-Lwke64Zq-DO2uqAHA.js');
         /**
          * @access public
          * @type {PeernetClient}
@@ -8813,8 +8813,8 @@ class Peernet {
             closestPeer = Object.values(providers)[0];
         debug(`closest peer for ${hash} is ${closestPeer?.address}`);
         // get peer instance by id
-        if (!closestPeer || !closestPeer.id)
-            return this.requestData(hash, store?.name || store);
+        if (!closestPeer || !closestPeer.id || !closestPeer.address)
+            return undefined;
         const id = closestPeer.id;
         const peer = this.connections[id];
         if (!peer || !peer?.connected) {

package/exports/browser/node-browser.js

@@ -1,4 +1,4 @@
-export { N as default } from './node-browser-CUMhie0d.js';
+export { N as default } from './node-browser-C5GuLP_b.js';
 import './identity-nIyW_Xm8-BU8xakCv.js';
 import './index-DUfUgiQY.js';
 import './networks-BdMfU1ag.js';

package/exports/chain.js

@@ -222,7 +222,6 @@ class Contract extends Transaction {
     constructor(config) {
         super(config);
     }
-    async init() { }
     /**
      *
      * @param {Address} creator
@@ -921,19 +920,28 @@ 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');
+            console.log({ rawBlock });
+            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 +950,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')))

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.117",
+  "version": "1.7.119",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -69,7 +69,7 @@
     "@leofcoin/messages": "^1.4.40",
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/networks": "^1.1.25",
-    "@leofcoin/peernet": "^1.1.103",
+    "@leofcoin/peernet": "^1.1.104",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.40",
     "@leofcoin/workers": "^1.5.27",