@leofcoin/chain 1.5.23 → 1.5.24

package/exports/chain.d.ts

@@ -1,8 +1,8 @@
 import { BigNumber } from '@leofcoin/utils';
 import { BigNumberish } from '@ethersproject/bignumber';
-import State from './state.js';
 import { Address } from './types.js';
-export default class Chain extends State {
+import { VersionControl } from './version-control.js';
+export default class Chain extends VersionControl {
     #private;
     id: any;
     utils: {};
@@ -10,7 +10,6 @@ export default class Chain extends State {
     get nativeToken(): string;
     get validators(): any[];
     hasTransactionToHandle(): Promise<boolean>;
-    clearPool(): Promise<void>;
     participate(address: any): Promise<void>;
     /**
      * every tx done is trough contracts so no need for amount

package/exports/chain.js

@@ -632,6 +632,18 @@ class State extends Contract {
             return Promise.all(lastTransactions.map(transaction => transaction.hash()));
         };
     }
+    async clearPool() {
+        await globalThis.transactionPoolStore.clear();
+    }
+    /**
+     * drastic measurement, removes everything!
+     */
+    async clearAll() {
+        await globalThis.accountsStore.clear();
+        await globalThis.chainStore.clear();
+        await globalThis.blockStore.clear();
+        await globalThis.transactionPoolStore.clear();
+    }
     async init() {
         this.jobber = new Jobber(30000);
         if (super.init)
@@ -1027,10 +1039,43 @@ class State extends Contract {
     }
 }
 
+class VersionControl extends State {
+    constructor() {
+        super();
+    }
+    async init() {
+        super.init && await super.init();
+        console.log('init');
+        try {
+            const version = await globalThis.chainStore.get('version');
+            this.version = new TextDecoder().decode(version);
+            console.log(this.version);
+            /**
+             * protocol version control!
+             * note v1 and 1.1 delete everything because of big changes, this is not what we want in the future
+             * in the future we want newer nodes to handle the new changes and still confirm old version transactions
+             * unless there is a security issue!
+             */
+            if (this.version !== '1.1.1') {
+                this.version = '1.1.1';
+                await this.clearAll();
+                await globalThis.chainStore.put('version', this.version);
+            }
+            // if (version)
+        }
+        catch (e) {
+            console.log(e);
+            this.version = '1.1.1';
+            await this.clearAll();
+            await globalThis.chainStore.put('version', this.version);
+        }
+    }
+}
+
 globalThis.BigNumber = BigNumber;
 const ignorelist = [];
 // check if browser or local
-class Chain extends State {
+class Chain extends VersionControl {
     #state;
     #slotTime;
     /** {Address[]} */
@@ -1110,46 +1155,7 @@ class Chain extends State {
         console.log('handle native contracts');
         // handle native contracts
     }
-    async clearPool() {
-        await globalThis.transactionPoolStore.clear();
-    }
-    /**
-     * drastic measurement, removes everything!
-     */
-    async #clearAll() {
-        await globalThis.accountsStore.clear();
-        await globalThis.chainStore.clear();
-        await globalThis.blockStore.clear();
-        await globalThis.transactionPoolStore.clear();
-    }
     async #init() {
-        try {
-            const version = await globalThis.chainStore.get('version');
-            this.version = new TextDecoder().decode(version);
-            /**
-             * protocol version control!
-             * note v1 and 1.1 delete everything because of big changes, this is not what we want in the future
-             * in the future we want newer nodes to handle the new changes and still confirm old version transactions
-             * unless there is a security issue!
-             */
-            if (this.version !== '1.0.0') {
-                this.version = '1.0.0';
-                await this.#clearAll();
-                await globalThis.chainStore.put('version', this.version);
-            }
-            else if (this.version !== '1.1.1') {
-                this.version = '1.1.1';
-                await this.#clearAll();
-                await globalThis.chainStore.put('version', this.version);
-            }
-            // if (version)
-        }
-        catch (e) {
-            console.log(e);
-            this.version = '1.0.0';
-            await this.#clearAll();
-            await globalThis.chainStore.put('version', new TextEncoder().encode(this.version));
-        }
         // this.node = await new Node()
         this.#participants = [];
         this.#participating = false;
@@ -1158,6 +1164,8 @@ class Chain extends State {
             await this.#setup();
         this.utils = { BigNumber, formatUnits, parseUnits };
         // this.#state = new State()
+        // todo some functions rely on state
+        await super.init();
         await globalThis.peernet.addRequestHandler('bw-request-message', () => {
             return new BWMessage(globalThis.peernet.client.bw) || { up: 0, down: 0 };
         });
@@ -1173,8 +1181,6 @@ class Chain extends State {
         globalThis.peernet.subscribe('add-transaction', this.#addTransaction.bind(this));
         globalThis.peernet.subscribe('validator:timeout', this.#validatorTimeout.bind(this));
         globalThis.pubsub.subscribe('peer:connected', this.#peerConnected.bind(this));
-        // todo some functions rely on state
-        await super.init();
         globalThis.pubsub.publish('chain:ready', true);
         return this;
     }

package/exports/state.d.ts

@@ -25,6 +25,11 @@ export default class State extends Contract {
     get totalSize(): number;
     get machine(): Machine;
     constructor();
+    clearPool(): Promise<void>;
+    /**
+     * drastic measurement, removes everything!
+     */
+    clearAll(): Promise<void>;
     init(): Promise<void>;
     updateState(message: any): Promise<void>;
     getLatestBlock(): Promise<BlockMessage['decoded']>;

package/exports/version-control.d.ts

@@ -0,0 +1,5 @@
+import State from "./state.js";
+export declare class VersionControl extends State {
+    constructor();
+    init(): Promise<void>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "Official javascript implementation",
   "exports": {
     "./node": {
@@ -54,6 +54,7 @@
     "@types/bs58check": "^2.1.0",
     "@types/pako": "^2.0.0",
     "@types/randombytes": "^2.0.0",
+    "@types/semver": "^7.5.6",
     "@types/varint": "^6.0.1",
     "@vandeurenglenn/debug": "^1.0.0",
     "eslint": "^8.28.0",
@@ -89,6 +90,7 @@
     "p-queue": "^7.3.4",
     "p2pt": "^1.5.1",
     "pako": "^2.0.4",
+    "semver": "^7.5.4",
     "simple-peer": "^9.11.1"
   },
   "eslintConfig": {