@leofcoin/chain 1.6.11 → 1.6.12

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

@@ -117,6 +117,10 @@ let nativeMints = 0;
 let nativeTransfers = 0;
 let totalTransactions = 0;
 
+let totalBurnAmount = 0;
+let totalMintAmount = 0;
+let totalTransferAmount = 0;
+
 let blocks = [];
 let contracts = {};
 const _ = {};
@@ -223,9 +227,18 @@ const _executeTransaction = async (transaction) => {
     await _.execute({ contract: to, method, params });
     if (to === nativeToken$2) {
       nativeCalls += 1;
-      if (method === 'burn') nativeBurns += 1;
-      if (method === 'mint') nativeMints += 1;
-      if (method === 'transfer') nativeTransfers += 1;
+      if (method === 'burn') {
+        nativeBurns += 1;
+        totalBurnAmount += params[0];
+      }
+      if (method === 'mint') {
+        nativeMints += 1;
+        totalMintAmount += params[0];
+      }
+      if (method === 'transfer') {
+        nativeTransfers += 1;
+        totalTransferAmount += params[0];
+      }
     }
     totalTransactions += 1;
 
@@ -241,10 +254,19 @@ const _executeTransaction = async (transaction) => {
 };
 
 _.init = async (message) => {
-  let { peerid, fromState, state } = message;
+  let { peerid, fromState, state, info } = message;
   globalThis.peerid = peerid;
   console.log({ fromState });
   if (fromState) {
+    nativeCalls = info.nativeCalls;
+    nativeBurns = info.nativeBurns;
+    nativeMints = info.nativeMints;
+    nativeTransfers = info.nativeTransfers;
+    totalTransactions = info.totalTransactions;
+    totalBurnAmount = info.totalBurnAmount;
+    totalMintAmount = info.totalMintAmount;
+    totalTransferAmount = info.totalTransferAmount;
+
     lastBlock = message.lastBlock;
     const setState = async (address, state) => {
       const contractBytes = await resolveContract(address);
@@ -418,6 +440,15 @@ worker.onmessage(({ id, type, input }) => {
     case 'nativeTransfers':
       respond(id, nativeTransfers);
       break
+    case 'totalBurnAmount':
+      respond(id, totalBurnAmount);
+      break
+    case 'totalMintAmount':
+      respond(id, totalMintAmount);
+      break
+    case 'totalTransferAmount':
+      respond(id, totalTransferAmount);
+      break
     case 'totalTransfers':
       respond(id, totalTransfers);
       break

package/exports/chain.js

@@ -282,7 +282,15 @@ class Machine {
                 index: 0,
                 hash: ''
             },
-            accounts: {}
+            accounts: {},
+            info: {
+                nativeCalls: 0,
+                nativeMints: 0,
+                nativeBurns: 0,
+                nativeTransfers: 0,
+                totalTransactions: 0,
+                totalBlocks: 0
+            }
         };
         // @ts-ignore
         return this.#init(blocks);
@@ -376,7 +384,18 @@ class Machine {
                 const tasks = [
                     stateStore.put('lastBlock', JSON.stringify(await this.lastBlock)),
                     stateStore.put('states', JSON.stringify(state)),
-                    stateStore.put('accounts', JSON.stringify(accounts))
+                    stateStore.put('accounts', JSON.stringify(accounts)),
+                    stateStore.put('info', JSON.stringify({
+                        nativeCalls: this.nativeCalls,
+                        nativeMints: this.nativeMints,
+                        nativeBurns: this.nativeBurns,
+                        nativeTransfers: this.nativeTransfers,
+                        totalTransactions: this.totalTransactions,
+                        totalBurnAmount: this.totalBurnAmount,
+                        totaMintAmount: this.totaMintAmount,
+                        totalTransferAmount: this.totalTransferAmount,
+                        totalBlocks: await blockStore.length
+                    }))
                     // accountsStore.clear()
                 ];
                 await Promise.all(tasks);
@@ -415,9 +434,19 @@ class Machine {
                 this.states.states = JSON.parse(new TextDecoder().decode(await stateStore.get('states')));
                 try {
                     this.states.accounts = JSON.parse(new TextDecoder().decode(await stateStore.get('accounts')));
+                    this.states.info = JSON.parse(new TextDecoder().decode(await stateStore.get('info')));
                 }
                 catch {
                     this.states.accounts = {};
+                    // todo try fetching info from fully synced peer
+                    this.states.info = {
+                        nativeCalls: 0,
+                        nativeMints: 0,
+                        nativeBurns: 0,
+                        nativeTransfers: 0,
+                        totalTransactions: 0,
+                        totalBlocks: 0
+                    };
                 }
                 console.log({ balances: this.states.states[addresses.nativeToken].balances });
             }
@@ -428,6 +457,7 @@ class Machine {
                     fromState: this.states.lastBlock.index > 0,
                     lastBlock: this.states.lastBlock,
                     state: this.states.states,
+                    info: this.states.info,
                     // @ts-ignore
                     peerid: peernet.peerId
                 }
@@ -593,6 +623,15 @@ class Machine {
     get totalBlocks() {
         return this.#askWorker('totalBlocks');
     }
+    get totalBurnAmount() {
+        return this.#askWorker('totalBurnAmount');
+    }
+    get totaMintAmount() {
+        return this.#askWorker('totaMintAmount');
+    }
+    get totalTransferAmount() {
+        return this.#askWorker('totalTransferAmount');
+    }
     getBlocks(from, to) {
         return this.#askWorker('blocks', { from, to });
     }
@@ -1418,9 +1457,11 @@ class Chain extends VersionControl {
             else if (!this.knownBlocks)
                 this.knownBlocks = await this.#makeRequest(peer, 'knownBlocks');
         }
-        const peerTransactionPool = (higherThenCurrentLocal && (await this.getPeerTransactionPool(peer))) || [];
-        if (this.#participating && peerTransactionPool.length > 0)
-            return this.#runEpoch();
+        setTimeout(async () => {
+            const peerTransactionPool = (higherThenCurrentLocal && (await this.getPeerTransactionPool(peer))) || [];
+            if (this.#participating && peerTransactionPool.length > 0)
+                return this.#runEpoch();
+        }, 3000);
     }
     #epochTimeout;
     async #transactionPoolHandler() {

package/exports/machine.d.ts

@@ -9,6 +9,14 @@ export default class Machine {
             hash: string;
         };
         accounts: {};
+        info: {
+            nativeCalls: number;
+            nativeMints: number;
+            nativeBurns: number;
+            nativeTransfers: number;
+            totalTransactions: number;
+            totalBlocks: number;
+        };
     };
     constructor(blocks: any);
     updateState(): Promise<void>;
@@ -30,6 +38,9 @@ export default class Machine {
     get blocks(): Promise<[]>;
     get lastBlock(): Promise<any>;
     get totalBlocks(): Promise<any>;
+    get totalBurnAmount(): Promise<any>;
+    get totaMintAmount(): Promise<any>;
+    get totalTransferAmount(): Promise<any>;
     getBlocks(from?: any, to?: any): Promise<[]>;
     getBlock(index: any): Promise<any>;
     addLoadedBlock(block: any): Promise<any>;

package/exports/workers/machine-worker.js

@@ -117,6 +117,10 @@ let nativeMints = 0;
 let nativeTransfers = 0;
 let totalTransactions = 0;
 
+let totalBurnAmount = 0;
+let totalMintAmount = 0;
+let totalTransferAmount = 0;
+
 let blocks = [];
 let contracts = {};
 const _ = {};
@@ -223,9 +227,18 @@ const _executeTransaction = async (transaction) => {
     await _.execute({ contract: to, method, params });
     if (to === nativeToken$2) {
       nativeCalls += 1;
-      if (method === 'burn') nativeBurns += 1;
-      if (method === 'mint') nativeMints += 1;
-      if (method === 'transfer') nativeTransfers += 1;
+      if (method === 'burn') {
+        nativeBurns += 1;
+        totalBurnAmount += params[0];
+      }
+      if (method === 'mint') {
+        nativeMints += 1;
+        totalMintAmount += params[0];
+      }
+      if (method === 'transfer') {
+        nativeTransfers += 1;
+        totalTransferAmount += params[0];
+      }
     }
     totalTransactions += 1;
 
@@ -241,10 +254,19 @@ const _executeTransaction = async (transaction) => {
 };
 
 _.init = async (message) => {
-  let { peerid, fromState, state } = message;
+  let { peerid, fromState, state, info } = message;
   globalThis.peerid = peerid;
   console.log({ fromState });
   if (fromState) {
+    nativeCalls = info.nativeCalls;
+    nativeBurns = info.nativeBurns;
+    nativeMints = info.nativeMints;
+    nativeTransfers = info.nativeTransfers;
+    totalTransactions = info.totalTransactions;
+    totalBurnAmount = info.totalBurnAmount;
+    totalMintAmount = info.totalMintAmount;
+    totalTransferAmount = info.totalTransferAmount;
+
     lastBlock = message.lastBlock;
     const setState = async (address, state) => {
       const contractBytes = await resolveContract(address);
@@ -418,6 +440,15 @@ worker.onmessage(({ id, type, input }) => {
     case 'nativeTransfers':
       respond(id, nativeTransfers);
       break
+    case 'totalBurnAmount':
+      respond(id, totalBurnAmount);
+      break
+    case 'totalMintAmount':
+      respond(id, totalMintAmount);
+      break
+    case 'totalTransferAmount':
+      respond(id, totalTransferAmount);
+      break
     case 'totalTransfers':
       respond(id, totalTransfers);
       break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "description": "Official javascript implementation",
   "private": false,
   "exports": {
@@ -55,25 +55,25 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/semver": "^7.5.8",
-    "@vandeurenglenn/debug": "^1.2.2",
-    "rollup": "^4.12.1",
+    "@vandeurenglenn/debug": "^1.2.3",
+    "rollup": "^4.16.4",
     "rollup-plugin-modify": "^3.0.0",
     "tape": "^5.7.5",
     "tslib": "^2.6.2"
   },
   "dependencies": {
-    "@leofcoin/addresses": "^1.0.22",
+    "@leofcoin/addresses": "^1.0.23",
     "@leofcoin/contracts": "^0.1.9",
-    "@leofcoin/crypto": "^0.2.11",
-    "@leofcoin/errors": "^1.0.6",
-    "@leofcoin/lib": "^1.2.42",
-    "@leofcoin/messages": "^1.4.12",
-    "@leofcoin/multi-wallet": "^3.1.7",
-    "@leofcoin/networks": "^1.1.5",
+    "@leofcoin/crypto": "^0.2.12",
+    "@leofcoin/errors": "^1.0.7",
+    "@leofcoin/lib": "^1.2.43",
+    "@leofcoin/messages": "^1.4.13",
+    "@leofcoin/multi-wallet": "^3.1.8",
+    "@leofcoin/networks": "^1.1.6",
     "@leofcoin/peernet": "^1.1.77",
-    "@leofcoin/storage": "^3.5.24",
-    "@leofcoin/utils": "^1.1.17",
-    "@leofcoin/workers": "^1.4.18",
+    "@leofcoin/storage": "^3.5.28",
+    "@leofcoin/utils": "^1.1.18",
+    "@leofcoin/workers": "^1.4.19",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/easy-worker": "^1.0.2",
     "semver": "^7.6.0"