@leofcoin/workers 1.3.4 → 1.3.6

package/dist/bundle/commonjs/{machine-worker-51023882.js → machine-worker-70f71351.js}

@@ -2,7 +2,6 @@
 
 var worker$1 = require('./worker-6ace445f.js');
 var utils = require('./utils-6e881be4.js');
-require('path');
 
 var proto = `
 message ContractMessage {
@@ -59,21 +58,20 @@ const get = (contract, method, params) => {
   return result
 };
 
-const runContract = async (contractMessage) => {
-  const params = contractMessage.decoded.constructorParameters;
+const runContract = async ({decoded, hash, encoded}) => {
+  const params = decoded.constructorParameters;
   try {
 
-    const func = new Function(contractMessage.decoded.contract);
+    const func = new Function(decoded.contract);
     const Contract = func();
 
-    globalThis.msg = createMessage(contractMessage.decoded.creator);
-    // globalThis.msg = {sender: contractMessage.decoded.creator}
-    contracts[await contractMessage.hash] = await new Contract(...params);
+    globalThis.msg = createMessage(decoded.creator);
+    contracts[hash] = await new Contract(...params);
     worker.postMessage({
       type: 'debug',
       messages: [
-        `loaded contract: ${await contractMessage.hash}`,
-        `size: ${utils.formatBytes(contractMessage.encoded.length)}`
+        `loaded contract: ${hash}`,
+        `size: ${utils.formatBytes(encoded.length)}`
       ]
     });
   } catch (e) {
@@ -137,7 +135,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   contracts = await Promise.all(contracts.map(async contract => {
     contract = await new ContractMessage(new Uint8Array(contract.split(',')));
-    await runContract(contract);
+    await runContract({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash});
     return contract
   }));
 
@@ -196,6 +194,22 @@ const tasks = async (e) => {
         });
       }
     }
+    if (e.type === 'run') {
+      try {
+        const value = await runContract(e.input);
+        worker.postMessage({
+          type: 'response',
+          id,
+          value
+        });
+      } catch (e) {
+        worker.postMessage({
+          type: 'fetchError',
+          message: e.message,
+          id          
+        });
+      }
+    }
     if (e.type === 'get') {
       try {
         const value = await get(e.input.contract, e.input.method, e.input.params);

package/dist/bundle/commonjs/machine-worker.js

@@ -1,14 +1,14 @@
 'use strict';
 
-require('./machine-worker-51023882.js');
+require('./machine-worker-70f71351.js');
 require('./worker-6ace445f.js');
 require('./utils-6e881be4.js');
-require('path');
 require('stream');
 require('events');
 require('buffer');
 require('util');
 require('string_decoder/');
 require('fs');
+require('path');
 require('os');
 

package/dist/bundle/commonjs/workers.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var transactionWorker = require('./transaction-worker-176a5aaa.js');
 var blockWorker = require('./block-worker-21ad8152.js');
 var poolWorker = require('./pool-worker-f450eeff.js');
-var machineWorker = require('./machine-worker-51023882.js');
+var machineWorker = require('./machine-worker-70f71351.js');
 require('./worker-6ace445f.js');
 require('stream');
 require('events');

package/dist/bundle/module/{machine-worker-b1412cf2.js → machine-worker-5896ac08.js}

@@ -1,6 +1,5 @@
 import { F as FormatInterface_1, E as EasyWorker } from './worker-def77c26.js';
-import { B as BigNumber, a as BlockMessage, f as formatBytes } from './utils-ac8c68e6.js';
-import 'path';
+import { B as BigNumber, f as formatBytes, a as BlockMessage } from './utils-ac8c68e6.js';
 
 var proto = `
 message ContractMessage {
@@ -57,21 +56,20 @@ const get = (contract, method, params) => {
   return result
 };
 
-const runContract = async (contractMessage) => {
-  const params = contractMessage.decoded.constructorParameters;
+const runContract = async ({decoded, hash, encoded}) => {
+  const params = decoded.constructorParameters;
   try {
 
-    const func = new Function(contractMessage.decoded.contract);
+    const func = new Function(decoded.contract);
     const Contract = func();
 
-    globalThis.msg = createMessage(contractMessage.decoded.creator);
-    // globalThis.msg = {sender: contractMessage.decoded.creator}
-    contracts[await contractMessage.hash] = await new Contract(...params);
+    globalThis.msg = createMessage(decoded.creator);
+    contracts[hash] = await new Contract(...params);
     worker.postMessage({
       type: 'debug',
       messages: [
-        `loaded contract: ${await contractMessage.hash}`,
-        `size: ${formatBytes(contractMessage.encoded.length)}`
+        `loaded contract: ${hash}`,
+        `size: ${formatBytes(encoded.length)}`
       ]
     });
   } catch (e) {
@@ -135,7 +133,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   contracts = await Promise.all(contracts.map(async contract => {
     contract = await new ContractMessage(new Uint8Array(contract.split(',')));
-    await runContract(contract);
+    await runContract({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash});
     return contract
   }));
 
@@ -194,6 +192,22 @@ const tasks = async (e) => {
         });
       }
     }
+    if (e.type === 'run') {
+      try {
+        const value = await runContract(e.input);
+        worker.postMessage({
+          type: 'response',
+          id,
+          value
+        });
+      } catch (e) {
+        worker.postMessage({
+          type: 'fetchError',
+          message: e.message,
+          id          
+        });
+      }
+    }
     if (e.type === 'get') {
       try {
         const value = await get(e.input.contract, e.input.method, e.input.params);

package/dist/bundle/module/machine-worker.js

@@ -1,11 +1,11 @@
-import './machine-worker-b1412cf2.js';
+import './machine-worker-5896ac08.js';
 import './worker-def77c26.js';
 import './utils-ac8c68e6.js';
-import 'path';
 import 'stream';
 import 'events';
 import 'buffer';
 import 'util';
 import 'string_decoder/';
 import 'fs';
+import 'path';
 import 'os';

package/dist/bundle/module/workers.js

@@ -1,7 +1,7 @@
 import { t as transactionWorker } from './transaction-worker-548cd200.js';
 import { b as blockWorker } from './block-worker-414860e0.js';
 import { p as poolWorker } from './pool-worker-0d927e3c.js';
-import { m as machineWorker } from './machine-worker-b1412cf2.js';
+import { m as machineWorker } from './machine-worker-5896ac08.js';
 import './worker-def77c26.js';
 import 'stream';
 import 'events';

package/dist/commonjs/{machine-worker-cb614eb0.js → machine-worker-b46cac38.js}

@@ -2,7 +2,6 @@
 
 var codecFormatInterface = require('@leofcoin/codec-format-interface');
 var utils = require('./utils-1dc37f72.js');
-require('path');
 var EasyWorker = require('@vandeurenglenn/easy-worker');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -64,21 +63,20 @@ const get = (contract, method, params) => {
   return result
 };
 
-const runContract = async (contractMessage) => {
-  const params = contractMessage.decoded.constructorParameters;
+const runContract = async ({decoded, hash, encoded}) => {
+  const params = decoded.constructorParameters;
   try {
 
-    const func = new Function(contractMessage.decoded.contract);
+    const func = new Function(decoded.contract);
     const Contract = func();
 
-    globalThis.msg = createMessage(contractMessage.decoded.creator);
-    // globalThis.msg = {sender: contractMessage.decoded.creator}
-    contracts[await contractMessage.hash] = await new Contract(...params);
+    globalThis.msg = createMessage(decoded.creator);
+    contracts[hash] = await new Contract(...params);
     worker.postMessage({
       type: 'debug',
       messages: [
-        `loaded contract: ${await contractMessage.hash}`,
-        `size: ${utils.formatBytes(contractMessage.encoded.length)}`
+        `loaded contract: ${hash}`,
+        `size: ${utils.formatBytes(encoded.length)}`
       ]
     });
   } catch (e) {
@@ -142,7 +140,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   contracts = await Promise.all(contracts.map(async contract => {
     contract = await new ContractMessage(new Uint8Array(contract.split(',')));
-    await runContract(contract);
+    await runContract({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash});
     return contract
   }));
 
@@ -201,6 +199,22 @@ const tasks = async (e) => {
         });
       }
     }
+    if (e.type === 'run') {
+      try {
+        const value = await runContract(e.input);
+        worker.postMessage({
+          type: 'response',
+          id,
+          value
+        });
+      } catch (e) {
+        worker.postMessage({
+          type: 'fetchError',
+          message: e.message,
+          id          
+        });
+      }
+    }
     if (e.type === 'get') {
       try {
         const value = await get(e.input.contract, e.input.method, e.input.params);

package/dist/commonjs/machine-worker.js

@@ -1,9 +1,8 @@
 'use strict';
 
-require('./machine-worker-cb614eb0.js');
+require('./machine-worker-b46cac38.js');
 require('@leofcoin/codec-format-interface');
 require('./utils-1dc37f72.js');
-require('path');
 require('@vandeurenglenn/easy-worker');
 require('bn.js');
 require('@ethersproject/bytes');

package/dist/commonjs/workers.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var transactionWorker = require('./transaction-worker-8eecc7a1.js');
 var blockWorker = require('./block-worker-60e4cfa3.js');
 var poolWorker = require('./pool-worker-81e8b4c0.js');
-var machineWorker = require('./machine-worker-cb614eb0.js');
+var machineWorker = require('./machine-worker-b46cac38.js');
 require('@leofcoin/codec-format-interface');
 require('./transaction-220a3a15.js');
 require('@vandeurenglenn/easy-worker');
@@ -14,7 +14,6 @@ require('bn.js');
 require('@ethersproject/bytes');
 require('@ethersproject/logger');
 require('@ethersproject/bignumber');
-require('path');
 
 const TransactionWorker = transactionWorker.transactionWorker;
 const BlockWorker = blockWorker.blockWorker;

package/dist/module/{machine-worker-8e58ffb3.js → machine-worker-da95e492.js}

@@ -1,6 +1,5 @@
 import { FormatInterface } from '@leofcoin/codec-format-interface';
-import { B as BigNumber, a as BlockMessage, f as formatBytes } from './utils-e87bc63d.js';
-import 'path';
+import { B as BigNumber, f as formatBytes, a as BlockMessage } from './utils-e87bc63d.js';
 import EasyWorker from '@vandeurenglenn/easy-worker';
 
 var proto = `
@@ -58,21 +57,20 @@ const get = (contract, method, params) => {
   return result
 };
 
-const runContract = async (contractMessage) => {
-  const params = contractMessage.decoded.constructorParameters;
+const runContract = async ({decoded, hash, encoded}) => {
+  const params = decoded.constructorParameters;
   try {
 
-    const func = new Function(contractMessage.decoded.contract);
+    const func = new Function(decoded.contract);
     const Contract = func();
 
-    globalThis.msg = createMessage(contractMessage.decoded.creator);
-    // globalThis.msg = {sender: contractMessage.decoded.creator}
-    contracts[await contractMessage.hash] = await new Contract(...params);
+    globalThis.msg = createMessage(decoded.creator);
+    contracts[hash] = await new Contract(...params);
     worker.postMessage({
       type: 'debug',
       messages: [
-        `loaded contract: ${await contractMessage.hash}`,
-        `size: ${formatBytes(contractMessage.encoded.length)}`
+        `loaded contract: ${hash}`,
+        `size: ${formatBytes(encoded.length)}`
       ]
     });
   } catch (e) {
@@ -136,7 +134,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   contracts = await Promise.all(contracts.map(async contract => {
     contract = await new ContractMessage(new Uint8Array(contract.split(',')));
-    await runContract(contract);
+    await runContract({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash});
     return contract
   }));
 
@@ -195,6 +193,22 @@ const tasks = async (e) => {
         });
       }
     }
+    if (e.type === 'run') {
+      try {
+        const value = await runContract(e.input);
+        worker.postMessage({
+          type: 'response',
+          id,
+          value
+        });
+      } catch (e) {
+        worker.postMessage({
+          type: 'fetchError',
+          message: e.message,
+          id          
+        });
+      }
+    }
     if (e.type === 'get') {
       try {
         const value = await get(e.input.contract, e.input.method, e.input.params);

package/dist/module/machine-worker.js

@@ -1,7 +1,6 @@
-import './machine-worker-8e58ffb3.js';
+import './machine-worker-da95e492.js';
 import '@leofcoin/codec-format-interface';
 import './utils-e87bc63d.js';
-import 'path';
 import '@vandeurenglenn/easy-worker';
 import 'bn.js';
 import '@ethersproject/bytes';

package/dist/module/workers.js

@@ -1,7 +1,7 @@
 import { t as transactionWorker } from './transaction-worker-105deaa8.js';
 import { b as blockWorker } from './block-worker-f539b1b2.js';
 import { p as poolWorker } from './pool-worker-f65671d7.js';
-import { m as machineWorker } from './machine-worker-8e58ffb3.js';
+import { m as machineWorker } from './machine-worker-da95e492.js';
 import '@leofcoin/codec-format-interface';
 import './transaction-d06dc6c4.js';
 import '@vandeurenglenn/easy-worker';
@@ -10,7 +10,6 @@ import 'bn.js';
 import '@ethersproject/bytes';
 import '@ethersproject/logger';
 import '@ethersproject/bignumber';
-import 'path';
 
 const TransactionWorker = transactionWorker;
 const BlockWorker = blockWorker;

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@leofcoin/workers",
-  "version": "1.3.4",
-  "description": "",
-  "module": "src/workers.js",
+  "version": "1.3.6",
+  "description": "Workers used in @leofcoin/chain",
+  "type": "module",
+  "exports": {
+    ".": "./src/workers.js",
+    "./machine-worker": "./src/machine-worker.js",
+    "./block-worker": "./src/block-worker.js",
+    "./transaction-worker": "./src/transaction-worker.js",
+    "./pool-worker": "./src/pool-worker.js"
+  },
   "scripts": {
     "build": "rollup -c",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -10,12 +17,6 @@
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^14.1.0",
-    "rollup": "^2.79.1"
-  },
   "dependencies": {
     "@leofcoin/messages": "^1.2.0"
   }

package/src/block-worker.js

@@ -1,5 +1,5 @@
-import { BlockMessage } from './../../messages/src/messages'
-import { formatBytes, BigNumber } from './../../utils/src/utils'
+import { BlockMessage } from '@leofcoin/messages'
+import { formatBytes, BigNumber } from '@leofcoin/utils'
 
 import EasyWorker from '@vandeurenglenn/easy-worker'
 
@@ -17,7 +17,7 @@ const run = async (blocks) => {
   blocks = await Promise.all(blocks.map(block => new Promise(async (resolve, reject) => {
     // todo: tx worker or nah?
     const size = block.encoded.length || block.encoded.byteLength
-    console.log(`loaded block: ${await block.hash} @${block.decoded.index} ${formatBytes(size)}`);
+    console.log(`loaded block: ${await block.hash()} @${block.decoded.index} ${formatBytes(size)}`);
     resolve(block)
   })))
   return blocks

package/src/machine-worker.js

@@ -1,8 +1,6 @@
-import { BlockMessage, ContractMessage } from './../../messages/src/messages'
-import { formatBytes, BigNumber } from './../../utils/src/utils'
-import bytecodes  from './../../lib/src/bytecodes.json'
-import { join } from 'path'
-
+import { BlockMessage, ContractMessage } from '@leofcoin/messages'
+import { formatBytes, BigNumber } from '@leofcoin/utils'
+import bytecodes  from '@leofcoin/lib/bytecodes.json' assert {type: 'json'}
 import EasyWorker from '@vandeurenglenn/easy-worker'
 const worker = new EasyWorker()
 
@@ -30,28 +28,27 @@ const get = (contract, method, params) => {
   return result
 }
 
-const runContract = async (contractMessage) => {
-  const params = contractMessage.decoded.constructorParameters
+const runContract = async ({decoded, hash, encoded}) => {
+  const params = decoded.constructorParameters
   try {
 
-    const func = new Function(contractMessage.decoded.contract)
+    const func = new Function(decoded.contract)
     const Contract = func()
 
-    globalThis.msg = createMessage(contractMessage.decoded.creator)
-    // globalThis.msg = {sender: contractMessage.decoded.creator}
-    contracts[await contractMessage.hash] = await new Contract(...params)
+    globalThis.msg = createMessage(decoded.creator)
+    contracts[hash] = await new Contract(...params)
     worker.postMessage({
       type: 'debug',
       messages: [
-        `loaded contract: ${await contractMessage.hash}`,
-        `size: ${formatBytes(contractMessage.encoded.length)}`
+        `loaded contract: ${hash}`,
+        `size: ${formatBytes(encoded.length)}`
       ]
     })
   } catch (e) {
     console.log(e);
     worker.postMessage({
       type: 'contractError',
-      hash: await contractMessage.hash
+      hash: await contractMessage.hash()
     })
   }
 }
@@ -108,7 +105,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
 
   contracts = await Promise.all(contracts.map(async contract => {
     contract = await new ContractMessage(new Uint8Array(contract.split(',')))
-    await runContract(contract)
+    await runContract({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash()})
     return contract
   }))
 
@@ -140,7 +137,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
   
       lastBlock = {
         ...lastBlock.decoded,
-        hash: await lastBlock.hash
+        hash: await lastBlock.hash()
       };
     }
     globalThis.blocks = blocks
@@ -167,6 +164,22 @@ const tasks = async (e) => {
         })
       }
     }
+    if (e.type === 'run') {
+      try {
+        const value = await runContract(e.input)
+        worker.postMessage({
+          type: 'response',
+          id,
+          value
+        })
+      } catch (e) {
+        worker.postMessage({
+          type: 'runError',
+          message: e.message,
+          id          
+        })
+      }
+    }
     if (e.type === 'get') {
       try {
         const value = await get(e.input.contract, e.input.method, e.input.params)

package/src/pool-worker.js

@@ -1,4 +1,4 @@
-import { TransactionMessage } from './../../messages/src/messages'
+import { TransactionMessage } from '@leofcoin/messages'
 
 import EasyWorker from '@vandeurenglenn/easy-worker'
 
@@ -19,7 +19,7 @@ const tasks = async transactions => {
   transactions = await Promise.all(transactions.map(async message => {
     message = await new TransactionMessage(message)
     
-    return {...message.decoded, hash: await message.hash, size: message.encoded.length}
+    return {...message.decoded, hash: await message.hash(), size: message.encoded.length}
   }))
 
   worker.postMessage(transactions)

package/src/transaction-worker.js

@@ -1,4 +1,4 @@
-import { TransactionMessage } from './../../messages/src/messages.js'
+import { TransactionMessage } from '@leofcoin/messages'
 
 globalThis.peernet = globalThis.peernet || {}
 globalThis.contracts = {}

package/src/workers.js

@@ -1,7 +1,7 @@
-import * as transactionWorker from './transaction-worker'
-import * as blockWorker from './block-worker'
-import * as poolWorker from './pool-worker'
-import * as machineWorker from './machine-worker'
+import * as transactionWorker from './transaction-worker.js'
+import * as blockWorker from './block-worker.js'
+import * as poolWorker from './pool-worker.js'
+import * as machineWorker from './machine-worker.js'
 
 export const TransactionWorker = transactionWorker
 export const BlockWorker = blockWorker

package/rollup.config.js

@@ -1,40 +0,0 @@
-import { execSync } from 'child_process'
-import json from '@rollup/plugin-json'
-import resolve from '@rollup/plugin-node-resolve'
-
-import commonjs from '@rollup/plugin-commonjs'
-try {
-  execSync(`rm -rf ./dist/**`)
-
-} catch (e) {
-
-}
-export default [{
-  input: ['./src/workers.js', './src/transaction-worker.js', './src/block-worker.js', './src/pool-worker.js', './src/machine-worker.js'],
-  
-  plugins: [
-    json()
-  ],
-  output: [{
-    dir: './dist/commonjs',
-    format: 'cjs'
-  }, {    
-    dir: './dist/module',
-    format: 'es'
-  }]
-}, {
-  input: ['./src/workers.js', './src/transaction-worker.js', './src/block-worker.js', './src/pool-worker.js', './src/machine-worker.js'],
-  
-  plugins: [
-    json(),
-    commonjs(),
-    resolve()
-  ],
-  output: [{
-    dir: './dist/bundle/commonjs',
-    format: 'cjs'
-  }, {    
-    dir: './dist/bundle/module',
-    format: 'es'
-  }]
-}]