status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-02-26 02:45:29 +00:00
Code Issues Projects Releases Wiki Activity

results: use canonical import (#2248)

Browse Source
This commit is contained in:
Jacek Sieka 2024-05-30 14:54:03 +02:00 committed by GitHub
parent 198e9c6c98
commit 919242c98e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
76 changed files with 126 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fluffy/common/common_types.nim
View File

@ -7,7 +7,7 @@
{.push raises: [].} {.push raises: [].}
import ssz_serialization, eth/rlp, stew/[byteutils, results], nimcrypto/hash import results, ssz_serialization, eth/rlp, stew/byteutils, nimcrypto/hash
export hash export hash

2
fluffy/database/content_db.nim
View File

@ -11,7 +11,7 @@ import
chronicles, chronicles,
metrics, metrics,
stint, stint,
stew/results, results,
eth/db/kvstore, eth/db/kvstore,
eth/db/kvstore_sqlite3, eth/db/kvstore_sqlite3,
../network/state/state_content, ../network/state/state_content,

3
fluffy/eth_data/history_data_json_store.nim
View File

@ -10,7 +10,8 @@
import import
json_serialization, json_serialization,
json_serialization/std/tables, json_serialization/std/tables,
stew/[byteutils, io2, results], results,
stew/[byteutils, io2],
chronicles, chronicles,
eth/[rlp, common/eth_types], eth/[rlp, common/eth_types],
../../nimbus/common/[chain_config, genesis], ../../nimbus/common/[chain_config, genesis],

3
fluffy/eth_data/history_data_ssz_e2s.nim
View File

@ -8,8 +8,9 @@
{.push raises: [].} {.push raises: [].}
import import
stew/[byteutils, io2, results], stew/[byteutils, io2],
chronicles, chronicles,
results,
eth/[rlp, common/eth_types], eth/[rlp, common/eth_types],
ncli/e2store, ncli/e2store,
../network/history/[history_content, accumulator] ../network/history/[history_content, accumulator]

3
fluffy/fluffy.nim
View File

@ -18,7 +18,8 @@ import
metrics/chronos_httpserver, metrics/chronos_httpserver,
json_rpc/clients/httpclient, json_rpc/clients/httpclient,
json_rpc/rpcproxy, json_rpc/rpcproxy,
stew/[byteutils, io2, results], results,
stew/[byteutils, io2],
eth/keys, eth/keys,
eth/net/nat, eth/net/nat,
eth/p2p/discoveryv5/protocol as discv5_protocol, eth/p2p/discoveryv5/protocol as discv5_protocol,

2
fluffy/logging.nim
View File

@ -17,7 +17,7 @@ import
pkg/chronicles, pkg/chronicles,
pkg/chronicles/helpers, pkg/chronicles/helpers,
chronicles/topics_registry, chronicles/topics_registry,
pkg/stew/results pkg/results
export results export results

3
fluffy/network/beacon/beacon_content.nim
View File

@ -9,7 +9,8 @@
import import
std/typetraits, std/typetraits,
stew/[arrayops, results], stew/arrayops,
results,
beacon_chain/spec/forks, beacon_chain/spec/forks,
beacon_chain/spec/datatypes/altair, beacon_chain/spec/datatypes/altair,
nimcrypto/[sha2, hash], nimcrypto/[sha2, hash],

2
fluffy/network/beacon/beacon_db.nim
View File

@ -13,7 +13,7 @@ import
eth/db/kvstore, eth/db/kvstore,
eth/db/kvstore_sqlite3, eth/db/kvstore_sqlite3,
stint, stint,
stew/results, results,
ssz_serialization, ssz_serialization,
beacon_chain/db_limits, beacon_chain/db_limits,
beacon_chain/spec/datatypes/[phase0, altair, bellatrix], beacon_chain/spec/datatypes/[phase0, altair, bellatrix],

3
fluffy/network/beacon/beacon_light_client_manager.nim
View File

@ -11,7 +11,8 @@ import
std/typetraits, std/typetraits,
chronos, chronos,
chronicles, chronicles,
stew/[base10, results], stew/base10,
results,
eth/p2p/discoveryv5/random2, eth/p2p/discoveryv5/random2,
beacon_chain/spec/datatypes/[phase0, altair, bellatrix, capella, deneb], beacon_chain/spec/datatypes/[phase0, altair, bellatrix, capella, deneb],
beacon_chain/spec/[forks_light_client, digest], beacon_chain/spec/[forks_light_client, digest],

2
fluffy/network/beacon/beacon_network.nim
View File

@ -8,7 +8,7 @@
{.push raises: [].} {.push raises: [].}
import import
stew/results, results,
chronos, chronos,
chronicles, chronicles,
eth/p2p/discoveryv5/[protocol, enr], eth/p2p/discoveryv5/[protocol, enr],

2
fluffy/network/history/beacon_chain_block_proof_bellatrix.nim
View File

@ -74,7 +74,7 @@
{.push raises: [].} {.push raises: [].}
import import
stew/results, results,
ssz_serialization, ssz_serialization,
ssz_serialization/[proofs, merkleization], ssz_serialization/[proofs, merkleization],
beacon_chain/spec/eth2_ssz_serialization, beacon_chain/spec/eth2_ssz_serialization,

2
fluffy/network/history/beacon_chain_historical_roots.nim
View File

@ -20,7 +20,7 @@
{.push raises: [].} {.push raises: [].}
import stew/results, beacon_chain/spec/forks, beacon_chain/spec/datatypes/bellatrix import results, beacon_chain/spec/forks, beacon_chain/spec/datatypes/bellatrix
export results export results

2
fluffy/network/history/experimental/beacon_chain_block_proof_capella.nim
View File

@ -24,7 +24,7 @@
{.push raises: [].} {.push raises: [].}
import import
stew/results, results,
ssz_serialization, ssz_serialization,
ssz_serialization/[proofs, merkleization], ssz_serialization/[proofs, merkleization],
beacon_chain/spec/eth2_ssz_serialization, beacon_chain/spec/eth2_ssz_serialization,

3
fluffy/network/history/history_content.nim
View File

@ -12,7 +12,8 @@
import import
std/math, std/math,
nimcrypto/[sha2, hash], nimcrypto/[sha2, hash],
stew/[byteutils, results], stew/byteutils,
results,
stint, stint,
ssz_serialization, ssz_serialization,
../../common/common_types ../../common/common_types

2
fluffy/network/history/history_network.nim
View File

@ -8,7 +8,7 @@
{.push raises: [].} {.push raises: [].}
import import
stew/results, results,
chronos, chronos,
chronicles, chronicles,
eth/[common/eth_types_rlp, rlp, trie, trie/db], eth/[common/eth_types_rlp, rlp, trie, trie/db],

2
fluffy/network/wire/messages.nim
View File

@ -11,7 +11,7 @@
{.push raises: [].} {.push raises: [].}
import import
stint, stew/[results, objects, endians2], ssz_serialization, ../../common/common_types stint, stew/[objects, endians2], ssz_serialization, ../../common/common_types, results
export ssz_serialization, stint, common_types export ssz_serialization, stint, common_types

3
fluffy/network/wire/portal_protocol.nim
View File

@ -12,7 +12,8 @@
import import
std/[sequtils, sets, algorithm, tables], std/[sequtils, sets, algorithm, tables],
stew/[results, byteutils, leb128, endians2], stew/[byteutils, leb128, endians2],
results,
chronicles, chronicles,
chronos, chronos,
nimcrypto/hash, nimcrypto/hash,

3
fluffy/rpc/rpc_types.nim
View File

@ -10,7 +10,8 @@
import import
stint, stint,
json_rpc/jsonmarshal, json_rpc/jsonmarshal,
stew/[results, byteutils], stew/[byteutils],
results,
eth/p2p/discoveryv5/[routing_table, enr, node] eth/p2p/discoveryv5/[routing_table, enr, node]
export jsonmarshal, routing_table, enr, node export jsonmarshal, routing_table, enr, node

2
fluffy/tests/beacon_network_tests/test_beacon_content.nim
View File

@ -11,7 +11,7 @@ import
unittest2, unittest2,
stew/byteutils, stew/byteutils,
stew/io2, stew/io2,
stew/results, results,
beacon_chain/networking/network_metadata, beacon_chain/networking/network_metadata,
beacon_chain/spec/forks, beacon_chain/spec/forks,
beacon_chain/spec/datatypes/altair, beacon_chain/spec/datatypes/altair,

3
fluffy/tests/portal_spec_tests/mainnet/test_history_content_validation.nim
View File

@ -12,7 +12,8 @@
import import
unittest2, unittest2,
stint, stint,
stew/[byteutils, results], stew/byteutils,
results,
eth/[common/eth_types, rlp], eth/[common/eth_types, rlp],
../../../common/common_types, ../../../common/common_types,
../../../eth_data/history_data_json_store, ../../../eth_data/history_data_json_store,

3
fluffy/tests/portal_spec_tests/mainnet/test_portal_wire_encoding.nim
View File

@ -10,7 +10,8 @@
import import
unittest2, unittest2,
stint, stint,
stew/[byteutils, results], stew/byteutils,
results,
eth/p2p/discoveryv5/enr, eth/p2p/discoveryv5/enr,
../../../network/wire/messages ../../../network/wire/messages

2
fluffy/tests/state_network_tests/test_state_gossip_getparent_genesis.nim
View File

@ -10,7 +10,7 @@
import import
std/os, std/os,
unittest2, unittest2,
stew/results, results,
eth/[common, trie, trie/db], eth/[common, trie, trie/db],
../../../nimbus/common/chain_config, ../../../nimbus/common/chain_config,
../../network/state/[state_content, state_validation, state_gossip, state_utils], ../../network/state/[state_content, state_validation, state_gossip, state_utils],

2
fluffy/tests/state_network_tests/test_state_validation_genesis.nim
View File

@ -10,7 +10,7 @@
import import
std/os, std/os,
unittest2, unittest2,
stew/results, results,
eth/[common, trie, trie/trie_defs], eth/[common, trie, trie/trie_defs],
../../../nimbus/common/chain_config, ../../../nimbus/common/chain_config,
../../network/state/[state_content, state_validation], ../../network/state/[state_content, state_validation],

4
fluffy/tests/test_history_util.nim
View File

@ -8,9 +8,7 @@
{.push raises: [].} {.push raises: [].}
import import
stew/results, results, eth/common/eth_types_rlp, ../network/history/[history_content, accumulator]
eth/common/eth_types_rlp,
../network/history/[history_content, accumulator]
export results, accumulator, history_content export results, accumulator, history_content

2
fluffy/tests/test_portal_wire_protocol.nim
View File

@ -11,7 +11,7 @@ import
std/[algorithm, sequtils], std/[algorithm, sequtils],
chronos, chronos,
testutils/unittests, testutils/unittests,
stew/results, results,
eth/keys, eth/keys,
eth/p2p/discoveryv5/routing_table, eth/p2p/discoveryv5/routing_table,
nimcrypto/[hash, sha2], nimcrypto/[hash, sha2],

3
fluffy/tools/portalcli.nim
View File

@ -14,7 +14,8 @@ import
chronos, chronos,
metrics, metrics,
metrics/chronos_httpserver, metrics/chronos_httpserver,
stew/[byteutils, results], stew/byteutils,
results,
nimcrypto/[hash, sha2], nimcrypto/[hash, sha2],
eth/[keys, net/nat], eth/[keys, net/nat],
eth/p2p/discoveryv5/[enr, node], eth/p2p/discoveryv5/[enr, node],

2
hive_integration/nodocker/engine/cancun/blobs.nim
View File

@ -14,7 +14,7 @@ import
kzg4844/kzg_ex as kzg, kzg4844/kzg_ex as kzg,
stew/endians2, stew/endians2,
nimcrypto/sha2, nimcrypto/sha2,
stew/results, results,
../../../../nimbus/core/eip4844 ../../../../nimbus/core/eip4844
type type

2
hive_integration/nodocker/engine/engine_env.nim
View File

@ -14,7 +14,7 @@ import
eth/p2p as eth_p2p, eth/p2p as eth_p2p,
chronos, chronos,
json_rpc/[rpcserver, rpcclient], json_rpc/[rpcserver, rpcclient],
stew/[results], results,
../../../nimbus/[ ../../../nimbus/[
config, config,
constants, constants,

2
hive_integration/nodocker/engine/engine_sim.nim
View File

@ -11,7 +11,7 @@
import import
std/times, std/times,
chronicles, chronicles,
stew/results, results,
./types, ./types,
../sim_utils, ../sim_utils,
../../../nimbus/core/eip4844 ../../../nimbus/core/eip4844

2
hive_integration/nodocker/engine/test_env.nim
View File

@ -11,7 +11,7 @@
import import
chronicles, chronicles,
eth/keys, eth/keys,
stew/results, results,
json_rpc/rpcclient, json_rpc/rpcclient,
../../../nimbus/config, ../../../nimbus/config,
../../../nimbus/common, ../../../nimbus/common,

2
hive_integration/nodocker/rpc/test_env.nim
View File

@ -10,7 +10,7 @@
import import
std/[os, net], std/[os, net],
eth/p2p as ethp2p, eth/p2p as ethp2p,
stew/results, results,
chronos, json_rpc/[rpcserver, rpcclient], chronos, json_rpc/[rpcserver, rpcclient],
../../../nimbus/sync/protocol, ../../../nimbus/sync/protocol,
../../../nimbus/common, ../../../nimbus/common,

2
nimbus/beacon/api_handler/api_forkchoice.nim
View File

@ -10,7 +10,7 @@
import import
std/[typetraits], std/[typetraits],
eth/common, eth/common,
stew/results, results,
../web3_eth_conv, ../web3_eth_conv,
../beacon_engine, ../beacon_engine,
web3/execution_types, web3/execution_types,

2
nimbus/beacon/api_handler/api_newpayload.nim
View File

@ -9,7 +9,7 @@
import import
eth/common, eth/common,
stew/results, results,
../web3_eth_conv, ../web3_eth_conv,
../beacon_engine, ../beacon_engine,
web3/execution_types, web3/execution_types,

3
nimbus/beacon/api_handler/api_utils.nim
View File

@ -12,7 +12,8 @@ import
eth/[rlp], eth/[rlp],
json_rpc/errors, json_rpc/errors,
nimcrypto/[hash, sha2], nimcrypto/[hash, sha2],
stew/[results, endians2], stew/endians2,
results,
../../constants, ../../constants,
../../db/core_db, ../../db/core_db,
../../utils/utils, ../../utils/utils,

5
nimbus/common/context.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2021 Status Research & Development GmbH # Copyright (c) 2021-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE)) # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
# * MIT license ([LICENSE-MIT](LICENSE-MIT)) # * MIT license ([LICENSE-MIT](LICENSE-MIT))
@ -10,7 +10,8 @@
import import
std/[strutils, os], std/[strutils, os],
manager, manager,
stew/[results, io2, byteutils], stew/[io2, byteutils],
results,
eth/keys eth/keys
export manager export manager

7
nimbus/common/manager.nim
View File

@ -11,7 +11,8 @@
import import
std/[os, json, tables, strutils], std/[os, json, tables, strutils],
stew/[byteutils, results], stew/byteutils,
results,
eth/[keyfile, common, keys], eth/[keyfile, common, keys],
json_serialization json_serialization
@ -29,7 +30,7 @@ type
proc init*(_: type AccountsManager): AccountsManager = proc init*(_: type AccountsManager): AccountsManager =
discard discard
proc loadKeystores*(am: var AccountsManager, path: string): proc loadKeystores*(am: var AccountsManager, path: string):
Result[void, string] = Result[void, string] =
try: try:
createDir(path) createDir(path)
@ -39,7 +40,7 @@ proc loadKeystores*(am: var AccountsManager, path: string):
am.accounts[address] = NimbusAccount(keystore: data, unlocked: false) am.accounts[address] = NimbusAccount(keystore: data, unlocked: false)
except CatchableError as exc: except CatchableError as exc:
return err("loadKeystrores: " & exc.msg) return err("loadKeystrores: " & exc.msg)
ok() ok()
proc getAccount*(am: var AccountsManager, address: EthAddress): Result[NimbusAccount, string] = proc getAccount*(am: var AccountsManager, address: EthAddress): Result[NimbusAccount, string] =

2
nimbus/core/eip4844.nim
View File

@ -12,7 +12,7 @@ import
std/[os, strutils], std/[os, strutils],
nimcrypto/sha2, nimcrypto/sha2,
kzg4844/kzg_ex as kzg, kzg4844/kzg_ex as kzg,
stew/results, results,
stint, stint,
../constants, ../constants,
../common/common ../common/common

2
nimbus/core/executor/process_block.nim
View File

@ -21,7 +21,7 @@ import
./executor_helpers, ./executor_helpers,
./process_transaction, ./process_transaction,
chronicles, chronicles,
stew/results results
{.push raises: [].} {.push raises: [].}

2
nimbus/core/executor/process_transaction.nim
View File

@ -12,7 +12,7 @@
import import
std/strutils, std/strutils,
stew/results, results,
../../common/common, ../../common/common,
../../db/ledger, ../../db/ledger,
../../transaction/call_evm, ../../transaction/call_evm,

4
nimbus/core/gaslimit.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2018 Status Research & Development GmbH # Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -11,7 +11,7 @@
import import
../common/common, ../common/common,
std/strformat, std/strformat,
stew/results, results,
eth/[eip1559] eth/[eip1559]
export export

3
nimbus/core/tx_pool.nim
View File

@ -435,7 +435,8 @@ import
tx_recover], tx_recover],
chronicles, chronicles,
eth/keys, eth/keys,
stew/[keyed_queue, results], stew/keyed_queue,
results,
../common/common, ../common/common,
./casper ./casper

2
nimbus/core/tx_pool/tx_item.nim
View File

@ -18,7 +18,7 @@ import
../../utils/utils, ../../utils/utils,
./tx_info, ./tx_info,
eth/[common, keys], eth/[common, keys],
stew/results results
{.push raises: [].} {.push raises: [].}

7
nimbus/core/tx_pool/tx_tabs.nim
View File

@ -12,15 +12,16 @@
## ====================================================== ## ======================================================
## ##
{.push raises: [].}
import import
std/[sequtils, tables], std/[sequtils, tables],
./tx_info, ./tx_info,
./tx_item, ./tx_item,
./tx_tabs/[tx_sender, tx_rank, tx_status], ./tx_tabs/[tx_sender, tx_rank, tx_status],
eth/[common, keys], eth/[common, keys],
stew/[keyed_queue, keyed_queue/kq_debug, results, sorted_set] stew/[keyed_queue, keyed_queue/kq_debug, sorted_set],
results
{.push raises: [].}
export export
# bySender/byStatus index operations # bySender/byStatus index operations

8
nimbus/core/tx_pool/tx_tabs/tx_rank.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2018 Status Research & Development GmbH # Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -12,13 +12,15 @@
## ========================================= ## =========================================
## ##
{.push raises: [].}
import import
std/[tables], std/[tables],
../tx_info, ../tx_info,
eth/[common], eth/[common],
stew/[results, sorted_set] stew/[sorted_set],
results
{.push raises: [].}
type type
TxRank* = ##\ TxRank* = ##\

6
nimbus/core/tx_pool/tx_tabs/tx_sender.nim
View File

@ -8,6 +8,8 @@
# at your option. This file may not be copied, modified, or distributed except # at your option. This file may not be copied, modified, or distributed except
# according to those terms. # according to those terms.
{.push raises: [].}
## Transaction Pool Table: `Sender` > `status` | all > `nonce` ## Transaction Pool Table: `Sender` > `status` | all > `nonce`
## =========================================================== ## ===========================================================
## ##
@ -17,10 +19,10 @@ import
../tx_info, ../tx_info,
../tx_item, ../tx_item,
eth/[common], eth/[common],
stew/[results, keyed_queue, keyed_queue/kq_debug, sorted_set], stew/[keyed_queue, keyed_queue/kq_debug, sorted_set],
results,
../../eip4844 ../../eip4844
{.push raises: [].}
type type
TxSenderNonceRef* = ref object ##\ TxSenderNonceRef* = ref object ##\

5
nimbus/core/tx_pool/tx_tabs/tx_status.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2018 Status Research & Development GmbH # Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -16,7 +16,8 @@ import
../tx_info, ../tx_info,
../tx_item, ../tx_item,
eth/[common], eth/[common],
stew/[results, keyed_queue, keyed_queue/kq_debug, sorted_set] stew/[keyed_queue, keyed_queue/kq_debug, sorted_set],
results
{.push raises: [].} {.push raises: [].}

3
nimbus/core/validate.nim
View File

@ -20,7 +20,8 @@ import
./pow/[difficulty, header], ./pow/[difficulty, header],
./pow, ./pow,
nimcrypto/utils as cryptoutils, nimcrypto/utils as cryptoutils,
stew/[objects, results] stew/objects,
results
from stew/byteutils from stew/byteutils
import nil import nil

4
nimbus/core/withdrawals.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2022 Status Research & Development GmbH # Copyright (c) 2022-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -9,7 +9,7 @@
# according to those terms. # according to those terms.
import import
stew/results, results,
../common/common ../common/common
{.push raises: [].} {.push raises: [].}

2
nimbus/db/kvstore_rocksdb.nim
View File

@ -12,7 +12,7 @@
import import
std/[os, sequtils], std/[os, sequtils],
stew/results, results,
rocksdb, rocksdb,
eth/db/kvstore eth/db/kvstore

2
nimbus/evm/precompiles.nim
View File

@ -10,7 +10,7 @@
import import
std/[macros], std/[macros],
stew/results, results,
"."/[types, blake2b_f, blscurve], "."/[types, blake2b_f, blscurve],
./interpreter/[gas_meter, gas_costs, utils/utils_numeric], ./interpreter/[gas_meter, gas_costs, utils/utils_numeric],
../errors, eth/[common, keys], chronicles, ../errors, eth/[common, keys], chronicles,

3
nimbus/graphql/ethapi.nim
View File

@ -9,7 +9,8 @@
import import
std/[strutils], std/[strutils],
stew/[results, byteutils], stint, stew/byteutils, stint,
results,
eth/common/eth_types_rlp, chronos, eth/common/eth_types_rlp, chronos,
graphql, graphql/graphql as context, graphql, graphql/graphql as context,
graphql/common/types, graphql/httpserver, graphql/common/types, graphql/httpserver,

5
nimbus/rpc/jwt_auth.nim
View File

@ -23,7 +23,8 @@ import
chronos/apps/http/httpserver, chronos/apps/http/httpserver,
httputils, httputils,
nimcrypto/[hmac, utils], nimcrypto/[hmac, utils],
stew/[byteutils, objects, results], stew/[byteutils, objects],
results,
../config, ../config,
./jwt_auth_helper, ./jwt_auth_helper,
./rpc_server ./rpc_server
@ -254,7 +255,7 @@ proc jwtSharedSecret*(rng: ref rand.HmacDrbgContext; config: NimbusConf):
return err(jwtCreationError) return err(jwtCreationError)
proc httpJwtAuth*(key: JwtSharedKey): RpcAuthHook = proc httpJwtAuth*(key: JwtSharedKey): RpcAuthHook =
proc handler(req: HttpRequestRef): Future[HttpResponseRef] proc handler(req: HttpRequestRef): Future[HttpResponseRef]
{.gcsafe, async: (raises: [CatchableError]).} = {.gcsafe, async: (raises: [CatchableError]).} =
let auth = req.headers.getString("Authorization", "?") let auth = req.headers.getString("Authorization", "?")
if auth.len < 9 or auth[0..6].cmpIgnoreCase("Bearer ") != 0: if auth.len < 9 or auth[0..6].cmpIgnoreCase("Bearer ") != 0:

3
nimbus/sync/todo/snap/worker/db/hexary_inspect.nim
View File

@ -14,7 +14,8 @@ import
std/[sequtils, strutils, tables], std/[sequtils, strutils, tables],
chronicles, chronicles,
eth/[common, trie/nibbles], eth/[common, trie/nibbles],
stew/[results, byteutils], stew/[byteutils],
results,
"../.."/[constants, range_desc], "../.."/[constants, range_desc],
"."/[hexary_desc, hexary_nodes_helper, hexary_paths] "."/[hexary_desc, hexary_nodes_helper, hexary_paths]

4
nimbus/sync/todo/snap/worker/db/hexary_interpolate.nim
View File

@ -1,5 +1,5 @@
# nimbus-eth1 # nimbus-eth1
# Copyright (c) 2021 Status Research & Development GmbH # Copyright (c) 2021-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -19,7 +19,7 @@
import import
std/[tables], std/[tables],
eth/[common, trie/nibbles], eth/[common, trie/nibbles],
stew/results, results,
"../.."/[constants, range_desc], "../.."/[constants, range_desc],
"."/[hexary_desc, hexary_error, hexary_paths] "."/[hexary_desc, hexary_error, hexary_paths]

2
nimbus/sync/todo/snap/worker/db/hexary_nearby.nim
View File

@ -13,7 +13,7 @@
import import
std/tables, std/tables,
eth/[common, trie/nibbles], eth/[common, trie/nibbles],
stew/results, results,
../../range_desc, ../../range_desc,
"."/[hexary_desc, hexary_error, hexary_nodes_helper, hexary_paths] "."/[hexary_desc, hexary_error, hexary_nodes_helper, hexary_paths]

2
nimbus/sync/todo/snap/worker/db/hexary_nodes_helper.nim
View File

@ -15,7 +15,7 @@
import import
std/[sequtils, tables], std/[sequtils, tables],
eth/[common, trie/nibbles], eth/[common, trie/nibbles],
stew/results, results,
../../range_desc, ../../range_desc,
"."/[hexary_desc, hexary_error] "."/[hexary_desc, hexary_error]

2
nimbus/sync/todo/snap/worker/db/snapdb_debug.nim
View File

@ -13,7 +13,7 @@
import import
std/[algorithm, sequtils, tables], std/[algorithm, sequtils, tables],
eth/[common, trie/nibbles], eth/[common, trie/nibbles],
stew/results, results,
../../range_desc, ../../range_desc,
"."/[hexary_debug, hexary_desc, hexary_error, hexary_paths, snapdb_desc] "."/[hexary_debug, hexary_desc, hexary_error, hexary_paths, snapdb_desc]

4
nimbus/sync/todo/snap/worker/db/snapdb_pivot.nim
View File

@ -1,5 +1,5 @@
# nimbus-eth1 # nimbus-eth1
# Copyright (c) 2021 Status Research & Development GmbH # Copyright (c) 2021-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -12,7 +12,7 @@
import import
eth/[common, rlp], eth/[common, rlp],
stew/results, results,
../../range_desc, ../../range_desc,
"."/[hexary_error, snapdb_desc, snapdb_persistent] "."/[hexary_error, snapdb_desc, snapdb_persistent]

5
nimbus/utils/ec_recover.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2018-2023 Status Research & Development GmbH # Copyright (c) 2018-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -21,7 +21,8 @@ import
./keyed_queue/kq_rlp, ./keyed_queue/kq_rlp,
./utils_defs, ./utils_defs,
eth/[common, common/transaction, keys, rlp], eth/[common, common/transaction, keys, rlp],
stew/[keyed_queue, results], stew/keyed_queue,
results,
stint stint
export export

2
nimbus_verified_proxy/block_cache.nim
View File

@ -7,7 +7,7 @@
{.push raises: [].} {.push raises: [].}
import std/tables, web3/primitives, stew/[results, keyed_queue], ./rpc/rpc_utils import std/tables, web3/primitives, stew/keyed_queue, results, ./rpc/rpc_utils
## Cache for payloads received through block gossip and validated by the ## Cache for payloads received through block gossip and validated by the
## consensus light client. ## consensus light client.

3
nimbus_verified_proxy/rpc/rpc_eth_api.nim
View File

@ -10,7 +10,8 @@
import import
std/[strutils, typetraits], std/[strutils, typetraits],
stint, stint,
stew/[byteutils, results], stew/byteutils,
results,
chronicles, chronicles,
json_rpc/[rpcproxy, rpcserver, rpcclient], json_rpc/[rpcproxy, rpcserver, rpcclient],
eth/common/eth_types as etypes, eth/common/eth_types as etypes,

2
nimbus_verified_proxy/validate_proof.nim
View File

@ -10,7 +10,7 @@
import import
std/[sequtils, typetraits, options], std/[sequtils, typetraits, options],
stint, stint,
stew/results, results,
eth/common/eth_types as etypes, eth/common/eth_types as etypes,
eth/common/eth_types_rlp, eth/common/eth_types_rlp,
eth/rlp, eth/rlp,

4
premix/graphql_downloader.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2021-2023 Status Research & Development GmbH # Copyright (c) 2021-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -10,7 +10,7 @@
import import
std/json, std/json,
chronos, stew/results, eth/common, chronos, results, eth/common,
graphql/httpclient, graphql/httpclient,
./parser ./parser

2
stateless/test_witness_verification.nim
View File

@ -10,7 +10,7 @@
import import
std/os, std/os,
unittest2, unittest2,
stew/results, results,
eth/[common, trie/trie_defs], eth/[common, trie/trie_defs],
../nimbus/db/[ledger, core_db], ../nimbus/db/[ledger, core_db],
../nimbus/common/chain_config, ../nimbus/common/chain_config,

2
stateless/witness_verification.nim
View File

@ -11,7 +11,7 @@ import
std/tables, std/tables,
stint, stint,
eth/[common, rlp], eth/[common, rlp],
stew/results, results,
../nimbus/db/[core_db, state_db], ../nimbus/db/[core_db, state_db],
./[tree_from_witness, witness_types] ./[tree_from_witness, witness_types]

4
tests/replay/gunzip.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2021-2023 Status Research & Development GmbH # Copyright (c) 2021-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -10,7 +10,7 @@
import import
std/strutils, std/strutils,
stew/results, results,
zlib zlib
const const

3
tests/test_generalstate_json.nim
View File

@ -21,7 +21,8 @@ import
../tools/common/state_clearing, ../tools/common/state_clearing,
eth/trie/trie_defs, eth/trie/trie_defs,
unittest2, unittest2,
stew/[results, byteutils] stew/byteutils,
results
type type
TestCtx = object TestCtx = object

2
tests/test_jwt_auth.nim
View File

@ -22,7 +22,7 @@ import
chronos/apps/http/httptable, chronos/apps/http/httptable,
eth/[common, keys, p2p], eth/[common, keys, p2p],
nimcrypto/[hmac, utils], nimcrypto/[hmac, utils],
stew/results, results,
stint, stint,
unittest2, unittest2,
graphql, graphql,

3
tests/test_sync_snap/test_helpers.nim
View File

@ -11,7 +11,8 @@
import import
std/times, std/times,
eth/common, eth/common,
stew/[interval_set, results], stew/interval_set,
results,
unittest2, unittest2,
../../nimbus/sync/snap/range_desc, ../../nimbus/sync/snap/range_desc,
../../nimbus/sync/snap/worker/db/hexary_error, ../../nimbus/sync/snap/worker/db/hexary_error,

3
tests/test_sync_snap/test_node_range.nim
View File

@ -13,7 +13,8 @@
import import
std/[sequtils, sets, strformat, strutils], std/[sequtils, sets, strformat, strutils],
eth/[common, p2p, trie/nibbles], eth/[common, p2p, trie/nibbles],
stew/[byteutils, interval_set, results], stew/[byteutils, interval_set],
results,
unittest2, unittest2,
../../nimbus/sync/[handlers, protocol, types], ../../nimbus/sync/[handlers, protocol, types],
../../nimbus/sync/snap/range_desc, ../../nimbus/sync/snap/range_desc,

4
tests/test_txpool/sign_helper.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2022-2023 Status Research & Development GmbH # Copyright (c) 2022-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -14,7 +14,7 @@ import
../../nimbus/core/tx_pool/tx_item, ../../nimbus/core/tx_pool/tx_item,
../../nimbus/core/clique/clique_desc, ../../nimbus/core/clique/clique_desc,
eth/[common, common/transaction, keys], eth/[common, common/transaction, keys],
stew/results, results,
stint stint
const const

2
tests/test_txpool2.nim
View File

@ -11,7 +11,7 @@
import import
std/[tables, os], std/[tables, os],
eth/[keys], eth/[keys],
stew/[byteutils, results], unittest2, stew/byteutils, results, unittest2,
../nimbus/db/ledger, ../nimbus/db/ledger,
../nimbus/core/chain, ../nimbus/core/chain,
../nimbus/[config, transaction, constants], ../nimbus/[config, transaction, constants],

3
tools/evmstate/evmstate.nim
View File

@ -12,7 +12,8 @@ import
std/[json, strutils, sets, tables, options, streams], std/[json, strutils, sets, tables, options, streams],
chronicles, chronicles,
eth/keys, eth/keys,
stew/[results, byteutils], stew/byteutils,
results,
stint, stint,
eth/trie/[trie_defs], eth/trie/[trie_defs],
../../nimbus/[vm_types, vm_state], ../../nimbus/[vm_types, vm_state],

4
tools/t8n/helpers.nim
View File

@ -1,5 +1,5 @@
# Nimbus # Nimbus
# Copyright (c) 2022 Status Research & Development GmbH # Copyright (c) 2022-2024 Status Research & Development GmbH
# Licensed under either of # Licensed under either of
# * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or # * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
# http://www.apache.org/licenses/LICENSE-2.0) # http://www.apache.org/licenses/LICENSE-2.0)
@ -10,7 +10,7 @@
import import
std/[json, strutils, tables], std/[json, strutils, tables],
stew/[byteutils, results], stew/byteutils,
stint, stint,
eth/[common, rlp, keys], eth/[common, rlp, keys],
../../nimbus/transaction, ../../nimbus/transaction,

2
tools/t8n/transition.nim
View File

@ -11,7 +11,7 @@
import import
std/[json, strutils, tables, os, streams], std/[json, strutils, tables, os, streams],
eth/[rlp, trie, eip1559], eth/[rlp, trie, eip1559],
stint, stew/results, stint, results,
"."/[config, types, helpers], "."/[config, types, helpers],
../common/state_clearing, ../common/state_clearing,
../../nimbus/[vm_types, vm_state, transaction], ../../nimbus/[vm_types, vm_state, transaction],

2
vendor/nim-results vendored

@ -1 +1 @@
Subproject commit dfeef8ba705d7bab3e2073bb44549f0a2562df70 Subproject commit e2adf66b8bc2f41606e8469a5f0a850d1e545b55