@leofcoin/chain 1.8.15 → 1.8.17

package/exports/browser/chain.js

@@ -1,4 +1,4 @@
-import { t as toBase58, T as TransactionMessage, C as ContractMessage, R as RawTransactionMessage, B as BlockMessage, L as LastBlockMessage, P as PROTOCOL_VERSION, a as REACHED_ONE_ZERO_ZERO, u as utils, b as BWMessage, c as BWRequestMessage } from './constants-BKKQytjd.js';
+import { t as toBase58, T as TransactionMessage, C as ContractMessage, R as RawTransactionMessage, B as BlockMessage, u as utils, L as LastBlockMessage, P as PROTOCOL_VERSION, a as REACHED_ONE_ZERO_ZERO, b as BWMessage, c as BWRequestMessage } from './constants-BKKQytjd.js';
 import { log } from 'console';
 import { log as log$1 } from 'node:console';
 
@@ -963,7 +963,7 @@ function parseUnits(value, unit) {
     return FixedNumber.fromString(value, { decimals, width: 512 }).value;
 }
 
-const jsonStringifyBigInt = (key, value) => (typeof value === 'bigint' ? { $bigint: value.toString() } : value);
+const jsonStringifyBigInt$1 = (key, value) => (typeof value === 'bigint' ? { $bigint: value.toString() } : value);
 const jsonParseBigInt = (key, value) => typeof value === 'object' && value.$bigint ? BigInt(value.$bigint) : value;
 
 const byteFormats = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
@@ -4631,9 +4631,9 @@ class Machine {
                     await Promise.all(promises);
                 }
                 const tasks = [
-                    stateStore.put('lastBlock', JSON.stringify(await this.lastBlock, jsonStringifyBigInt)),
-                    stateStore.put('states', JSON.stringify(state, jsonStringifyBigInt)),
-                    stateStore.put('accounts', JSON.stringify(accounts, jsonStringifyBigInt)),
+                    stateStore.put('lastBlock', JSON.stringify(await this.lastBlock, jsonStringifyBigInt$1)),
+                    stateStore.put('states', JSON.stringify(state, jsonStringifyBigInt$1)),
+                    stateStore.put('accounts', JSON.stringify(accounts, jsonStringifyBigInt$1)),
                     stateStore.put('info', JSON.stringify({
                         nativeCalls: await this.nativeCalls,
                         nativeMints: await this.nativeMints,
@@ -4644,7 +4644,7 @@ class Machine {
                         totalMintAmount: await this.totalMintAmount,
                         totalTransferAmount: await this.totalTransferAmount,
                         totalBlocks: await blockStore.length
-                    }, jsonStringifyBigInt))
+                    }, jsonStringifyBigInt$1))
                     // accountsStore.clear()
                 ];
                 await Promise.all(tasks);
@@ -4710,7 +4710,7 @@ class Machine {
                         totalTransactions: BigInt(0),
                         totalBlocks: BigInt(0)
                     };
-                    rawInfo = JSON.stringify(this.states.info, jsonStringifyBigInt);
+                    rawInfo = JSON.stringify(this.states.info, jsonStringifyBigInt$1);
                     await stateStore.put('info', new TextEncoder().encode(rawInfo));
                 }
             }
@@ -4945,7 +4945,7 @@ class Machine {
         debug$2(`adding loaded block: ${block.index}@${block.hash}`);
         if (block.decoded)
             block = { ...block.decoded, hash: await block.hash() };
-        return this.#askWorker('addLoadedBlock', JSON.stringify(block, jsonStringifyBigInt));
+        return this.#askWorker('addLoadedBlock', JSON.stringify(block, jsonStringifyBigInt$1));
     }
     async latestTransactions() {
         return this.#askWorker('latestTransactions');
@@ -4994,6 +4994,16 @@ class Jobber {
     }
 }
 
+utils.addCodec({
+    name: 'last-block-message',
+    codec: 0x6c626d,
+    hashAlg: 'keccak-256'
+});
+const jsonStringifyBigInt = (key, value) => {
+    if (typeof value === 'bigint')
+        return value.toString();
+    return value;
+};
 const debug$1 = createDebugger('leofcoin/state');
 class State extends Contract {
     #resolveErrored;
@@ -5107,7 +5117,7 @@ class State extends Contract {
         };
         this.#lastBlockHandler = async () => {
             return new globalThis.peernet.protos['peernet-response']({
-                response: new Uint8Array(new LastBlockMessage(await this.lastBlock).encoded)
+                response: JSON.stringify(new LastBlockMessage(await this.lastBlock).decoded, jsonStringifyBigInt)
             });
         };
         this.#knownBlocksHandler = async () => {
@@ -6307,7 +6317,12 @@ class Chain extends VersionControl {
         try {
             let response = await peer.request(node.encoded);
             response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-            return response.decoded.response;
+            let decoded = response.decoded.response;
+            try {
+                decoded = JSON.parse(decoded);
+            }
+            catch { }
+            return decoded;
         }
         catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || 'unknown';
@@ -6354,7 +6369,7 @@ class Chain extends VersionControl {
         }
         let lastBlock;
         try {
-            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).decoded;
+            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).encoded;
         }
         catch (error) {
             const peerName = peer?.peerId || peer?.id || peer?.address || peerId || 'unknown';

package/exports/chain.js

@@ -1,5 +1,5 @@
 import { createDebugger } from '@vandeurenglenn/debug';
-import { formatBytes, jsonStringifyBigInt, jsonParseBigInt, parseUnits, formatUnits } from '@leofcoin/utils';
+import { formatBytes, jsonStringifyBigInt as jsonStringifyBigInt$1, jsonParseBigInt, parseUnits, formatUnits } from '@leofcoin/utils';
 import { TransactionMessage, BlockMessage, ContractMessage, LastBlockMessage, BWMessage, BWRequestMessage } from '@leofcoin/messages';
 import addresses, { contractFactory } from '@leofcoin/addresses';
 import { calculateFee, createContractMessage, signTransaction, contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage } from '@leofcoin/lib';
@@ -8,9 +8,9 @@ import { randombytes } from '@leofcoin/crypto';
 import EasyWorker from '@vandeurenglenn/easy-worker';
 import { ContractDeploymentError, ExecutionError, isResolveError, ResolveError, isExecutionError } from '@leofcoin/errors';
 import { log } from 'console';
+import codecs from '@leofcoin/codecs/utils';
 import { P as PROTOCOL_VERSION, R as REACHED_ONE_ZERO_ZERO } from './constants-eo0U5-D_.js';
 import { log as log$1 } from 'node:console';
-import codecs from '@leofcoin/codecs/utils';
 import '@leofcoin/networks';
 
 const limit = 1800;
@@ -772,9 +772,9 @@ class Machine {
                     await Promise.all(promises);
                 }
                 const tasks = [
-                    stateStore.put('lastBlock', JSON.stringify(await this.lastBlock, jsonStringifyBigInt)),
-                    stateStore.put('states', JSON.stringify(state, jsonStringifyBigInt)),
-                    stateStore.put('accounts', JSON.stringify(accounts, jsonStringifyBigInt)),
+                    stateStore.put('lastBlock', JSON.stringify(await this.lastBlock, jsonStringifyBigInt$1)),
+                    stateStore.put('states', JSON.stringify(state, jsonStringifyBigInt$1)),
+                    stateStore.put('accounts', JSON.stringify(accounts, jsonStringifyBigInt$1)),
                     stateStore.put('info', JSON.stringify({
                         nativeCalls: await this.nativeCalls,
                         nativeMints: await this.nativeMints,
@@ -785,7 +785,7 @@ class Machine {
                         totalMintAmount: await this.totalMintAmount,
                         totalTransferAmount: await this.totalTransferAmount,
                         totalBlocks: await blockStore.length
-                    }, jsonStringifyBigInt))
+                    }, jsonStringifyBigInt$1))
                     // accountsStore.clear()
                 ];
                 await Promise.all(tasks);
@@ -851,7 +851,7 @@ class Machine {
                         totalTransactions: BigInt(0),
                         totalBlocks: BigInt(0)
                     };
-                    rawInfo = JSON.stringify(this.states.info, jsonStringifyBigInt);
+                    rawInfo = JSON.stringify(this.states.info, jsonStringifyBigInt$1);
                     await stateStore.put('info', new TextEncoder().encode(rawInfo));
                 }
             }
@@ -1086,7 +1086,7 @@ class Machine {
         debug$2(`adding loaded block: ${block.index}@${block.hash}`);
         if (block.decoded)
             block = { ...block.decoded, hash: await block.hash() };
-        return this.#askWorker('addLoadedBlock', JSON.stringify(block, jsonStringifyBigInt));
+        return this.#askWorker('addLoadedBlock', JSON.stringify(block, jsonStringifyBigInt$1));
     }
     async latestTransactions() {
         return this.#askWorker('latestTransactions');
@@ -1135,6 +1135,16 @@ class Jobber {
     }
 }
 
+codecs.addCodec({
+    name: 'last-block-message',
+    codec: 0x6c626d,
+    hashAlg: 'keccak-256'
+});
+const jsonStringifyBigInt = (key, value) => {
+    if (typeof value === 'bigint')
+        return value.toString();
+    return value;
+};
 const debug$1 = createDebugger('leofcoin/state');
 class State extends Contract {
     #resolveErrored;
@@ -1248,7 +1258,7 @@ class State extends Contract {
         };
         this.#lastBlockHandler = async () => {
             return new globalThis.peernet.protos['peernet-response']({
-                response: new Uint8Array(new LastBlockMessage(await this.lastBlock).encoded)
+                response: JSON.stringify(new LastBlockMessage(await this.lastBlock).decoded, jsonStringifyBigInt)
             });
         };
         this.#knownBlocksHandler = async () => {
@@ -2448,7 +2458,12 @@ class Chain extends VersionControl {
         try {
             let response = await peer.request(node.encoded);
             response = await new globalThis.peernet.protos['peernet-response'](new Uint8Array(Object.values(response)));
-            return response.decoded.response;
+            let decoded = response.decoded.response;
+            try {
+                decoded = JSON.parse(decoded);
+            }
+            catch { }
+            return decoded;
         }
         catch (error) {
             const peerId = peer?.peerId || peer?.id || peer?.address || 'unknown';
@@ -2495,7 +2510,7 @@ class Chain extends VersionControl {
         }
         let lastBlock;
         try {
-            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).decoded;
+            lastBlock = new LastBlockMessage(await this.#makeRequest(peer, 'lastBlock')).encoded;
         }
         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.15",
+  "version": "1.8.17",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {