@leofcoin/chain 1.0.21 → 1.0.22

package/src/chain.js

@@ -1,10 +1,9 @@
 import { BigNumber, formatUnits, parseUnits } from '@leofcoin/utils'
 import Machine from './machine'
-import lib from '@leofcoin/lib'
+import { ContractMessage, TransactionMessage, BlockMessage, BWMessage, BWRequestMessage } from '@leofcoin/lib'
 
 globalThis.BigNumber = BigNumber
 
-const { ContractMessage, TransactionMessage, BlockMessage, BWMessage, BWRequestMessage } = lib
 // check if browser or local
 export default class Chain {
   #validators = []
@@ -101,7 +100,7 @@ export default class Chain {
     try {
       let localBlock = await chainStore.get('lastBlock')
       localBlock = await peernet.get(new TextDecoder().decode(localBlock))
-      localBlock = new BlockMessage(localBlock)
+      localBlock = await await new BlockMessage(localBlock)
       this.#lastBlock = {...localBlock.decoded, hash: localBlock.hash}
       // console.log(this.lastBlock.decoded.transactions);
     } catch (e) {
@@ -120,7 +119,7 @@ export default class Chain {
 
     peernet.subscribe('add-transaction', async transaction => {
       try {
-        transaction = new TransactionMessage(transaction)
+        transaction = await new TransactionMessage(transaction)
         await transactionPoolStore.put(transaction.hash, transaction.encoded)
         if (await this.hasTransactionToHandle() && !this.#runningEpoch) return this.#runEpoch()
       } catch (e) {
@@ -159,7 +158,7 @@ export default class Chain {
       const end = this.#blocks.length
       const start = (this.#blocks.length) - blocksSynced
       await this.#loadBlocks(this.#blocks)
-      const message = new BlockMessage(this.lastBlock)
+      const message = await new BlockMessage(this.lastBlock)
       await blockStore.put(message.hash, message.encoded)
       await chainStore.put('lastBlock', new TextEncoder().encode(this.lastBlock.hash))
     }
@@ -245,7 +244,7 @@ export default class Chain {
   }
 
   async #addBlock(block) {
-    const blockMessage = new BlockMessage(block)
+    const blockMessage = await new BlockMessage(block)
     // if (!Buffer.isBuffer(block)) block = Buffer.from(block, 'hex')
     // const transactionJob = async transaction => {
     //   try {
@@ -327,7 +326,7 @@ export default class Chain {
 
     // exclude failing tx
     for (let transaction of Object.values(transactions)) {
-      transaction = new TransactionMessage(new Uint8Array(transaction, transaction.byteOffset, transaction.byteLength))
+      transaction = await new TransactionMessage(new Uint8Array(transaction, transaction.byteOffset, transaction.byteLength))
 
       block.fees += Number(lib.calculateFee(transaction))
       _transactions.push({...transaction.decoded, hash: transaction.hash })
@@ -340,7 +339,7 @@ export default class Chain {
         await this.#executeTransaction(transaction)
         _transactions.push(transaction)
       } catch (e) {
-        transaction = new TransactionMessage(transaction)
+        transaction = await new TransactionMessage(transaction)
         block.fees -= Number(lib.calculateFee(transaction))
         await transactionPoolStore.delete(transaction.hash)
 
@@ -368,7 +367,7 @@ export default class Chain {
       if (validators[validator].active) {
         const peer = peers[validator]
         if (peer && peer.connected) {
-          let data = new BWRequestMessage()
+          let data = await new BWRequestMessage()
           const node = await peernet.prepareMessage(validator, data.encoded)
           try {
             const bw = await peer.request(node.encoded)
@@ -424,7 +423,7 @@ export default class Chain {
     block.fees = Number.parseFloat(String(block.fees)).toFixed(decimals)
 
     try {
-      let blockMessage = new BlockMessage(block)
+      let blockMessage = await new BlockMessage(block)
       this.#lastBlock = {...block, hash: blockMessage.hash}
       peernet.publish('add-block', blockMessage.encoded)
       this.#addBlock(blockMessage.encoded)
@@ -437,12 +436,12 @@ export default class Chain {
 
   async getNonce(address) {
     let transactions = await transactionPoolStore.get()
-    transactions = Object.keys(transactions).map(tx => new TransactionMessage(transactions[tx]))
+    transactions = Object.keys(transactions).map(async tx => await new TransactionMessage(transactions[tx]))
     transactions = transactions.filter(tx => tx.decoded.from === address)
     transactions = transactions.map(tx => { return {...tx.decoded, hash: tx.hash} })
     if (this.lastBlock && transactions.length === 0) {
       let block = await peernet.get(this.lastBlock.hash)
-      block = new BlockMessage(block)
+      block = await new BlockMessage(block)
 
       // for (let tx of block.decoded?.transactions) {
       //   tx = await peernet.get(tx, 'transaction')
@@ -451,7 +450,7 @@ export default class Chain {
       transactions = transactions.filter(tx => tx.from === address)
       while (transactions.length === 0 && block.decoded.index !== 0) {
         block = await blockStore.get(block.decoded.previousHash)
-        block = new BlockMessage(block)
+        block = await new BlockMessage(block)
         transactions = block.decoded.transactions.filter(tx => tx.from === address)
       }
 
@@ -494,7 +493,7 @@ export default class Chain {
     }
 
     let data
-    let message = new TransactionMessage({timestamp: new Date().getTime(), from, to, nonce, method, params})
+    let message = await new TransactionMessage({timestamp: new Date().getTime(), from, to, nonce, method, params})
     try {
       // await transactionPoolStore.put(message.hash, new TextEncoder().encode(JSON.stringify({signature, message: message.encoded})))
       await transactionPoolStore.put(message.hash, message.encoded)
@@ -524,8 +523,8 @@ export default class Chain {
   }
 
   async createContractAddress(creator, contract, constructorParameters = []) {
-    return this.createContractMessage(creator, contract, constructorParameters)
-      .hash
+    contract = await this.createContractMessage(creator, contract, constructorParameters)
+    return contract.hash
   }
 
   /**

package/src/machine.js

@@ -1,6 +1,6 @@
 import vm from 'vm'
 import { ContractMessage, TransactionMessage } from '@leofcoin/messages'
-import lib from '@leofcoin/lib'
+import { contractFactory, nativeToken, validators, nameService } from '@leofcoin/lib'
 // import State from './state'
 
 export default class Machine {
@@ -22,15 +22,15 @@ export default class Machine {
     // return
     try {
       let contracts = [
-        contractStore.get(lib.contractFactory),
-        contractStore.get(lib.nativeToken),
-        contractStore.get(lib.validators),
-        contractStore.get(lib.nameService)
+        contractStore.get(contractFactory),
+        contractStore.get(nativeToken),
+        contractStore.get(validators),
+        contractStore.get(nameService)
       ]
 
       contracts = await Promise.all(contracts)
       for (const contract of contracts) {
-        const message = new ContractMessage(new Uint8Array(contract.buffer, contract.buffer.byteOffset, contract.buffer.byteLength))
+        const message = await new ContractMessage(new Uint8Array(contract.buffer, contract.buffer.byteOffset, contract.buffer.byteLength))
         await this.#runContract(message)
       }
     } catch (e) {

package/src/node.js

@@ -1,7 +1,6 @@
 // import config from './config/config'
 import Peernet from '@leofcoin/peernet'
-import lib from '@leofcoin/lib'
-const { ContractMessage, TransactionMessage, BlockMessage, BWMessage, BWRequestMessage } = lib
+import { ContractMessage, TransactionMessage, BlockMessage, BWMessage, BWRequestMessage } from '@leofcoin/lib'
 
 export default class Node {
   constructor() {

package/webpack.config.js

@@ -1,44 +1,11 @@
 const path = require('path');
 const webpack = require('webpack');
 module.exports = [{
-  entry: './src/chain.js',
-  plugins: [
-    // Work around for Buffer is undefined:
-    // https://github.com/webpack/changelog-v5/issues/10
-    new webpack.ProvidePlugin({
-        Buffer: ['buffer', 'Buffer'],
-    }),
-    new webpack.ProvidePlugin({
-        process: 'process/browser',
-  })
-  ],
-  optimization: {
-    minimize: false
-  },
-  resolve: {
-    // extensions: [ '.ts', '.js' ],
-    fallback: {
-      vm: require.resolve("vm-browserify"),
-      // "stream": require.resolve("stream-browserify"),
-      "buffer": require.resolve("buffer")
-      // fs: false,
-      // "path": require.resolve("path-browserify"),
-      // "util": require.resolve("util/"),
-      // "assert": require.resolve("assert/"),
-    }
-  },
-  output: {
-    library: {
-      type: 'module'
-    },
-    filename: 'chain.browser.js',
-    path: path.resolve(__dirname, 'dist'),
+  mode: 'production',
+  entry: {
+    chain: './src/chain.js',
+    node: './src/node.js'
   },
-  experiments: {
-    outputModule: true
-  }
-}, {
-  entry: './src/chain.js',
   plugins: [
     // Work around for Buffer is undefined:
     // https://github.com/webpack/changelog-v5/issues/10
@@ -47,60 +14,7 @@ module.exports = [{
     }),
     new webpack.ProvidePlugin({
         process: 'process/browser',
-  })
-  ],
-  optimization: {
-    minimize: true
-  },
-  resolve: {
-    // extensions: [ '.ts', '.js' ],
-    fallback: {
-      vm: require.resolve("vm-browserify"),
-      // "stream": require.resolve("stream-browserify"),
-      "buffer": require.resolve("buffer")
-      // fs: false,
-      // "path": require.resolve("path-browserify"),
-      // "util": require.resolve("util/"),
-      // "assert": require.resolve("assert/"),
-    }
-  },
-  output: {
-    library: {
-      type: 'module'
-    },
-    filename: 'chain.browser.min.js',
-    path: path.resolve(__dirname, 'dist'),
-  },
-  experiments: {
-    outputModule: true
-  }
-}, {
-  entry: './src/chain.js',
-  optimization: {
-    minimize: true
-  },
-  output: {
-    library: {
-      type: 'module'
-    },
-    filename: 'chain.esm',
-    path: path.resolve(__dirname, 'dist'),
-  },
-  experiments: {
-    outputModule: true
-  }
-}, {
-  entry: './src/node.js',
-  plugins: [
-    // Work around for Buffer is undefined:
-    // https://github.com/webpack/changelog-v5/issues/10
-    // new webpack.ProvidePlugin({
-    //     Buffer: ['buffer', 'Buffer'],
-    // }),
-    new webpack.ProvidePlugin({
-      process: 'process/browser',
     }),
-
     new webpack.ProvidePlugin({
       WRTC_IMPORT: `globalThis.wrtc = {
         RTCPeerConnection,
@@ -115,65 +29,21 @@ module.exports = [{
   resolve: {
     // extensions: [ '.ts', '.js' ],
     fallback: {
+      vm: require.resolve("vm-browserify"),
       // "stream": require.resolve("stream-browserify"),
-      // "buffer": require.resolve("buffer"),
-      // fs: false,
-      // "path": require.resolve("path-browserify"),
-      // "util": require.resolve("util/"),
-      // "assert": require.resolve("assert/"),
-
-    }
-  },
-  output: {
-    library: {
-      type: 'module'
-    },
-    filename: 'node.browser.js',
-    path: path.resolve(__dirname, 'dist'),
-  },
-  experiments: {
-    outputModule: true
-  }
-}, {
-  entry: './src/node.js',
-  plugins: [
-    // Work around for Buffer is undefined:
-    // https://github.com/webpack/changelog-v5/issues/10
-    // new webpack.ProvidePlugin({
-    //     Buffer: ['buffer', 'Buffer'],
-    // }),
-    new webpack.ProvidePlugin({
-      process: 'process/browser',
-    }),
-
-    new webpack.ProvidePlugin({
-      WRTC_IMPORT: `globalThis.wrtc = {
-        RTCPeerConnection,
-        RTCSessionDescription,
-        RTCIceCandidate
-      }`
-    })
-  ],
-  optimization: {
-    minimize: true
-  },
-  resolve: {
-    // extensions: [ '.ts', '.js' ],
-    fallback: {
-      // "stream": require.resolve("stream-browserify"),
-      // "buffer": require.resolve("buffer"),
+      "buffer": require.resolve("buffer")
       // fs: false,
       // "path": require.resolve("path-browserify"),
       // "util": require.resolve("util/"),
       // "assert": require.resolve("assert/"),
-
     }
   },
   output: {
     library: {
       type: 'module'
     },
-    filename: 'node.browser.min.js',
+    filename: '[name].browser.js',
+    chunkFilename: '[name].browser.js',
     path: path.resolve(__dirname, 'dist'),
   },
   experiments: {