@leofcoin/chain 1.4.9 → 1.4.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "Official javascript implementation",
   "main": "./dist/node.js",
   "module": "./dist/chain.esm",

package/src/chain.js

@@ -382,6 +382,7 @@ async resolveBlock(hash) {
       pubsub.publish(`transaction.completed.${hash}`, {status: 'fulfilled', hash})
       return result || 'no state change'
     } catch (error) {
+      console.log(error);
       pubsub.publish(`transaction.completed.${hash}`, {status: 'fail', hash, error: error})
       throw error
     }
@@ -458,7 +459,7 @@ async resolveBlock(hash) {
     // vote for transactions
     if (await transactionPoolStore.size() === 0) return;
 
-    let transactions = await transactionPoolStore.values(limit)
+    let transactions = await transactionPoolStore.values(this.transactionLimit)
 
     if (Object.keys(transactions)?.length === 0 ) return
     
@@ -469,18 +470,18 @@ async resolveBlock(hash) {
     }
 
     // exclude failing tx
-    transactions = await this.getTransactions(transactions.slice(0, transactions.length < 1800 ? transactions.length : 1800))
+    transactions = await this.promiseTransactions(transactions)
 
     transactions = transactions.sort((a, b) => a.nonce - b.nonce)
     for (let transaction of transactions) { 
+      const hash = await transaction.hash()
       try {
-        await this.#executeTransaction(transaction)
-        block.transactions.push(transaction)
-        block.fees += Number(calculateFee(transaction))
-        await accountsStore.put(transaction.from, new TextEncoder().encode(String(transaction.nonce)))
+        await this.#executeTransaction({...transaction.decoded, hash})
+        block.transactions.push({hash, ...transaction.decoded})
+        block.fees += Number(calculateFee(transaction.decoded))
+        await accountsStore.put(transaction.decoded.from, new TextEncoder().encode(String(transaction.decoded.nonce)))
       } catch {
-        transaction = await new TransactionMessage(transaction)
-        await transactionPoolStore.delete(await transaction.hash())
+        await transactionPoolStore.delete(hash)
       }
     }
     // don't add empty block

package/src/machine.js

@@ -1,13 +1,8 @@
 import { contractFactory, nativeToken, validators, nameService } from '@leofcoin/addresses'
-import randombytes from 'randombytes'
-import { join, dirname } from 'node:path'
+import { randombytes } from '@leofcoin/crypto'
 import EasyWorker from '@vandeurenglenn/easy-worker'
 import { ContractMessage } from '@leofcoin/messages'
 // import State from './state'
-import { fileURLToPath } from 'node:url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 
 export default class Machine {
   #contracts = {}

package/src/protocol.js

@@ -1,3 +1,4 @@
 export default class Protocol {
   limit = 1800
+  transactionLimit = 1800
 }

package/src/transaction.js

@@ -64,7 +64,7 @@ export default class Transaction extends Protocol {
    * @returns {Number} nonce
    */
   async #getNonceFallback(address) {
-    let transactions = await transactionPoolStore.values()
+    let transactions = await transactionPoolStore.values(this.transactionLimit)
     transactions = await this.promiseTransactions(transactions)
     transactions = transactions.filter(tx => tx.decoded.from === address)
     transactions = await this.promiseTransactionsContent(transactions)
@@ -158,7 +158,7 @@ export default class Transaction extends Protocol {
     identity = JSON.parse(new TextDecoder().decode(identity))
     const wallet = new MultiWallet(peernet.network)
     await wallet.recover(identity.mnemonic)
-    const account = wallet.account(0).external(0)
+    const account = await wallet.account(0).external(0)
     transaction.signature = await this.#signTransaction(transaction, account)
     transaction.signature = bs32.encode(transaction.signature)
     return transaction
@@ -208,7 +208,7 @@ export default class Transaction extends Protocol {
       const message = await new TransactionMessage(transaction)
 
       let data
-      const wait = () => new Promise(async (resolve, reject) => {
+      const wait = new Promise(async (resolve, reject) => {
         if (pubsub.subscribers[`transaction.completed.${await message.hash()}`]) {
           const result = pubsub.subscribers[`transaction.completed.${await message.hash()}`].value
           result.status === 'fulfilled' ? resolve(result.hash) : reject({hash: result.hash, error: result.error})

package/test/chain.js

@@ -51,6 +51,9 @@ const job = async () => {
     // return
     let nonce = await chain.getNonce(peernet.selectedAccount)
     console.log({nonce});
+    let balances = await chain.balances
+    console.log(`balance for ${Object.keys(balances)[0]}:${chain.utils.formatUnits(balances[Object.keys(balances)[0]]).toString()}`);
+    console.log(`balance for ${Object.keys(balances)[1]}:${chain.utils.formatUnits(balances[Object.keys(balances)[1]]).toString()}`);
     // return
     let promises = []
     // nonce += 1
@@ -60,14 +63,11 @@ const job = async () => {
       promises.push(chain.createTransaction(chain.nativeToken, 'transfer', [peernet.selectedAccount, '6zqut21djrRNJAniaTByovGhnBGs5h9wfkP35mzjZkEBZwnQVo', chain.utils.parseUnits('100').toString()], nonce))
     }
     promises = await Promise.allSettled(promises)
-    promises = await Promise.allSettled(promises.map(({value}) => value.wait()))
-    promises.forEach((item, i) => {
-      if (item.reason) console.log(item.reason);
-    });
+    promises = await Promise.allSettled(promises.map(({value}) => value.wait))
 
     console.log(`${(new Date().getTime() - start) / 1000} s`);
 
-    let balances = await chain.balances
+    balances = await chain.balances
     console.log(`balance for ${Object.keys(balances)[0]}:${chain.utils.formatUnits(balances[Object.keys(balances)[0]]).toString()}`);
     console.log(`balance for ${Object.keys(balances)[1]}:${chain.utils.formatUnits(balances[Object.keys(balances)[1]]).toString()}`);
 // return
@@ -82,7 +82,7 @@ const job = async () => {
       promises.push(chain.createTransaction(chain.nativeToken, 'transfer', [peernet.selectedAccount, '6zqut21djrRNJAniaTByovGhnBGs5h9wfkP35mzjZkEBZwnQVo', chain.utils.parseUnits('100').toString()], nonce))
     }
     promises = await Promise.allSettled(promises)
-    promises = await Promise.allSettled(promises.map(({value}) => value.wait()))
+    promises = await Promise.allSettled(promises.map(({value}) => value.wait))
     balances = await chain.balances
     console.log(`balance for ${Object.keys(balances)[0]}:${chain.utils.formatUnits(balances[Object.keys(balances)[0]]).toString()}`);
     console.log(`balance for ${Object.keys(balances)[1]}:${chain.utils.formatUnits(balances[Object.keys(balances)[1]]).toString()}`);
@@ -90,14 +90,14 @@ const job = async () => {
     promises = []
 
     // nonce += 1
-    for (let i = 0; i < 100; i++) {
+    for (let i = 0; i < 1000; i++) {
       // contract , method, from, to, amount, (optional) nonce
       
       nonce += 1
       promises.push(chain.createTransaction(chain.nativeToken, 'transfer', [peernet.selectedAccount, '6zqut21djrRNJAniaTByovGhnBGs5h9wfkP35mzjZkEBZwnQVo', chain.utils.parseUnits('100').toString()], nonce))
     }
     promises = await Promise.allSettled(promises)
-    promises = await Promise.allSettled(promises.map(({value}) => value.wait()))
+    promises = await Promise.allSettled(promises.map(({value}) => value.wait))
     balances = await chain.balances
     console.log(`balance for ${Object.keys(balances)[0]}:${chain.utils.formatUnits(balances[Object.keys(balances)[0]]).toString()}`);
     console.log(`balance for ${Object.keys(balances)[1]}:${chain.utils.formatUnits(balances[Object.keys(balances)[1]]).toString()}`);