diff --git a/beacon_chain/nimbus_binary_common.nim b/beacon_chain/nimbus_binary_common.nim index 2ecda64e7..27086fa1a 100644 --- a/beacon_chain/nimbus_binary_common.nim +++ b/beacon_chain/nimbus_binary_common.nim @@ -11,7 +11,7 @@ import # Standard library - std/[os, tables, strutils, terminal, typetraits], + std/[tables, strutils, terminal, typetraits], # Nimble packages chronos, confutils, toml_serialization, @@ -96,6 +96,9 @@ proc detectTTY*(stdoutKind: StdoutLogKind): StdoutLogKind = else: stdoutKind +when defaultChroniclesStream.outputs.type.arity == 2: + from std/os import splitFile + proc setupLogging*( logLevel: string, stdoutKind: StdoutLogKind, logFile: Option[OutFile]) = # In the cfg file for nimbus, we create two formats: textlines and json. diff --git a/beacon_chain/rpc/rest_beacon_api.nim b/beacon_chain/rpc/rest_beacon_api.nim index 6194c2ebf..c2e2ef2fa 100644 --- a/beacon_chain/rpc/rest_beacon_api.nim +++ b/beacon_chain/rpc/rest_beacon_api.nim @@ -6,7 +6,7 @@ # at your option. This file may not be copied, modified, or distributed except according to those terms. import - std/[typetraits, sequtils, strutils, sets], + std/[typetraits, sequtils, sets], stew/[results, base10], chronicles, ./rest_utils, diff --git a/beacon_chain/rpc/rest_validator_api.nim b/beacon_chain/rpc/rest_validator_api.nim index d39910d3c..6d302546d 100644 --- a/beacon_chain/rpc/rest_validator_api.nim +++ b/beacon_chain/rpc/rest_validator_api.nim @@ -1,9 +1,10 @@ -# Copyright (c) 2018-2021 Status Research & Development GmbH +# Copyright (c) 2018-2022 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). # at your option. This file may not be copied, modified, or distributed except according to those terms. -import std/[typetraits, strutils, sets] + +import std/[typetraits, sets] import stew/[results, base10], chronicles import ".."/[beacon_chain_db, beacon_node], ".."/networking/eth2_network, diff --git a/beacon_chain/spec/eth2_apis/rest_keymanager_types.nim b/beacon_chain/spec/eth2_apis/rest_keymanager_types.nim index 55d97a480..23bfa8853 100644 --- a/beacon_chain/spec/eth2_apis/rest_keymanager_types.nim +++ b/beacon_chain/spec/eth2_apis/rest_keymanager_types.nim @@ -1,5 +1,11 @@ +# beacon_chain +# Copyright (c) 2021-2022 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + import - std/[tables, strutils, uri], ".."/[crypto, keystore], ../../validators/slashing_protection_common diff --git a/beacon_chain/spec/eth2_apis/rest_types.nim b/beacon_chain/spec/eth2_apis/rest_types.nim index 3239b99b5..a18af6b0a 100644 --- a/beacon_chain/spec/eth2_apis/rest_types.nim +++ b/beacon_chain/spec/eth2_apis/rest_types.nim @@ -14,7 +14,7 @@ {.push raises: [Defect].} import - std/[json, typetraits], + std/json, stew/base10, web3/ethtypes, ".."/forks, ".."/datatypes/[phase0, altair, bellatrix], diff --git a/beacon_chain/validator_client/attestation_service.nim b/beacon_chain/validator_client/attestation_service.nim index cbe433454..638ff77af 100644 --- a/beacon_chain/validator_client/attestation_service.nim +++ b/beacon_chain/validator_client/attestation_service.nim @@ -1,4 +1,11 @@ -import std/[sets, sequtils] +# beacon_chain +# Copyright (c) 2021-2022 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + +import std/sets import chronicles import "."/[common, api, block_service] diff --git a/beacon_chain/validator_client/common.nim b/beacon_chain/validator_client/common.nim index b452902b4..8115f543a 100644 --- a/beacon_chain/validator_client/common.nim +++ b/beacon_chain/validator_client/common.nim @@ -1,4 +1,11 @@ -import std/[tables, os, sets, sequtils, strutils] +# beacon_chain +# Copyright (c) 2021-2022 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + +import std/[tables, os, sets, sequtils] import chronos, presto, presto/client as presto_client, chronicles, confutils, json_serialization/std/[options, net], stew/[base10, results, byteutils] diff --git a/beacon_chain/validator_client/sync_committee_service.nim b/beacon_chain/validator_client/sync_committee_service.nim index a716da00a..dc38e9acc 100644 --- a/beacon_chain/validator_client/sync_committee_service.nim +++ b/beacon_chain/validator_client/sync_committee_service.nim @@ -1,5 +1,12 @@ +# beacon_chain +# Copyright (c) 2022 Status Research & Development GmbH +# Licensed and distributed under either of +# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). +# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). +# at your option. This file may not be copied, modified, or distributed except according to those terms. + import - std/[sets, sequtils], + std/sets, chronicles, "."/[common, api, block_service], ../spec/datatypes/[phase0, altair, bellatrix], diff --git a/beacon_chain/validators/validator_duties.nim b/beacon_chain/validators/validator_duties.nim index 570dbb578..aba2cb687 100644 --- a/beacon_chain/validators/validator_duties.nim +++ b/beacon_chain/validators/validator_duties.nim @@ -13,7 +13,7 @@ import # Standard library - std/[os, osproc, sequtils, streams, tables], + std/[os, sequtils, tables], # Nimble packages stew/[assign2, byteutils, objects],