@leofcoin/chain 1.4.6 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/chain",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "description": "Official javascript implementation",
   "main": "./dist/node.js",
   "module": "./dist/chain.esm",
@@ -18,7 +18,7 @@
     "workers": "cp ./../workers/src/** ./workers",
     "build": "npm run c && webpack && cp ./dist/*browser.js ./demo && cp -r ./dist/browser/workers/ ./demo",
     "demo": "jsproject --serve ./demo --port 5478 --open demo",
-    "test": "node test --openssl-legacy-provider",
+    "test": "node --openssl-legacy-provider test",
     "pack": "webpack"
   },
   "np": {

package/src/contract.js

@@ -30,7 +30,7 @@ export default class Contract extends Transaction {
    */
   async createContractAddress(creator, contract, constructorParameters = []) {
     contract = await this.createContractMessage(creator, contract, constructorParameters)
-    return contract.hash
+    return contract.hash()
   }
 
   /**

package/src/machine.js

@@ -50,7 +50,7 @@ export default class Machine {
       break
       }
       case 'response': {
-        pubsub.publish(data.id, data.value || true)
+        pubsub.publish(data.id, data.value || false)
       break
       }
     }
@@ -122,7 +122,7 @@ export default class Machine {
   async execute(contract, method, parameters) {
     try {
       if (contract === contractFactory && method === 'registerContract') {
-        if (this.#contracts[parameters[0]]) throw new Error(`duplicate contract @${parameters[0]}`)
+        if (await this.has(parameters[0])) throw new Error(`duplicate contract @${parameters[0]}`)
         let message;
         if (!await contractStore.has(parameters[0])) {
           message = await peernet.get(parameters[0], 'contract')
@@ -133,7 +133,7 @@ export default class Machine {
           message = await contractStore.get(parameters[0])
           message = await new ContractMessage(message)
         }
-        if (!this.#contracts[await message.hash()]) await this.#runContract(message)
+        if (!await this.has(await message.hash())) await this.#runContract(message)
       }
     } catch (error) {
       throw new Error(`contract deployment failed for ${parameters[0]}\n${error.message}`)
@@ -159,14 +159,6 @@ export default class Machine {
     
   }
 
-  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](...parameters)
-    // return setTimeout(() => {
-    //   return this.addJob(contract, method, params, from, nonce)
-    // }, 50)
-  }
-
   get(contract, method, parameters) {
     return new Promise((resolve, reject) => {
       const id = randombytes(20).toString()
@@ -187,6 +179,26 @@ export default class Machine {
     })
   }
 
+
+  async has(address) {
+    return new Promise((resolve, reject) => {
+      const id = randombytes(20).toString('hex')
+      const onmessage = message => {        
+        pubsub.unsubscribe(id, onmessage)
+        if (message?.error) reject(message.error)
+        else resolve(message)
+      }
+      pubsub.subscribe(id, onmessage)
+      this.worker.postMessage({
+        type: 'has',
+        id,
+        input: {
+          address 
+        }
+      })
+    })
+  }
+
   async delete(hash) {
     return contractStore.delete(hash)
   }