@leofcoin/chain 1.4.2 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Official javascript implementation",
   "main": "./dist/node.js",
   "module": "./dist/chain.esm",
@@ -48,10 +48,11 @@
     "@leofcoin/lib": "^1.0.11",
     "@leofcoin/messages": "^1.2.0",
     "@leofcoin/multi-wallet": "^2.1.1",
+    "@leofcoin/networks": "^1.0.0",
     "@leofcoin/peernet": "^0.16.0",
     "@leofcoin/storage": "^3.0.6",
-    "@leofcoin/utils": "^1.0.2",
-    "@leofcoin/workers": "^1.2.1",
+    "@leofcoin/utils": "^1.1.4",
+    "@leofcoin/workers": "^1.3.5",
     "@vandeurenglenn/base32": "^1.1.0",
     "@vandeurenglenn/easy-worker": "^1.0.2",
     "@vandeurenglenn/queue": "^1.0.0",

package/src/chain.js

@@ -1,9 +1,8 @@
-import { BigNumber, formatUnits, parseUnits } from '../../utils/src/utils.js'
+import { BigNumber, formatUnits, parseUnits, formatBytes } from '@leofcoin/utils'
 import Machine from './machine.js'
-import { ContractMessage, TransactionMessage, BlockMessage, BWMessage, BWRequestMessage } from '../../messages/src/messages.js'
-import addresses, { nativeToken } from '../../addresses/src/addresses.js'
-import { contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage, calculateFee } from '../../lib/src/lib.js'
-import { formatBytes } from '../../utils/src/utils.js'
+import { ContractMessage, TransactionMessage, BlockMessage, BWMessage, BWRequestMessage } from '@leofcoin/messages'
+import addresses, { nativeToken } from '@leofcoin/addresses'
+import { contractFactoryMessage, nativeTokenMessage, validatorsMessage, nameServiceMessage, calculateFee } from '@leofcoin/lib'
 import State from './state.js'
 import Contract from './contract.js'
 
@@ -242,7 +241,7 @@ export default class Chain  extends Contract {
       if (localBlock && localBlock !== '0x0') {
         localBlock = await peernet.get(localBlock, 'block')
         localBlock = await new BlockMessage(localBlock)
-        this.#lastBlock = {...localBlock.decoded, hash: await localBlock.hash}
+        this.#lastBlock = {...localBlock.decoded, hash: await localBlock.hash()}
       } else {
         const latestBlock = await this.#getLatestBlock()
         await this.#syncChain(latestBlock)
@@ -392,8 +391,8 @@ 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)))
-    const hash = await blockMessage.hash
+      .map(async transaction => transactionPoolStore.delete(await transaction.hash())))
+    const hash = await blockMessage.hash()
     
     await blockStore.put(hash, blockMessage.encoded)
     
@@ -434,7 +433,7 @@ async resolveBlock(hash) {
   }
 
   async #updateState(message) {
-    const hash = await message.hash
+    const hash = await message.hash()
     this.#lastBlock = { hash, ...message.decoded }
     await this.state.updateState(message)
     await chainStore.put('lastBlock', hash)
@@ -481,7 +480,7 @@ async resolveBlock(hash) {
         await accountsStore.put(transaction.from, new TextEncoder().encode(String(transaction.nonce)))
       } catch {
         transaction = await new TransactionMessage(transaction)
-        await transactionPoolStore.delete(await transaction.hash)
+        await transactionPoolStore.delete(await transaction.hash())
       }
     }
     // don't add empty block
@@ -558,11 +557,11 @@ async resolveBlock(hash) {
 
     try {
       await Promise.all(block.transactions
-        .map(async transaction => transactionPoolStore.delete(await transaction.hash)))
+        .map(async transaction => transactionPoolStore.delete(await transaction.hash())))
 
 
       let blockMessage = await new BlockMessage(block)
-      const hash = await blockMessage.hash
+      const hash = await blockMessage.hash()
       
       
       await peernet.put(hash, blockMessage.encoded, 'block')
@@ -583,9 +582,10 @@ async resolveBlock(hash) {
 
   async #addTransaction(transaction) {
     try {
+      const hash = await transaction.hash()
       transaction = await new TransactionMessage(transaction)
-      const has = await transactionPoolStore.has(await transaction.hash)
-      if (!has) await transactionPoolStore.put(await transaction.hash, transaction.encoded)
+      const has = await transactionPoolStore.has(hash)
+      if (!has) await transactionPoolStore.put(hash, transaction.encoded)
       if (this.#participating && !this.#runningEpoch) this.#runEpoch()
     } catch {
       throw new Error('invalid transaction')

package/src/contract.js

@@ -1,5 +1,5 @@
 import Transaction from "./transaction.js";
-import { createContractMessage } from './../../lib/src/lib.js'
+import { createContractMessage } from '@leofcoin/lib'
 
 /**
  * @extends {Transaction}

package/src/machine.js

@@ -1,10 +1,10 @@
-import { contractFactory, nativeToken, validators, nameService } from './../../addresses/src/addresses.js'
+import { contractFactory, nativeToken, validators, nameService } from '@leofcoin/addresses'
 import randombytes from 'randombytes'
 import { join, dirname } from 'node:path'
 import EasyWorker from '@vandeurenglenn/easy-worker'
-import { ContractMessage } from '../../messages/src/messages.js'
+import { ContractMessage } from '@leofcoin/messages'
 // import State from './state'
-import { fileURLToPath } from 'url';
+import { fileURLToPath } from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -29,8 +29,8 @@ export default class Machine {
   async #onmessage(data) {
     switch (data.type) {
       case 'contractError': {
-        console.warn(`removing contract ${await data.hash}`);
-        await contractStore.delete(await data.hash)  
+        console.warn(`removing contract ${await data.hash()}`);
+        await contractStore.delete(await data.hash())  
       break
       }
 
@@ -65,7 +65,7 @@ export default class Machine {
       }
       pubsub.subscribe('machine.ready', machineReady)
 
-      this.worker = await new EasyWorker('./workers/machine-worker.js', {serialization: 'advanced', type:'module'})
+      this.worker = await new EasyWorker('node_modules/@leofcoin/workers/src/machine-worker.js', {serialization: 'advanced', type:'module'})
       this.worker.onmessage(this.#onmessage.bind(this))
 
       // const blocks = await blockStore.values()
@@ -90,7 +90,7 @@ export default class Machine {
   }
 
   async #runContract(contractMessage) {
-    const hash = await contractMessage.hash
+    const hash = await contractMessage.hash()
     return new Promise((resolve, reject) => {
       const id = randombytes(20).toString('hex')
       const onmessage = message => {        
@@ -127,13 +127,13 @@ export default class Machine {
         if (!await contractStore.has(parameters[0])) {
           message = await peernet.get(parameters[0], 'contract')
           message = await new ContractMessage(message)
-          await contractStore.put(await message.hash, message.encoded)
+          await contractStore.put(await message.hash(), message.encoded)
         }
         if (!message) {
           message = await contractStore.get(parameters[0])
           message = await new ContractMessage(message)
         }
-        if (!this.#contracts[await message.hash]) await this.#runContract(message)
+        if (!this.#contracts[await message.hash()]) await this.#runContract(message)
       }
     } catch (error) {
       throw new Error(`contract deployment failed for ${parameters[0]}\n${error.message}`)

package/src/node.js

@@ -1,7 +1,7 @@
 // import config from './config/config'
 import Peernet from '@leofcoin/peernet'
-import nodeConfig from '../../lib/src/node-config.js';
-import networks from '../../networks/networks.js';
+import nodeConfig from '@leofcoin/lib/node-config';
+import networks from '@leofcoin/networks';
 
 export default class Node {
   constructor() {

package/src/transaction.js

@@ -2,9 +2,10 @@ import Protocol from "./protocol.js"
 import * as MultiWallet from '@leofcoin/multi-wallet'
 import {CodecHash} from '@leofcoin/codec-format-interface'
 import bs32 from '@vandeurenglenn/base32'
-import { TransactionMessage, BlockMessage } from "../../messages/src/messages.js"
-import { calculateFee } from './../../lib/src/lib.js'
-import { formatBytes } from '../../utils/src/utils.js'
+import { TransactionMessage, BlockMessage } from "@leofcoin/messages"
+import { calculateFee } from '@leofcoin/lib'
+import { formatBytes } from '@leofcoin/utils'
+
 export default class Transaction extends Protocol {
   constructor() {
     super()

package/src/apis/token.lfcc

@@ -1,17 +0,0 @@
-export default {
-  get name,
-  get symbol,
-  get holders,
-  get balances,
-  get roles,
-  function hasRole,
-  function grantRole,
-  function balance,
-  function setApproval,
-  function approved,
-  function mint,
-  function burn,
-  function transfer,
-  Event()
-  msg.sender
-}

package/src/transactions/transaction.js

@@ -1 +0,0 @@
-export default () => {}

package/src/transactions/validator.js

@@ -1,29 +0,0 @@
-import hasher from './crypto/hasher'
-import {create} from './crypto/transaction'
-
-export default class Validator {
-  constructor(address) {
-    this._init(address)
-  }
-
-  async _init(address) {
-    const valid = await this.isValid(address, this)
-    if (!valid) throw new Error('Invalid validator')
-    return this
-  }
-
-  async isValid(hash, transaction) {
-    return this.validateTransaction(hash, transaction)
-  }
-
-  async validateTransaction(hash, transaction) {
-    delete transaction.hash
-    transaction = await create(hasher.hash(transaction))
-    if (transaction !== hash) throw new Error('invalid hash')
-    // for (const input of transaction) {
-    //   input
-    // }
-    return true
-
-  }
-}