@leofcoin/chain 1.7.157 → 1.8.1

package/exports/browser/chain.js

@@ -4189,7 +4189,7 @@ class Machine {
                 break;
             }
             case 'debug': {
-                debug$2(data.message);
+                // debug(data.message)
                 if (data.message.includes('loaded transactions for block:')) {
                     pubsub.publish('block-loaded', data.message.replace('loaded transactions for block: ', '').split(' @')[0]);
                 }
@@ -4576,7 +4576,7 @@ class Machine {
     }
     async addLoadedBlock(block) {
         debug$2(`adding loaded block: ${block.index}@${block.hash}`);
-        // debug(JSON.stringify(block, jsonStringifyBigInt))
+        debug$2(JSON.stringify(block, jsonStringifyBigInt));
         if (block.decoded)
             block = { ...block.decoded, hash: await block.hash() };
         return this.#askWorker('addLoadedBlock', JSON.stringify(block, jsonStringifyBigInt));
@@ -4640,7 +4640,6 @@ class State extends Contract {
     // Block resolution state
     #resolvingBlocks;
     #maxConcurrentResolves;
-    #txConcurrency;
     #totalSize;
     #lastResolved;
     #lastResolvedTime;
@@ -4727,7 +4726,6 @@ class State extends Contract {
         // Block resolution state
         this.#resolvingBlocks = new Set();
         this.#maxConcurrentResolves = 10;
-        this.#txConcurrency = 25;
         this.knownBlocks = [];
         this.#totalSize = 0;
         this._wantList = [];
@@ -4871,9 +4869,16 @@ class State extends Contract {
             }
             // Fetch all missing transactions in parallel
             if (transactionsToFetch.length > 0) {
-                const fetchedTransactions = await Promise.all(transactionsToFetch.map((txHash) => globalThis.peernet.get(txHash, 'transaction')));
-                // Batch store all transactions
-                await Promise.all(transactionsToFetch.map((txHash, i) => globalThis.transactionStore.put(txHash, fetchedTransactions[i])));
+                const fetchedResults = await Promise.allSettled(transactionsToFetch.map((txHash) => globalThis.peernet.get(txHash, 'transaction')));
+                // Batch store all transactions that were successfully fetched
+                for (let i = 0; i < fetchedResults.length; i++) {
+                    if (fetchedResults[i].status === 'fulfilled') {
+                        await globalThis.transactionStore.put(transactionsToFetch[i], fetchedResults[i].value);
+                    }
+                    else {
+                        debug$1(`failed to fetch transaction ${transactionsToFetch[i]}: ${fetchedResults[i].reason?.message || fetchedResults[i].reason}`);
+                    }
+                }
             }
             // Remove from pool
             await Promise.all(transactionHashes.map(async (txHash) => {
@@ -4896,52 +4901,6 @@ class State extends Contract {
             this.#resolvingBlocks.delete(hash);
         }
     }
-    // Small utility to keep event loop responsive
-    async #sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
-    // Run a list of tasks with bounded concurrency
-    async #runWithConcurrency(items, concurrency, handler) {
-        let index = 0;
-        const total = items.length;
-        const worker = async () => {
-            while (true) {
-                const current = index++;
-                if (current >= total)
-                    break;
-                try {
-                    await handler(items[current], current);
-                    if (current % 50 === 0)
-                        debug$1(`executed ${current}/${total}`);
-                }
-                catch (e) {
-                    debug$1(`transaction handler error at ${current}: ${e}`);
-                }
-                // yield a tick every few ops to avoid blocking
-                if (current % 25 === 0)
-                    await this.#sleep(1);
-            }
-        };
-        const workers = Array.from({ length: Math.min(concurrency, Math.max(1, total)) }, () => worker());
-        await Promise.all(workers);
-    }
-    // Execute a single transaction with a timeout to avoid indefinite hangs
-    async #executeWithTimeout(transaction, timeoutMs) {
-        const timeout = timeoutMs ?? this.resolveTimeout ?? 5000;
-        let timer;
-        try {
-            return await Promise.race([
-                this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params),
-                new Promise((_, reject) => {
-                    timer = setTimeout(() => reject(new Error('transaction execution timeout')), timeout);
-                })
-            ]);
-        }
-        finally {
-            if (timer)
-                clearTimeout(timer);
-        }
-    }
     async #buildBlockChain(latestHash, maxBlocks = 1000) {
         const chain = [];
         let currentHash = latestHash;
@@ -5137,7 +5096,7 @@ class State extends Contract {
     // todo throw error
     async #_executeTransaction(transaction) {
         try {
-            await this.#executeWithTimeout(transaction);
+            await this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params);
             // await globalThis.accountsStore.put(transaction.decoded.from, String(transaction.decoded.nonce))
             // if (transaction.decoded.to === nativeToken) {
             //   this.#nativeCalls += 1
@@ -5203,8 +5162,7 @@ class State extends Contract {
                     }
                     transactions = transactions.filter((transaction) => !transaction.decoded.priority);
                     debug$1(`executing ${transactions.length} transactions for block ${block.index}`);
-                    // Concurrency-limited execution to avoid blocking on large blocks
-                    await this.#runWithConcurrency(transactions, this.#txConcurrency, async (tx) => this.#_executeTransaction(tx));
+                    await Promise.all(transactions.map((transaction) => this.#_executeTransaction(transaction)));
                     this.#blocks[block.index].loaded = true;
                     debug$1(`executed transactions for block ${block.index}`);
                     if (Number(block.index) === 0)
@@ -5915,8 +5873,9 @@ class Chain extends VersionControl {
         }
     }
     async #addBlock(block) {
-        const receivedEncoded = block instanceof BlockMessage ? block.encoded : this.#normalizeBytes(block);
-        const blockMessage = await new BlockMessage(receivedEncoded);
+        // Store the original received encoded bytes for validation
+        const receivedEncoded = block instanceof BlockMessage ? block.encoded : block;
+        const blockMessage = await new BlockMessage(block);
         const hash = await blockMessage.hash();
         // Verify data integrity: re-encode should produce the same bytes
         const canonicalEncoded = blockMessage.encoded;
@@ -6156,7 +6115,7 @@ class Chain extends VersionControl {
             debug(`created block: ${hash} @${block.index}`);
             // Publish canonical encoded form via codec interface
             console.log(`[chain] 📤 Publishing block #${block.index} | hash: ${hash} | encoded bytes: ${blockMessage.encoded.length}`);
-            globalThis.peernet.publish('add-block', Array.from(blockMessage.encoded));
+            globalThis.peernet.publish('add-block', blockMessage.decoded);
             globalThis.pubsub.publish('add-block', blockMessage.decoded);
         }
         catch (error) {
@@ -6191,7 +6150,7 @@ class Chain extends VersionControl {
         const transactionMessage = await new TransactionMessage({ ...transaction });
         const event = await super.sendTransaction(transactionMessage);
         this.#sendTransaction(transactionMessage.encoded);
-        globalThis.peernet.publish('send-transaction', transactionMessage.encoded);
+        globalThis.peernet.publish('send-transaction', transactionMessage.decoded);
         return event;
     }
     async addContract(transaction, contractMessage) {
@@ -6297,26 +6256,6 @@ class Chain extends VersionControl {
             console.warn('Failed to reconnect to peers:', error.message);
         }
     }
-    #normalizeBytes(input) {
-        if (input instanceof Uint8Array)
-            return input;
-        if (Array.isArray(input))
-            return Uint8Array.from(input);
-        if (input && typeof input === 'object') {
-            if (input.type === 'Buffer' && Array.isArray(input.data))
-                return Uint8Array.from(input.data);
-            const values = Object.values(input);
-            if (values.length > 0 && values.every((v) => typeof v === 'number'))
-                return Uint8Array.from(values);
-        }
-        try {
-            // @ts-ignore
-            return new Uint8Array(input);
-        }
-        catch {
-            throw new Error('Unsupported block payload format for normalization');
-        }
-    }
 }
 
 export { Chain as default };

package/exports/chain.js

@@ -330,7 +330,7 @@ class Machine {
                 break;
             }
             case 'debug': {
-                debug$2(data.message);
+                // debug(data.message)
                 if (data.message.includes('loaded transactions for block:')) {
                     pubsub.publish('block-loaded', data.message.replace('loaded transactions for block: ', '').split(' @')[0]);
                 }
@@ -717,7 +717,7 @@ class Machine {
     }
     async addLoadedBlock(block) {
         debug$2(`adding loaded block: ${block.index}@${block.hash}`);
-        // debug(JSON.stringify(block, jsonStringifyBigInt))
+        debug$2(JSON.stringify(block, jsonStringifyBigInt));
         if (block.decoded)
             block = { ...block.decoded, hash: await block.hash() };
         return this.#askWorker('addLoadedBlock', JSON.stringify(block, jsonStringifyBigInt));
@@ -781,7 +781,6 @@ class State extends Contract {
     // Block resolution state
     #resolvingBlocks;
     #maxConcurrentResolves;
-    #txConcurrency;
     #totalSize;
     #lastResolved;
     #lastResolvedTime;
@@ -868,7 +867,6 @@ class State extends Contract {
         // Block resolution state
         this.#resolvingBlocks = new Set();
         this.#maxConcurrentResolves = 10;
-        this.#txConcurrency = 25;
         this.knownBlocks = [];
         this.#totalSize = 0;
         this._wantList = [];
@@ -1012,9 +1010,16 @@ class State extends Contract {
             }
             // Fetch all missing transactions in parallel
             if (transactionsToFetch.length > 0) {
-                const fetchedTransactions = await Promise.all(transactionsToFetch.map((txHash) => globalThis.peernet.get(txHash, 'transaction')));
-                // Batch store all transactions
-                await Promise.all(transactionsToFetch.map((txHash, i) => globalThis.transactionStore.put(txHash, fetchedTransactions[i])));
+                const fetchedResults = await Promise.allSettled(transactionsToFetch.map((txHash) => globalThis.peernet.get(txHash, 'transaction')));
+                // Batch store all transactions that were successfully fetched
+                for (let i = 0; i < fetchedResults.length; i++) {
+                    if (fetchedResults[i].status === 'fulfilled') {
+                        await globalThis.transactionStore.put(transactionsToFetch[i], fetchedResults[i].value);
+                    }
+                    else {
+                        debug$1(`failed to fetch transaction ${transactionsToFetch[i]}: ${fetchedResults[i].reason?.message || fetchedResults[i].reason}`);
+                    }
+                }
             }
             // Remove from pool
             await Promise.all(transactionHashes.map(async (txHash) => {
@@ -1037,52 +1042,6 @@ class State extends Contract {
             this.#resolvingBlocks.delete(hash);
         }
     }
-    // Small utility to keep event loop responsive
-    async #sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
-    }
-    // Run a list of tasks with bounded concurrency
-    async #runWithConcurrency(items, concurrency, handler) {
-        let index = 0;
-        const total = items.length;
-        const worker = async () => {
-            while (true) {
-                const current = index++;
-                if (current >= total)
-                    break;
-                try {
-                    await handler(items[current], current);
-                    if (current % 50 === 0)
-                        debug$1(`executed ${current}/${total}`);
-                }
-                catch (e) {
-                    debug$1(`transaction handler error at ${current}: ${e}`);
-                }
-                // yield a tick every few ops to avoid blocking
-                if (current % 25 === 0)
-                    await this.#sleep(1);
-            }
-        };
-        const workers = Array.from({ length: Math.min(concurrency, Math.max(1, total)) }, () => worker());
-        await Promise.all(workers);
-    }
-    // Execute a single transaction with a timeout to avoid indefinite hangs
-    async #executeWithTimeout(transaction, timeoutMs) {
-        const timeout = timeoutMs ?? this.resolveTimeout ?? 5000;
-        let timer;
-        try {
-            return await Promise.race([
-                this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params),
-                new Promise((_, reject) => {
-                    timer = setTimeout(() => reject(new Error('transaction execution timeout')), timeout);
-                })
-            ]);
-        }
-        finally {
-            if (timer)
-                clearTimeout(timer);
-        }
-    }
     async #buildBlockChain(latestHash, maxBlocks = 1000) {
         const chain = [];
         let currentHash = latestHash;
@@ -1278,7 +1237,7 @@ class State extends Contract {
     // todo throw error
     async #_executeTransaction(transaction) {
         try {
-            await this.#executeWithTimeout(transaction);
+            await this.#machine.execute(transaction.decoded.to, transaction.decoded.method, transaction.decoded.params);
             // await globalThis.accountsStore.put(transaction.decoded.from, String(transaction.decoded.nonce))
             // if (transaction.decoded.to === nativeToken) {
             //   this.#nativeCalls += 1
@@ -1344,8 +1303,7 @@ class State extends Contract {
                     }
                     transactions = transactions.filter((transaction) => !transaction.decoded.priority);
                     debug$1(`executing ${transactions.length} transactions for block ${block.index}`);
-                    // Concurrency-limited execution to avoid blocking on large blocks
-                    await this.#runWithConcurrency(transactions, this.#txConcurrency, async (tx) => this.#_executeTransaction(tx));
+                    await Promise.all(transactions.map((transaction) => this.#_executeTransaction(transaction)));
                     this.#blocks[block.index].loaded = true;
                     debug$1(`executed transactions for block ${block.index}`);
                     if (Number(block.index) === 0)
@@ -2056,8 +2014,9 @@ class Chain extends VersionControl {
         }
     }
     async #addBlock(block) {
-        const receivedEncoded = block instanceof BlockMessage ? block.encoded : this.#normalizeBytes(block);
-        const blockMessage = await new BlockMessage(receivedEncoded);
+        // Store the original received encoded bytes for validation
+        const receivedEncoded = block instanceof BlockMessage ? block.encoded : block;
+        const blockMessage = await new BlockMessage(block);
         const hash = await blockMessage.hash();
         // Verify data integrity: re-encode should produce the same bytes
         const canonicalEncoded = blockMessage.encoded;
@@ -2297,7 +2256,7 @@ class Chain extends VersionControl {
             debug(`created block: ${hash} @${block.index}`);
             // Publish canonical encoded form via codec interface
             console.log(`[chain] 📤 Publishing block #${block.index} | hash: ${hash} | encoded bytes: ${blockMessage.encoded.length}`);
-            globalThis.peernet.publish('add-block', Array.from(blockMessage.encoded));
+            globalThis.peernet.publish('add-block', blockMessage.decoded);
             globalThis.pubsub.publish('add-block', blockMessage.decoded);
         }
         catch (error) {
@@ -2332,7 +2291,7 @@ class Chain extends VersionControl {
         const transactionMessage = await new TransactionMessage({ ...transaction });
         const event = await super.sendTransaction(transactionMessage);
         this.#sendTransaction(transactionMessage.encoded);
-        globalThis.peernet.publish('send-transaction', transactionMessage.encoded);
+        globalThis.peernet.publish('send-transaction', transactionMessage.decoded);
         return event;
     }
     async addContract(transaction, contractMessage) {
@@ -2438,26 +2397,6 @@ class Chain extends VersionControl {
             console.warn('Failed to reconnect to peers:', error.message);
         }
     }
-    #normalizeBytes(input) {
-        if (input instanceof Uint8Array)
-            return input;
-        if (Array.isArray(input))
-            return Uint8Array.from(input);
-        if (input && typeof input === 'object') {
-            if (input.type === 'Buffer' && Array.isArray(input.data))
-                return Uint8Array.from(input.data);
-            const values = Object.values(input);
-            if (values.length > 0 && values.every((v) => typeof v === 'number'))
-                return Uint8Array.from(values);
-        }
-        try {
-            // @ts-ignore
-            return new Uint8Array(input);
-        }
-        catch {
-            throw new Error('Unsupported block payload format for normalization');
-        }
-    }
 }
 
 export { Chain as default };

package/package.json

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