Merge branch 'dev' into dankrad-patch-7

* dev:
  Fix typo in libp2p-standardization
  update version used in test generators to get SHA-256 hash
This commit is contained in:
Carl Beekhuizen 2019-05-25 15:13:45 +02:00
commit 3bfe81ed7b
No known key found for this signature in database
GPG Key ID: D05CA176D0020646
2 changed files with 3 additions and 3 deletions

View File

@ -150,9 +150,9 @@ The [RPC Interface](./rpc-interface.md) is specified in this repository.
## Discovery ## Discovery
Discovery Version 5 Discovery Version 5
([discv5])(https://github.com/ethereum/devp2p/blob/master/discv5/discv5.md) ([discv5](https://github.com/ethereum/devp2p/blob/master/discv5/discv5.md))
will be used for discovery. This protocol uses a UDP transport and specifies will be used for discovery. This protocol uses a UDP transport and specifies
its own encryption, ip-discovery and topic advertisement. Therefore, it has no its own encryption, ip-discovery and topic advertisement. Therefore, it has no
need to establish establish streams through `multistream-select`, rather, act need to establish streams through `multistream-select`, rather, act
as a standalone implementation that feeds discovered peers/topics (ENR-records) as as a standalone implementation that feeds discovered peers/topics (ENR-records) as
`multiaddrs` into the libp2p service. `multiaddrs` into the libp2p service.

View File

@ -1,3 +1,3 @@
py-ecc==1.6.0 py-ecc==1.7.0
eth-utils==1.4.1 eth-utils==1.4.1
../../test_libs/gen_helpers ../../test_libs/gen_helpers