Merge branch 'master' into fix-tx-isSigned-fromValuesArray

Author: holgerd77

package-lock.json

@@ -12,7 +12,8 @@
   },
   "scripts": {
     "postinstall": "npm run bootstrap",
-    "bootstrap": "lerna bootstrap --ignore-scripts --include-dependencies --no-ci --hoist && npm run build",
+    "bootstrap": "lerna bootstrap --ignore-scripts --include-dependencies --no-ci --hoist && npm run temporaryClientFixes && npm run build",
+    "temporaryClientFixes": "cp node_modules/interface-datastore/dist/src/key.d.ts node_modules/interface-datastore/src && cd node_modules/bcrypto && npm i",
     "bootstrap:block": "npm run bootstrap -- --scope @ethereumjs/block",
     "bootstrap:blockchain": "npm run bootstrap -- --scope @ethereumjs/blockchain",
     "bootstrap:client": "npm run bootstrap -- --scope @ethereumjs/client",

package.json

@@ -1,10 +1,15 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [UNRELEASED]
+
+- `libp2p` modules upgraded to latest, PR [#1027](https://github.com/ethereumjs/ethereumjs-vm/pull/1027)
+
 ## [0.0.6] - 2020-06-19
 
 ### Revival Release 🌻
@@ -26,6 +31,7 @@ showing the relations between the main components as well as the initialization
 ## Changes
 
 **Dependencies, CI and Docs**
+
 - Added Node 12, removed Node 8 on CI runs, updated `level` and `ethereumjs-common` dependency,
   PR [#111](https://github.com/ethereumjs/ethereumjs-client/pull/111)
 - Upgraded CI provider to GitHub actions,
@@ -40,17 +46,19 @@ showing the relations between the main components as well as the initialization
   PR [#134](https://github.com/ethereumjs/ethereumjs-client/pull/134)
 
 **Bug Fixes and Maintenance**
+
 - Fixed tx initialization bug, PR [#113](https://github.com/ethereumjs/ethereumjs-client/pull/113)
 - fix(rpc): Handle rpc request with empty params,
   PR [#122](https://github.com/ethereumjs/ethereumjs-client/pull/122)
 - Fixed light sync block init bug,
   PR [#127](https://github.com/ethereumjs/ethereumjs-client/pull/127)
 - `RPC` test method cleanup,
   PR [#126](https://github.com/ethereumjs/ethereumjs-client/pull/126)
-- Removed old fields `consensus` and `finality`, 
+- Removed old fields `consensus` and `finality`,
   PR [#120](https://github.com/ethereumjs/ethereumjs-client/pull/120)
 
 **New Features**
+
 - Improved sync reliability,
   PR [#133](https://github.com/ethereumjs/ethereumjs-client/pull/133)
 - Added `eth_blockNumber` RPC method,
@@ -61,36 +69,41 @@ showing the relations between the main components as well as the initialization
 [0.0.6]: https://github.com/ethereumjs/ethereumjs-client/compare/v0.0.5...v0.0.6
 
 ## [0.0.5] - 2019-02-12
+
 - Add support for final [Goerli](https://github.com/goerli/testnet) testnet,
   PR [#89](https://github.com/ethereumjs/ethereumjs-client/pull/89)
 
 [0.0.5]: https://github.com/ethereumjs/ethereumjs-client/compare/v0.0.4...v0.0.5
 
 ## [0.0.4] - 2018-12-30
+
 - Add more RPC endpoints, PR [#65](https://github.com/ethereumjs/ethereumjs-client/pull/65), [#69](https://github.com/ethereumjs/ethereumjs-client/pull/69), [#75](https://github.com/ethereumjs/ethereumjs-client/pull/75), [#81](https://github.com/ethereumjs/ethereumjs-client/pull/81)
 - Add unit tests, PR [#70](https://github.com/ethereumjs/ethereumjs-client/pull/70)
 - Fix error with geth genesis file parser, PR [#71](https://github.com/ethereumjs/ethereumjs-client/pull/71)
-- Update ``ethereumjs-common`` to 0.6.1, PR [#72](https://github.com/ethereumjs/ethereumjs-client/pull/72)
+- Update `ethereumjs-common` to 0.6.1, PR [#72](https://github.com/ethereumjs/ethereumjs-client/pull/72)
 - Fix bug with sender status, PR [#74](https://github.com/ethereumjs/ethereumjs-client/pull/74)
 - Add documentation and strict mode to RPC modules, PR [#76](https://github.com/ethereumjs/ethereumjs-client/pull/76)
 - Shutdown gracefully on SIGINT, PR [#79](https://github.com/ethereumjs/ethereumjs-client/pull/79)
 - Add integration tests, PR [#82](https://github.com/ethereumjs/ethereumjs-client/pull/82)
-- Update ``ethereumjs-devp2p`` to 2.5.1, PR [#84](https://github.com/ethereumjs/ethereumjs-client/pull/84)
+- Update `ethereumjs-devp2p` to 2.5.1, PR [#84](https://github.com/ethereumjs/ethereumjs-client/pull/84)
 - Refactor syncing to use streams, PR [#85](https://github.com/ethereumjs/ethereumjs-client/pull/85)
 
 [0.0.4]: https://github.com/ethereumjs/ethereumjs-client/compare/v0.0.3...v0.0.4
 
 ## [0.0.3] - 2018-10-30
+
 - Update libp2p defaults, PR [#63](https://github.com/ethereumjs/ethereumjs-client/pull/63)
 
 [0.0.3]: https://github.com/ethereumjs/ethereumjs-client/compare/v0.0.2...v0.0.3
 
 ## [0.0.2] - 2018-10-26
-- Update ``ethereumjs-blockchain`` to 3.3.1, PR [#61](https://github.com/ethereumjs/ethereumjs-client/pull/61)
+
+- Update `ethereumjs-blockchain` to 3.3.1, PR [#61](https://github.com/ethereumjs/ethereumjs-client/pull/61)
 
 [0.0.2]: https://github.com/ethereumjs/ethereumjs-client/compare/v0.0.1...v0.0.2
 
 ## [0.0.1] - 2018-10-26
+
 - Initial development release
 
 [0.0.1]: https://github.com/ethereumjs/ethereumjs-client/tree/v0.0.1

packages/client/CHANGELOG.md

@@ -6,7 +6,7 @@
 [![Code Coverage][client-coverage-badge]][client-coverage-link]
 [![Discord][discord-badge]][discord-link]
 
-This is the work repository for the EthereumJS client project targeting both Node.js and the browser as a platform.
+This is the work repository for the EthereumJS client project targeting both Node.js and the browser.
 
 See [Technical Guidelines](#technical-guidelines) to dive directly into development info.
 
@@ -32,8 +32,7 @@ For the `ethereumjs` CLI command to work run:
 npm link
 ```
 
-Note: for development purposes you can invoke the client by build with `npm run build:node` and
-then run `node ./dist/bin/cli.js`.
+Note: for development purposes you can invoke the client with `npm run client:start`
 
 ### Running the Client
 
@@ -222,16 +221,16 @@ Output:
 <pre>
 ...
 INFO [10-24|11:42:26] Listener up transport=rlpx url=enode://1c3a3d70e9fb7c274355b7ffbbb34465576ecec7ab275947fd4bdc7ddcd19320dfb61b210cbacc0702011aea6971204d4309cf9cc1856fce4887145962281907@[::]:30303
-INFO [10-24|11:37:48] Listener up transport=libp2p url=<b>/ip4/127.0.0.1/tcp/50505/ws/ipfs/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa</b>
+INFO [10-24|11:37:48] Listener up transport=libp2p url=<b>/ip4/127.0.0.1/tcp/50505/ws/p2p/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa</b>
 ...
 </pre>
 
-Copy the libp2p URL from the output. In this example, the url is `/ip4/127.0.0.1/tcp/50505/ws/ipfs/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa` but it will be different in your case.
+Copy the libp2p URL from the output. In this example, the url is `/ip4/127.0.0.1/tcp/50505/ws/p2p/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa` but it will be different in your case.
 
 Wait until a few thousand blocks are downloaded and then run the second client in a new terminal, using the url above to connect to the first client:
 
 <pre>
-ethereumjs --syncmode light --network rinkeby --datadir second --transports libp2p:multiaddrs=/ip4/0.0.0.0/tcp/50506,bootnodes=<b>/ip4/127.0.0.1/tcp/50505/ws/ipfs/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa</b>
+ethereumjs --syncmode light --network rinkeby --datadir second --transports libp2p:multiaddrs=/ip4/0.0.0.0/tcp/50506,bootnodes=<b>/ip4/127.0.0.1/tcp/50505/ws/p2p/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa</b>
 </pre>
 
 Notice that we have to run the second client on port 50506 using the `multiaddrs=/ip4/0.0.0.0/tcp/50506` libp2p option to avoid port conflicts.
@@ -261,7 +260,7 @@ http-server
 Now, open a new browser window and navigate to `http://localhost:8080`. Open the developer console in your browser and run the following command to start syncing to the first client. Again, remember to change the value of bootnodes to match the url of the first client from above:
 
 ```
-ethereumjs.run({ network: 'rinkeby', syncmode: 'light', bootnodes: '/ip4/127.0.0.1/tcp/50505/ws/ipfs/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa' })
+ethereumjs.run({ network: 'rinkeby', syncmode: 'light', bootnodes: '/ip4/127.0.0.1/tcp/50505/ws/p2p/QmYAuYxw6QX1x5aafs6g3bUrPbMDifP5pDun3N9zbVLpEa' })
 ```
 
 That's it! Now, you should start seeing headers being downloaded to the local storage of your browser. Since IndexDB is being used, even if you close and re-open the browser window, the headers you've downloaded will be saved.

packages/client/README.md

@@ -39,7 +39,7 @@ const args = require('yargs')
     },
     datadir: {
       describe: 'Data directory for the blockchain',
-      default: Config.DATADIR_DEFAULT,
+      default: `${os.homedir()}/Library/Ethereum/ethereumjs`,
     },
     transports: {
       describe: 'Network transports',
@@ -93,6 +93,14 @@ const args = require('yargs')
       boolean: true,
       default: Config.DEBUGCODE_DEFAULT,
     },
+    discDns: {
+      describe: 'Query EIP-1459 DNS TXT records for peer discovery',
+      boolean: true,
+    },
+    discV4: {
+      describe: 'Use v4 ("findneighbour" node requests) for peer discovery',
+      boolean: true,
+    },
   })
   .locale('en_EN').argv
 
@@ -163,7 +171,7 @@ async function run() {
     common,
     syncmode: args.syncmode,
     lightserv: args.lightserv,
-    datadir: `${os.homedir()}/Library/Ethereum/ethereumjs`,
+    datadir: args.datadir,
     transports: args.transports,
     rpc: args.rpc,
     rpcport: args.rpcport,
@@ -174,6 +182,8 @@ async function run() {
     dnsAddr: args.dnsAddr,
     dnsNetworks: args.dnsNetworks,
     debugCode: args.debugCode,
+    discDns: args.discDns,
+    discV4: args.discV4,
   })
   logger = config.logger
 

packages/client/bin/cli.ts

@@ -1,5 +1,4 @@
 import Common from '@ethereumjs/common'
-const level = require('level')
 
 // Blockchain
 export * from '../lib/blockchain/chain'
@@ -21,9 +20,11 @@ export * from '../lib/net/protocol/flowcontrol'
 // Server
 export * from '../lib/net/server/server'
 export * from '../lib/net/server/libp2pserver'
+import { Libp2pServer } from '../lib/net/server/libp2pserver'
 
 // EthereumClient
 export * from '../lib/client'
+import EthereumClient from '../lib/client'
 
 // Service
 export * from '../lib/service/service'
@@ -37,38 +38,37 @@ export * from '../lib/sync/lightsync'
 
 // Utilities
 export * from '../lib/util'
+import { Config } from '../lib/config'
 
 // Logging
 export * from './logging'
 import { getLogger } from './logging'
 
 export function createClient(args: any) {
-  const logger = getLogger({ loglevel: args.loglevel })
-  const options = {
+  const logger = getLogger({ loglevel: args.loglevel ?? 'info' })
+  const config = new Config({
     common: new Common({ chain: args.network ?? 'mainnet' }),
-    servers: [new exports.Libp2pServer({ multiaddrs: [], ...args })],
+    servers: [new Libp2pServer({ multiaddrs: [], config: new Config({ logger }), ...args })],
     syncmode: args.syncmode ?? 'full',
-    db: level(args.db ?? 'ethereumjs'),
-    logger: logger,
-  }
-  return new exports.EthereumClient(options)
+    logger,
+  })
+  return new EthereumClient({ config })
 }
 
-export function run(args: any) {
+export async function run(args: any) {
   const client = createClient(args)
-  const logger = client.logger
+  const { logger, chainCommon: common } = client.config
   logger.info('Initializing Ethereumjs client...')
-  logger.info(`Connecting to network: ${client.common.chainName()}`)
+  logger.info(`Connecting to network: ${common.chainName()}`)
   client.on('error', (err: any) => logger.error(err))
   client.on('listening', (details: any) => {
     logger.info(`Listener up transport=${details.transport} url=${details.url}`)
   })
   client.on('synchronized', () => {
     logger.info('Synchronized')
   })
-  client.open().then(() => {
-    logger.info('Synchronizing blockchain...')
-    client.start()
-  })
+  await client.open()
+  logger.info('Synchronizing blockchain...')
+  await client.start()
   return client
 }

packages/client/browser/index.ts

@@ -3,42 +3,60 @@
  * @memberof module:net/peer
  */
 
-import LibP2pWebsockets from 'libp2p-websockets'
-import LibP2pBootstrap from 'libp2p-bootstrap'
-import mplex from 'libp2p-mplex'
-import secio from 'libp2p-secio'
+import LibP2p from 'libp2p'
+import { NOISE } from 'libp2p-noise'
+import PeerId from 'peer-id'
+import multiaddr from 'multiaddr'
+// types currently unavailable for below libp2p deps,
+// tracking issue: https://github.com/libp2p/js-libp2p/issues/659
+const LibP2pWebsockets = require('libp2p-websockets')
+const filters = require('libp2p-websockets/src/filters')
+const LibP2pBootstrap = require('libp2p-bootstrap')
+const mplex = require('libp2p-mplex')
 
-const libp2p = require('libp2p')
-const promisify = require('util-promisify')
+export interface Libp2pNodeOptions {
+  /* Peer id */
+  peerId: PeerId
 
-export class Libp2pNode extends libp2p {
-  constructor(options: any) {
+  /* Addresses */
+  addresses?: {
+    listen?: string[]
+    announce?: string[]
+    announceFilter?: (ma: multiaddr[]) => multiaddr[]
+  }
+
+  /* Bootnodes */
+  bootnodes?: multiaddr[]
+}
+
+export class Libp2pNode extends LibP2p {
+  constructor(options: Libp2pNodeOptions) {
+    const wsTransportKey = LibP2pWebsockets.prototype[Symbol.toStringTag]
+    options.bootnodes = options.bootnodes ?? []
     super({
-      peerInfo: options.peerInfo,
+      peerId: options.peerId,
+      addresses: options.addresses,
       modules: {
         transport: [LibP2pWebsockets],
         streamMuxer: [mplex],
-        connEncryption: [secio],
-        peerDiscovery: [LibP2pBootstrap],
+        connEncryption: [NOISE],
+        [<any>'peerDiscovery']: [LibP2pBootstrap],
       },
       config: {
+        transport: {
+          [wsTransportKey]: {
+            filter: filters.all,
+          },
+        },
         peerDiscovery: {
-          bootstrap: {
+          autoDial: false,
+          [LibP2pBootstrap.tag]: {
             interval: 2000,
-            enabled: options.bootnodes !== undefined,
-            list: options.bootnodes ?? [],
+            enabled: options.bootnodes.length > 0,
+            list: options.bootnodes,
           },
         },
-        EXPERIMENTAL: {
-          dht: false,
-          pubsub: false,
-        },
       },
     })
-
-    this.asyncStart = promisify(this.start.bind(this))
-    this.asyncStop = promisify(this.stop.bind(this))
-    this.asyncDial = promisify(this.dial.bind(this))
-    this.asyncDialProtocol = promisify(this.dialProtocol.bind(this))
   }
 }

packages/client/browser/libp2pnode.ts

@@ -1,6 +1,6 @@
 import events from 'events'
 import { LevelUp } from 'levelup'
-import { BootnodeLike } from './types'
+import { MultiaddrLike } from './types'
 import { Config } from './config'
 import { FullEthereumService, LightEthereumService } from './service'
 
@@ -23,7 +23,7 @@ export interface EthereumClientOptions {
   stateDB?: LevelUp
 
   /* List of bootnodes to use for discovery */
-  bootnodes?: BootnodeLike[]
+  bootnodes?: MultiaddrLike[]
 
   /* List of supported clients */
   clientFilter?: string[]