@leofcoin/chain 1.3.1 → 1.3.4

package/dist/contracts/validators.js

@@ -1 +1 @@
-class Validators{#name="ArtOnlineValidators";#totalValidators=0;#validators={};#owner;#currency;#minimumBalance;get state(){return{owner:this.#owner,minimumBalance:this.#minimumBalance,currency:this.#currency,totalValidators:this.#totalValidators,validators:this.#validators}}constructor(tokenAddress,state){state?(this.#owner=state.owner,this.#minimumBalance=state.minimumBalance,this.#currency=state.currency,this.#totalValidators=state.totalValidators,this.#validators=state.validators):(this.#owner=msg.sender,this.#minimumBalance=5e4,this.#currency=tokenAddress,this.#totalValidators+=1,this.#validators[msg.sender]={firstSeen:(new Date).getTime(),active:!0})}get name(){return this.#name}get owner(){return this.#owner}get currency(){return this.#currency}get validators(){return{...this.#validators}}get totalValidators(){return this.#totalValidators}get minimumBalance(){return this.#minimumBalance}changeOwner(owner){if(msg.sender!==this.#owner)throw new Error("not an owner")}changeCurrency(currency){if(msg.sender!==this.#owner)throw new Error("not an owner");this.#currency=currency}has(validator){return Boolean(void 0!==this.#validators[validator])}async addValidator(validator){if(this.has(validator))throw new Error("already a validator");const balance=await msg.staticCall(this.currency,"balanceOf",[msg.sender]);if(balance<this.minimumBalance)throw new Error(`balance to low! got: ${balance} need: ${this.#minimumBalance}`);this.#totalValidators+=1,this.#validators[validator]={firstSeen:(new Date).getTime(),active:!0}}removeValidator(validator){if(!this.has(validator))throw new Error("validator not found");this.#totalValidators-=1,delete this.#validators[validator]}async updateValidator(validator,active){if(!this.has(validator))throw new Error("validator not found");const balance=await msg.staticCall(this.currency,"balanceOf",[msg.sender]);if(balance<this.minimumBalance&&this.#validators[validator].active&&(this.#validators[validator].active=!1),balance<this.minimumBalance)throw new Error(`balance to low! got: ${balance} need: ${this.#minimumBalance}`);this.#validators[validator].active=active}}export{Validators as default};
+class Roles{#roles={IMPLEMENTATION_MANAGER:[],OWNER:[],MINT:[],BURN:[]};constructor(roles){if(roles){if(!(roles instanceof Object))throw new TypeError("expected roles to be an object");this.#roles={...roles,...this.#roles}}else this.#grantRole(msg.sender,"OWNER"),this.#grantRole(msg.sender,"IMPLEMENTATION_MANAGER")}get state(){return{roles:this.roles}}get roles(){return{...this.#roles}}hasRole(address,role){return!!this.#roles[role]&&this.#roles[role].includes(address)}#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("OWNER"===role&&1===this.#roles[role].length)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)}}class Validators extends Roles{#name="ArtOnlineValidators";#totalValidators=0;#activeValidators=0;#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),state?(this.#minimumBalance=state.minimumBalance,this.#currency=state.currency,this.#totalValidators=state.totalValidators,this.#activeValidators=state.activeValidators,this.#validators=state.validators):(this.#minimumBalance=5e4,this.#currency=tokenAddress,this.#totalValidators+=1,this.#activeValidators+=1,this.#validators[msg.sender]={firstSeen:Date.now(),lastSeen:Date.now(),active:!0})}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(void 0!==this.#validators[validator])}#isAllowed(address){if(msg.sender!==address&&!this.hasRole(msg.sender,"OWNER"))throw new Error("sender is not the validator or owner");return!0}async addValidator(validator){if(this.#isAllowed(validator),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:!0}}removeValidator(validator){if(this.#isAllowed(validator),!this.has(validator))throw new Error("validator not found");this.#totalValidators-=1,this.#validators[validator].active&&(this.#activeValidators-=1),delete this.#validators[validator]}async updateValidator(validator,active){if(this.#isAllowed(validator),!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"));active?this.#activeValidators+=1:this.#activeValidators-=1,this.#validators[validator].active=active}}export{Validators as default};

package/dist/module/chain.js

@@ -3,8 +3,8 @@ import _BN from 'bn.js';
 import '@ethersproject/bytes';
 import { Logger } from '@ethersproject/logger';
 import '@ethersproject/bignumber';
-import { randomBytes } from 'crypto';
-import { join } from 'path';
+import { randomBytes } from 'node:crypto';
+import { join } from 'node:path';
 import EasyWorker from '@vandeurenglenn/easy-worker';
 import { FormatInterface } from '@leofcoin/codec-format-interface';
 import MultiWallet from '@leofcoin/multi-wallet';
@@ -55,8 +55,8 @@ class Machine {
   #nonces = {}
   lastBlock = {index: 0, hash: '0x0', previousHash: '0x0'}
 
-  constructor() {
-    return this.#init()
+  constructor(blocks) {
+    return this.#init(blocks)
   }
 
   #createMessage(sender = peernet.selectedAccount) {
@@ -69,31 +69,36 @@ class Machine {
 
   async #onmessage(data) {
     switch (data.type) {
-      case 'contractError':
+      case 'contractError': {
         console.warn(`removing contract ${await data.hash}`);
         await contractStore.delete(await data.hash);  
-      break
+      break
+      }
 
-      case 'executionError':
+      case 'executionError': {
         // console.warn(`error executing transaction ${data.message}`);
         pubsub.publish(data.id, {error: data.message});
-      break
+      break
+      }
 
-      case 'debug':
-        data.messages.forEach(message => debug(message));
-      break
-      case 'machine-ready':
+      case 'debug': {
+        for (const message of data.messages) debug(message);
+      break
+      }
+      case 'machine-ready': {
         this.lastBlock = data.lastBlock;
         pubsub.publish('machine.ready', true);
-      break
-      case 'response':
+      break
+      }
+      case 'response': {
         pubsub.publish(data.id, data.value);
-      break
+      break
+      }
     }
     
   }
 
-  async #init() {
+  async #init(blocks) {
     return new Promise(async (resolve) => {
       pubsub.subscribe('machine.ready', ()  => {
         resolve(this);
@@ -102,7 +107,7 @@ class Machine {
       this.worker = await new EasyWorker(join(__dirname, './workers/machine-worker.js'), {serialization: 'advanced', type:'module'});
       this.worker.onmessage(this.#onmessage.bind(this));
 
-      const blocks = await blockStore.values();
+      // const blocks = await blockStore.values()
       const contracts = await Promise.all([
         contractStore.get(contractFactory$1),
         contractStore.get(nativeToken$1),
@@ -124,19 +129,19 @@ class Machine {
   }
 
   async #runContract(contractMessage) {
-    const params = contractMessage.decoded.constructorParameters;
+    const parameters = contractMessage.decoded.constructorParameters;
     try {
 
-      const func = new Function(contractMessage.decoded.contract);
-      const Contract = func();
+      const function_ = new Function(contractMessage.decoded.contract);
+      const Contract = function_();
 
       globalThis.msg = this.#createMessage(contractMessage.decoded.creator);
       // globalThis.msg = {sender: contractMessage.decoded.creator}
-      this.#contracts[await contractMessage.hash] = await new Contract(...params);
+      this.#contracts[await contractMessage.hash] = await new Contract(...parameters);
       debug(`loaded contract: ${await contractMessage.hash}`);
       debug(`size: ${formatBytes(contractMessage.encoded.length)}`);
-    } catch (e) {
-      console.log(e);
+    } catch (error) {
+      console.log(error);
       console.warn(`removing contract ${await contractMessage.hash}`);
       await contractStore.delete(await contractMessage.hash, contractMessage.encoded);
     }
@@ -153,7 +158,7 @@ class Machine {
     throw new Error('duplicate contract')
   }
 
-  async execute(contract, method, params) {
+  async execute(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = randomBytes(20).toString('hex');
       const message = message => {
@@ -167,22 +172,22 @@ class Machine {
         input: {
           contract,
           method,
-          params
+          params: parameters
         }
       });
     })
     
   }
 
-  addJob(contract, method, params, from, nonce) {
+  addJob(contract, method, parameters, from, nonce) {
     if (!this.#nonces[from]) this.#nonces[from] = nonce;
-    if (nonce === this.#nonces[from] + 1) return this.#contracts[contract][method](...params)
+    if (nonce === this.#nonces[from] + 1) return this.#contracts[contract][method](...parameters)
     // return setTimeout(() => {
     //   return this.addJob(contract, method, params, from, nonce)
     // }, 50)
   }
 
-  get(contract, method, params) {
+  get(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = randomBytes(20).toString();
       const message = message => {
@@ -195,7 +200,7 @@ class Machine {
         input: {
           contract,
           method,
-          params
+          params: parameters
         }
       });
     })
@@ -404,8 +409,10 @@ class Chain {
   #blocks = []
   #machine
   #runningEpoch = false
+  #chainSyncing = false
   #lastBlock = {index: 0, hash: '0x0', previousHash: '0x0'}
-
+  #participants = []
+  #participating = false
   #jail = []
 
   constructor() {
@@ -445,14 +452,14 @@ class Chain {
     console.log(validators);
     if (!validators[peernet.selectedAccount]?.active) return
 
-    const start = new Date().getTime();
+    const start = Date.now();
     try {
       await this.#createBlock();
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     }
     
-    const end = new Date().getTime();
+    const end = Date.now();
     console.log(((end - start) / 1000) + ' s');
     
     if (await this.hasTransactionToHandle()) return this.#runEpoch()
@@ -489,7 +496,7 @@ class Chain {
       const timeout = setTimeout(() => {
         resolve([{index: 0, hash: '0x0'}]);
         debug('sync timed out');
-      }, 10000);
+      }, 10_000);
   
       promises = await Promise.allSettled(promises);
       promises = promises.filter(({status}) => status === 'fulfilled');
@@ -503,11 +510,11 @@ class Chain {
     
   }
 
-  sync() {
-    return this.#sync()
+  getLatestBlock() {
+    return this.#getLatestBlock()
   }
 
-  async #sync() {
+  async #getLatestBlock() {
     let promises = [];
     
     let data = await new peernet.protos['peernet-request']({request: 'lastBlock'});
@@ -519,37 +526,38 @@ class Chain {
       } else if (!peer.connected || peer.readyState !== 'open') ;
     }
     promises = await this.promiseRequests(promises);
-    promises = promises.reduce((set, value) => {
-      
-      if (value.index > set.index) {
-        set.index = value.index;
-        set.hash = value.hash;
-      }
-      return set
-    }, {index: 0, hash: '0x0'});
-    // get lastblock
-      if (promises.hash && promises.hash !== '0x0') {
-        await peernet.get(promises.hash);
+    let latest = {index: 0, hash: '0x0'};
+
+    for (const value of promises) {      
+      if (value.index > latest.index) {
+        latest.index = value.index;
+        latest.hash = value.hash;
       }
-      
-      
+    }
+    
+    if (latest.hash && latest.hash !== '0x0') {
+      let latestBlock = await peernet.get(latest.hash, block);
+      latestBlock = await new BlockMessage(latestBlock);
+    }
+
+    return latestBlock
   }
 
   async #init() {
     // this.node = await new Node()
-    this.participants = [];
-    this.participating = false;
+    this.#participants = [];
+    this.#participating = false;
     const initialized = await contractStore.has(addresses.contractFactory);
     if (!initialized) await this.#setup();
 
-    this.#machine = await new Machine();
+   
     this.utils = { BigNumber, formatUnits, parseUnits };
     
     try {
       let localBlock;
       try {
         localBlock = await chainStore.get('lastBlock');
-      } catch(e) {
+      } catch{
         await chainStore.put('lastBlock', '0x0');
         localBlock = await chainStore.get('lastBlock');
       }
@@ -559,13 +567,11 @@ class Chain {
         localBlock = await new BlockMessage(localBlock);
         this.#lastBlock = {...localBlock.decoded, hash: await localBlock.hash};
       } else {
-        await this.#sync();
+        const latestBlock = await this.#getLatestBlock();
+        await this.#syncChain(latestBlock);
       }      
-    } catch (e) {
-      console.log({e});     
-      
-
-      // this.#setup()
+    } catch (error) {
+      console.log({e: error});
     }
 
     await peernet.addRequestHandler('bw-request-message', () => {
@@ -586,6 +592,8 @@ class Chain {
     
     // load local blocks
     await this.resolveBlocks();
+    this.#machine = await new Machine(this.#blocks);
+    await this.#loadBlocks(this.#blocks);
     return this
   }
 
@@ -596,29 +604,33 @@ class Chain {
     this.#jail.push(validatorInfo.address);
   }
 
-  async #peerConnected(peer) {
-    let node = await new peernet.protos['peernet-request']({request: 'lastBlock'});
-    node = await peernet.prepareMessage(node);
-    let response = await peer.request(node.encoded);
-    response = await new globalThis.peernet.protos['peernet-response'](response);
-    let lastBlock = response.decoded.response;
+  async #syncChain(lastBlock) {
+    if (this.#chainSyncing) return
 
     if (!this.lastBlock || Number(this.lastBlock.index) < Number(lastBlock.index)) {
-         // TODO: check if valid
+      this.#chainSyncing = true;
+      // TODO: check if valid
       const localIndex = this.lastBlock ? this.lastBlock.index : 0;
       const index = lastBlock.index;
       await this.resolveBlock(lastBlock.hash);
-      let blocksSynced = localIndex > 0 ? localIndex > index ? localIndex - index : index - localIndex : index;
+      let blocksSynced = localIndex > 0 ? (localIndex > index ? localIndex - index : index - localIndex) : index;
       debug(`synced ${blocksSynced} ${blocksSynced > 1 ? 'blocks' : 'block'}`);
 
       this.#blocks.length;
-      (this.#blocks.length) - blocksSynced;
-      await this.#loadBlocks(this.#blocks);
-      this.#lastBlock = this.#blocks[this.#blocks.length - 1];
-      const message = await new BlockMessage(this.lastBlock);
-      await blockStore.put(await message.hash, message.encoded);
-      await chainStore.put('lastBlock', this.lastBlock.hash);
+      const start = this.#blocks.length - blocksSynced;
+      await this.#loadBlocks(this.blocks.slice(start));
+      await this.#updateState(this.#blocks[this.#blocks.length - 1]);      
+      this.#chainSyncing = false;
     }
+  }
+
+  async #peerConnected(peer) {
+    let node = await new peernet.protos['peernet-request']({request: 'lastBlock'});
+    node = await peernet.prepareMessage(node);
+    let response = await peer.request(node.encoded);
+    response = await new globalThis.peernet.protos['peernet-response'](response);
+    let lastBlock = response.decoded.response;
+    this.#syncChain(lastBlock);
  }
 
  #epochTimeout
@@ -628,9 +640,9 @@ class Chain {
     transaction = await new TransactionMessage(transaction);
     const has = await transactionPoolStore.has(await transaction.hash);
     if (!has) await transactionPoolStore.put(await transaction.hash, transaction.encoded);
-    if (this.participating && !this.#runningEpoch) this.#runEpoch();
-  } catch (e) {
-    throw Error('invalid transaction')
+    if (this.#participating && !this.#runningEpoch) this.#runEpoch();
+  } catch {
+    throw new Error('invalid transaction')
   }
 }
 
@@ -643,11 +655,11 @@ async resolveBlock(hash) {
   let block = await peernet.get(hash, 'block');
   block = await new BlockMessage(block);
   if (!await peernet.has(hash, 'block')) await peernet.put(hash, block.encoded, 'block');
-  const size = block.encoded.length || block.encoded.byteLength;
+  const size = block.encoded.length > 0 ? block.encoded.length : block.encoded.byteLength;
   block = {...block.decoded, hash};
-  if (this.#blocks[block.index]) throw `invalid block ${hash} @${block.index}`
+  if (this.#blocks[block.index] && this.#blocks[block.index].hash !== block.hash) throw `invalid block ${hash} @${block.index}`
   this.#blocks[block.index] = block;
-  console.log(`loaded block: ${hash} @${block.index} ${formatBytes(size)}`);
+  console.log(`resolved block: ${hash} @${block.index} ${formatBytes(size)}`);
   if (block.previousHash !== '0x0') {
     return this.resolveBlock(block.previousHash)
   }
@@ -661,8 +673,8 @@ async resolveBlock(hash) {
       if (hash && hash !== '0x0')
         await this.resolveBlock(hash);
         this.#lastBlock = this.#blocks[this.#blocks.length - 1];
-        await this.#loadBlocks(this.#blocks);
-    } catch (e) {
+        
+    } catch {
       await chainStore.put('lastBlock', new TextEncoder().encode('0x0'));
       return this.resolveBlocks()
 // console.log(e);
@@ -676,11 +688,12 @@ async resolveBlock(hash) {
           try {
             await this.#machine.execute(transaction.to, transaction.method, transaction.params);
 
-          } catch (e) {
-  console.log(e);
+          } catch (error) {
+  console.log(error);
           }
         }
-        block.loaded = true;
+        this.#blocks[block.index].loaded = true;
+        console.log(`loaded block: ${block.hash} @${block.index}`);
         // let message = await peernet.get(block.hash, 'block')
 
         // const compressed = pako.deflate(message);
@@ -708,10 +721,10 @@ async resolveBlock(hash) {
       let result = await this.#machine.execute(to, method, params, from, nonce);
       // if (!result) result = this.#machine.state
       pubsub.publish(`transaction.completed.${hash}`, {status: 'fulfilled', hash});
-      return result ? result : 'no state change'
-    } catch (e) {
-      pubsub.publish(`transaction.completed.${hash}`, {status: 'fail', hash, error: e});
-      throw e
+      return result || 'no state change'
+    } catch (error) {
+      pubsub.publish(`transaction.completed.${hash}`, {status: 'fail', hash, error: error});
+      throw error
     }
   }
 
@@ -732,8 +745,6 @@ async resolveBlock(hash) {
     //   transaction = new TransactionMessage(transaction)
     //   return transaction
     // }
-
-    console.log(blockMessage);
     await Promise.all(blockMessage.decoded.transactions
       .map(async transaction => transactionPoolStore.delete(await transaction.hash)));
     const hash = await blockMessage.hash;
@@ -750,11 +761,15 @@ async resolveBlock(hash) {
       // await transactionStore.put(transaction.hash, transaction.encoded)
       const index = contracts.indexOf(transaction.to);
       if (index === -1) contracts.push(transaction.to);
+      // Todo: go trough all accounts      
       promises.push(this.#executeTransaction(transaction));
+      
     }
     try {
       promises = await Promise.allSettled(promises);
       for (let transaction of blockMessage.decoded.transactions) {
+        pubsub.publish('transaction-processed', transaction);
+        if (transaction.to === peernet.selectedAccount) pubsub.publish('account-transaction-processed', transaction);        
         await accountsStore.put(transaction.from, String(transaction.nonce));
       }
       
@@ -767,8 +782,9 @@ async resolveBlock(hash) {
 
       
       pubsub.publish('block-processed', blockMessage.decoded);
-    } catch (e) {
-      console.log({e});
+      
+    } catch (error) {
+      console.log({e: error});
     }
 
   }
@@ -788,7 +804,7 @@ async resolveBlock(hash) {
     // introduce peer-reputation
     // peerReputation(peerId)
     // {bandwith: {up, down}, uptime}
-    this.participating = true;
+    this.#participating = true;
     if (!await this.staticCall(addresses.validators, 'has', [address])) await this.createTransactionFrom(address, addresses.validators, 'addValidator', [address]);
     if (await this.hasTransactionToHandle() && !this.#runningEpoch) await this.#runEpoch();
     
@@ -850,7 +866,7 @@ async resolveBlock(hash) {
         block.transactions.push(transaction);
         block.fees += Number(calculateFee(transaction));
         await accountsStore.put(transaction.from, new TextEncoder().encode(String(transaction.nonce)));
-      } catch (e) {
+      } catch {
         transaction = await new TransactionMessage(transaction);
         await transactionPoolStore.delete(await transaction.hash);
       }
@@ -883,9 +899,7 @@ async resolveBlock(hash) {
               address: validator,
               bw: bw.up + bw.down
             });
-          } catch(e) {
-
-          }
+          } catch{}
 
         } else if (peernet.selectedAccount === validator) {
           block.validators.push({
@@ -913,17 +927,17 @@ async resolveBlock(hash) {
     else block.index += 1;
 
     block.previousHash = this.lastBlock?.hash || '0x0';
-    block.timestamp = new Date().getTime();
+    block.timestamp = Date.now();
 
     const parts = String(block.fees).split('.');
     let decimals = 0;
     if (parts[1]) {
       const potentional = parts[1].split('e');
-      if (potentional[0] !== parts[1]) {
-        parts[1] = potentional[0];
-        decimals = Number(potentional[1]?.replace(/\-|\+/g, '')) + Number(potentional[0].length);
-      } else {
+      if (potentional[0] === parts[1]) {
         decimals = parts[1].length;
+      } else {
+        parts[1] = potentional[0];
+        decimals = Number(potentional[1]?.replace(/[+-]/g, '')) + Number(potentional[0].length);
       }
 
     }
@@ -943,9 +957,10 @@ async resolveBlock(hash) {
       debug(`created block: ${hash}`);
 
       peernet.publish('add-block', blockMessage.encoded);
-    } catch (e) {
-      console.log(e);
-      throw Error(`invalid block ${block}`)
+      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)
     // transactionStore.put(message.hash, message.encoded)
@@ -1014,8 +1029,8 @@ async resolveBlock(hash) {
    * @param {Array} params - array of paramters to apply to the contract method
    * @param {Number} nonce - total transaction count [optional]
    */
-  async createTransaction(to, method, params, nonce, signature) {
-    return this.createTransactionFrom(peernet.selectedAccount, to, method, params, nonce)
+  async createTransaction(to, method, parameters, nonce, signature) {
+    return this.createTransactionFrom(peernet.selectedAccount, to, method, parameters, nonce)
   }
 
   
@@ -1075,8 +1090,8 @@ async #signTransaction (transaction, wallet) {
     } else {
       let nonce = await accountsStore.get(transaction.from);
       nonce = new TextDecoder().decode(nonce);
-      if (transaction.nonce < nonce) throw Error(`a transaction with a higher nonce already exists`)
-      if (transaction.nonce === nonce) throw Error(`a transaction with the same nonce already exists`)
+      if (transaction.nonce < nonce) throw new Error(`a transaction with a higher nonce already exists`)
+      if (transaction.nonce === nonce) throw new Error(`a transaction with the same nonce already exists`)
     }
     return transaction
   }
@@ -1091,10 +1106,10 @@ async #signTransaction (transaction, wallet) {
    * @param {Array} params - array of paramters to apply to the contract method
    * @param {Number} nonce - total transaction count [optional]
    */
-  async createTransactionFrom(from, to, method, params, nonce) {
+  async createTransactionFrom(from, to, method, parameters, nonce) {
     try {
       
-      const rawTransaction = await this.createRawTransaction({from, to, nonce, method, params});    
+      const rawTransaction = await this.createRawTransaction({from, to, nonce, method, params: parameters});    
       const transaction = await this.signTransaction(rawTransaction, from);
       const message = await new TransactionMessage(transaction);
 
@@ -1110,7 +1125,7 @@ async #signTransaction (transaction, wallet) {
     
             setTimeout(async () => {
               pubsub.unsubscribe(`transaction.completed.${await message.hash}`, completed);
-            }, 10000);
+            }, 10_000);
           };
           pubsub.subscribe(`transaction.completed.${await message.hash}`, completed);
         }
@@ -1122,9 +1137,9 @@ async #signTransaction (transaction, wallet) {
       peernet.publish('add-transaction', message.encoded);
       this.#addTransaction(message.encoded);
       return {hash: await message.hash, data, fee: await calculateFee(message.decoded), wait}
-    } catch (e) {
-      console.log(e);
-      throw e
+    } catch (error) {
+      console.log(error);
+      throw error
     }
     
   }
@@ -1142,15 +1157,15 @@ async #signTransaction (transaction, wallet) {
    *
    * @param {String} contract - a contract string (see plugins/deployContract)
    */
-  async deployContract(contract, params = []) {
+  async deployContract(contract, parameters = []) {
     globalThis.msg = {sender: peernet.selectedAccount, call: this.call};
 
-    const hash = await this.createContractAddress(creator, contract, params);
+    const hash = await this.createContractAddress(creator, contract, parameters);
 console.log(hash);
     try {
       const tx = await this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
-    } catch (e) {
-      throw e
+    } catch (error) {
+      throw error
     }
     return this.#machine.addContract(message)
   }
@@ -1165,33 +1180,33 @@ console.log(hash);
     }
   }
 
-  internalCall(sender, contract, method, params) {
+  internalCall(sender, contract, method, parameters) {
     globalThis.msg = this.#createMessage(sender);
 
-    return this.#machine.execute(contract, method, params)
+    return this.#machine.execute(contract, method, parameters)
   }
 
-  call(contract, method, params) {
+  call(contract, method, parameters) {
     globalThis.msg = this.#createMessage();
 
-    return this.#machine.execute(contract, method, params)
+    return this.#machine.execute(contract, method, parameters)
   }
 
-  staticCall(contract, method, params) {
+  staticCall(contract, method, parameters) {
     globalThis.msg = this.#createMessage();
-    return this.#machine.get(contract, method, params)
+    return this.#machine.get(contract, method, parameters)
   }
 
-  delegate(contract, method, params) {
+  delegate(contract, method, parameters) {
     globalThis.msg = this.#createMessage();
 
-    return this.#machine.execute(contract, method, params)
+    return this.#machine.execute(contract, method, parameters)
   }
 
-  staticDelegate(contract, method, params) {
+  staticDelegate(contract, method, parameters) {
     globalThis.msg = this.#createMessage();
 
-    return this.#machine.get(contract, method, params)
+    return this.#machine.get(contract, method, parameters)
   }
 
   mint(to, amount) {