bump submodules (#1043)

This commit is contained in:
Ștefan Talpalaru 2020-05-20 06:57:39 +02:00 committed by GitHub
parent c4462af4ab
commit 383b22795c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 12 deletions

View File

@ -14,7 +14,7 @@ import
protocols/identify, protocols/protocol],
libp2p/protocols/secure/[secure, secio],
libp2p/protocols/pubsub/[pubsub, floodsub, rpc/messages],
libp2p/transports/[transport, tcptransport],
libp2p/transports/tcptransport,
libp2p/stream/lpstream,
eth/[keys, async_utils], eth/p2p/[enode, p2p_protocol_dsl],
eth/net/nat, eth/p2p/discoveryv5/[enr, node],

View File

@ -7,8 +7,9 @@
import strutils, os, tables, options
import confutils, chronicles, chronos
import libp2p/[switch, standard_setup, connection, multiaddress, multicodec,
peer, crypto/secp, peerinfo, peer]
peer, peerinfo, peer]
import libp2p/crypto/crypto as lcrypto
import libp2p/crypto/secp as lsecp
import eth/p2p/discoveryv5/enr as enr
import eth/p2p/discoveryv5/[protocol, discovery_db, types]
import eth/keys as ethkeys, eth/trie/db
@ -316,10 +317,10 @@ proc init*(p: typedesc[PeerInfo],
if trecOpt.isSome():
trec = trecOpt.get()
if trec.secp256k1.isSome():
let skpubkey = SkPublicKey.fromRaw(trec.secp256k1.get())
let skpubkey = lsecp.SkPublicKey.init(trec.secp256k1.get())
if skpubkey.isOk():
let peerid = PeerID.init(PublicKey(scheme: Secp256k1,
skkey: skpubkey[]))
skkey: skpubkey.get()))
var mas = newSeq[MultiAddress]()
if trec.ip.isSome() and trec.tcp.isSome():
let ma = MultiAddress.init(multiCodec("ip4"), trec.ip.get()) &

View File

@ -8,7 +8,7 @@
{.used.}
import
chronicles, options, sequtils, unittest,
options, sequtils, unittest,
./testutil, ./testblockutil,
../beacon_chain/spec/[datatypes, digest, helpers],
../beacon_chain/[beacon_node_types, block_pool, state_transition, ssz]

View File

@ -8,7 +8,7 @@
import
algorithm, strformat, stats, times, tables, std/monotimes, stew/endians2,
testutils/markdown_reports, chronicles,
../beacon_chain/[beacon_chain_db, block_pool, extras, ssz, beacon_node_types],
../beacon_chain/[beacon_chain_db, block_pool, extras, ssz],
../beacon_chain/spec/[digest, beaconstate, datatypes],
eth/db/kvstore,
testblockutil

2
vendor/nim-chronos vendored

@ -1 +1 @@
Subproject commit 357baa52a0ea3da699c8229d97230c7f4340da92
Subproject commit bce0f878d16bea14395dc8944ff8dbdeffe33496

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 67bb54b6a5d6bb29d13fd80eab382cff14a7f341
Subproject commit 53166fd1ff28693d12044a7143d0508805c7ae8a

@ -1 +1 @@
Subproject commit dd63bbfd1cea26e9ca830a3a8fd70e5d3a0d1306
Subproject commit d3ef34b325eafca43405ee2b8390e1b6f218b644

@ -1 +1 @@
Subproject commit fc63983c73ba541413f12ee70a2b6f025b03efea
Subproject commit 2ddb255b145e5d2f38b1cddcccbed3db8fe0d960

2
vendor/nim-libp2p vendored

@ -1 +1 @@
Subproject commit 9cf1fd0216c7e9a5f29de01339060ad66ab965be
Subproject commit 7900fd9f61d976e030d6bef96030cb8db97f55f6

@ -1 +1 @@
Subproject commit db5378154553cde11be0e7d7d5925e8e5206efc2
Subproject commit 4edb4c9ae41f8f6fc7489dca63d1d9f5a48e37cd