@leofcoin/chain 1.3.4 → 1.3.5

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,12 +159,11 @@ 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) {
@@ -1163,20 +1162,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 +1228,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/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={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(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/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,12 +150,11 @@ 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) {
@@ -1154,20 +1153,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 +1219,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={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(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.5",
   "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/machine.js

@@ -28,27 +28,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,12 +106,11 @@ 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) {

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) {