@leofcoin/workers 1.1.0 → 1.2.0

package/dist/commonjs/{pool-worker-3d581327.js → pool-worker-81e8b4c0.js}

@@ -2,24 +2,23 @@
 
 require('@leofcoin/codec-format-interface');
 var transaction = require('./transaction-220a3a15.js');
+var EasyWorker = require('@vandeurenglenn/easy-worker');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var EasyWorker__default = /*#__PURE__*/_interopDefaultLegacy(EasyWorker);
 
 globalThis.peernet = globalThis.peernet || {};
 globalThis.contracts = {};
 
+const worker = new EasyWorker__default["default"]();
+
 const tasks = async transactions => {
   
   globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
     'transaction-message': {
       codec: parseInt('746d', 16),
       hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
     }
   };
   
@@ -29,15 +28,10 @@ const tasks = async transactions => {
     return {...message.decoded, hash: await message.hash, size: message.encoded.length}
   }));
 
-  globalThis.process ? process.send(transactions) : postMessage(transactions);
+  worker.postMessage(transactions);
   
 };
-
-if (globalThis.process) {
-  process.on('message', tasks);
-} else {
-  onmessage = message => tasks(message.data);
-}
+ worker.onmessage(data => tasks(data));
 
 var poolWorker = /*#__PURE__*/Object.freeze({
   __proto__: null

package/dist/commonjs/pool-worker.js

@@ -2,5 +2,6 @@
 
 require('@leofcoin/codec-format-interface');
 require('./transaction-220a3a15.js');
-require('./pool-worker-3d581327.js');
+require('@vandeurenglenn/easy-worker');
+require('./pool-worker-81e8b4c0.js');
 

package/dist/commonjs/transaction-worker-8eecc7a1.js

@@ -0,0 +1,32 @@
+'use strict';
+
+require('@leofcoin/codec-format-interface');
+var transaction = require('./transaction-220a3a15.js');
+var EasyWorker = require('@vandeurenglenn/easy-worker');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var EasyWorker__default = /*#__PURE__*/_interopDefaultLegacy(EasyWorker);
+
+globalThis.peernet = globalThis.peernet || {};
+globalThis.contracts = {};
+
+const worker = new EasyWorker__default["default"]();
+
+worker.onmessage(async (transactions) => {  
+  globalThis.peernet.codecs =  {
+    'transaction-message': {
+      codec: parseInt('746d', 16),
+      hashAlg: 'keccak-256'
+    }
+  };
+  transactions = await Promise.all(transactions.map(async message => new transaction.TransactionMessage(message)));
+
+  worker.postMessage(transactions);
+});
+
+var transactionWorker = /*#__PURE__*/Object.freeze({
+  __proto__: null
+});
+
+exports.transactionWorker = transactionWorker;

package/dist/commonjs/transaction-worker.js

@@ -2,5 +2,6 @@
 
 require('@leofcoin/codec-format-interface');
 require('./transaction-220a3a15.js');
-require('./transaction-worker-02476daf.js');
+require('@vandeurenglenn/easy-worker');
+require('./transaction-worker-8eecc7a1.js');
 

package/dist/commonjs/{utils-def2fce8.js → utils-1dc37f72.js}

@@ -1,5 +1,6 @@
 'use strict';
 
+var codecFormatInterface = require('@leofcoin/codec-format-interface');
 var _BN = require('bn.js');
 var bytes = require('@ethersproject/bytes');
 var logger$1 = require('@ethersproject/logger');
@@ -9,6 +10,48 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _BN__default = /*#__PURE__*/_interopDefaultLegacy(_BN);
 
+var proto = `
+message ValidatorMessage {
+  required string address = 1;
+  required string reward = 2;
+}
+
+message Transaction {
+  required string hash = 1;
+  required uint64 timestamp = 2;
+  required string from = 3;
+  required string to = 4;
+  required uint64 nonce = 5;
+  required string method = 6;
+  repeated string params = 7;
+}
+
+message BlockMessage {
+  required uint64 index = 1;
+  required string previousHash = 3;
+  required uint64 timestamp = 4;
+  required uint64 reward = 5;
+  required string fees = 6;
+  repeated Transaction transactions = 7;
+  repeated ValidatorMessage validators = 8;
+}
+`;
+
+class BlockMessage extends codecFormatInterface.FormatInterface {
+  get keys() {
+    return ['index', 'previousHash', 'timestamp', 'reward', 'fees', 'transactions', 'validators']
+  }
+
+  get messageName() {
+    return 'BlockMessage'
+  }
+
+  constructor(buffer) {
+    const name = 'block-message';
+    super(buffer, proto, {name});
+  }
+}
+
 const version$1 = "bignumber/5.6.2";
 
 var BN = _BN__default["default"].BN;
@@ -305,4 +348,5 @@ const formatBytes = (bytes, decimals = 2) => {
 };
 
 exports.BigNumber = BigNumber;
+exports.BlockMessage = BlockMessage;
 exports.formatBytes = formatBytes;

package/dist/commonjs/workers.js

@@ -2,18 +2,19 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var transactionWorker = require('./transaction-worker-02476daf.js');
-var blockWorker = require('./block-worker-d849f917.js');
-var poolWorker = require('./pool-worker-3d581327.js');
-var machineWorker = require('./machine-worker-481c0a4b.js');
+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-696e3b91.js');
 require('@leofcoin/codec-format-interface');
 require('./transaction-220a3a15.js');
-require('./utils-def2fce8.js');
+require('@vandeurenglenn/easy-worker');
+require('./utils-1dc37f72.js');
 require('bn.js');
 require('@ethersproject/bytes');
 require('@ethersproject/logger');
 require('@ethersproject/bignumber');
-require('child_process');
+require('path');
 
 const TransactionWorker = transactionWorker.transactionWorker;
 const BlockWorker = blockWorker.blockWorker;

package/dist/module/block-worker-f539b1b2.js

@@ -0,0 +1,44 @@
+import '@leofcoin/codec-format-interface';
+import { B as BigNumber, a as BlockMessage, f as formatBytes } from './utils-e87bc63d.js';
+import EasyWorker from '@vandeurenglenn/easy-worker';
+
+const worker = new EasyWorker();
+
+globalThis.BigNumber = BigNumber;
+
+globalThis.peernet = globalThis.peernet || {};
+globalThis.contracts = {};
+
+const run = async (blocks) => {  
+  blocks = await Promise.all(blocks.map(block => new BlockMessage(block)));
+  blocks = blocks.sort((a, b) => a.decoded.timestamp - b.decoded.timestamp);
+
+  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)}`);
+    resolve(block);
+  })));
+  return blocks
+};
+
+const tasks = async blocks => {
+  globalThis.peernet.codecs =  {
+    'block-message': {
+      codec: parseInt('626d', 16),
+      hashAlg: 'keccak-256'
+    }
+  };  
+  
+  blocks = await run(blocks);
+  worker.postMessage(blocks);
+};
+ 
+
+worker.onmessage(data => tasks(data));
+
+var blockWorker = /*#__PURE__*/Object.freeze({
+  __proto__: null
+});
+
+export { blockWorker as b };

package/dist/module/block-worker.js

@@ -1,7 +1,7 @@
 import '@leofcoin/codec-format-interface';
-import './block-worker-f5b28240.js';
-import './utils-96ad7b3e.js';
-import 'child_process';
+import './utils-e87bc63d.js';
+import '@vandeurenglenn/easy-worker';
+import './block-worker-f539b1b2.js';
 import 'bn.js';
 import '@ethersproject/bytes';
 import '@ethersproject/logger';

package/dist/module/{machine-worker-08b605fa.js → machine-worker-e7d98549.js}

@@ -1,6 +1,7 @@
 import { FormatInterface } from '@leofcoin/codec-format-interface';
-import { B as BigNumber, f as formatBytes } from './utils-96ad7b3e.js';
-import { fork } from 'child_process';
+import { B as BigNumber, a as BlockMessage, f as formatBytes } from './utils-e87bc63d.js';
+import { join } from 'path';
+import EasyWorker from '@vandeurenglenn/easy-worker';
 
 var proto = `
 message ContractMessage {
@@ -35,6 +36,8 @@ var bytecodes = {
 	validators: validators
 };
 
+const worker = new EasyWorker();
+
 const contractFactoryMessage = bytecodes.contractFactory;
 const nativeTokenMessage = bytecodes.nativeToken;
 const nameServiceMessage = bytecodes.nameService;
@@ -45,6 +48,7 @@ globalThis.BigNumber = BigNumber;
 globalThis.peernet = globalThis.peernet || {};
 globalThis.contracts = {};
 
+
 const get = (contract, method, params) => {
   let result;
   if (params?.length > 0) {
@@ -90,7 +94,6 @@ const execute = async (contract, method, params) => {
     } else {
       result = await contracts[contract][method](...params);
     }
-
     // state.put(result)
     return result
   } catch (e) {
@@ -108,6 +111,22 @@ const createMessage = (sender = globalThis.peerid) => {
 };
 
 const _init = async ({ contracts, blocks, peerid })=> {
+  
+  globalThis.peernet.codecs =  {
+    'contract-message': {
+      codec: parseInt('63636d', 16),
+      hashAlg: 'keccak-256'
+    },
+    'transaction-message': {
+      codec: parseInt('746d', 16),
+      hashAlg: 'keccak-256'
+    },
+    'block-message': {
+      codec: parseInt('626d', 16),
+      hashAlg: 'keccak-256'
+    }
+  };
+
   globalThis.peerid = peerid;
   contracts = [
     contractFactoryMessage,
@@ -122,19 +141,29 @@ const _init = async ({ contracts, blocks, peerid })=> {
     return contract
   }));
 
-  const worker = fork('./workers/block-worker.js', {serialization: 'advanced'});
+  const _worker = new EasyWorker(join(__dirname, './block-worker.js'), {serialization: 'advanced'});
   // worker.on('message')
-    worker.once('message', async (blocks) => {
+    _worker.once('message', async (blocks) => {
       for (const block of blocks) {
         await Promise.all(block.decoded.transactions.map(async message => {
-          const {from, to, method, params} = message.decoded;
+          const {from, to, method, params} = message;
           globalThis.msg = createMessage(from);
         
           await execute(to, method, params);
         }));
       }
-      process.send({type: 'machine-ready'});
-      worker.kill(); 
+      let lastBlock;
+      if (blocks.length > 0) {
+        lastBlock = blocks[blocks.length - 1].decoded;
+     
+        lastBlock = await new BlockMessage(lastBlock);
+        lastBlock = {
+          ...lastBlock.decoded,
+          hash: await lastBlock.hash
+        };
+      }
+      worker.postMessage({type: 'machine-ready', lastBlock });
+      _worker.terminate(); 
         
 
       
@@ -143,54 +172,36 @@ const _init = async ({ contracts, blocks, peerid })=> {
 };
 
 const tasks = async (e) => {
-  globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'transaction-message': {
-      codec: parseInt('746d', 16),
-      hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
-    }
-  };
+  const id = e.id;
     if (e.type === 'init') await _init(e.input);
     if (e.type === 'get') {
       const value = await get(e.input.contract, e.input.method, e.input.params);
-      process.send({
+      worker.postMessage({
         type: 'response',
-        id: e.id,
+        id,
         value
       });
     }
     if (e.type === 'execute') {
       try {
         const value = await execute(e.input.contract, e.input.method, e.input.params);
-        process.send({
+        worker.postMessage({
           type: 'response',
-          id: e.id,
+          id,
           value
         });
       } catch(e) {
-        process.send({
+        worker.postMessage({
           type: 'executionError',
-          message: e,
-          id: e.id
+          message: e.message,
+          id
           
         });
       }
     }
   };
 
-
-if (globalThis.process) {
-  process.on('message', tasks);
-} else {
-  onmessage = message => tasks(message.data);
-}
+worker.onmessage(data => tasks(data));
 
 var machineWorker = /*#__PURE__*/Object.freeze({
   __proto__: null

package/dist/module/machine-worker.js

@@ -1,7 +1,8 @@
-import './machine-worker-08b605fa.js';
+import './machine-worker-e7d98549.js';
 import '@leofcoin/codec-format-interface';
-import './utils-96ad7b3e.js';
-import 'child_process';
+import './utils-e87bc63d.js';
+import 'path';
+import '@vandeurenglenn/easy-worker';
 import 'bn.js';
 import '@ethersproject/bytes';
 import '@ethersproject/logger';

package/dist/module/{pool-worker-8d3369b4.js → pool-worker-f65671d7.js}

@@ -1,23 +1,18 @@
 import '@leofcoin/codec-format-interface';
 import { T as TransactionMessage } from './transaction-d06dc6c4.js';
+import EasyWorker from '@vandeurenglenn/easy-worker';
 
 globalThis.peernet = globalThis.peernet || {};
 globalThis.contracts = {};
 
+const worker = new EasyWorker();
+
 const tasks = async transactions => {
   
   globalThis.peernet.codecs =  {
-    'contract-message': {
-      codec: parseInt('63636d', 16),
-      hashAlg: 'keccak-256'
-    },
     'transaction-message': {
       codec: parseInt('746d', 16),
       hashAlg: 'keccak-256'
-    },
-    'block-message': {
-      codec: parseInt('626d', 16),
-      hashAlg: 'keccak-256'
     }
   };
   
@@ -27,15 +22,10 @@ const tasks = async transactions => {
     return {...message.decoded, hash: await message.hash, size: message.encoded.length}
   }));
 
-  globalThis.process ? process.send(transactions) : postMessage(transactions);
+  worker.postMessage(transactions);
   
 };
-
-if (globalThis.process) {
-  process.on('message', tasks);
-} else {
-  onmessage = message => tasks(message.data);
-}
+ worker.onmessage(data => tasks(data));
 
 var poolWorker = /*#__PURE__*/Object.freeze({
   __proto__: null

package/dist/module/pool-worker.js

@@ -1,3 +1,4 @@
 import '@leofcoin/codec-format-interface';
 import './transaction-d06dc6c4.js';
-import './pool-worker-8d3369b4.js';
+import '@vandeurenglenn/easy-worker';
+import './pool-worker-f65671d7.js';

package/dist/module/{transaction-worker-0f96397e.js → transaction-worker-105deaa8.js}

@@ -1,29 +1,22 @@
 import '@leofcoin/codec-format-interface';
 import { T as TransactionMessage } from './transaction-d06dc6c4.js';
+import EasyWorker from '@vandeurenglenn/easy-worker';
 
 globalThis.peernet = globalThis.peernet || {};
 globalThis.contracts = {};
- 
 
-process.on('message', async (transactions) => {
-  
-globalThis.peernet.codecs =  {
-  'contract-message': {
-    codec: parseInt('63636d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'transaction-message': {
-    codec: parseInt('746d', 16),
-    hashAlg: 'keccak-256'
-  },
-  'block-message': {
-    codec: parseInt('626d', 16),
-    hashAlg: 'keccak-256'
-  }
-};
+const worker = new EasyWorker();
+
+worker.onmessage(async (transactions) => {  
+  globalThis.peernet.codecs =  {
+    'transaction-message': {
+      codec: parseInt('746d', 16),
+      hashAlg: 'keccak-256'
+    }
+  };
   transactions = await Promise.all(transactions.map(async message => new TransactionMessage(message)));
 
-  process.send(transactions);
+  worker.postMessage(transactions);
 });
 
 var transactionWorker = /*#__PURE__*/Object.freeze({

package/dist/module/transaction-worker.js

@@ -1,3 +1,4 @@
 import '@leofcoin/codec-format-interface';
 import './transaction-d06dc6c4.js';
-import './transaction-worker-0f96397e.js';
+import '@vandeurenglenn/easy-worker';
+import './transaction-worker-105deaa8.js';

package/dist/module/{utils-96ad7b3e.js → utils-e87bc63d.js}

@@ -1,8 +1,51 @@
+import { FormatInterface } from '@leofcoin/codec-format-interface';
 import _BN from 'bn.js';
 import { isBytes, hexlify, isHexString } from '@ethersproject/bytes';
 import { Logger } from '@ethersproject/logger';
 import '@ethersproject/bignumber';
 
+var proto = `
+message ValidatorMessage {
+  required string address = 1;
+  required string reward = 2;
+}
+
+message Transaction {
+  required string hash = 1;
+  required uint64 timestamp = 2;
+  required string from = 3;
+  required string to = 4;
+  required uint64 nonce = 5;
+  required string method = 6;
+  repeated string params = 7;
+}
+
+message BlockMessage {
+  required uint64 index = 1;
+  required string previousHash = 3;
+  required uint64 timestamp = 4;
+  required uint64 reward = 5;
+  required string fees = 6;
+  repeated Transaction transactions = 7;
+  repeated ValidatorMessage validators = 8;
+}
+`;
+
+class BlockMessage extends FormatInterface {
+  get keys() {
+    return ['index', 'previousHash', 'timestamp', 'reward', 'fees', 'transactions', 'validators']
+  }
+
+  get messageName() {
+    return 'BlockMessage'
+  }
+
+  constructor(buffer) {
+    const name = 'block-message';
+    super(buffer, proto, {name});
+  }
+}
+
 const version$1 = "bignumber/5.6.2";
 
 var BN = _BN.BN;
@@ -298,4 +341,4 @@ const formatBytes = (bytes, decimals = 2) => {
   return `${parseFloat((bytes / Math.pow(k, i)).toFixed(decimals))} ${byteFormats[i]}`
 };
 
-export { BigNumber as B, formatBytes as f };
+export { BigNumber as B, BlockMessage as a, formatBytes as f };

package/dist/module/workers.js

@@ -1,15 +1,16 @@
-import { t as transactionWorker } from './transaction-worker-0f96397e.js';
-import { b as blockWorker } from './block-worker-f5b28240.js';
-import { p as poolWorker } from './pool-worker-8d3369b4.js';
-import { m as machineWorker } from './machine-worker-08b605fa.js';
+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-e7d98549.js';
 import '@leofcoin/codec-format-interface';
 import './transaction-d06dc6c4.js';
-import './utils-96ad7b3e.js';
+import '@vandeurenglenn/easy-worker';
+import './utils-e87bc63d.js';
 import 'bn.js';
 import '@ethersproject/bytes';
 import '@ethersproject/logger';
 import '@ethersproject/bignumber';
-import 'child_process';
+import 'path';
 
 const TransactionWorker = transactionWorker;
 const BlockWorker = blockWorker;

package/package.json

@@ -1,22 +1,22 @@
-{
-  "name": "@leofcoin/workers",
-  "version": "1.1.0",
-  "description": "",
-  "module": "src/workers.js",
-  "scripts": {
-    "build": "rollup -c",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "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"
-  }
-}
+{
+  "name": "@leofcoin/workers",
+  "version": "1.2.0",
+  "description": "",
+  "module": "src/workers.js",
+  "scripts": {
+    "build": "rollup -c",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "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"
+  }
+}