@leofcoin/chain 1.5.15 → 1.5.16

package/exports/browser/chain.js

@@ -808,6 +808,28 @@ class EasyWorker {
   }  
 }
 
+class LeofcoinError extends Error {
+    #message;
+    constructor(message, options) {
+        super(message, options);
+        this.#message = message;
+    }
+    get message() {
+        return `${this.name}: ${this.#message}`;
+    }
+}
+class ResolveError extends LeofcoinError {
+    name = 'ResolveError';
+}
+class ExecutionError extends LeofcoinError {
+    name = 'ExecutionError';
+}
+class ContractDeploymentError extends LeofcoinError {
+    name = 'ContractDeploymentError';
+}
+const isResolveError = (error) => error.name === 'ResolveError';
+const isExecutionError = (error) => error.name === 'ExecutionError';
+
 // import State from './state'
 class Machine {
     #contracts;
@@ -949,7 +971,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
@@ -957,7 +979,7 @@ class Machine {
             const onmessage = message => {
                 pubsub.unsubscribe(id, onmessage);
                 if (message?.error)
-                    reject(message.error);
+                    reject(new ExecutionError(message.error));
                 else
                     resolve(message);
             };
@@ -1056,21 +1078,6 @@ class Jobber {
     }
 }
 
-class LeofcoinError extends Error {
-    #message;
-    constructor(message, options) {
-        super(message, options);
-        this.#message = message;
-    }
-    get message() {
-        return `${this.name}: ${this.#message}`;
-    }
-}
-class ResolveError extends LeofcoinError {
-    name = 'ResolveError';
-}
-const isResolveError = (error) => error.name === 'ResolveError';
-
 class State extends Contract {
     #resolveErrored;
     #lastResolvedTime;
@@ -1499,7 +1506,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 {
@@ -1518,8 +1525,15 @@ class State extends Contract {
                     }
                     catch (error) {
                         console.log(error);
+                        console.log(blocks, block.index);
                         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/browser/{index-329e0324-71fa9c50.js → index-329e0324-0b2da3d5.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-af58f01b.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-f07d5ecd.js';
 import './index-e8f03811.js';
 
 /**

package/exports/browser/{messages-000b7f84-88d5e15b.js → messages-000b7f84-854cd18c.js}

@@ -1,4 +1,4 @@
-import { F as FormatInterface } from './node-browser-af58f01b.js';
+import { F as FormatInterface } from './node-browser-f07d5ecd.js';
 import './index-e8f03811.js';
 
 var proto$b = {

package/exports/browser/{node-browser-af58f01b.js → node-browser-f07d5ecd.js}

@@ -5,19 +5,19 @@ var nodeConfig = async (config = {
     networkName: 'leofcoin:peach',
     networkVersion: 'v1.0.0'
 }) => {
-    await globalThis.peernet.addProto('contract-message', ContractMessage);
-    await globalThis.peernet.addProto('transaction-message', TransactionMessage);
-    await globalThis.peernet.addProto('block-message', BlockMessage);
-    await globalThis.peernet.addProto('bw-message', BWMessage);
-    await globalThis.peernet.addProto('bw-request-message', BWRequestMessage);
-    await globalThis.peernet.addProto('validator-message', ValidatorMessage);
+    await peernet.addProto('contract-message', ContractMessage);
+    await peernet.addProto('transaction-message', TransactionMessage);
+    await peernet.addProto('block-message', BlockMessage);
+    await peernet.addProto('bw-message', BWMessage);
+    await peernet.addProto('bw-request-message', BWRequestMessage);
+    await peernet.addProto('validator-message', ValidatorMessage);
     let name = `.${config.network}`;
     const parts = config.network.split(':');
     if (parts[1])
         name = `.${parts[0]}/${parts[1]}`;
-    await globalThis.peernet.addStore('contract', 'lfc', name, false);
-    await globalThis.peernet.addStore('accounts', 'lfc', name, false);
-    await globalThis.peernet.addStore('transactionPool', 'lfc', name, false);
+    await peernet.addStore('contract', 'lfc', name, false);
+    await peernet.addStore('accounts', 'lfc', name, false);
+    await peernet.addStore('transactionPool', 'lfc', name, false);
 };
 
 const encode$9 = (string) => {
@@ -20216,7 +20216,7 @@ class Identity {
             this.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-329e0324-71fa9c50.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-329e0324-0b2da3d5.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -20407,7 +20407,7 @@ class Peernet {
         this.root = options.root;
         const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile
         // FolderMessageResponse
-         } = await import(/* webpackChunkName: "messages" */ './messages-000b7f84-88d5e15b.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-000b7f84-854cd18c.js');
         /**
          * proto Object containing protos
          * @type {Object}

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-af58f01b.js';
+export { N as default } from './node-browser-f07d5ecd.js';
 import './index-e8f03811.js';

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 {
@@ -961,8 +961,15 @@ class State extends Contract {
                     }
                     catch (error) {
                         console.log(error);
+                        console.log(blocks, block.index);
                         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/package.json

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