@leofcoin/chain 1.5.15 → 1.5.17

package/exports/chain.js

@@ -4,7 +4,7 @@ import addresses, { contractFactory, nativeToken, validators, nameService } from
 import { calculateFee, createContractMessage, signTransaction, contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage } from '@leofcoin/lib';
 import { randombytes } from '@leofcoin/crypto';
 import EasyWorker from '@vandeurenglenn/easy-worker';
-import { isResolveError, ResolveError } from '@leofcoin/errors';
+import { ContractDeploymentError, ExecutionError, isResolveError, ResolveError, isExecutionError } from '@leofcoin/errors';
 
 const limit = 1800;
 const transactionLimit = 1800;
@@ -407,7 +407,7 @@ class Machine {
             }
         }
         catch (error) {
-            throw new Error(`contract deployment failed for ${parameters[0]}\n${error.message}`);
+            throw new ContractDeploymentError(`contract deployment failed for ${parameters[0]}\n${error.message}`);
         }
         return new Promise((resolve, reject) => {
             // @ts-ignore
@@ -415,7 +415,7 @@ class Machine {
             const onmessage = message => {
                 pubsub.unsubscribe(id, onmessage);
                 if (message?.error)
-                    reject(message.error);
+                    reject(new ExecutionError(message.error));
                 else
                     resolve(message);
             };
@@ -942,7 +942,7 @@ class State extends Contract {
                     if (lastTransactions.includes(hash)) {
                         console.log('removing invalid block');
                         await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
-                        blocks.splice(block.index);
+                        blocks.splice(block.index - 1, 1);
                         return this.#loadBlocks(blocks);
                     }
                     try {
@@ -963,6 +963,12 @@ class State extends Contract {
                         console.log(error);
                         await globalThis.transactionPoolStore.delete(hash);
                         console.log('removing invalid transaction');
+                        if (isExecutionError(error)) {
+                            console.log('removing invalid block');
+                            await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
+                            blocks.splice(block.index - 1, 1);
+                            return this.#loadBlocks(blocks);
+                        }
                         console.log(error);
                         return false;
                     }

package/exports/workers/block-worker.js

@@ -5894,21 +5894,21 @@ class BlockMessage extends FormatInterface {
         const name = 'block-message';
         super(buffer, proto, { name });
     }
-    encode() {
-        const decoded = this.decoded;
+    encode(decoded) {
+        decoded = decoded || this.decoded;
         const validators = [];
         const transactions = [];
         for (const validator of decoded.validators) {
             if (validator instanceof ValidatorMessage)
-                validators.push(validator.encoded);
+                validators.push(validator.encode());
             else
-                validators.push(new ValidatorMessage(validator).encoded);
+                validators.push(new ValidatorMessage(validator).encode());
         }
         for (const transaction of decoded.transactions) {
             if (transaction instanceof TransactionMessage)
-                transactions.push(transaction.encoded);
+                transactions.push(transaction.encode());
             else
-                transactions.push(new TransactionMessage(transaction).encoded);
+                transactions.push(new TransactionMessage(transaction).encode());
         }
         return super.encode({
             ...decoded,
@@ -5916,8 +5916,9 @@ class BlockMessage extends FormatInterface {
             transactions: index$5(transactions)
         });
     }
-    decode() {
-        super.decode();
+    decode(encoded) {
+        encoded = encoded || this.encoded;
+        super.decode(encoded);
         // @ts-ignore
         this.decoded.transactions = index$4(this.decoded.transactions).map(transaction => new TransactionMessage(transaction).decoded);
         // @ts-ignore
@@ -6019,28 +6020,28 @@ class EasyWorker {
   }  
 }
 
-const worker = new EasyWorker();
-
-globalThis.BigNumber = BigNumber;
-globalThis.contracts = {};
-
-const run = async (blocks) => {  
-  blocks = await Promise.all(blocks.map(block => new BlockMessage(block)));
-  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
-
-  blocks = await Promise.all(blocks.map(block => new Promise(async (resolve, reject) => {
-    // todo: tx worker or nah?
-    const size = block.encoded.length || block.encoded.byteLength;
-    console.log(`loaded block: ${await block.hash()} @${block.decoded.index} ${formatBytes(size)}`);
-    resolve(block);
-  })));
-  return blocks
-};
-
-const tasks = async blocks => {  
-  blocks = await run(blocks);
-  worker.postMessage(blocks);
-};
- 
-
+const worker = new EasyWorker();
+
+globalThis.BigNumber = BigNumber;
+globalThis.contracts = {};
+
+const run = async (blocks) => {  
+  blocks = await Promise.all(blocks.map(block => new BlockMessage(block)));
+  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
+
+  blocks = await Promise.all(blocks.map(block => new Promise(async (resolve, reject) => {
+    // todo: tx worker or nah?
+    const size = block.encoded.length || block.encoded.byteLength;
+    console.log(`loaded block: ${await block.hash()} @${block.decoded.index} ${formatBytes(size)}`);
+    resolve(block);
+  })));
+  return blocks
+};
+
+const tasks = async blocks => {  
+  blocks = await run(blocks);
+  worker.postMessage(blocks);
+};
+ 
+
 worker.onmessage(data => tasks(data));