@leofcoin/chain 1.3.4 → 1.3.6

package/dist/chain.js

@@ -81,27 +81,27 @@ class Machine {
       case 'contractError': {
         console.warn(`removing contract ${await data.hash}`);
         await contractStore.delete(await data.hash);  
-      break
+      break
       }
 
       case 'executionError': {
         // console.warn(`error executing transaction ${data.message}`);
         pubsub.publish(data.id, {error: data.message});
-      break
+      break
       }
 
       case 'debug': {
         for (const message of data.messages) debug(message);
-      break
+      break
       }
       case 'machine-ready': {
         this.lastBlock = data.lastBlock;
         pubsub.publish('machine.ready', true);
-      break
+      break
       }
       case 'response': {
         pubsub.publish(data.id, data.value);
-      break
+      break
       }
     }
     
@@ -159,18 +159,18 @@ class Machine {
    * @params {ContractMessage} - contractMessage
    */
   async addContract(contractMessage) {
-    if (!await contractStore.has(contractMessage.hash)) {
-      await contractStore.put(contractMessage.hash, contractMessage.encoded);
-      await this.#runContract(contractMessage);
-      return contractMessage.hash
-    }
-    throw new Error('duplicate contract')
+    if (await contractStore.has(await contractMessage.hash)) throw new Error('duplicate contract')
+
+    await contractStore.put(await contractMessage.hash, contractMessage.encoded);
+    await this.#runContract(contractMessage);
+    return contractMessage.hash
   }
 
   async execute(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = node_crypto.randomBytes(20).toString('hex');
       const message = message => {
+        pubsub.unsubscribe(id, message);
         if (message?.error) reject(message.error);
         else resolve(message);
       };
@@ -1163,20 +1163,19 @@ async #signTransaction (transaction, wallet) {
   }
 
   /**
-   *
-   * @param {String} contract - a contract string (see plugins/deployContract)
+   * 
+   * @param {String} contract 
+   * @param {Array} parameters 
+   * @returns 
    */
   async deployContract(contract, parameters = []) {
-    globalThis.msg = {sender: peernet.selectedAccount, call: this.call};
-
-    const hash = await this.createContractAddress(creator, contract, parameters);
-console.log(hash);
+    const message = await createContractMessage(peernet.selectedAccount, contract, parameters);
     try {
-      const tx = await this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
+      await this.#machine.addContract(message);  
     } catch (error) {
       throw error
     }
-    return this.#machine.addContract(message)
+    return this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'registerContract', [await message.hash])    
   }
 
   #createMessage(sender = peernet.selectedAccount) {
@@ -1230,6 +1229,19 @@ console.log(hash);
     return this.staticCall(addresses.nativeToken, 'balances')
   }
 
+  get contracts() {
+    return this.staticCall(addresses.contractFactory, 'contracts')
+  }
+  /**
+   * 
+   * @param {Address} address old contract address
+   * @param {Address} newAddress new contract address
+   * @returns 
+   */
+  async updateImplementation(address, newAddress) {
+    return this.call(addresses.contractFactory, 'updateImplementation', [address, newAddress])
+  }
+
   deleteAll() {
     return this.#machine.deleteAll()
   }

package/dist/contracts/factory.js

@@ -1 +1 @@
-class Factory{#name="ArtOnlineContractFactory";#totalContracts=0;#contracts=[];#implementations={};constructor(state){state&&(this.#contracts=state.contracts,this.#totalContracts=state.totalContracts,this.#implementations=state.implementations)}get state(){return{totalContracts:this.#totalContracts,contracts:this.#contracts,implementations:this.#implementations}}get name(){return this.#name}get contracts(){return[...this.#contracts]}get totalContracts(){return this.#totalContracts}get implementations(){return{...this.#implementations}}async registerContract(address){let isAllowed=!1;if(isAllowed=await msg.staticCall(address,"hasRole",[msg.sender,"IMPLEMENTATION_MANAGER"]),!isAllowed)throw new Error("only the implementation manager can update");if(this.#implementations[address])throw new Error("already registered");this.#totalContracts+=1,this.#implementations[address]=[],this.#implementations[address].push(address),this.#contracts.push(address)}async updateImplementation(address,newAddress){let isAllowed=!1;if(isAllowed=await msg.staticCall(address,"hasRole",[msg.sender,"IMPLEMENTATION_MANAGER"]),!isAllowed)throw new Error("only the implementation manager can update");if(!this.#implementations[address])throw new Error(`register ${address} before updating to ${newAddress}`);this.#implementations[address].push(newAddress)}getImplementations(address){return this.#implementations[address]}getImplementation(address,index){return index=index||this.#implementations[address].length-1,this.#implementations[address][index]}}export{Factory as default};
+class Factory{#name="ArtOnlineContractFactory";#totalContracts=0;#contracts=[];#implementations={};constructor(state){state&&(this.#contracts=state.contracts,this.#totalContracts=state.totalContracts,this.#implementations=state.implementations)}get state(){return{totalContracts:this.#totalContracts,contracts:this.#contracts,implementations:this.#implementations}}get name(){return this.#name}get contracts(){return[...this.#contracts]}get totalContracts(){return this.#totalContracts}get implementations(){return{...this.#implementations}}async registerContract(address){if(await msg.staticCall(address,"hasRole",[msg.sender,"OWNER"]),this.#implementations[address])throw new Error("already registered");this.#totalContracts+=1,this.#contracts.push(address)}}export{Factory as default};

package/dist/contracts/native-token.js

@@ -1 +1 @@
-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 Token extends Roles{#name;#symbol;#holders=0;#balances={};#approvals={};#decimals=18;#totalSupply=BigNumber.from(0);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}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(to,amount){if(!this.hasRole(msg.sender,"BURN"))throw new Error("not allowed");this.#totalSupply=this.#totalSupply.sub(amount),this.#decreaseBalance(to,amount)}#beforeTransfer(from,to,amount){if(!this.#balances[from]||this.#balances[from]<amount)throw new Error("amount exceeds balance")}#updateHolders(address,previousBalance){"0x00"===this.#balances[address].toHexString()?this.#holders-=1:"0x00"!==this.#balances[address].toHexString()&&"0x00"===previousBalance.toHexString()&&(this.#holders+=1)}#increaseBalance(address,amount){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;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){amount=BigNumber.from(amount),this.#beforeTransfer(from,to,amount),this.#decreaseBalance(from,amount),this.#increaseBalance(to,amount)}}class ArtOnline extends Token{constructor(state){super("ArtOnline","ART",18,state)}}export{ArtOnline as default};
+class Roles{#roles={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 Token extends Roles{#name;#symbol;#holders=0;#balances={};#approvals={};#decimals=18;#totalSupply=BigNumber.from(0);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}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){"0x00"===this.#balances[address].toHexString()?this.#holders-=1:"0x00"!==this.#balances[address].toHexString()&&"0x00"===previousBalance.toHexString()&&(this.#holders+=1)}#increaseBalance(address,amount){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;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){amount=BigNumber.from(amount),this.#beforeTransfer(from,to,amount),this.#decreaseBalance(from,amount),this.#increaseBalance(to,amount)}}class ArtOnline extends Token{constructor(state){super("ArtOnline","ART",18,state)}}export{ArtOnline as default};

package/dist/contracts/validators.js

@@ -1 +1 @@
-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};
+class Roles{#roles={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

@@ -72,27 +72,27 @@ class Machine {
       case 'contractError': {
         console.warn(`removing contract ${await data.hash}`);
         await contractStore.delete(await data.hash);  
-      break
+      break
       }
 
       case 'executionError': {
         // console.warn(`error executing transaction ${data.message}`);
         pubsub.publish(data.id, {error: data.message});
-      break
+      break
       }
 
       case 'debug': {
         for (const message of data.messages) debug(message);
-      break
+      break
       }
       case 'machine-ready': {
         this.lastBlock = data.lastBlock;
         pubsub.publish('machine.ready', true);
-      break
+      break
       }
       case 'response': {
         pubsub.publish(data.id, data.value);
-      break
+      break
       }
     }
     
@@ -150,18 +150,18 @@ class Machine {
    * @params {ContractMessage} - contractMessage
    */
   async addContract(contractMessage) {
-    if (!await contractStore.has(contractMessage.hash)) {
-      await contractStore.put(contractMessage.hash, contractMessage.encoded);
-      await this.#runContract(contractMessage);
-      return contractMessage.hash
-    }
-    throw new Error('duplicate contract')
+    if (await contractStore.has(await contractMessage.hash)) throw new Error('duplicate contract')
+
+    await contractStore.put(await contractMessage.hash, contractMessage.encoded);
+    await this.#runContract(contractMessage);
+    return contractMessage.hash
   }
 
   async execute(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = randomBytes(20).toString('hex');
       const message = message => {
+        pubsub.unsubscribe(id, message);
         if (message?.error) reject(message.error);
         else resolve(message);
       };
@@ -1154,20 +1154,19 @@ async #signTransaction (transaction, wallet) {
   }
 
   /**
-   *
-   * @param {String} contract - a contract string (see plugins/deployContract)
+   * 
+   * @param {String} contract 
+   * @param {Array} parameters 
+   * @returns 
    */
   async deployContract(contract, parameters = []) {
-    globalThis.msg = {sender: peernet.selectedAccount, call: this.call};
-
-    const hash = await this.createContractAddress(creator, contract, parameters);
-console.log(hash);
+    const message = await createContractMessage(peernet.selectedAccount, contract, parameters);
     try {
-      const tx = await this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters]);
+      await this.#machine.addContract(message);  
     } catch (error) {
       throw error
     }
-    return this.#machine.addContract(message)
+    return this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'registerContract', [await message.hash])    
   }
 
   #createMessage(sender = peernet.selectedAccount) {
@@ -1221,6 +1220,19 @@ console.log(hash);
     return this.staticCall(addresses.nativeToken, 'balances')
   }
 
+  get contracts() {
+    return this.staticCall(addresses.contractFactory, 'contracts')
+  }
+  /**
+   * 
+   * @param {Address} address old contract address
+   * @param {Address} newAddress new contract address
+   * @returns 
+   */
+  async updateImplementation(address, newAddress) {
+    return this.call(addresses.contractFactory, 'updateImplementation', [address, newAddress])
+  }
+
   deleteAll() {
     return this.#machine.deleteAll()
   }

package/dist/standards/token.js

@@ -1 +1 @@
-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 Token extends Roles{#name;#symbol;#holders=0;#balances={};#approvals={};#decimals=18;#totalSupply=BigNumber.from(0);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}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(to,amount){if(!this.hasRole(msg.sender,"BURN"))throw new Error("not allowed");this.#totalSupply=this.#totalSupply.sub(amount),this.#decreaseBalance(to,amount)}#beforeTransfer(from,to,amount){if(!this.#balances[from]||this.#balances[from]<amount)throw new Error("amount exceeds balance")}#updateHolders(address,previousBalance){"0x00"===this.#balances[address].toHexString()?this.#holders-=1:"0x00"!==this.#balances[address].toHexString()&&"0x00"===previousBalance.toHexString()&&(this.#holders+=1)}#increaseBalance(address,amount){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;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){amount=BigNumber.from(amount),this.#beforeTransfer(from,to,amount),this.#decreaseBalance(from,amount),this.#increaseBalance(to,amount)}}export{Token as default};
+class Roles{#roles={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 Token extends Roles{#name;#symbol;#holders=0;#balances={};#approvals={};#decimals=18;#totalSupply=BigNumber.from(0);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}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){"0x00"===this.#balances[address].toHexString()?this.#holders-=1:"0x00"!==this.#balances[address].toHexString()&&"0x00"===previousBalance.toHexString()&&(this.#holders+=1)}#increaseBalance(address,amount){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;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){amount=BigNumber.from(amount),this.#beforeTransfer(from,to,amount),this.#decreaseBalance(from,amount),this.#increaseBalance(to,amount)}}export{Token as default};

package/package.json

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

package/src/chain.js

@@ -764,20 +764,19 @@ async #signTransaction (transaction, wallet) {
   }
 
   /**
-   *
-   * @param {String} contract - a contract string (see plugins/deployContract)
+   * 
+   * @param {String} contract 
+   * @param {Array} parameters 
+   * @returns 
    */
   async deployContract(contract, parameters = []) {
-    globalThis.msg = {sender: peernet.selectedAccount, call: this.call}
-
-    const hash = await this.createContractAddress(creator, contract, parameters)
-console.log(hash);
+    const message = await createContractMessage(peernet.selectedAccount, contract, parameters)
     try {
-      const tx = await this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'deployContract', [hash, creator, contract, constructorParameters])
+      await this.#machine.addContract(message)  
     } catch (error) {
       throw error
     }
-    return this.#machine.addContract(message)
+    return this.createTransactionFrom(peernet.selectedAccount, addresses.contractFactory, 'registerContract', [await message.hash])    
   }
 
   #createMessage(sender = peernet.selectedAccount) {
@@ -831,6 +830,19 @@ console.log(hash);
     return this.staticCall(addresses.nativeToken, 'balances')
   }
 
+  get contracts() {
+    return this.staticCall(addresses.contractFactory, 'contracts')
+  }
+  /**
+   * 
+   * @param {Address} address old contract address
+   * @param {Address} newAddress new contract address
+   * @returns 
+   */
+  async updateImplementation(address, newAddress) {
+    return this.call(addresses.contractFactory, 'updateImplementation', [address, newAddress])
+  }
+
   deleteAll() {
     return this.#machine.deleteAll()
   }

package/src/contracts/factory.js

@@ -54,49 +54,10 @@ export default class Factory {
    * @param {Address} address contract address to register
    */
   async registerContract(address) {
-    let isAllowed = false
-    isAllowed = await msg.staticCall(address, 'hasRole', [msg.sender, 'IMPLEMENTATION_MANAGER'])
-    if (!isAllowed) throw new Error('only the implementation manager can update') 
+    await msg.staticCall(address, 'hasRole', [msg.sender, 'OWNER'])
     if (this.#implementations[address]) throw new Error('already registered')
 
     this.#totalContracts += 1
-    this.#implementations[address] = []
-    this.#implementations[address].push(address)
     this.#contracts.push(address)
   }
-
-  /**
-   * updates the current implementation to a new address
-   * 
-   * @param {Address} address the current contract address
-   * @param {Address} newAddress the new contract address
-   */
-  async updateImplementation(address, newAddress) {
-    let isAllowed = false
-    isAllowed = await msg.staticCall(address, 'hasRole', [msg.sender, 'IMPLEMENTATION_MANAGER'])
-    if (!isAllowed) throw new Error('only the implementation manager can update')
-    if (!this.#implementations[address]) throw new Error(`register ${address} before updating to ${newAddress}`)
-
-    this.#implementations[address].push(newAddress)
-  }
-
-  /**
-   * 
-   * @param {Address} address the original contract address
-   * @returns {Address} all implementations of the original contract
-   */
-   getImplementations(address) {
-    return this.#implementations[address]
-  }
-
-  /**
-   * 
-   * @param {Address} address the original contract address
-   * @param {Number} index the index of the implmentation item or undefined (returns the latest implementation when undefined)
-   * @returns {Address} the latest/selected implementation of the original contract
-   */
-  getImplementation(address, index) {
-    index = index || this.#implementations[address].length - 1
-    return this.#implementations[address][index]
-  }
 }

package/src/contracts/native-token.js

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

package/src/machine.js

@@ -3,7 +3,6 @@ import { formatBytes } from './../../utils/src/utils'
 import { randomBytes } from 'node:crypto'
 import { join } from 'node:path'
 import EasyWorker from '@vandeurenglenn/easy-worker'
-
 // import State from './state'
 
 export default class Machine {
@@ -28,27 +27,27 @@ export default class Machine {
       case 'contractError': {
         console.warn(`removing contract ${await data.hash}`);
         await contractStore.delete(await data.hash)  
-      break
+      break
       }
 
       case 'executionError': {
         // console.warn(`error executing transaction ${data.message}`);
         pubsub.publish(data.id, {error: data.message})
-      break
+      break
       }
 
       case 'debug': {
         for (const message of data.messages) debug(message)
-      break
+      break
       }
       case 'machine-ready': {
         this.lastBlock = data.lastBlock
         pubsub.publish('machine.ready', true)
-      break
+      break
       }
       case 'response': {
         pubsub.publish(data.id, data.value)
-      break
+      break
       }
     }
     
@@ -106,18 +105,18 @@ export default class Machine {
    * @params {ContractMessage} - contractMessage
    */
   async addContract(contractMessage) {
-    if (!await contractStore.has(contractMessage.hash)) {
-      await contractStore.put(contractMessage.hash, contractMessage.encoded)
-      await this.#runContract(contractMessage)
-      return contractMessage.hash
-    }
-    throw new Error('duplicate contract')
+    if (await contractStore.has(await contractMessage.hash)) throw new Error('duplicate contract')
+
+    await contractStore.put(await contractMessage.hash, contractMessage.encoded)
+    await this.#runContract(contractMessage)
+    return contractMessage.hash
   }
 
   async execute(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = randomBytes(20).toString('hex')
       const message = message => {
+        pubsub.unsubscribe(id, message)
         if (message?.error) reject(message.error)
         else resolve(message)
       }

package/src/standards/roles.js

@@ -4,7 +4,6 @@ export default class Roles {
    * Object => Array
    */
   #roles = {
-    'IMPLEMENTATION_MANAGER': [],
     'OWNER': [],
     'MINT': [],
     'BURN': []

package/src/standards/token.js

@@ -81,11 +81,11 @@ export default class Token extends Roles {
     this.#increaseBalance(to, amount)
   }
 
-  burn(to, amount) {
+  burn(from, amount) {
     if (!this.hasRole(msg.sender, 'BURN')) throw new Error('not allowed')
 
     this.#totalSupply = this.#totalSupply.sub(amount)
-    this.#decreaseBalance(to, amount)
+    this.#decreaseBalance(from, amount)
   }
 
   #beforeTransfer(from, to, amount) {

package/src/contracts/proxies/factory-proxy.js

@@ -1,12 +0,0 @@
-import Proxy from '../../standards/proxy.js'
-
-export default class FactoryProxy extends Proxy {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineContractFactoryProxy'
-
-  constructor(proxyManager, state) {
-    super(proxyManager, state)
-  }
-}

package/src/contracts/proxies/name-service-proxy.js

@@ -1,12 +0,0 @@
-import Proxy from '../../standards/proxy.js'
-
-export default class NameServiceProxy extends Proxy {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineNameServiceProxy'
-
-  constructor(proxyManager, state) {
-    super(proxyManager, state)
-  }
-}

package/src/contracts/proxies/native-token-proxy.js

@@ -1,12 +0,0 @@
-import Proxy from '../../standards/proxy.js'
-
-export default class NativeTokenProxy extends Proxy {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineNativeTokenProxy'
-
-  constructor(proxyManager, state) {
-    super(proxyManager, state)
-  }
-}

package/src/contracts/proxies/validators-proxy.js

@@ -1,12 +0,0 @@
-import Proxy from '../../standards/proxy.js'
-
-export default class ValidatorsProxy extends Proxy {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineValidatorsProxy'
-
-  constructor(proxyManager, state) {
-    super(proxyManager, state)
-  }
-}

package/src/contracts/proxies/voting-proxy.js

@@ -1,12 +0,0 @@
-import Proxy from '../../standards/proxy.js'
-
-export default class VotingProxy extends Proxy {
-  /**
-   * string
-   */
-  #name = 'ArtOnlineVotingProxy'
-
-  constructor(proxyManager, state) {
-    super(proxyManager, state)
-  }
-}

package/src/contracts/proxy-manager.js

@@ -1,7 +0,0 @@
-import ProxyManager from '../standards/proxy-manager.js'
-
-export default class ArtOnlineProxyManager extends ProxyManager {
-  constructor(state) {
-    super('ArtOnlineProxyManager', state)
-  }
-}

package/src/standards/proxy-manager.js

@@ -1,66 +0,0 @@
-import Roles from './roles.js'
-
-export default class ProxyManager extends Roles {
-  #name
-  #proxies = {}
-  #manager
-
-
-  constructor(name, state) {
-    super(state?.roles)
-    this.#name = name
-
-    if (state) {
-      this.#proxies = state.proxies
-      this.#manager = state.manager
-    } else {
-      this.#manager = msg.sender
-    }
-  }
-
-  /**
-   *
-   */
-  async #upgradeProxy(proxy, address) {
-    await msg.internalCall(this.#manager, proxy, 'setImplementation', [address])
-    this.#proxies[proxy] = address
-  }
-
-  /**
-   *
-   */
-  upgradeProxy(proxy, address) {
-    if (!this.hasRole(msg.sender, 'MANAGER')) throw new Error('Not allowed, expected MANAGER')
-    this.#upgradeProxy(proxy, address)
-  }
-
-  async #changeManager(address) {
-    this.#revokeRole(this.#manager, 'MANAGER')
-    this.#grantRole(address, 'MANAGER')
-    for (const proxy of Object.keys(this.#proxies)) {
-      await msg.internalCall(this.#manager, proxy, 'changeProxyManager', [address])
-    }
-    this.#manager = address
-  }
-
-  changeManager(address) {
-    if (!this.hasRole(msg.sender, 'OWNER')) throw new Error('Not allowed, expected OWNER')
-    return this.#changeManager(address)
-  }
-
-  get state() {
-    return {
-      ...super.state,
-      proxies: this.proxies,
-      manager: this.manager
-    }
-  }
-
-  get manager() {
-    return this.#manager
-  }
-
-  get proxies() {
-    return { ...this.#proxies }
-  }
-}

package/src/standards/proxy.js

@@ -1,38 +0,0 @@
-import Roles from './roles.js'
-
-export default class Proxy extends Roles {
-  #proxyManager
-  #implementation
-
-  constructor(proxyManager, state) {
-    super(state?.roles)
-    this.#proxyManager = state ? state.proxyManager : proxyManager;
-  }
-
-  get state() {
-    return {
-      ...super.state,
-      proxyManager: this.#proxyManager,
-      implementation: this.#implementation
-    }
-  }
-
-  async setImplementation(address) {
-    if (msg.sender !== this.#proxyManager) throw new Error(`not allowed, expected proxy manager`)
-
-    const state = await stateStore.get(this.#implementation)
-    await stateStore.put(address, state)
-    stateStore.delete(this.#implementation)
-    this.#implementation = address
-  }
-
-  async changeProxyManager(address) {
-    if (msg.sender !== this.#proxyManager) throw new Error(`not allowed, expected proxy manager`)
-    this.#proxyManager = address
-  }
-
-  fallback(method, parameters) {
-    if (msg.sender === this.proxyManager) return this[method](...parameters)
-    return msg.internalCall(msg.sender, this.#implementation, method, parameters)
-  }
-}