@leofcoin/chain 1.8.23 → 1.8.25

package/exports/browser/chain.js

@@ -5509,7 +5509,8 @@ class State extends Contract {
                     try {
                         const result = await peer.request(node.encoded);
                         debug$1({ result });
-                        return { result: Uint8Array.from(Object.values(result)), peer };
+                        console.log({ result });
+                        return { result: new LastBlockMessage(result), peer };
                     }
                     catch (error) {
                         const peerId = peer?.peerId || peer?.id || peer?.address || 'unknown';
@@ -6314,24 +6315,11 @@ class Chain extends VersionControl {
         const node = await this.#prepareRequest(request);
         try {
             let response = await peer.request(node.encoded);
-            console.log({ rawResponse: response });
-            console.log('raw response received, decoding...');
-            console.log({ responseBytes: response });
             response = await new globalThis.peernet.protos['peernet-response'](response);
-            let responseData = response.decoded.response;
-            console.log(`response decoded:`, responseData);
-            if (typeof responseData === 'string') {
-                console.warn(`Deprecated: ${request} response is a string, attempting to parse as JSON...`);
-                try {
-                    responseData = JSON.parse(responseData);
-                }
-                catch { }
+            if (!(response.decoded.response instanceof Uint8Array)) {
+                console.warn(`Deprecated: ${response.decoded.response} is not an Uint8Array`);
             }
-            if (!(responseData instanceof Uint8Array)) {
-                console.warn(`Deprecated: ${request} response is not a Uint8Array and will be ignored.`);
-                return responseData;
-            }
-            return responseData;
+            return response.decoded.response;
         }
         catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || 'unknown';
@@ -6340,7 +6328,18 @@ class Chain extends VersionControl {
         }
     }
     async getPeerTransactionPool(peer) {
-        const transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
+        let transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
+        if (transactionsInPool instanceof Uint8Array) {
+            try {
+                const text = new TextDecoder().decode(transactionsInPool);
+                transactionsInPool = JSON.parse(text);
+            }
+            catch (e) {
+                return [];
+            }
+        }
+        if (!Array.isArray(transactionsInPool))
+            return [];
         // todo iterate vs getting all keys?
         const transactions = await globalThis.transactionPoolStore.keys();
         const transactionsToGet = [];
@@ -6397,7 +6396,15 @@ class Chain extends VersionControl {
         if (lastBlock) {
             if (!this.lastBlock || higherThenCurrentLocal) {
                 try {
-                    const knownBlocksResponse = await this.#makeRequest(peer, 'knownBlocks');
+                    let knownBlocksResponse = await this.#makeRequest(peer, 'knownBlocks');
+                    if (knownBlocksResponse instanceof Uint8Array) {
+                        try {
+                            knownBlocksResponse = JSON.parse(new TextDecoder().decode(knownBlocksResponse));
+                        }
+                        catch (e) {
+                            console.log(e);
+                        }
+                    }
                     if (knownBlocksResponse.blocks)
                         for (const hash of knownBlocksResponse.blocks) {
                             this.wantList.push(hash);
@@ -6433,7 +6440,15 @@ class Chain extends VersionControl {
             }
         }, 3000);
         try {
-            const stateInfo = await this.#makeRequest(peer, 'stateInfo');
+            let stateInfo = await this.#makeRequest(peer, 'stateInfo');
+            if (stateInfo instanceof Uint8Array) {
+                try {
+                    stateInfo = JSON.parse(new TextDecoder().decode(stateInfo));
+                }
+                catch (e) {
+                    console.log(e);
+                }
+            }
             await this.syncChain(lastBlock);
             this.machine.states.info = stateInfo;
         }

package/exports/chain.js

@@ -1650,7 +1650,8 @@ class State extends Contract {
                     try {
                         const result = await peer.request(node.encoded);
                         debug$1({ result });
-                        return { result: Uint8Array.from(Object.values(result)), peer };
+                        console.log({ result });
+                        return { result: new LastBlockMessage(result), peer };
                     }
                     catch (error) {
                         const peerId = peer?.peerId || peer?.id || peer?.address || 'unknown';
@@ -2455,24 +2456,11 @@ class Chain extends VersionControl {
         const node = await this.#prepareRequest(request);
         try {
             let response = await peer.request(node.encoded);
-            console.log({ rawResponse: response });
-            console.log('raw response received, decoding...');
-            console.log({ responseBytes: response });
             response = await new globalThis.peernet.protos['peernet-response'](response);
-            let responseData = response.decoded.response;
-            console.log(`response decoded:`, responseData);
-            if (typeof responseData === 'string') {
-                console.warn(`Deprecated: ${request} response is a string, attempting to parse as JSON...`);
-                try {
-                    responseData = JSON.parse(responseData);
-                }
-                catch { }
+            if (!(response.decoded.response instanceof Uint8Array)) {
+                console.warn(`Deprecated: ${response.decoded.response} is not an Uint8Array`);
             }
-            if (!(responseData instanceof Uint8Array)) {
-                console.warn(`Deprecated: ${request} response is not a Uint8Array and will be ignored.`);
-                return responseData;
-            }
-            return responseData;
+            return response.decoded.response;
         }
         catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || 'unknown';
@@ -2481,7 +2469,18 @@ class Chain extends VersionControl {
         }
     }
     async getPeerTransactionPool(peer) {
-        const transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
+        let transactionsInPool = await this.#makeRequest(peer, 'transactionPool');
+        if (transactionsInPool instanceof Uint8Array) {
+            try {
+                const text = new TextDecoder().decode(transactionsInPool);
+                transactionsInPool = JSON.parse(text);
+            }
+            catch (e) {
+                return [];
+            }
+        }
+        if (!Array.isArray(transactionsInPool))
+            return [];
         // todo iterate vs getting all keys?
         const transactions = await globalThis.transactionPoolStore.keys();
         const transactionsToGet = [];
@@ -2538,7 +2537,15 @@ class Chain extends VersionControl {
         if (lastBlock) {
             if (!this.lastBlock || higherThenCurrentLocal) {
                 try {
-                    const knownBlocksResponse = await this.#makeRequest(peer, 'knownBlocks');
+                    let knownBlocksResponse = await this.#makeRequest(peer, 'knownBlocks');
+                    if (knownBlocksResponse instanceof Uint8Array) {
+                        try {
+                            knownBlocksResponse = JSON.parse(new TextDecoder().decode(knownBlocksResponse));
+                        }
+                        catch (e) {
+                            console.log(e);
+                        }
+                    }
                     if (knownBlocksResponse.blocks)
                         for (const hash of knownBlocksResponse.blocks) {
                             this.wantList.push(hash);
@@ -2574,7 +2581,15 @@ class Chain extends VersionControl {
             }
         }, 3000);
         try {
-            const stateInfo = await this.#makeRequest(peer, 'stateInfo');
+            let stateInfo = await this.#makeRequest(peer, 'stateInfo');
+            if (stateInfo instanceof Uint8Array) {
+                try {
+                    stateInfo = JSON.parse(new TextDecoder().decode(stateInfo));
+                }
+                catch (e) {
+                    console.log(e);
+                }
+            }
             await this.syncChain(lastBlock);
             this.machine.states.info = stateInfo;
         }

package/package.json

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