From f89c604fb008453fae6f52d52e0dce3f89751ba4 Mon Sep 17 00:00:00 2001 From: zah Date: Thu, 31 Mar 2022 01:00:03 +0300 Subject: [PATCH] Add Nimble lock file (#3560) --- .gitignore | 4 + beacon_chain.nimble | 84 +++ .../validators/keystore_management.nim | 5 +- nimble.lock | 554 ++++++++++++++++++ vendor/nimbus-security-resources | 2 +- 5 files changed, 646 insertions(+), 3 deletions(-) create mode 100644 beacon_chain.nimble create mode 100644 nimble.lock diff --git a/.gitignore b/.gitignore index ea1660403..1c17a296a 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,7 @@ resttest0_data # OSX .DS_Store **/.DS_Store + +# Nimble user files +nimble.develop +nimble.paths diff --git a/beacon_chain.nimble b/beacon_chain.nimble new file mode 100644 index 000000000..1995024b9 --- /dev/null +++ b/beacon_chain.nimble @@ -0,0 +1,84 @@ +mode = ScriptMode.Verbose + +version = "1.4.2" +author = "Status Research & Development GmbH" +description = "The Nimbus beacon chain node is a highly efficient Ethereum 2.0 client" +license = "MIT or Apache License 2.0" + +requires( + "nim >= 1.2.0", + "https://github.com/status-im/NimYAML", + "bearssl", + "blscurve", + "chronicles", + "chronos", + "confutils", + "eth", + "faststreams", + "httputils", + "json_rpc", + "json_serialization", + "libbacktrace", + "libp2p", + "metrics", + "nat_traversal", + "nimcrypto", + "normalize", + "presto", + "secp256k1", + "serialization", + "snappy", + "sqlite3_abi", + "ssz_serialization", + "stew", + "stint", + "taskpools", + "testutils", + "unicodedb >= 0.10", + "unittest2", + "web3", + "zlib", + "zxcvbn" +) + +requires "https://gitlab.com/status-im/nimbus-security-resources.git" + +namedBin = { + "beacon_chain/nimbus_beacon_node": "nimbus_beacon_node", + "beacon_chain/nimbus_validator_client": "nimbus_validator_client", + "ncli/ncli": "ncli", +}.toTable() + +binDir = "build" + +skipDirs = @[ + ".github", + ".vscode" + "docker", + "grafana", + "installer". + "media", + "nfuzz", + "research", + "scripts", + "tests", + "tools", + "vendor", + "wasm", +] + +proc getLang(): string = + var lang = "c" + if existsEnv"TEST_LANG": + lang = getEnv"TEST_LANG" + lang + +proc test(name: string, defaultLang = getLang()) = + if not dirExists "build": + mkDir "build" + --run + switch("out", ("./build/" & name)) + setCommand defaultLang, "tests/" & name & ".nim" + +task test, "Run all tests": + test "all_tests" diff --git a/beacon_chain/validators/keystore_management.nim b/beacon_chain/validators/keystore_management.nim index fec1c504d..3a69ade0f 100644 --- a/beacon_chain/validators/keystore_management.nim +++ b/beacon_chain/validators/keystore_management.nim @@ -11,6 +11,7 @@ import std/[os, strutils, terminal, wordwrap, unicode], chronicles, chronos, json_serialization, zxcvbn, serialization, blscurve, eth/common/eth_types, eth/keys, confutils, bearssl, + nimbus_security_resources, ".."/spec/[eth2_merkleization, keystore, crypto], ".."/spec/datatypes/base, stew/io2, libp2p/crypto/crypto as lcrypto, @@ -68,8 +69,8 @@ const minPasswordEntropy = 60.0 mostCommonPasswords = wordListArray( - currentSourcePath.parentDir / - "../../vendor/nimbus-security-resources/passwords/10-million-password-list-top-100000.txt", + nimbusSecurityResourcesPath / + "passwords" / "10-million-password-list-top-100000.txt", minWordLen = minPasswordLen) proc echoP*(msg: string) = diff --git a/nimble.lock b/nimble.lock new file mode 100644 index 000000000..5033fa9a5 --- /dev/null +++ b/nimble.lock @@ -0,0 +1,554 @@ +{ + "version": 1, + "packages": { + "stew": { + "version": "0.1.0", + "vcsRevision": "bb705bf17b46d2c8f9bfb106d9cc7437009a2501", + "url": "https://github.com/status-im/nim-stew", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "adac4b56a0dc35b1f5fc8fb66e8bb182100c857a" + } + }, + "unittest2": { + "version": "0.0.3", + "vcsRevision": "24eb5e829ed07e71e3a5d09786d5f80aa988874f", + "url": "https://github.com/status-im/nim-unittest2.git", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "0140709df36bca378cfa8678e04082f9a1fccabf" + } + }, + "httputils": { + "version": "0.3.0", + "vcsRevision": "40048e8b3e69284bdb5d4daa0a16ad93402c55db", + "url": "https://github.com/status-im/nim-http-utils", + "downloadMethod": "git", + "dependencies": [ + "stew", + "unittest2" + ], + "checksums": { + "sha1": "7a3ddd118b1f5eecd413a2effcc289cd19cb812e" + } + }, + "nimcrypto": { + "version": "0.5.4", + "vcsRevision": "a5742a9a214ac33f91615f3862c7b099aec43b00", + "url": "https://github.com/cheatfate/nimcrypto", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "f76c87707cd4e96355b8bb6ef27e7f8b0aac1e08" + } + }, + "taskpools": { + "version": "0.0.3", + "vcsRevision": "8d408ac6cfc9c24ec8b7b65d5993e85050dcbaa9", + "url": "https://github.com/status-im/nim-taskpools.git", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "37bbbbb03d9b893af6980592624211ab057392c0" + } + }, + "blscurve": { + "version": "0.0.1", + "vcsRevision": "0237e4e0e914fc19359c18a66406d33bc942775c", + "url": "https://github.com/status-im/nim-blscurve", + "downloadMethod": "git", + "dependencies": [ + "nimcrypto", + "stew", + "taskpools" + ], + "checksums": { + "sha1": "65f58854ffd2098e0d0ca08f6ea0efb3c27529e0" + } + }, + "stint": { + "version": "0.0.1", + "vcsRevision": "ddfa6c608a6c2a843d7b405f377a22703947267a", + "url": "https://github.com/status-im/nim-stint", + "downloadMethod": "git", + "dependencies": [ + "stew" + ], + "checksums": { + "sha1": "b08fe1fc190d9e07016cd4047d872836264adebe" + } + }, + "bearssl": { + "version": "0.1.5", + "vcsRevision": "ba80e2a0d7ae8aab666cee013e38ff8d33a3e5e7", + "url": "https://github.com/status-im/nim-bearssl", + "downloadMethod": "git", + "dependencies": [ + "unittest2" + ], + "checksums": { + "sha1": "383abd5becc77bf8e365b780a29d20529e1d9c4c" + } + }, + "chronos": { + "version": "3.0.11", + "vcsRevision": "87197230779002a2bfa8642f0e2ae07e2349e304", + "url": "https://github.com/status-im/nim-chronos", + "downloadMethod": "git", + "dependencies": [ + "stew", + "bearssl", + "httputils", + "unittest2" + ], + "checksums": { + "sha1": "badd688fa1121e2685e7927e0f2f4fe62a0ed62e" + } + }, + "testutils": { + "version": "0.4.2", + "vcsRevision": "aa6e5216f4b4ab5aa971cdcdd70e1ec1203cedf2", + "url": "https://github.com/status-im/nim-testutils", + "downloadMethod": "git", + "dependencies": [ + "unittest2" + ], + "checksums": { + "sha1": "94427e0cce0e0c5841edcd3a6530b4e6b857a3cb" + } + }, + "faststreams": { + "version": "0.3.0", + "vcsRevision": "37a183153c071539ab870f427c09a1376ba311b9", + "url": "https://github.com/status-im/nim-faststreams", + "downloadMethod": "git", + "dependencies": [ + "stew", + "testutils", + "chronos", + "unittest2" + ], + "checksums": { + "sha1": "5f7dbee99012f64e5d2365337e0a1fa056af63a0" + } + }, + "serialization": { + "version": "0.1.0", + "vcsRevision": "37bc0db558d85711967acb16e9bb822b06911d46", + "url": "https://github.com/status-im/nim-serialization", + "downloadMethod": "git", + "dependencies": [ + "faststreams", + "unittest2", + "stew" + ], + "checksums": { + "sha1": "5420a09b1d955e77971389852951892f42150241" + } + }, + "json_serialization": { + "version": "0.1.0", + "vcsRevision": "ea965bbe00c4ebc6d4d23bb3dee501a7474c0014", + "url": "https://github.com/status-im/nim-json-serialization", + "downloadMethod": "git", + "dependencies": [ + "serialization", + "stew" + ], + "checksums": { + "sha1": "adcecf3fa6cc3a1ba02f710314cd683de36d3880" + } + }, + "chronicles": { + "version": "0.10.2", + "vcsRevision": "1682096306ddba8185dcfac360a8c3f952d721e4", + "url": "https://github.com/status-im/nim-chronicles", + "downloadMethod": "git", + "dependencies": [ + "testutils", + "json_serialization" + ], + "checksums": { + "sha1": "9a5bebb76b0f7d587a31e621d260119279e91c76" + } + }, + "news": { + "version": "0.5", + "vcsRevision": "9094ae314754908838979fe0840b9b33c0e0a603", + "url": "https://github.com/status-im/news", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "db9d3265b01c039bb9c7e7d304c23c744344c507" + } + }, + "asynctest": { + "version": "0.3.0", + "vcsRevision": "3882ed64ed3159578f796bc5ae0c6b13837fe798", + "url": "https://github.com/markspanbroek/asynctest", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "7a3182c135b291e8e486d83accfc6d960cf75191" + } + }, + "zlib": { + "version": "0.1.0", + "vcsRevision": "74cdeb54b21bededb5a515d36f608bc1850555a2", + "url": "https://github.com/status-im/nim-zlib", + "downloadMethod": "git", + "dependencies": [ + "stew" + ], + "checksums": { + "sha1": "01d330dc4c1924e56b1559ee73bc760e526f635c" + } + }, + "websock": { + "version": "0.1.0", + "vcsRevision": "73edde4417f7b45003113b7a34212c3ccd95b9fd", + "url": "https://github.com/status-im/nim-websock", + "downloadMethod": "git", + "dependencies": [ + "chronos", + "httputils", + "chronicles", + "stew", + "asynctest", + "nimcrypto", + "bearssl", + "zlib" + ], + "checksums": { + "sha1": "ec2b137543f280298ca48de9ed4461a033ba88d3" + } + }, + "json_rpc": { + "version": "0.0.2", + "vcsRevision": "733a05b00c01f90e805225a8c65396fbf0374403", + "url": "https://github.com/status-im/nim-json-rpc", + "downloadMethod": "git", + "dependencies": [ + "stew", + "nimcrypto", + "stint", + "chronos", + "httputils", + "chronicles", + "news", + "websock", + "json_serialization" + ], + "checksums": { + "sha1": "1b6f2cfe9b1012be712de3d7daed8a11d4364d19" + } + }, + "snappy": { + "version": "0.1.0", + "vcsRevision": "3d39a6228af6204af21ad6eaa693f1661716ae2a", + "url": "https://github.com/status-im/nim-snappy", + "downloadMethod": "git", + "dependencies": [ + "faststreams", + "stew" + ], + "checksums": { + "sha1": "ce2e3f10151630d72fac12b927f0f1c238f651e2" + } + }, + "websocket": { + "version": "0.5.0", + "vcsRevision": "28cc44c8defc0b248b3abbc8205759b69a98f7f6", + "url": "https://github.com/niv/websocket.nim", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "cd7f7d3ec4d800f5c920c769ecafc38837319e57" + } + }, + "unicodedb": { + "version": "0.10.0", + "vcsRevision": "675407fa4b6e701ebf9f94e5370ce18c3af40cc3", + "url": "https://github.com/nitely/nim-unicodedb", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "49a66e3391badf050aab2c7bddd60ddac00a2290" + } + }, + "tempfile": { + "version": "0.1.7", + "vcsRevision": "26e0239441755e5edcfd170e9aa566bb9c9eb6f3", + "url": "https://github.com/OpenSystemsLab/tempfile.nim", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "d7c473819bbf0e38cad32e00598bd42366606e08" + } + }, + "ws": { + "version": "0.5.0", + "vcsRevision": "9536bf99ddf5948db221ccb7bb3663aa238a8e21", + "url": "https://github.com/treeform/ws", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "ae4daf4ae302d0431f3c2d385ae9d2fe767a3246" + } + }, + "nat_traversal": { + "version": "0.0.1", + "vcsRevision": "8994b67b07813955c61bebddf4bd2325439c3535", + "url": "https://github.com/status-im/nim-nat-traversal", + "downloadMethod": "git", + "dependencies": [ + "stew" + ], + "checksums": { + "sha1": "74ceb2eb41dca5252d04d3dd8369b7eab517281b" + } + }, + "libbacktrace": { + "version": "0.0.8", + "vcsRevision": "ce966b1c469dda179b54346feaaf1a62202c984f", + "url": "https://github.com/status-im/nim-libbacktrace", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "ba7a2f3d21db894ace7bb4ebe0a5b06af995d68b" + } + }, + "dnsclient": { + "version": "0.1.0", + "vcsRevision": "647ed10deca7758a147c7f0af90d5addfe514c0f", + "url": "https://github.com/ba0f3/dnsclient.nim", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "ddf1f02944db2802fbb9dfe8b11085681b3b2a46" + } + }, + "metrics": { + "version": "0.0.1", + "vcsRevision": "858f73b7d3ae992333a7ffab35da87e3b7b81356", + "url": "https://github.com/status-im/nim-metrics", + "downloadMethod": "git", + "dependencies": [ + "chronos" + ], + "checksums": { + "sha1": "fb332b70d824bf3f714bfdc06e37371c52b59ff5" + } + }, + "secp256k1": { + "version": "0.5.2", + "vcsRevision": "e092373a5cbe1fa25abfc62e0f2a5f138dc3fb13", + "url": "https://github.com/status-im/nim-secp256k1", + "downloadMethod": "git", + "dependencies": [ + "stew", + "nimcrypto" + ], + "checksums": { + "sha1": "75aafb13984bb6006e3c2a1e74be19ff40a08b0f" + } + }, + "libp2p": { + "version": "0.0.2", + "vcsRevision": "58f383e661521314df314e7096c24db5a7490372", + "url": "https://github.com/status-im/nim-libp2p", + "downloadMethod": "git", + "dependencies": [ + "nimcrypto", + "dnsclient", + "bearssl", + "chronicles", + "chronos", + "metrics", + "secp256k1", + "stew", + "websock" + ], + "checksums": { + "sha1": "58b1e544b91c886a4633946e9685d043417eaf16" + } + }, + "asynctools": { + "version": "0.1.1", + "vcsRevision": "84ced6d002789567f2396c75800ffd6dff2866f7", + "url": "https://github.com/cheatfate/asynctools", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "7b83755829059030a15a9c5ad39cf118366c56d9" + } + }, + "rocksdb": { + "version": "0.3.1", + "vcsRevision": "c565aa88b963ae1e6ca8bf1296d2ff9ce2847295", + "url": "https://github.com/status-im/nim-rocksdb", + "downloadMethod": "git", + "dependencies": [ + "stew", + "tempfile" + ], + "checksums": { + "sha1": "eca1de31383f69137e4830cd89199d55a85e3d1a" + } + }, + "sqlite3_abi": { + "version": "3.34.0", + "vcsRevision": "07039dd887c4e5b57367a16f4be3c18763be1d7b", + "url": "https://github.com/arnetheduck/nim-sqlite3-abi", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "5a08191466f05542e49d36d2672ad14f5d1c0a6a" + } + }, + "confutils": { + "version": "0.1.0", + "vcsRevision": "0435e67832b6bb8dfdf0ddb102903e9d820206d2", + "url": "https://github.com/status-im/nim-confutils", + "downloadMethod": "git", + "dependencies": [ + "stew" + ], + "checksums": { + "sha1": "1edab14b434aca6ae28e2385982fa60d623c600a" + } + }, + "eth": { + "version": "1.0.0", + "vcsRevision": "779d767b024175a51cf74c79ec7513301ebe2f46", + "url": "https://github.com/status-im/nim-eth", + "downloadMethod": "git", + "dependencies": [ + "nimcrypto", + "stint", + "secp256k1", + "rocksdb", + "chronos", + "chronicles", + "stew", + "nat_traversal", + "metrics", + "sqlite3_abi", + "confutils", + "testutils", + "unittest2" + ], + "checksums": { + "sha1": "4a9a2140196046c7cbaa539d119099c355567c88" + } + }, + "zxcvbn": { + "version": "0.1.0", + "vcsRevision": "4794baca09cd971d9723e0371cb3de27a5f3722b", + "url": "https://github.com/status-im/nim-zxcvbn", + "downloadMethod": "git", + "dependencies": [ + "testutils" + ], + "checksums": { + "sha1": "b8e5b0dd6db2b9d69604c1afd484aea1fd0b22d6" + } + }, + "nimbus_security_resources": { + "version": "0.1.0", + "vcsRevision": "577fbc483f9ffeb715731c9f105f5ac81b3f703a", + "url": "ssh://git@gitlab.com/metacraft-labs/nimbus/nimbus-security-resources.git", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "6a754ed71c7e8d3ce8f0a91a5d46b46dda7bec09" + } + }, + "presto": { + "version": "0.0.4", + "vcsRevision": "1dba6dd6f466cd4e7b793b0e473c237ce453d82a", + "url": "https://github.com/status-im/nim-presto", + "downloadMethod": "git", + "dependencies": [ + "chronos", + "chronicles", + "stew" + ], + "checksums": { + "sha1": "0d94d20991fe38ae252d2e1feb81044caa7e6f38" + } + }, + "ssz_serialization": { + "version": "0.1.0", + "vcsRevision": "cd500484e054ead951f2d07aeb81c1c8c695db26", + "url": "https://github.com/status-im/nim-ssz-serialization", + "downloadMethod": "git", + "dependencies": [ + "serialization", + "json_serialization", + "stew", + "stint", + "nimcrypto", + "blscurve", + "unittest2" + ], + "checksums": { + "sha1": "f7f024ee895d2212ba71b5ca757e899a62e4b774" + } + }, + "web3": { + "version": "0.0.1", + "vcsRevision": "0012deda7965d8a3f464c29763ef26623b6776f8", + "url": "https://github.com/status-im/nim-web3", + "downloadMethod": "git", + "dependencies": [ + "chronicles", + "chronos", + "eth", + "faststreams", + "json_rpc", + "json_serialization", + "nimcrypto", + "stew", + "stint" + ], + "checksums": { + "sha1": "e89378aacfd71b950b0fc9556a3936fcb56982dc" + } + }, + "dotenv": { + "version": "2.0.1", + "vcsRevision": "4b8613cb4c46331729e88f594c5ae2b727381a57", + "url": "https://github.com/euantorano/dotenv.nim", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "9a9e39544f129e6666935796610da79fbe724510" + } + }, + "yaml": { + "version": "0.14.0", + "vcsRevision": "27642432ca66c97b07730b5a84e9565f5b69be13", + "url": "https://github.com/status-im/NimYAML", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "2ba8d30ede073325688ae899b972974ed6d9341b" + } + }, + "normalize": { + "version": "0.8.0", + "vcsRevision": "30948551be113d809b28bf6131c925caff3af515", + "url": "https://github.com/nitely/nim-normalize", + "downloadMethod": "git", + "dependencies": [ + "unicodedb" + ], + "checksums": { + "sha1": "9ad415f090f6e8e40cbbcc72efd5a925ac1aa725" + } + } + } +} diff --git a/vendor/nimbus-security-resources b/vendor/nimbus-security-resources index 145e12aaa..ce9945b1b 160000 --- a/vendor/nimbus-security-resources +++ b/vendor/nimbus-security-resources @@ -1 +1 @@ -Subproject commit 145e12aaad958cae8fce34e48be0da0111733bf6 +Subproject commit ce9945b1b159d4c9b628f8c4cd2d262964692810