@leofcoin/workers 1.3.5 → 1.3.6

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@leofcoin/workers",
-  "version": "1.3.5",
-  "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,7 +1,6 @@
-import { BlockMessage, ContractMessage } from './../../messages/src/messages'
-import { formatBytes, BigNumber } from './../../utils/src/utils'
-import bytecodes  from './../../lib/src/bytecodes.json'
-
+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()
 
@@ -49,7 +48,7 @@ const runContract = async ({decoded, hash, encoded}) => {
     console.log(e);
     worker.postMessage({
       type: 'contractError',
-      hash: await contractMessage.hash
+      hash: await contractMessage.hash()
     })
   }
 }
@@ -106,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({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash})
+    await runContract({decoded: contract.decoded, encoded: contract.encoded, hash: await contract.hash()})
     return contract
   }))
 
@@ -138,7 +137,7 @@ const _init = async ({ contracts, blocks, peerid })=> {
   
       lastBlock = {
         ...lastBlock.decoded,
-        hash: await lastBlock.hash
+        hash: await lastBlock.hash()
       };
     }
     globalThis.blocks = blocks
@@ -175,7 +174,7 @@ const tasks = async (e) => {
         })
       } catch (e) {
         worker.postMessage({
-          type: 'fetchError',
+          type: 'runError',
           message: e.message,
           id          
         })

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'
-  }]
-}]