diff --git a/beacon_chain.nimble b/beacon_chain.nimble index 6082c7943f..8e13e5b8ef 100644 --- a/beacon_chain.nimble +++ b/beacon_chain.nimble @@ -13,7 +13,7 @@ bin = @[ ### Dependencies requires "nim >= 0.18.0", - "https://github.com/status-im/nim-eth", + "eth", "nimcrypto", "https://github.com/status-im/nim-blscurve#master", "ranges", @@ -21,7 +21,8 @@ requires "nim >= 0.18.0", "confutils", "serialization", "json_serialization", - "json_rpc" + "json_rpc", + "chronos" ### Helper functions proc test(name: string, defaultLang = "c") = diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim index 61ec2fb58c..1914a529c9 100644 --- a/beacon_chain/beacon_node.nim +++ b/beacon_chain/beacon_node.nim @@ -1,6 +1,6 @@ import std_shims/[os_shims, objects], net, sequtils, options, tables, - asyncdispatch2, chronicles, confutils, eth/[p2p, keys], + chronos, chronicles, confutils, eth/[p2p, keys], spec/[datatypes, digest, crypto, beaconstate, helpers, validator], conf, time, state_transition, fork_choice, ssz, beacon_chain_db, validator_pool, extras, mainchain_monitor, sync_protocol, gossipsub_protocol, trusted_state_snapshots, diff --git a/beacon_chain/gossipsub_protocol.nim b/beacon_chain/gossipsub_protocol.nim index 9e91d02f32..ef60d457ee 100644 --- a/beacon_chain/gossipsub_protocol.nim +++ b/beacon_chain/gossipsub_protocol.nim @@ -1,6 +1,6 @@ import tables, sets, macros, base64, - asyncdispatch2, nimcrypto/sysrand, chronicles, json_serialization, + chronos, nimcrypto/sysrand, chronicles, json_serialization, eth/[p2p, rlp], eth/p2p/[rlpx, peer_pool], spec/[datatypes, crypto] diff --git a/beacon_chain/mainchain_monitor.nim b/beacon_chain/mainchain_monitor.nim index c2b1c6a637..3dfe4885a0 100644 --- a/beacon_chain/mainchain_monitor.nim +++ b/beacon_chain/mainchain_monitor.nim @@ -1,5 +1,5 @@ import - asyncdispatch2, json_rpc/rpcclient, + chronos, json_rpc/rpcclient, spec/[datatypes, digest] type diff --git a/beacon_chain/sync_protocol.nim b/beacon_chain/sync_protocol.nim index 837657ba3b..2a9021fdd3 100644 --- a/beacon_chain/sync_protocol.nim +++ b/beacon_chain/sync_protocol.nim @@ -1,6 +1,6 @@ import options, - chronicles, eth/[rlp, p2p], asyncdispatch2, ranges/bitranges, eth/p2p/rlpx, + chronicles, eth/[rlp, p2p], chronos, ranges/bitranges, eth/p2p/rlpx, spec/[datatypes, crypto, digest] type diff --git a/beacon_chain/time.nim b/beacon_chain/time.nim index 5caa95969d..c062bef36f 100644 --- a/beacon_chain/time.nim +++ b/beacon_chain/time.nim @@ -1,6 +1,6 @@ import random, - asyncdispatch2, + chronos, spec/datatypes type diff --git a/beacon_chain/trusted_state_snapshots.nim b/beacon_chain/trusted_state_snapshots.nim index 26e5d069ff..772da77bcf 100644 --- a/beacon_chain/trusted_state_snapshots.nim +++ b/beacon_chain/trusted_state_snapshots.nim @@ -1,5 +1,5 @@ import - asyncdispatch2, + chronos, spec/[datatypes, crypto, digest, beaconstate], beacon_chain_db, conf const diff --git a/beacon_chain/validator_keygen.nim b/beacon_chain/validator_keygen.nim index b09d0d12e0..2d40d6f2bc 100644 --- a/beacon_chain/validator_keygen.nim +++ b/beacon_chain/validator_keygen.nim @@ -1,6 +1,6 @@ import os, ospaths, strutils, strformat, - asyncdispatch2, nimcrypto, json_serialization, confutils, + chronos, nimcrypto, json_serialization, confutils, spec/[datatypes, digest, crypto], conf, randao, time, ssz, ../tests/testutil diff --git a/beacon_chain/validator_pool.nim b/beacon_chain/validator_pool.nim index 1696cbc2f1..925edf6a4e 100644 --- a/beacon_chain/validator_pool.nim +++ b/beacon_chain/validator_pool.nim @@ -1,6 +1,6 @@ import tables, random, - asyncdispatch2, + chronos, spec/[datatypes, crypto, digest], randao, ssz type