@leofcoin/chain 1.4.91 → 1.4.93

package/exports/browser/{index-fd1bc5f0.js → index-b32f624f.js}

@@ -6081,4 +6081,4 @@ class RawTransactionMessage extends FormatInterface {
     }
 }
 
-export { BigNumber as B, ContractMessage as C, Logger as L, RawTransactionMessage as R, TransactionMessage as T, ValidatorMessage as V, arrayify as a, isBytes as b, BlockMessage as c, BWMessage as d, BWRequestMessage as e, getDefaultExportFromCjs as g, hexZeroPad as h, isBigNumberish as i, toBase58 as t, version as v };
+export { BigNumber as B, ContractMessage as C, Logger as L, RawTransactionMessage as R, TransactionMessage as T, ValidatorMessage as V, arrayify as a, isBytes as b, BlockMessage as c, BWMessage as d, BWRequestMessage as e, hexZeroPad as h, isBigNumberish as i, toBase58 as t, version as v };

package/exports/browser/{index-ed6cbdf7-cced6308.js → index-ed6cbdf7-8662153e.js}

@@ -1,5 +1,5 @@
-import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-e89e6592.js';
-import './index-fd1bc5f0.js';
+import { M as MultiWallet, e as encrypt, b as base58$1 } from './node-browser-b56b946d.js';
+import './index-b32f624f.js';
 
 /**
  * @params {String} network

package/exports/browser/{messages-35d069e1-0b6352ff.js → messages-35d069e1-7ad3a4bb.js}

@@ -1,5 +1,5 @@
-import { F as FormatInterface } from './node-browser-e89e6592.js';
-import './index-fd1bc5f0.js';
+import { F as FormatInterface } from './node-browser-b56b946d.js';
+import './index-b32f624f.js';
 
 var proto$b = {
   data: new Uint8Array(),

package/exports/browser/{node-browser-e89e6592.js → node-browser-b56b946d.js}

@@ -1,4 +1,4 @@
-import { C as ContractMessage, T as TransactionMessage, c as BlockMessage, d as BWMessage, e as BWRequestMessage, V as ValidatorMessage } from './index-fd1bc5f0.js';
+import { C as ContractMessage, T as TransactionMessage, c as BlockMessage, d as BWMessage, e as BWRequestMessage, V as ValidatorMessage } from './index-b32f624f.js';
 
 var nodeConfig = async (config = {
     network: 'leofcoin:peach',
@@ -20166,7 +20166,7 @@ class Identity {
             globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-ed6cbdf7-cced6308.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-ed6cbdf7-8662153e.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));
@@ -20345,7 +20345,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-35d069e1-0b6352ff.js');
+         } = await import(/* webpackChunkName: "messages" */ './messages-35d069e1-7ad3a4bb.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -20873,15 +20873,26 @@ class Peernet {
 }
 globalThis.Peernet = Peernet;
 
+// todo only one star needed, no need to have one for each network
+// unless we change anything to the star protocoll
+// version diferences should be handled in the chain
+// maybe a good way to handle could be in p2pt-swarm
 var networks = {
     leofcoin: {
         mainnet: {
-            port: 33333,
-            stars: ['wss://mainnet.leofcoin.org'] // todo webrtc and bittorent stars
+            // ports don't really matter since it is favorable to have it begind a ngninx proxy but if we change something to the proto it's easier maybe?
+            port: 44444,
+            // todo a versionhash would be nice to have as a double check?
+            versionHash: '0',
+            // a short description identifying the version
+            description: 'Main net current version',
+            stars: ['wss://star.leofcoin.org'] // todo webrtc and bittorent stars
         },
         peach: {
             port: 44444,
-            stars: ['wss://peach.leofcoin.org'] // todo webrtc and bittorent stars
+            description: 'Main testnet: latest step before merging into main',
+            versionHash: '1',
+            stars: ['wss://star.leofcoin.org'] // todo webrtc and bittorent stars
         }
     }
 };

package/exports/browser/node-browser.js

@@ -1,2 +1,2 @@
-export { N as default } from './node-browser-e89e6592.js';
-import './index-fd1bc5f0.js';
+export { N as default } from './node-browser-b56b946d.js';
+import './index-b32f624f.js';

package/exports/chain.js

@@ -2,7 +2,6 @@ import { formatBytes, BigNumber, formatUnits, parseUnits } from '@leofcoin/utils
 import { TransactionMessage, BlockMessage, ContractMessage, BWMessage, BWRequestMessage } from '@leofcoin/messages';
 import addresses, { contractFactory, nativeToken, validators, nameService } from '@leofcoin/addresses';
 import { calculateFee, createContractMessage, contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage, signTransaction } from '@leofcoin/lib';
-import PQueue from 'p-queue';
 import { randombytes } from '@leofcoin/crypto';
 import EasyWorker from '@vandeurenglenn/easy-worker';
 
@@ -11,8 +10,9 @@ const transactionLimit = 1800;
 const requestTimeout = 30000;
 const syncTimeout = 30000;
 class Protocol {
-    version;
-    resolveTimeout = 30000;
+    constructor() {
+        this.resolveTimeout = 30000;
+    }
     get limit() {
         return limit;
     }
@@ -254,11 +254,12 @@ class Contract extends Transaction {
 
 // import State from './state'
 class Machine {
-    worker;
-    #contracts = {};
-    #nonces = {};
-    lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
+    #contracts;
+    #nonces;
     constructor(blocks) {
+        this.#contracts = {};
+        this.#nonces = {};
+        this.lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
         // @ts-ignore
         return this.#init(blocks);
     }
@@ -472,10 +473,8 @@ class Machine {
 }
 
 class Jobber {
-    timeout;
-    busy = false;
-    stop;
     constructor(timeout) {
+        this.busy = false;
         this.timeout = timeout;
     }
     add(fn) {
@@ -497,24 +496,22 @@ class Jobber {
     }
 }
 
-new PQueue({ concurrency: 1, throwOnTimeout: true });
 class State extends Contract {
     #resolveErrored;
     #lastResolvedTime;
     #lastResolved;
-    #resolving = false;
-    #resolveErrorCount = 0;
+    #resolving;
+    #resolveErrorCount;
     #syncState;
     #lastBlockInQue;
-    #syncErrorCount = 0;
-    #blockHashMap = new Map();
-    #chainSyncing = false;
-    #lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
-    #blocks = [];
-    knownBlocks = [];
-    #totalSize = 0;
+    #syncErrorCount;
+    #blockHashMap;
+    #chainSyncing;
+    #lastBlock;
+    #blocks;
+    #totalSize;
     #machine;
-    #loaded = false;
+    #loaded;
     get blockHashMap() {
         return this.#blockHashMap.entries();
     }
@@ -527,26 +524,26 @@ class State extends Contract {
     /**
      * amount the native token has been iteracted with
      */
-    #nativeCalls = 0;
+    #nativeCalls;
     /**
      * amount the native token has been iteracted with
      */
-    #nativeTransfers = 0;
+    #nativeTransfers;
     /**
      * amount of native token burned
      * {Number}
      */
-    #nativeBurns = 0;
+    #nativeBurns;
     /**
      * amount of native tokens minted
      * {Number}
      */
-    #nativeMints = 0;
+    #nativeMints;
     /**
      * total amount of transactions
      * {Number}
      */
-    #totalTransactions = 0;
+    #totalTransactions;
     get nativeMints() {
         return this.#nativeMints;
     }
@@ -576,6 +573,46 @@ class State extends Contract {
     }
     constructor() {
         super();
+        this.#resolving = false;
+        this.#resolveErrorCount = 0;
+        this.#syncErrorCount = 0;
+        this.#blockHashMap = new Map();
+        this.#chainSyncing = false;
+        this.#lastBlock = { index: 0, hash: '0x0', previousHash: '0x0' };
+        this.#blocks = [];
+        this.knownBlocks = [];
+        this.#totalSize = 0;
+        this.#loaded = false;
+        /**
+         * amount the native token has been iteracted with
+         */
+        this.#nativeCalls = 0;
+        /**
+         * amount the native token has been iteracted with
+         */
+        this.#nativeTransfers = 0;
+        /**
+         * amount of native token burned
+         * {Number}
+         */
+        this.#nativeBurns = 0;
+        /**
+         * amount of native tokens minted
+         * {Number}
+         */
+        this.#nativeMints = 0;
+        /**
+         * total amount of transactions
+         * {Number}
+         */
+        this.#totalTransactions = 0;
+        this.#loadBlockTransactions = (transactions) => Promise.all(transactions.map((transaction) => new TransactionMessage(transaction)));
+        this.#getLastTransactions = async () => {
+            let lastTransactions = (await Promise.all(this.#blocks.filter(block => block.loaded).slice(-128)
+                .map(block => this.#loadBlockTransactions(block.transactions))))
+                .reduce((all, transactions) => [...all, ...transactions], []);
+            return Promise.all(lastTransactions.map(transaction => transaction.hash()));
+        };
     }
     async init() {
         this.jobber = new Jobber(30000);
@@ -739,7 +776,6 @@ class State extends Contract {
         catch (error) {
             console.error(error);
         }
-        // await queue.clear()
         this.#chainSyncing = true;
         if (!lastBlock)
             lastBlock = await this.#getLatestBlock();
@@ -836,13 +872,8 @@ class State extends Contract {
         }
         return latest;
     }
-    #loadBlockTransactions = (transactions) => Promise.all(transactions.map((transaction) => new TransactionMessage(transaction)));
-    #getLastTransactions = async () => {
-        let lastTransactions = (await Promise.all(this.#blocks.filter(block => block.loaded).slice(-128)
-            .map(block => this.#loadBlockTransactions(block.transactions))))
-            .reduce((all, transactions) => [...all, ...transactions], []);
-        return Promise.all(lastTransactions.map(transaction => transaction.hash()));
-    };
+    #loadBlockTransactions;
+    #getLastTransactions;
     /**
      *
      * @param {Block[]} blocks
@@ -854,14 +885,15 @@ class State extends Contract {
                 if (block.index === 0)
                     this.#loaded = true;
                 const transactions = await this.#loadBlockTransactions([...block.transactions] || []);
+                const lastTransactions = await this.#getLastTransactions();
                 for (const transaction of transactions) {
-                    const lastTransactions = await this.#getLastTransactions();
                     const hash = await transaction.hash();
                     if (poolTransactionKeys.includes(hash))
                         await globalThis.transactionPoolStore.delete(hash);
                     if (lastTransactions.includes(hash)) {
                         console.log('removing invalid block');
                         await globalThis.blockStore.delete(await (await new BlockMessage(block)).hash());
+                        blocks.splice(block.index - 1);
                         return this.#loadBlocks(blocks);
                     }
                     try {
@@ -937,18 +969,25 @@ const ignorelist = ['BA5XUACBBBAT653LT3GHP2Z5SUHVCA42BP6IBFBJACHOZIHHR4DUPG2XMB'
 // check if browser or local
 class Chain extends State {
     #state;
-    #slotTime = 10000;
-    id;
-    utils = {};
+    #slotTime;
     /** {Address[]} */
-    #validators = [];
+    #validators;
     /** {Boolean} */
-    #runningEpoch = false;
-    #participants = [];
-    #participating = false;
-    #jail = [];
+    #runningEpoch;
+    #participants;
+    #participating;
+    #jail;
     constructor() {
         super();
+        this.#slotTime = 10000;
+        this.utils = {};
+        /** {Address[]} */
+        this.#validators = [];
+        /** {Boolean} */
+        this.#runningEpoch = false;
+        this.#participants = [];
+        this.#participating = false;
+        this.#jail = [];
         // @ts-ignore
         return this.#init();
     }
@@ -1192,7 +1231,7 @@ class Chain extends State {
             await this.#runEpoch();
     }
     // todo filter tx that need to wait on prev nonce
-    async #createBlock(limit = 1800) {
+    async #createBlock(limit = this.transactionLimit) {
         // vote for transactions
         if (await globalThis.transactionPoolStore.size() === 0)
             return;
@@ -1249,6 +1288,7 @@ class Chain extends State {
                 console.log(await globalThis.transactionPoolStore.has(e.hash));
             }
         }
+        console.log(block.transactions.length);
         // don't add empty block
         if (block.transactions.length === 0)
             return;

package/exports/node.js

@@ -18,6 +18,7 @@ class Node {
         this.#node = globalThis.Peernet ? await new globalThis.Peernet(config, password) : await new Peernet(config, password);
         await nodeConfig(config);
         globalThis.pubsub.subscribe('chain:ready', () => {
+            // when autostart is false the node will only be started after the chain is ready (this is here so we can just use node for communication)
             if (!this.#node.autoStart)
                 this.#node.start();
         });

package/exports/types/state.d.ts

@@ -1,11 +1,13 @@
 import { BlockMessage } from '@leofcoin/messages';
 import Contract from './contract.js';
 import Machine from './machine.js';
+import Jobber from './jobs/jobber.js';
 import { BlockHash } from './types.js';
 declare type SyncState = 'syncing' | 'synced' | 'errored' | 'connectionless';
 export default class State extends Contract {
     #private;
     knownBlocks: BlockHash[];
+    jobber: Jobber;
     get blockHashMap(): IterableIterator<[any, any]>;
     get loaded(): boolean;
     get resolving(): boolean;

package/exports/types/types.d.ts

@@ -1,2 +1,22 @@
 export type Address = base58String;
 export type BlockHash = base58String;
+interface Transaction {
+    to: Address;
+    from: Address;
+    method: String;
+    params: string[];
+    nonce: Number;
+}
+interface RawTransaction extends Transaction {
+    timestamp: Number;
+}
+export declare type BlockInMemory = {
+    index: number;
+    transactions: RawTransaction[];
+    loaded?: Boolean;
+};
+export declare type RawBlock = {
+    index: number;
+    transactions: RawTransaction[];
+};
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.91",
+  "version": "1.4.93",
   "description": "Official javascript implementation",
   "exports": {
     "./node": "./exports/node.js",
@@ -22,12 +22,7 @@
     "demo": "jsproject --serve ./ --port 5478 --open demo",
     "test": "node --openssl-legacy-provider test",
     "pack": "webpack",
-    "build": "wireit"
-  },
-  "wireit": {
-    "build": {
-      "command": "rollup -c --silent error --cache true"
-    }
+    "build": "rollup -c"
   },
   "np": {
     "yarn": false,