@leofcoin/chain 1.5.55 → 1.5.57

package/exports/browser/chain.js

@@ -3882,9 +3882,11 @@ class Machine {
                 const { from, nonce, hash } = data.result;
                 (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
                 await accountsStore.put(from, nonce);
+                break;
             }
             case 'contractError': {
-                console.warn(`removing contract ${data.hash}`);
+                console.warn(data.error);
+                console.warn(`contract error: ${data.hash}`);
                 // @ts-ignore
                 await contractStore.delete(data.hash);
                 break;
@@ -4521,8 +4523,9 @@ class State extends Contract {
         let node = await globalThis.peernet.prepareMessage(data);
         console.log(node.encoded);
         console.log(node.encode());
-        for (const peer of globalThis.peernet?.connections) {
+        for (const id in globalThis.peernet.connections) {
             // @ts-ignore
+            const peer = globalThis.peernet.connections[id];
             if (peer.connected && peer.version === this.version) {
                 const task = async () => {
                     try {

package/exports/browser/workers/block-worker.js

@@ -20,6 +20,7 @@ const run = async (blocks) => {
           const index = block.decoded.index;
           console.log(`loaded block: ${hash} @${index} ${formatBytes(size)}`);
           // todo we don't want this, need shared state
+          block.decoded.transactions = block.decoded.transactions.sort((a, b) => a.nonce - b.nonce);
           resolve({ ...block.decoded, blockInfo: { hash, size, index } });
         })
     )

package/exports/browser/workers/machine-worker.js

@@ -62,13 +62,14 @@ const runContract = async ({ decoded, hash, encoded }) => {
     contracts[hash] = await new Contract(...params);
     worker.postMessage({
       type: 'debug',
-      messages: [`loaded contract: ${hash}`, `size: ${formatBytes(encoded.length)}`]
+      message: `loaded contract: ${hash} size: ${formatBytes(encoded.length)}`
     });
   } catch (e) {
     console.log(e);
     worker.postMessage({
       type: 'contractError',
-      hash: await contractMessage.hash()
+      message: e.message,
+      hash
     });
   }
 };
@@ -134,7 +135,6 @@ const _init = async ({ contracts, blocks, peerid }) => {
       type: 'module'
     });
     blocks = await _worker.once(blocks);
-    console.log({ blocks });
     _worker = null;
     // blocks = unique(globalThis.blocks ? globalThis : [], blocks)
     // for (let i = 0; i < blocks.length; i++) {

package/exports/chain.js

@@ -293,9 +293,11 @@ class Machine {
                 const { from, nonce, hash } = data.result;
                 (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
                 await accountsStore.put(from, nonce);
+                break;
             }
             case 'contractError': {
-                console.warn(`removing contract ${data.hash}`);
+                console.warn(data.error);
+                console.warn(`contract error: ${data.hash}`);
                 // @ts-ignore
                 await contractStore.delete(data.hash);
                 break;
@@ -932,8 +934,9 @@ class State extends Contract {
         let node = await globalThis.peernet.prepareMessage(data);
         console.log(node.encoded);
         console.log(node.encode());
-        for (const peer of globalThis.peernet?.connections) {
+        for (const id in globalThis.peernet.connections) {
             // @ts-ignore
+            const peer = globalThis.peernet.connections[id];
             if (peer.connected && peer.version === this.version) {
                 const task = async () => {
                     try {

package/exports/workers/block-worker.js

@@ -20,6 +20,7 @@ const run = async (blocks) => {
           const index = block.decoded.index;
           console.log(`loaded block: ${hash} @${index} ${formatBytes(size)}`);
           // todo we don't want this, need shared state
+          block.decoded.transactions = block.decoded.transactions.sort((a, b) => a.nonce - b.nonce);
           resolve({ ...block.decoded, blockInfo: { hash, size, index } });
         })
     )

package/exports/workers/machine-worker.js

@@ -62,13 +62,14 @@ const runContract = async ({ decoded, hash, encoded }) => {
     contracts[hash] = await new Contract(...params);
     worker.postMessage({
       type: 'debug',
-      messages: [`loaded contract: ${hash}`, `size: ${formatBytes(encoded.length)}`]
+      message: `loaded contract: ${hash} size: ${formatBytes(encoded.length)}`
     });
   } catch (e) {
     console.log(e);
     worker.postMessage({
       type: 'contractError',
-      hash: await contractMessage.hash()
+      message: e.message,
+      hash
     });
   }
 };
@@ -134,7 +135,6 @@ const _init = async ({ contracts, blocks, peerid }) => {
       type: 'module'
     });
     blocks = await _worker.once(blocks);
-    console.log({ blocks });
     _worker = null;
     // blocks = unique(globalThis.blocks ? globalThis : [], blocks)
     // for (let i = 0; i < blocks.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.5.55",
+  "version": "1.5.57",
   "description": "Official javascript implementation",
   "exports": {
     "./node": {