@leofcoin/chain 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "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/contract.js

@@ -1,5 +1,6 @@
 import Transaction from "./transaction.js";
 import { createContractMessage } from '@leofcoin/lib'
+import addresses from "@leofcoin/addresses"
 
 /**
  * @extends {Transaction}
@@ -41,11 +42,11 @@ export default class Contract extends Transaction {
   async deployContract(contract, constructorParameters = []) {
     const message = await createContractMessage(peernet.selectedAccount, contract, constructorParameters)
     try {
-      await contractStore.put(await message.hash, message.encoded)
+      await contractStore.put(await message.hash(), message.encoded)
     } catch (error) {
       throw error
     }
-    return this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'registerContract', [await message.hash])    
+    return this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'registerContract', [await message.hash()])    
   }
   
 }

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

package/src/contracts/factory.js

@@ -1,52 +0,0 @@
-export default class Factory {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineContractFactory'
-  /**
-   * uint
-   */
-  #totalContracts = 0
-  /**
-   * Array => string
-   */
-  #contracts = []
-
-  constructor(state) {
-    if (state) {
-      this.#contracts = state.contracts
-      this.#totalContracts = state.totalContracts
-    }
-  }
-
-  get state() {
-    return {
-      totalContracts: this.#totalContracts,
-      contracts: this.#contracts
-    }
-  }
-
-  get name() {
-    return this.#name
-  }
-
-  get contracts() {
-    return [...this.#contracts]
-  }
-
-  get totalContracts() {
-    return this.#totalContracts
-  }
-
-  /**
-   * 
-   * @param {Address} address contract address to register
-   */
-  async registerContract(address) {
-    await msg.staticCall(address, 'hasRole', [msg.sender, 'OWNER'])
-    if (this.#contracts.includes(address)) throw new Error('already registered')
-
-    this.#totalContracts += 1
-    this.#contracts.push(address)
-  }
-}

package/src/contracts/name-service.js

@@ -1,106 +0,0 @@
-export default class NameService {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineNameService'
-  /**
-   * string
-   */
-  #owner
-  /**
-   * number
-   */
-  #price = 0
-  /**
-   * Object => string
-   */
-  #registry = {}
-
-  /**
-   * => string
-   */
-  #currency
-
-  get name() {
-    return this.#name
-  }
-
-  get registry() {
-    return {...this.#registry}
-  }
-
-  get state() {}
-
-  // TODO: control with contract
-  constructor(factoryAddress, currency, validatorAddress, price, state) {
-    if (state) {
-      this.#owner = state.owner
-      this.#registry = state.registry
-      this.#currency = state.currency
-      this.#price = state.price
-    } else {
-      this.#owner = msg.sender
-      this.#price = price
-      this.#registry['ArtOnlineContractFactory'] = {
-        owner: msg.sender,
-        address: factoryAddress
-      }
-
-      this.#registry['ArtOnlineToken'] = {
-        owner: msg.sender,
-        address: currency
-      }
-
-      this.#registry['ArtOnlineValidators'] = {
-        owner: msg.sender,
-        address: validatorAddress
-      }
-
-      this.#currency = currency
-    }
-  }
-
-  changeOwner(owner) {
-    if (msg.sender !== this.#owner) throw new Error('no owner')
-    this.#owner = owner
-  }
-
-  changePrice(price) {
-    if (msg.sender !== this.#owner) throw new Error('no owner')
-    this.#price = price
-  }
-
-  changeCurrency(currency) {
-    if (msg.sender !== this.#owner) throw new Error('no owner')
-    this.#currency = currency
-  }
-
-  async purchaseName(name, address) {
-    const balance = await msg.call(this.#currency, 'balanceOf', [msg.sender])
-    if (balance < this.#price) throw new Error('price exceeds balance')
-    try {
-      await msg.call(this.#currency, 'transfer', [msg.sender, this.#owner, this.#price])
-    } catch (error) {
-      throw error
-    }
-
-    this.#registry[name] = {
-      owner: msg.sender,
-      address
-    }
-  }
-
-  lookup(name) {
-    return this.#registry[name]
-  }
-
-  transferOwnership(name, to) {
-    if (msg.sender !== this.#registry.owner) throw new Error('not a owner')
-    this.#registry[name].owner = to
-  }
-
-  changeAddress(name, address) {
-    if (msg.sender !== this.#registry.owner) throw new Error('not a owner')
-    this.#registry[name].address = address
-  }
-}

package/src/contracts/native-token.js

@@ -1,7 +0,0 @@
-import Token from './../standards/token.js'
-
-export default class ArtOnline extends Token {
-  constructor(state) {
-    super('ArtOnline', 'ART', 18, state)
-  }
-}

package/src/contracts/power-token.js

@@ -1,7 +0,0 @@
-import Token from '../standards/token.js'
-
-export default class Power extends Token {
-  constructor(state) {
-    super('Power', 'PWR', 18, state)
-  }
-}

package/src/contracts/validators.js

@@ -1,129 +0,0 @@
-import Roles from './../standards/roles'
-
-export default class Validators extends Roles {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineValidators'
-  /**
-   * uint
-   */
-  #totalValidators = 0
-
-  #activeValidators = 0
-  /**
-   * Object => string(address) => Object
-   */
-  #validators = {}
-
-  #currency
-
-  #minimumBalance
-
-  get state() {
-    return {
-      ...super.state,
-      minimumBalance: this.#minimumBalance,
-      currency: this.#currency,
-      totalValidators: this.#totalValidators,
-      activeValidators: this.#activeValidators,
-      validators: this.#validators
-    }
-  }
-
-  constructor(tokenAddress, state) {
-    super(state?.roles)
-    if (state) {
-      this.#minimumBalance = state.minimumBalance
-      this.#currency = state.currency
-
-      this.#totalValidators = state.totalValidators
-      this.#activeValidators = state.activeValidators
-      this.#validators = state.validators
-    } else {
-      this.#minimumBalance = 50_000
-      this.#currency = tokenAddress
-
-      this.#totalValidators += 1
-      this.#activeValidators += 1
-      this.#validators[msg.sender] = {
-        firstSeen: Date.now(),
-        lastSeen: Date.now(),
-        active: true
-      }
-    }
-
-  }
-
-  get name() {
-    return this.#name
-  }
-
-  get currency() {
-    return this.#currency
-  }
-
-  get validators() {
-    return {...this.#validators}
-  }
-
-  get totalValidators() {
-    return this.#totalValidators
-  }
-
-  get minimumBalance() {
-    return this.#minimumBalance
-  }
-
-  changeCurrency(currency) {
-    if (!this.hasRole(msg.sender, 'OWNER')) throw new Error('not an owner')
-    this.#currency = currency
-  }
-
-  has(validator) {
-    return Boolean(this.#validators[validator] !== undefined)
-  }
-
-  #isAllowed(address) {
-    if (msg.sender !== address && !this.hasRole(msg.sender, 'OWNER')) throw new Error('sender is not the validator or owner')
-    return true
-  }
-
-  async addValidator(validator) {
-    this.#isAllowed(validator)
-    if (this.has(validator)) throw new Error('already a validator')
-    
-    const balance = await msg.staticCall(this.currency, 'balanceOf', [validator])
-
-    if (balance < this.minimumBalance) throw new Error(`balance to low! got: ${balance} need: ${this.#minimumBalance}`)
-
-    this.#totalValidators += 1
-    this.#activeValidators += 1
-    this.#validators[validator] = {
-      firstSeen: Date.now(),
-      lastSeen: Date.now(),
-      active: true
-    }
-  }
-
-  removeValidator(validator) {
-    this.#isAllowed(validator)
-    if (!this.has(validator)) throw new Error('validator not found')
-    
-    this.#totalValidators -= 1
-    if (this.#validators[validator].active) this.#activeValidators -= 1
-    delete this.#validators[validator]
-  }
-
-  async updateValidator(validator, active) {
-    this.#isAllowed(validator)
-    if (!this.has(validator)) throw new Error('validator not found')
-    const balance = await msg.staticCall(this.currency, 'balanceOf', [validator])
-    if (balance < this.minimumBalance && active) throw new Error(`balance to low! got: ${balance} need: ${this.#minimumBalance}`)
-    if (this.#validators[validator].active === active) throw new Error(`already ${active ? 'activated' : 'deactivated'}`)
-    if (active) this.#activeValidators += 1
-    else this.#activeValidators -= 1
-    /** minimum balance always needs to be met */
-    this.#validators[validator].active = active
-  }
-}

package/src/standards/roles.js

@@ -1,65 +0,0 @@
-export default class Roles {
-
-  /**
-   * Object => Array
-   */
-  #roles = {
-    'OWNER': [],
-    'MINT': [],
-    'BURN': []
-  }
-
-  constructor(roles) {
-    // allow devs to set their own roles but always keep the default ones included
-    // also allows roles to be loaded from the stateStore
-    // carefull when including the roles make sure to add the owner
-    // because no roles are granted by default when using custom roles
-    if (roles) {
-      if (roles instanceof Object) {
-       this.#roles = {...roles, ...this.#roles}
-      } else {
-       throw new TypeError(`expected roles to be an object`)
-      }
-    } else {
-      // no roles given so fallback to default to the msg sender
-      this.#grantRole(msg.sender, 'OWNER')
-    }
-  }
-
-  get state() {
-    return { roles: this.roles }
-  }
-
-  get roles() {
-    return {...this.#roles}
-  }
-
-  hasRole(address, role) {
-    return this.#roles[role] ? this.#roles[role].includes(address) : false
-  }
-
-  #grantRole(address, role) {
-    if (this.hasRole(address, role)) throw new Error(`${role} role already granted for ${address}`)
-
-    this.#roles[role].push(address)
-  }
-
-  #revokeRole(address, role) {
-    if (!this.hasRole(address, role)) throw new Error(`${role} role already revoked for ${address}`)
-    if (role === 'OWNER' && this.#roles[role].length === 1) throw new Error(`atleast one owner is needed!`)
-
-    this.#roles[role].splice(this.#roles[role].indexOf(address))
-  }
-
-  grantRole(address, role) {
-    if (!this.hasRole(address, 'OWNER')) throw new Error('Not allowed')
-
-    this.#grantRole(address, role)
-  }
-
-  revokeRole(address, role) {
-    if (!this.hasRole(address, 'OWNER')) throw new Error('Not allowed')
-
-    this.#revokeRole(address, role)
-  }
-}

package/src/standards/token.js

@@ -1,137 +0,0 @@
-import Roles from './roles.js'
-
-export default class Token extends Roles {
-  /**
-   * string
-   */
-  #name
-  /**
-   * String
-   */
-  #symbol
-  /**
-   * uint
-   */
-  #holders = 0
-  /**
-   * Object => Object => uint
-   */
-  #balances = {}
-  /**
-   * Object => Object => uint
-   */
-  #approvals = {}
-
-  #decimals = 18
-
-  #totalSupply = BigNumber.from(0)
-
-    // this.#privateField2 = 1
-  constructor(name, symbol, decimals = 18, state) {
-    if (!name) throw new Error(`name undefined`)
-    if (!symbol) throw new Error(`symbol undefined`)
-
-    super(state?.roles)
-
-    this.#name = name
-    this.#symbol = symbol
-    this.#decimals = decimals
-  }
-
-  // enables snapshotting
-  // needs dev attention so nothing breaks after snapshot happens
-  // iow everything that is not static needs to be included in the stateObject
-  /**
-   * @return {Object} {holders, balances, ...}
-   */
-  get state() {
-    return {
-      ...super.state,
-      holders: this.holders,
-      balances: this.balances,
-      approvals: { ...this.#approvals },
-      totalSupply: this.totalSupply
-    }
-  }
-
-  get totalSupply() {
-    return this.#totalSupply
-  }
-
-  get name() {
-    return this.#name
-  }
-
-  get symbol() {
-    return this.#symbol
-  }
-
-  get holders() {
-    return this.#holders
-  }
-
-  get balances() {
-    return {...this.#balances}
-  }
-
-  mint(to, amount) {
-    if (!this.hasRole(msg.sender, 'MINT')) throw new Error('not allowed')
-
-    this.#totalSupply = this.#totalSupply.add(amount)
-    this.#increaseBalance(to, amount)
-  }
-
-  burn(from, amount) {
-    if (!this.hasRole(msg.sender, 'BURN')) throw new Error('not allowed')
-
-    this.#totalSupply = this.#totalSupply.sub(amount)
-    this.#decreaseBalance(from, amount)
-  }
-
-  #beforeTransfer(from, to, amount) {
-    if (!this.#balances[from] || this.#balances[from] < amount) throw new Error('amount exceeds balance')
-  }
-
-  #updateHolders(address, previousBalance) {
-    if (this.#balances[address].toHexString() === '0x00') this.#holders -= 1
-    else if (this.#balances[address].toHexString() !== '0x00' && previousBalance.toHexString() === '0x00') this.#holders += 1
-  }
-
-  #increaseBalance(address, amount) {
-    if (!this.#balances[address]) this.#balances[address] = BigNumber.from(0)
-    const previousBalance = this.#balances[address]
-
-    this.#balances[address] = this.#balances[address].add(amount)
-    this.#updateHolders(address, previousBalance)
-  }
-
-  #decreaseBalance(address, amount) {
-    const previousBalance = this.#balances[address]
-    this.#balances[address] = this.#balances[address].sub(amount)
-    this.#updateHolders(address, previousBalance)
-  }
-
-  balanceOf(address) {
-    return this.#balances[address]
-  }
-
-  setApproval(operator, amount) {
-    const owner = globalThis.msg.sender
-    if (!this.#approvals[owner]) this.#approvals[owner] = {}
-    this.#approvals[owner][operator] = amount
-  }
-
-  approved(owner, operator, amount) {
-    return this.#approvals[owner][operator] === amount
-  }
-
-  transfer(from, to, amount) {
-    // TODO: is BigNumber?
-    amount = BigNumber.from(amount)
-    this.#beforeTransfer(from, to, amount)
-    this.#decreaseBalance(from, amount)
-    this.#increaseBalance(to, amount)
-  }
-
-
-}

package/src/standards/voting.js

@@ -1 +0,0 @@
-export default class ArtOnlineVoting {}