@leofcoin/chain 1.4.12 → 1.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "description": "Official javascript implementation",
   "main": "./dist/node.js",
   "module": "./dist/chain.esm",
@@ -43,12 +43,12 @@
   },
   "dependencies": {
     "@leofcoin/addresses": "^1.0.4",
-    "@leofcoin/codec-format-interface": "^1.5.0",
+    "@leofcoin/codec-format-interface": "^1.6.4",
     "@leofcoin/lib": "^1.0.11",
     "@leofcoin/messages": "^1.2.0",
     "@leofcoin/multi-wallet": "^2.1.1",
     "@leofcoin/networks": "^1.0.0",
-    "@leofcoin/peernet": "^0.17.0",
+    "@leofcoin/peernet": "^0.18.0",
     "@leofcoin/storage": "^3.0.6",
     "@leofcoin/utils": "^1.1.4",
     "@leofcoin/workers": "^1.3.5",

package/src/chain.js

@@ -121,7 +121,7 @@ export default class Chain  extends Contract {
     this.#runningEpoch = true
     console.log('epoch');
     const validators = await this.staticCall(addresses.validators, 'validators')
-    console.log(validators);
+    console.log({validators});
     if (!validators[peernet.selectedAccount]?.active) return
     const start = Date.now()
     try {
@@ -155,7 +155,8 @@ export default class Chain  extends Contract {
     }]
 
     await Promise.all(contracts.map(async ({address, message}) => {
-      message = await new ContractMessage(message)
+      // console.log({message});
+      message = await new ContractMessage(Uint8Array.from(message.split(',').map(string => Number(string))))
       await contractStore.put(address, message.encoded)
     }))
     console.log('handle native contracts');
@@ -460,7 +461,6 @@ async resolveBlock(hash) {
     if (await transactionPoolStore.size() === 0) return;
 
     let transactions = await transactionPoolStore.values(this.transactionLimit)
-
     if (Object.keys(transactions)?.length === 0 ) return
     
     let block = {
@@ -471,7 +471,6 @@ async resolveBlock(hash) {
 
     // exclude failing tx
     transactions = await this.promiseTransactions(transactions)
-
     transactions = transactions.sort((a, b) => a.nonce - b.nonce)
     for (let transaction of transactions) { 
       const hash = await transaction.hash()
@@ -480,7 +479,7 @@ async resolveBlock(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 {
+      } catch (e) {
         await transactionPoolStore.delete(hash)
       }
     }
@@ -572,7 +571,6 @@ async resolveBlock(hash) {
       peernet.publish('add-block', blockMessage.encoded)
       pubsub.publish('add-block', blockMessage.decoded)
     } catch (error) {
-      console.log(error);
       throw new Error(`invalid block ${block}`)
     }
     // data = await this.#machine.execute(to, method, params)
@@ -588,7 +586,8 @@ async resolveBlock(hash) {
       const has = await transactionPoolStore.has(hash)
       if (!has) await transactionPoolStore.put(hash, transaction.encoded)
       if (this.#participating && !this.#runningEpoch) this.#runEpoch()
-    } catch {
+    } catch (e) {
+      console.log(e);
       throw new Error('invalid transaction')
     }
   }

package/src/machine.js

@@ -26,7 +26,12 @@ export default class Machine {
       case 'contractError': {
         console.warn(`removing contract ${await data.hash()}`);
         await contractStore.delete(await data.hash())  
-      break
+        break
+      }
+
+      case 'initError': {
+        console.error(`init error: ${data.message}`);       
+        break
       }
 
       case 'executionError': {

package/src/transaction.js

@@ -160,7 +160,6 @@ export default class Transaction extends Protocol {
     await wallet.recover(identity.mnemonic)
     const account = await wallet.account(0).external(0)
     transaction.signature = await this.#signTransaction(transaction, account)
-    transaction.signature = bs32.encode(transaction.signature)
     return transaction
   }
 
@@ -206,28 +205,29 @@ export default class Transaction extends Protocol {
       const rawTransaction = await this.ensureNonce({from, to, nonce, method, params: parameters})    
       const transaction = await this.signTransaction(rawTransaction, from)
       const message = await new TransactionMessage(transaction)
-
+      const hash = await message.hash()
+      
       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
+        if (pubsub.subscribers[`transaction.completed.${hash}`]) {
+          const result = pubsub.subscribers[`transaction.completed.${hash}`].value
           result.status === 'fulfilled' ? resolve(result.hash) : reject({hash: result.hash, error: result.error})
         } else {
           const completed = async result => {
             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.${hash}`, completed)
             }, 10_000)
           }
-          pubsub.subscribe(`transaction.completed.${await message.hash()}`, completed)
+          pubsub.subscribe(`transaction.completed.${hash}`, completed)
         }
       })
-      await transactionPoolStore.put(await message.hash(), message.encoded)
+      await transactionPoolStore.put(hash, message.encoded)
+      debug(`Added ${hash} to the transaction pool`)
       peernet.publish('add-transaction', message.encoded)
-      return {hash: await message.hash(), data, fee: await calculateFee(message.decoded), wait, message}
+      return {hash: hash, data, fee: await calculateFee(message.decoded), wait, message}
     } catch (error) {
-      console.log(error)
       throw error
     }
   }

package/test/chain.js

@@ -1,5 +1,5 @@
 
-(async () => {
+
   globalThis.DEBUG = true
   const Chain = await import('./../src/chain.js');
   const Node = await import('./../src/node.js');
@@ -14,28 +14,17 @@
   })
   const chain = await new Chain.default()
   let start
-  //
-  // await chain.deleteAll()
-  // return
-//   try {
-//     const contract = await chain.utils.read('./dist/native.js')
-//     const address = await chain.deployContract(peernet.Buffer.from(`return ${contract.toString().replace(/export{([A-Z])\w+ as default}/g, '')}`))
-//     console.log(address);
-//   } catch (e) {
-// console.log(e);
-//   } finally {
-//
-//   }
-  // '5xdacigaguxg3yjllehp65htk32ha3sztlexxrrhmviobgibz6dt6hkxfu'
-console.log(peernet.selectedAccount);
       await chain.participate(peernet.selectedAccount)
       console.log(peernet.selectedAccount);
 const job = async () => {
-  // setTimeout(async () => {
+  
+  let nonce = await chain.getNonce(peernet.selectedAccount)
+  // // setTimeout(async () => {
     let tx
     // try {
     //   tx = await chain.createTransaction(chain.nativeToken, 'grantRole', [peernet.selectedAccount, 'MINT'])
-    //   await tx.wait()
+    //   console.log({tx});
+    //   await tx.wait
 
     // } catch (e) {
     //   console.log({e});
@@ -44,16 +33,17 @@ const job = async () => {
     // try {
     //   tx = await chain.createTransaction(chain.nativeToken, 'mint', [peernet.selectedAccount, chain.utils.parseUnits('100000000000000').toString()])
 
-    //   await tx.wait()
+    //   await tx.wait
     // } catch (e) {
     //   console.log({e});
     // }
-    // return
-    let nonce = await chain.getNonce(peernet.selectedAccount)
+    return
     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()}`);
+    console.log({balances});
+    // return
+    // 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
@@ -116,5 +106,4 @@ const job = async () => {
   } catch (e) {
     console.warn(e);
   }
-  return peernet
-})()
+