@leofcoin/chain 1.6.11 → 1.6.13

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);
@@ -338,8 +346,8 @@ class Machine {
                 break;
             }
             case 'ask': {
-                if (data.question === 'contract') {
-                    const input = await peernet.get(data.input, 'contract');
+                if (data.question === 'contract' || data.question === 'transaction') {
+                    const input = await peernet.get(data.input, data.question);
                     this.worker.postMessage({ id: data.id, input });
                 }
             }
@@ -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() {
@@ -1449,27 +1490,25 @@ class Chain extends VersionControl {
     async #addBlock(block) {
         const blockMessage = await new BlockMessage(block);
         const hash = await blockMessage.hash();
-        await Promise.all(blockMessage.decoded.transactions
-            // @ts-ignore
-            .map(async (transaction) => {
+        const transactionsMessages = await Promise.all(blockMessage.decoded.transactions
             // @ts-ignore
-            let hash = transaction.hash;
-            if (!hash) {
-                hash = await new TransactionMessage(transaction).hash();
-                // @ts-ignore
-                transaction.hash = hash;
-            }
+            .map(async (hash) => {
+            let data;
             if (!(await transactionStore.has(hash))) {
-                transactionStore.put(hash, await blockMessage.hash());
+                data = await peernet.get(hash, 'transaction');
+                transactionStore.put(hash, data);
+            }
+            else {
+                data = transactionStore.get(hash);
             }
             (await transactionPoolStore.has(hash)) && (await transactionPoolStore.delete(hash));
-            return transaction;
+            return new TransactionMessage(data).decode();
         }));
         await globalThis.blockStore.put(hash, blockMessage.encoded);
         debug(`added block: ${hash}`);
         let promises = [];
         let contracts = [];
-        for (let transaction of blockMessage.decoded.transactions) {
+        for (let transaction of transactionsMessages) {
             // await transactionStore.put(transaction.hash, transaction.encoded)
             if (!contracts.includes(transaction.to)) {
                 contracts.push(transaction.to);
@@ -1481,7 +1520,7 @@ class Chain extends VersionControl {
         try {
             promises = await Promise.allSettled(promises);
             const noncesByAddress = {};
-            for (let transaction of blockMessage.decoded.transactions) {
+            for (let transaction of transactionsMessages) {
                 globalThis.pubsub.publish('transaction-processed', transaction);
                 if (transaction.to === globalThis.peernet.selectedAccount)
                     globalThis.pubsub.publish('account-transaction-processed', transaction);
@@ -1528,7 +1567,7 @@ class Chain extends VersionControl {
     async #handleTransaction(transaction, latestTransactions, block) {
         const hash = await transaction.hash();
         const doubleTransactions = [];
-        if (latestTransactions.includes(hash)) {
+        if (latestTransactions.includes(hash) || transactionStore.has(hash)) {
             doubleTransactions.push(hash);
         }
         if (doubleTransactions.length > 0) {
@@ -1539,7 +1578,7 @@ class Chain extends VersionControl {
         // if (timestamp + this.#slotTime > Date.now()) {
         try {
             const result = await this.#executeTransaction({ ...transaction.decoded, hash });
-            block.transactions.push(transaction);
+            block.transactions.push(hash);
             block.fees = block.fees.add(await calculateFee(transaction.decoded));
             await globalThis.accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)));
         }
@@ -1644,10 +1683,7 @@ class Chain extends VersionControl {
         // block.reward = block.reward.toString()
         // block.fees = block.fees.toString()
         try {
-            block.transactions = await Promise.all(block.transactions.map(async (transaction) => {
-                await globalThis.transactionPoolStore.delete(await transaction.hash());
-                return transaction.decoded;
-            }));
+            await Promise.all(block.transactions.map(async (transaction) => await globalThis.transactionPoolStore.delete(transaction)));
             let blockMessage = await new BlockMessage(block);
             const hash = await blockMessage.hash();
             await globalThis.peernet.put(hash, blockMessage.encoded, 'block');

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/block-worker.js

@@ -1,4 +1,4 @@
-import { E as EasyWorker, B as BigNumber, a as BlockMessage } from './worker-CFrwP8cD.js';
+import { E as EasyWorker, B as BigNumber, a as BlockMessage } from './worker-Cqj1ERFr.js';
 
 const worker = new EasyWorker();
 

package/exports/workers/machine-worker.js

@@ -1,4 +1,4 @@
-import { E as EasyWorker, B as BigNumber, C as ContractMessage, T as TransactionMessage } from './worker-CFrwP8cD.js';
+import { E as EasyWorker, B as BigNumber, C as ContractMessage, T as TransactionMessage } from './worker-Cqj1ERFr.js';
 
 const byteFormats = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 const formatBytes = (bytes, decimals = 2) => {
@@ -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 _ = {};
@@ -146,7 +150,9 @@ const get = ({ contract, method, params }) => {
   return result
 };
 
-const resolveContract = (address) => askFor('contract', address);
+const resolveContract = (hash) => askFor('contract', hash);
+
+const resolveTransaction = (hash) => askFor('transaction', hash);
 
 const respond = (id, value) => {
   worker.postMessage({
@@ -223,9 +229,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 +256,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);
@@ -284,23 +308,23 @@ _.init = async (message) => {
     );
     console.log({ blocks: message.blocks });
     if (message.blocks?.length > 0) {
-      let pre;
-
-      try {
-        const importee = await import('url');
-        const url = importee.default;
-        if (url) pre = url.fileURLToPath(new URL('.', import.meta.url));
-      } catch {
-        // browser env
-        pre = './';
-      }
+      // let pre
+
+      // try {
+      //   const importee = await import('url')
+      //   const url = importee.default
+      //   if (url) pre = url.fileURLToPath(new URL('.', import.meta.url))
+      // } catch {
+      //   // browser env
+      //   pre = './'
+      // }
 
-      let _worker = await new EasyWorker(pre + 'block-worker.js', {
-        serialization: 'advanced',
-        type: 'module'
-      });
-      blocks = await _worker.once(message.blocks);
-      _worker = null;
+      // let _worker = await new EasyWorker(pre + 'block-worker.js', {
+      //   serialization: 'advanced',
+      //   type: 'module'
+      // })
+      // blocks = await _worker.once(message.blocks)
+      // _worker = null
       // blocks = unique(globalThis.blocks ? globalThis : [], blocks)
       // for (let i = 0; i < blocks.length; i++) {
 
@@ -311,20 +335,25 @@ _.init = async (message) => {
         // this means contracts will be restored from this state
         // this also means devs NEED to make sure the state can be restored
         // on contract deploy an error will be thrown if state wasn't recoverable
-        if (block.index > 24) {
+        if (block.index >= blocks.length - 24) {
           const transactionCount = blocks[block.index - 1].transactions.length;
           latestTransactions.splice(-(transactionCount - 1), latestTransactions.length);
         }
 
         if (!block.loaded && !fromState) {
-          const priority = block.transactions.filter((transaction) => transaction.priority);
+          const transactions = await Promise.all(
+            block.transactions.map(async (transaction) =>
+              new TransactionMessage(await resolveTransaction(transaction)).decode()
+            )
+          );
+          const priority = transactions.filter((transaction) => transaction.priority)?.sort((a, b) => a.nonce - b.nonce);
           if (priority.length > 0)
-            await Promise.all(
-              priority.sort((a, b) => a.nonce - b.nonce).map((transaction) => _executeTransaction(transaction))
-            );
+            for (const transaction of priority) {
+              await _executeTransaction(transaction);
+            }
 
           await Promise.all(
-            block.transactions
+            transactions
               .filter((transaction) => !transaction.priority)
               .map(async (transaction) => _executeTransaction(transaction))
           );
@@ -418,6 +447,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/workers/{worker-CFrwP8cD.js → worker-Cqj1ERFr.js}

@@ -12379,37 +12379,6 @@ let FormatInterface$1 = class FormatInterface extends BasicInterface {
 const FormatInterface = FormatInterface$1;
 
 var proto$3 = {
-    timestamp: Number(),
-    from: String(),
-    to: String(),
-    method: String(),
-    params: Array(),
-    signature: String(),
-    'nonce?': Number(),
-    'dependsOn?': Array(),
-    'priority?': Boolean()
-};
-
-class TransactionMessage extends FormatInterface {
-    get messageName() {
-        return 'TransactionMessage';
-    }
-    constructor(buffer) {
-        if (buffer instanceof TransactionMessage)
-            return buffer;
-        const name = 'transaction-message';
-        super(buffer, proto$3, { name });
-    }
-    beforeHashing(decoded) {
-        decoded = super.beforeHashing(decoded);
-        delete decoded.signature;
-        delete decoded.priority;
-        delete decoded.dependsOn;
-        return decoded;
-    }
-}
-
-var proto$2 = {
     address: String(),
     reward: BigNumber.from(0)
 };
@@ -12422,17 +12391,17 @@ class ValidatorMessage extends FormatInterface {
         if (buffer instanceof ValidatorMessage)
             return buffer;
         const name = 'validator-message';
-        super(buffer, proto$2, { name });
+        super(buffer, proto$3, { name });
     }
 }
 
-var proto$1 = {
+var proto$2 = {
     index: Number(),
     previousHash: String(),
     timestamp: Number(),
     reward: BigNumber.from(0),
     fees: BigNumber.from(0),
-    transactions: new Uint8Array(),
+    transactions: Array(),
     validators: new Uint8Array()
 };
 
@@ -12444,42 +12413,32 @@ class BlockMessage extends FormatInterface {
         if (buffer instanceof BlockMessage)
             return buffer;
         const name = 'block-message';
-        super(buffer, proto$1, { name });
+        super(buffer, proto$2, { name });
     }
     encode(decoded) {
         decoded = decoded || this.decoded;
         const validators = [];
-        const transactions = [];
         for (const validator of decoded.validators) {
             if (validator instanceof ValidatorMessage)
                 validators.push(validator.encode());
             else
                 validators.push(new ValidatorMessage(validator).encode());
         }
-        for (const transaction of decoded.transactions) {
-            if (transaction instanceof TransactionMessage)
-                transactions.push(transaction.encode());
-            else
-                transactions.push(new TransactionMessage(transaction).encode());
-        }
         return super.encode({
             ...decoded,
-            validators: index$5(validators),
-            transactions: index$5(transactions)
+            validators: index$5(validators)
         });
     }
     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
         this.decoded.validators = index$4(this.decoded.validators).map((validator) => new ValidatorMessage(validator).decoded);
         return this.decoded;
     }
 }
 
-var proto = {
+var proto$1 = {
     creator: String(),
     contract: new Uint8Array(),
     constructorParameters: Array()
@@ -12492,7 +12451,38 @@ class ContractMessage extends FormatInterface {
     constructor(buffer) {
         if (buffer instanceof ContractMessage)
             return buffer;
-        super(buffer, proto, { name: 'contract-message' });
+        super(buffer, proto$1, { name: 'contract-message' });
+    }
+}
+
+var proto = {
+    timestamp: Number(),
+    from: String(),
+    to: String(),
+    method: String(),
+    params: Array(),
+    signature: String(),
+    'nonce?': Number(),
+    'dependsOn?': Array(),
+    'priority?': Boolean()
+};
+
+class TransactionMessage extends FormatInterface {
+    get messageName() {
+        return 'TransactionMessage';
+    }
+    constructor(buffer) {
+        if (buffer instanceof TransactionMessage)
+            return buffer;
+        const name = 'transaction-message';
+        super(buffer, proto, { name });
+    }
+    beforeHashing(decoded) {
+        decoded = super.beforeHashing(decoded);
+        delete decoded.signature;
+        delete decoded.priority;
+        delete decoded.dependsOn;
+        return decoded;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.6.11",
+  "version": "1.6.13",
   "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"