@leofcoin/chain 1.8.19 → 1.8.21

package/exports/browser/chain.js

@@ -3955,8 +3955,8 @@ class Transaction extends Protocol {
         try {
             let data;
             const wait = new Promise(async (resolve, reject) => {
-                if (pubsub.subscribers[`transaction.completed.${hash}`]) {
-                    const result = pubsub.subscribers[`transaction.completed.${hash}`].value;
+                if (pubsub.hasSubscribers(`transaction.completed.${hash}`)) {
+                    const result = pubsub.getValue(`transaction.completed.${hash}`);
                     if (result.status !== 'fulfilled') {
                         await transactionPoolStore.delete(hash);
                     }
@@ -5507,7 +5507,7 @@ class State extends Contract {
             if (peer.connected && peer.version === this.version) {
                 const task = async () => {
                     try {
-                        const result = await peer.request(node.encode());
+                        const result = await peer.request(node.encoded);
                         debug$1({ result });
                         return { result: Uint8Array.from(Object.values(result)), peer };
                     }
@@ -5521,6 +5521,7 @@ class State extends Contract {
             }
         }
         // @ts-ignore
+        console.log({ promises });
         promises = await this.promiseRequests(promises);
         console.log({ promises });
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
@@ -5653,7 +5654,9 @@ class State extends Contract {
                 resolve([{ index: 0, hash: '0x0' }]);
                 debug$1('sync timed out');
             }, this.requestTimeout);
-            promises = await Promise.allSettled(promises);
+            console.log({ promises });
+            promises = await Promise.any(promises);
+            console.log({ promises });
             promises = promises.filter(({ status }) => status === 'fulfilled');
             clearTimeout(timeout);
             if (promises.length > 0) {
@@ -6364,7 +6367,10 @@ class Chain extends VersionControl {
         }
         let lastBlock;
         try {
-            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).encoded;
+            console.log('requesting last block from peer...');
+            console.log(await this.lastBlock);
+            console.log(new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')));
+            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).decoded;
         }
         catch (error) {
             const peerName = peer?.peerId || peer?.id || peer?.address || peerId || 'unknown';

package/exports/browser/node-browser.js

@@ -1,5 +1,5 @@
 import Peernet from '@leofcoin/peernet/browser';
-import { F as FormatInterface, T as TransactionMessage, C as ContractMessage, B as BlockMessage, b as BWMessage, c as BWRequestMessage, V as ValidatorMessage, D as DEFAULT_NODE_OPTIONS } from './constants-BKKQytjd.js';
+import { F as FormatInterface, T as TransactionMessage, C as ContractMessage, B as BlockMessage, b as BWMessage, c as BWRequestMessage, V as ValidatorMessage, L as LastBlockMessage, D as DEFAULT_NODE_OPTIONS } from './constants-BKKQytjd.js';
 
 var proto = {
     lastblock: Object(),
@@ -29,7 +29,8 @@ var nodeConfig = async (config = {
         { name: 'bw-message', handler: BWMessage },
         { name: 'bw-request-message', handler: BWRequestMessage },
         { name: 'validator-message', handler: ValidatorMessage },
-        { name: 'state-message', handler: StateMessage }
+        { name: 'state-message', handler: StateMessage },
+        { name: 'last-block', handler: LastBlockMessage }
     ];
     for (const proto of protos) {
         peernet.addProto(proto.name, proto.handler);

package/exports/chain.js

@@ -197,8 +197,8 @@ class Transaction extends Protocol {
         try {
             let data;
             const wait = new Promise(async (resolve, reject) => {
-                if (pubsub.subscribers[`transaction.completed.${hash}`]) {
-                    const result = pubsub.subscribers[`transaction.completed.${hash}`].value;
+                if (pubsub.hasSubscribers(`transaction.completed.${hash}`)) {
+                    const result = pubsub.getValue(`transaction.completed.${hash}`);
                     if (result.status !== 'fulfilled') {
                         await transactionPoolStore.delete(hash);
                     }
@@ -1648,7 +1648,7 @@ class State extends Contract {
             if (peer.connected && peer.version === this.version) {
                 const task = async () => {
                     try {
-                        const result = await peer.request(node.encode());
+                        const result = await peer.request(node.encoded);
                         debug$1({ result });
                         return { result: Uint8Array.from(Object.values(result)), peer };
                     }
@@ -1662,6 +1662,7 @@ class State extends Contract {
             }
         }
         // @ts-ignore
+        console.log({ promises });
         promises = await this.promiseRequests(promises);
         console.log({ promises });
         let latest = { index: 0, hash: '0x0', previousHash: '0x0' };
@@ -1794,7 +1795,9 @@ class State extends Contract {
                 resolve([{ index: 0, hash: '0x0' }]);
                 debug$1('sync timed out');
             }, this.requestTimeout);
-            promises = await Promise.allSettled(promises);
+            console.log({ promises });
+            promises = await Promise.any(promises);
+            console.log({ promises });
             promises = promises.filter(({ status }) => status === 'fulfilled');
             clearTimeout(timeout);
             if (promises.length > 0) {
@@ -2505,7 +2508,10 @@ class Chain extends VersionControl {
         }
         let lastBlock;
         try {
-            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).encoded;
+            console.log('requesting last block from peer...');
+            console.log(await this.lastBlock);
+            console.log(new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')));
+            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).decoded;
         }
         catch (error) {
             const peerName = peer?.peerId || peer?.id || peer?.address || peerId || 'unknown';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.8.19",
+  "version": "1.8.21",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -65,11 +65,11 @@
     "@leofcoin/contracts": "^0.1.16",
     "@leofcoin/crypto": "^0.2.37",
     "@leofcoin/errors": "^1.0.25",
-    "@leofcoin/lib": "^1.2.72",
+    "@leofcoin/lib": "^1.2.73",
     "@leofcoin/messages": "^1.4.40",
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/networks": "^1.1.25",
-    "@leofcoin/peernet": "^1.2.14",
+    "@leofcoin/peernet": "^1.2.15",
     "@leofcoin/storage": "^3.5.38",
     "@leofcoin/utils": "^1.1.40",
     "@leofcoin/workers": "^1.5.27",