@leofcoin/chain 1.4.4 → 1.4.5

package/package.json

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

package/src/chain.js

@@ -205,7 +205,7 @@ export default class Chain  extends Contract {
     for (const value of promises) {      
       if (value.index > latest.index) {
         latest.index = value.index;
-        latest.hash = value.hash;
+        latest.hash = await value.hash();
       }
     }
     
@@ -391,7 +391,7 @@ async resolveBlock(hash) {
     // console.log(block);
     const blockMessage = await new BlockMessage(new Uint8Array(Object.values(block)))
     await Promise.all(blockMessage.decoded.transactions
-      .map(async transaction => transactionPoolStore.delete(await transaction.hash())))
+      .map(async transaction => transactionPoolStore.delete(transaction.hash)))
     const hash = await blockMessage.hash()
     
     await blockStore.put(hash, blockMessage.encoded)
@@ -557,7 +557,7 @@ async resolveBlock(hash) {
 
     try {
       await Promise.all(block.transactions
-        .map(async transaction => transactionPoolStore.delete(await transaction.hash())))
+        .map(async transaction => transactionPoolStore.delete(transaction.hash)))
 
 
       let blockMessage = await new BlockMessage(block)
@@ -581,9 +581,9 @@ async resolveBlock(hash) {
   
 
   async #addTransaction(transaction) {
-    try {
-      const hash = await transaction.hash()
+    try {      
       transaction = await new TransactionMessage(transaction)
+      const hash = await transaction.hash()
       const has = await transactionPoolStore.has(hash)
       if (!has) await transactionPoolStore.put(hash, transaction.encoded)
       if (this.#participating && !this.#runningEpoch) this.#runEpoch()

package/src/machine.js

@@ -50,7 +50,7 @@ export default class Machine {
       break
       }
       case 'response': {
-        pubsub.publish(data.id, data.value)
+        pubsub.publish(data.id, data.value || true)
       break
       }
     }
@@ -140,7 +140,7 @@ export default class Machine {
     }
     return new Promise((resolve, reject) => {
       const id = randombytes(20).toString('hex')
-      const onmessage = message => {        
+      const onmessage = message => {
         pubsub.unsubscribe(id, onmessage)
         if (message?.error) reject(message.error)
         else resolve(message)

package/src/transaction.js

@@ -1,5 +1,5 @@
 import Protocol from "./protocol.js"
-import * as MultiWallet from '@leofcoin/multi-wallet'
+import MultiWallet from '@leofcoin/multi-wallet'
 import {CodecHash} from '@leofcoin/codec-format-interface'
 import bs32 from '@vandeurenglenn/base32'
 import { TransactionMessage, BlockMessage } from "@leofcoin/messages"
@@ -26,7 +26,7 @@ export default class Transaction extends Protocol {
         .map(async tx => {
           tx = await new TransactionMessage(tx)
           size += tx.encoded.length
-          if (!formatBytes(size).includes('MB') || formatBytes(size).includes('MB') && Number(formatBytes(size).split(' MB')[0]) <= 0.75) _transactions.push({...tx.decoded, hash: await tx.hash})
+          if (!formatBytes(size).includes('MB') || formatBytes(size).includes('MB') && Number(formatBytes(size).split(' MB')[0]) <= 0.75) _transactions.push({...tx.decoded, hash: await tx.hash()})
           else resolve(_transactions)
         }))
 
@@ -52,7 +52,7 @@ export default class Transaction extends Protocol {
    */
   async promiseTransactionsContent(transactions) {
     transactions = await Promise.all(transactions.map(tx => new Promise(async (resolve, reject) => {
-      resolve({ ...tx.decoded, hash: await tx.hash })
+      resolve({ ...tx.decoded, hash: await tx.hash() })
     })))
 
     return transactions
@@ -157,7 +157,7 @@ export default class Transaction extends Protocol {
     let identity = await walletStore.get('identity')
     identity = JSON.parse(new TextDecoder().decode(identity))
     const wallet = new MultiWallet(peernet.network)
-    wallet.recover(identity.mnemonic)
+    await wallet.recover(identity.mnemonic)
     const account = wallet.account(0).external(0)
     transaction.signature = await this.#signTransaction(transaction, account)
     transaction.signature = bs32.encode(transaction.signature)
@@ -209,23 +209,23 @@ export default class Transaction extends Protocol {
 
       let data
       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(await result.hash) : reject({hash: await result.hash, error: result.error})
+        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})
         } else {
           const completed = async result => {
-            result.status === 'fulfilled' ? resolve(await result.hash) : reject({hash: await result.hash, error: result.error})
+            result.status === 'fulfilled' ? resolve(result.hash) : reject({hash: result.hash, error: result.error})
     
             setTimeout(async () => {
-              pubsub.unsubscribe(`transaction.completed.${await message.hash}`, completed)
+              pubsub.unsubscribe(`transaction.completed.${await message.hash()}`, completed)
             }, 10_000)
           }
-          pubsub.subscribe(`transaction.completed.${await message.hash}`, completed)
+          pubsub.subscribe(`transaction.completed.${await message.hash()}`, completed)
         }
       })
-      await transactionPoolStore.put(await message.hash, message.encoded)
+      await transactionPoolStore.put(await message.hash(), message.encoded)
       peernet.publish('add-transaction', message.encoded)
-      return {hash: await message.hash, data, fee: await calculateFee(message.decoded), wait, message}
+      return {hash: await message.hash(), data, fee: await calculateFee(message.decoded), wait, message}
     } catch (error) {
       console.log(error)
       throw error

package/test/chain.js

@@ -67,7 +67,7 @@ const job = async () => {
 
     console.log(`${(new Date().getTime() - start) / 1000} s`);
 
-    balances = await chain.balances
+    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