From 7ebf01023ed2589c486b47052ca2012bee1d6186 Mon Sep 17 00:00:00 2001 From: Coa Date: Tue, 13 Aug 2024 14:47:33 +0200 Subject: [PATCH 1/2] Format and fix lock file --- Cargo.lock | 1330 +++++++++++++++++++++--- crates/telos/node/src/args.rs | 2 +- crates/telos/node/src/lib.rs | 3 +- crates/telos/node/src/node.rs | 12 +- crates/telos/node/tests/integration.rs | 42 +- 5 files changed, 1187 insertions(+), 202 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14995d2696a7..c849b3fbd835 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,6 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "const-random", "getrandom 0.2.15", "once_cell", "version_check", @@ -107,6 +108,22 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +[[package]] +name = "alloy" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100" +dependencies = [ + "alloy-consensus", + "alloy-core", + "alloy-eips", + "alloy-genesis", + "alloy-provider", + "alloy-rpc-client", + "alloy-serde", + "alloy-transport-http", +] + [[package]] name = "alloy-chains" version = "0.1.25" @@ -136,6 +153,18 @@ dependencies = [ "serde", ] +[[package]] +name = "alloy-core" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-primitives", + "alloy-sol-types", +] + [[package]] name = "alloy-dyn-abi" version = "0.7.7" @@ -280,7 +309,7 @@ dependencies = [ "proptest", "proptest-derive 0.4.0", "rand 0.8.5", - "ruint", + "ruint 1.12.3", "serde", "tiny-keccak", ] @@ -343,9 +372,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43b18702501396fa9bcdeecd533bc85fac75150d308fc0f6800a01e6234a003" +checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -354,9 +383,9 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83524c1f6162fcb5b0decf775498a125066c86dda6066ed609531b0e912f85a" +checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", @@ -695,7 +724,7 @@ dependencies = [ "rustls", "serde_json", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.23.1", "tracing", "ws_stream_wasm", ] @@ -822,6 +851,38 @@ dependencies = [ "tokio", ] +[[package]] +name = "antelope-client" +version = "0.2.1" +source = "git+https://github.com/telosnetwork/antelope-rs?branch=serialization#4bb0af2b4dab220b8185e450ba84f008209df896" +dependencies = [ + "antelope-client-macros", + "async-trait", + "base64 0.21.7", + "bs58", + "chrono", + "digest 0.10.7", + "ecdsa", + "flate2", + "hex", + "hmac 0.12.1", + "k256", + "log", + "once_cell", + "p256", + "rand 0.8.5", + "rand_core 0.6.4", + "reqwest 0.11.27", + "ripemd", + "serde", + "serde-big-array", + "serde_json", + "sha2 0.10.8", + "signature", + "thiserror", + "tokio", +] + [[package]] name = "antelope-client-macros" version = "0.2.0" @@ -997,6 +1058,248 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "arrow" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219d05930b81663fd3b32e3bde8ce5bff3c4d23052a99f11a8fa50a3b47b2658" +dependencies = [ + "arrow-arith", + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-csv", + "arrow-data", + "arrow-ipc", + "arrow-json", + "arrow-ord", + "arrow-row", + "arrow-schema", + "arrow-select", + "arrow-string", +] + +[[package]] +name = "arrow-arith" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0272150200c07a86a390be651abdd320a2d12e84535f0837566ca87ecd8f95e0" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "num", +] + +[[package]] +name = "arrow-array" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8010572cf8c745e242d1b632bd97bd6d4f40fefed5ed1290a8f433abaa686fea" +dependencies = [ + "ahash", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "hashbrown 0.14.5", + "num", +] + +[[package]] +name = "arrow-buffer" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d0a2432f0cba5692bf4cb757469c66791394bac9ec7ce63c1afe74744c37b27" +dependencies = [ + "bytes", + "half", + "num", +] + +[[package]] +name = "arrow-cast" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9abc10cd7995e83505cc290df9384d6e5412b207b79ce6bdff89a10505ed2cba" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "atoi", + "base64 0.22.1", + "chrono", + "half", + "lexical-core", + "num", + "ryu", +] + +[[package]] +name = "arrow-csv" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95cbcba196b862270bf2a5edb75927380a7f3a163622c61d40cbba416a6305f2" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "csv", + "csv-core", + "lazy_static", + "lexical-core", + "regex", +] + +[[package]] +name = "arrow-data" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2742ac1f6650696ab08c88f6dd3f0eb68ce10f8c253958a18c943a68cd04aec5" +dependencies = [ + "arrow-buffer", + "arrow-schema", + "half", + "num", +] + +[[package]] +name = "arrow-ipc" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42ea853130f7e78b9b9d178cb4cd01dee0f78e64d96c2949dc0a915d6d9e19d" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "flatbuffers", +] + +[[package]] +name = "arrow-json" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaafb5714d4e59feae964714d724f880511500e3569cc2a94d02456b403a2a49" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-cast", + "arrow-data", + "arrow-schema", + "chrono", + "half", + "indexmap 2.3.0", + "lexical-core", + "num", + "serde", + "serde_json", +] + +[[package]] +name = "arrow-ord" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e6b61e3dc468f503181dccc2fc705bdcc5f2f146755fa5b56d0a6c5943f412" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "half", + "num", +] + +[[package]] +name = "arrow-row" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "848ee52bb92eb459b811fb471175ea3afcf620157674c8794f539838920f9228" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "half", + "hashbrown 0.14.5", +] + +[[package]] +name = "arrow-schema" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d9483aaabe910c4781153ae1b6ae0393f72d9ef757d38d09d450070cf2e528" + +[[package]] +name = "arrow-select" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849524fa70e0e3c5ab58394c770cb8f514d0122d20de08475f7b472ed8075830" +dependencies = [ + "ahash", + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "num", +] + +[[package]] +name = "arrow-string" +version = "51.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9373cb5a021aee58863498c37eb484998ef13377f69989c6c5ccfbd258236cdb" +dependencies = [ + "arrow-array", + "arrow-buffer", + "arrow-data", + "arrow-schema", + "arrow-select", + "memchr", + "num", + "regex", + "regex-syntax 0.8.4", +] + +[[package]] +name = "arrowbatch" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e304bae8e33446c64842dba444042ce65cb23e2b1e439fa2f4abb7591db562c5" +dependencies = [ + "arrow", + "base64 0.22.1", + "chrono", + "env_logger", + "futures", + "futures-util", + "hex", + "log", + "moka", + "num", + "num-bigint", + "rlp", + "serde", + "serde_json", + "tokio", + "tokio-tungstenite 0.21.0", + "tungstenite 0.21.0", + "uuid", + "zstd", +] + [[package]] name = "asn1_der" version = "0.7.6" @@ -1022,9 +1325,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "brotli", "flate2", @@ -1094,6 +1397,15 @@ dependencies = [ "rustc_version 0.4.0", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -1127,6 +1439,33 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +[[package]] +name = "aws-lc-rs" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "backon" version = "0.4.4" @@ -1223,12 +1562,15 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "lazycell", + "log", + "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash 1.1.0", "shlex", "syn 2.0.72", + "which", ] [[package]] @@ -1480,6 +1822,56 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "bollard" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a063d51a634c7137ecd9f6390ec78e1c512e84c9ded80198ec7df3339a16a33" +dependencies = [ + "base64 0.22.1", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http 1.1.0", + "http-body-util", + "hyper 1.4.1", + "hyper-named-pipe", + "hyper-rustls", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "serde", + "serde_derive", + "serde_json", + "serde_repr", + "serde_urlencoded", + "thiserror", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", +] + +[[package]] +name = "bollard-stubs" +version = "1.45.0-rc.26.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" +dependencies = [ + "serde", + "serde_repr", + "serde_with", +] + [[package]] name = "boyer-moore-magiclen" version = "0.2.20" @@ -1788,6 +2180,15 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "coins-bip32" version = "0.11.1" @@ -1941,6 +2342,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "tiny-keccak", +] + [[package]] name = "const_format" version = "0.2.32" @@ -2551,6 +2972,17 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "docker_credential" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07" +dependencies = [ + "base64 0.21.7", + "serde", + "serde_json", +] + [[package]] name = "doctest-file" version = "1.0.0" @@ -2630,7 +3062,7 @@ dependencies = [ "reth-db", "reth-db-api", "reth-evm-ethereum", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-stages", "serde", @@ -2730,6 +3162,19 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -2829,7 +3274,7 @@ dependencies = [ "reth-network", "reth-network-api", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-tracing", "secp256k1", "serde_json", @@ -2847,7 +3292,7 @@ dependencies = [ "reth-chainspec", "reth-node-core", "reth-node-ethereum", - "reth-primitives", + "reth-primitives 1.0.5", "serde_json", "tokio", ] @@ -2866,8 +3311,8 @@ dependencies = [ "reth-node-core", "reth-node-ethereum", "reth-payload-builder", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.5", + "reth-rpc-types 1.0.5", "reth-tracing", "serde", "thiserror", @@ -2886,7 +3331,7 @@ dependencies = [ "reth-node-api", "reth-node-core", "reth-node-ethereum", - "reth-primitives", + "reth-primitives 1.0.5", "reth-tracing", "tokio", ] @@ -2899,7 +3344,7 @@ dependencies = [ "futures-util", "reth", "reth-node-ethereum", - "reth-rpc-types", + "reth-rpc-types 1.0.5", ] [[package]] @@ -2926,7 +3371,7 @@ dependencies = [ "reth-node-api", "reth-node-ethereum", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "tracing", ] @@ -2942,9 +3387,9 @@ dependencies = [ "reth-network", "reth-network-api", "reth-node-ethereum", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "tokio", "tokio-stream", "tracing", @@ -2957,9 +3402,9 @@ dependencies = [ "eyre", "reth-chainspec", "reth-db", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", - "reth-rpc-types", + "reth-rpc-types 1.0.5", ] [[package]] @@ -2974,7 +3419,7 @@ dependencies = [ "reth-eth-wire", "reth-network", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "secp256k1", "tokio", ] @@ -3028,7 +3473,7 @@ dependencies = [ "reth-chainspec", "reth-discv4", "reth-network", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-tracing", "secp256k1", @@ -3065,7 +3510,7 @@ dependencies = [ "reth-node-api", "reth-node-core", "reth-node-ethereum", - "reth-primitives", + "reth-primitives 1.0.5", "reth-tracing", "schnellru", "tokio", @@ -3175,6 +3620,16 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "flatbuffers" +version = "23.5.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" +dependencies = [ + "bitflags 1.3.2", + "rustc_version 0.4.0", +] + [[package]] name = "flate2" version = "1.0.31" @@ -3221,6 +3676,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -3508,6 +3969,7 @@ checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", + "num-traits", ] [[package]] @@ -3630,6 +4092,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3802,6 +4273,21 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + [[package]] name = "hyper-rustls" version = "0.27.2" @@ -3835,6 +4321,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.6" @@ -3855,6 +4357,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "iai-callgrind" version = "0.11.1" @@ -4586,6 +5103,70 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +[[package]] +name = "lexical-core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +dependencies = [ + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", +] + +[[package]] +name = "lexical-parse-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-parse-integer" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" +dependencies = [ + "lexical-util", + "static_assertions", +] + +[[package]] +name = "lexical-util" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "lexical-write-float" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" +dependencies = [ + "lexical-util", + "lexical-write-integer", + "static_assertions", +] + +[[package]] +name = "lexical-write-integer" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" +dependencies = [ + "lexical-util", + "static_assertions", +] + [[package]] name = "libc" version = "0.2.155" @@ -5042,6 +5623,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "mockall" version = "0.12.1" @@ -5090,6 +5677,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "moka" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f" +dependencies = [ + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "once_cell", + "parking_lot 0.12.3", + "quanta", + "rustc_version 0.4.0", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] + [[package]] name = "more-asserts" version = "0.3.1" @@ -5595,6 +6202,31 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "parse-display" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax 0.8.4", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.8.4", + "structmeta", + "syn 2.0.72", +] + [[package]] name = "paste" version = "1.0.15" @@ -6382,7 +7014,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -6422,11 +7054,13 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-rustls", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -6440,6 +7074,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", + "tokio-native-tls", "tokio-rustls", "tokio-util", "tower-service", @@ -6516,7 +7151,7 @@ dependencies = [ "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-revm", @@ -6525,12 +7160,12 @@ dependencies = [ "reth-rpc-builder", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-stages", "reth-stages-api", "reth-static-file", - "reth-static-file-types", + "reth-static-file-types 1.0.5", "reth-tasks", "reth-telos-rpc", "reth-tracing", @@ -6561,10 +7196,10 @@ dependencies = [ "reth-execution-types", "reth-network-p2p", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-stages-api", "reth-tokio-util", "reth-transaction-pool", @@ -6585,7 +7220,7 @@ dependencies = [ "reth-metrics", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", "reth-tasks", @@ -6624,11 +7259,11 @@ dependencies = [ "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-prune-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-stages", "reth-stages-api", @@ -6670,9 +7305,9 @@ dependencies = [ "reth-db", "reth-node-api", "reth-node-core", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-tracing", "serde", @@ -6706,7 +7341,7 @@ dependencies = [ "reth-execution-types", "reth-metrics", "reth-network", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune-types", "reth-revm", @@ -6726,7 +7361,7 @@ version = "1.0.5" dependencies = [ "reth-consensus", "reth-execution-errors", - "reth-primitives", + "reth-primitives 1.0.5", "reth-storage-errors", "thiserror", ] @@ -6747,7 +7382,7 @@ dependencies = [ "reth-errors", "reth-execution-types", "reth-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-storage-api", "reth-trie", "revm", @@ -6770,10 +7405,10 @@ dependencies = [ "derive_more", "once_cell", "op-alloy-rpc-types", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-network-peers", - "reth-primitives-traits", - "reth-trie-common", + "reth-primitives-traits 1.0.5", + "reth-trie-common 1.0.5", "serde", "serde_json", ] @@ -6830,12 +7465,12 @@ dependencies = [ "reth-node-core", "reth-node-events", "reth-node-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-stages", "reth-static-file", - "reth-static-file-types", + "reth-static-file-types 1.0.5", "reth-trie", "reth-trie-db", "secp256k1", @@ -6883,12 +7518,28 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "reth-codecs-derive", + "reth-codecs-derive 1.0.5", "serde", "serde_json", "test-fuzz", ] +[[package]] +name = "reth-codecs" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-trie", + "bytes", + "modular-bitfield", + "reth-codecs-derive 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "serde", +] + [[package]] name = "reth-codecs-derive" version = "1.0.5" @@ -6900,6 +7551,17 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "reth-codecs-derive" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "reth-config" version = "1.0.5" @@ -6920,7 +7582,7 @@ name = "reth-consensus" version = "1.0.5" dependencies = [ "auto_impl", - "reth-primitives", + "reth-primitives 1.0.5", "thiserror-no-std", ] @@ -6932,7 +7594,7 @@ dependencies = [ "rand 0.8.5", "reth-chainspec", "reth-consensus", - "reth-primitives", + "reth-primitives 1.0.5", "reth-storage-api", ] @@ -6951,7 +7613,7 @@ dependencies = [ "reth-node-core", "reth-rpc-api", "reth-rpc-builder", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-tracing", "ringbuffer", "serde", @@ -6980,13 +7642,13 @@ dependencies = [ "reth-libmdbx", "reth-metrics", "reth-nippy-jar", - "reth-primitives", - "reth-primitives-traits", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", "reth-prune-types", "reth-stages-types", "reth-storage-errors", "reth-tracing", - "reth-trie-common", + "reth-trie-common 1.0.5", "rustc-hash 2.0.0", "serde", "serde_json", @@ -7014,13 +7676,13 @@ dependencies = [ "proptest", "proptest-arbitrary-interop", "rand 0.8.5", - "reth-codecs", - "reth-primitives", - "reth-primitives-traits", + "reth-codecs 1.0.5", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", "reth-prune-types", "reth-stages-types", "reth-storage-errors", - "reth-trie-common", + "reth-trie-common 1.0.5", "serde", "test-fuzz", ] @@ -7033,14 +7695,14 @@ dependencies = [ "boyer-moore-magiclen", "eyre", "reth-chainspec", - "reth-codecs", + "reth-codecs 1.0.5", "reth-config", "reth-db", "reth-db-api", "reth-etl", "reth-fs-util", - "reth-primitives", - "reth-primitives-traits", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", "reth-provider", "reth-stages-types", "reth-trie", @@ -7063,7 +7725,7 @@ dependencies = [ "generic-array", "parking_lot 0.12.3", "rand 0.8.5", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-net-banlist", "reth-net-nat", "reth-network-peers", @@ -7093,7 +7755,7 @@ dependencies = [ "multiaddr", "rand 0.8.5", "reth-chainspec", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-metrics", "reth-network-peers", "reth-tracing", @@ -7116,7 +7778,7 @@ dependencies = [ "parking_lot 0.12.3", "rand 0.8.5", "reth-chainspec", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-network-peers", "reth-tokio-util", "reth-tracing", @@ -7152,7 +7814,7 @@ dependencies = [ "reth-metrics", "reth-network-p2p", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-storage-api", "reth-tasks", @@ -7185,7 +7847,7 @@ dependencies = [ "reth-node-builder", "reth-node-ethereum", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-rpc", "reth-rpc-layer", @@ -7257,7 +7919,7 @@ dependencies = [ "reth-network-p2p", "reth-payload-builder", "reth-payload-validator", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-prune-types", @@ -7295,12 +7957,12 @@ dependencies = [ "reth-payload-builder", "reth-payload-primitives", "reth-payload-validator", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-prune-types", "reth-revm", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-stages", "reth-stages-api", @@ -7324,14 +7986,14 @@ dependencies = [ "reth-beacon-consensus", "reth-engine-primitives", "reth-errors", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-evm", "reth-fs-util", "reth-payload-validator", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "revm-primitives", "serde", @@ -7368,12 +8030,12 @@ dependencies = [ "proptest-arbitrary-interop", "rand 0.8.5", "reth-chainspec", - "reth-codecs", + "reth-codecs 1.0.5", "reth-ecies", "reth-eth-wire-types", "reth-metrics", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-tracing", "secp256k1", "serde", @@ -7400,8 +8062,8 @@ dependencies = [ "proptest-arbitrary-interop", "rand 0.8.5", "reth-chainspec", - "reth-codecs-derive", - "reth-primitives", + "reth-codecs-derive 1.0.5", + "reth-primitives 1.0.5", "serde", "thiserror", ] @@ -7426,7 +8088,7 @@ dependencies = [ "reth-chainspec", "reth-consensus", "reth-consensus-common", - "reth-primitives", + "reth-primitives 1.0.5", "tracing", ] @@ -7439,8 +8101,8 @@ dependencies = [ "reth-engine-primitives", "reth-evm-ethereum", "reth-payload-primitives", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.5", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "revm-primitives", "serde", @@ -7460,8 +8122,25 @@ dependencies = [ "crc", "dyn-clone", "once_cell", - "proptest", - "proptest-derive 0.5.0", + "proptest", + "proptest-derive 0.5.0", + "rustc-hash 2.0.0", + "serde", + "thiserror-no-std", +] + +[[package]] +name = "reth-ethereum-forks" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-chains", + "alloy-primitives", + "alloy-rlp", + "auto_impl", + "crc", + "dyn-clone", + "once_cell", "rustc-hash 2.0.0", "serde", "thiserror-no-std", @@ -7477,7 +8156,7 @@ dependencies = [ "reth-evm-ethereum", "reth-execution-types", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", "reth-transaction-pool", @@ -7506,7 +8185,7 @@ dependencies = [ "reth-chainspec", "reth-execution-errors", "reth-execution-types", - "reth-primitives", + "reth-primitives 1.0.5", "reth-prune-types", "reth-storage-errors", "revm", @@ -7521,10 +8200,10 @@ dependencies = [ "alloy-sol-types", "reth-chainspec", "reth-ethereum-consensus", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-evm", "reth-execution-types", - "reth-primitives", + "reth-primitives 1.0.5", "reth-prune-types", "reth-revm", "reth-testing-utils", @@ -7538,12 +8217,12 @@ name = "reth-evm-optimism" version = "1.0.5" dependencies = [ "reth-chainspec", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-evm", "reth-execution-errors", "reth-execution-types", "reth-optimism-consensus", - "reth-primitives", + "reth-primitives 1.0.5", "reth-prune-types", "reth-revm", "revm", @@ -7575,7 +8254,7 @@ dependencies = [ "alloy-primitives", "reth-chainspec", "reth-execution-errors", - "reth-primitives", + "reth-primitives 1.0.5", "reth-trie", "revm", "serde", @@ -7600,8 +8279,8 @@ dependencies = [ "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives", - "reth-primitives-traits", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", "reth-provider", "reth-prune-types", "reth-revm", @@ -7636,7 +8315,7 @@ dependencies = [ "reth-node-core", "reth-node-ethereum", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-tasks", "reth-transaction-pool", @@ -7790,7 +8469,7 @@ dependencies = [ "reth-network-p2p", "reth-network-peers", "reth-network-types", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-storage-api", "reth-tasks", @@ -7823,7 +8502,7 @@ dependencies = [ "enr", "futures", "reth-eth-wire-types", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-network-p2p", "reth-network-peers", "reth-network-types", @@ -7844,7 +8523,7 @@ dependencies = [ "reth-consensus", "reth-eth-wire-types", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-storage-errors", "serde", "thiserror", @@ -7873,7 +8552,7 @@ name = "reth-network-types" version = "1.0.5" dependencies = [ "humantime-serde", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-net-banlist", "reth-network-p2p", "reth-network-peers", @@ -7954,7 +8633,7 @@ dependencies = [ "reth-node-metrics", "reth-payload-builder", "reth-payload-validator", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-rpc", @@ -7962,7 +8641,7 @@ dependencies = [ "reth-rpc-engine-api", "reth-rpc-eth-types", "reth-rpc-layer", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-stages", "reth-static-file", "reth-tasks", @@ -8004,14 +8683,14 @@ dependencies = [ "reth-network", "reth-network-p2p", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune-types", "reth-rpc-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-stages-types", "reth-storage-errors", @@ -8072,8 +8751,8 @@ dependencies = [ "reth-db-api", "reth-network", "reth-network-api", - "reth-primitives", - "reth-primitives-traits", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", "reth-provider", "reth-prune", "reth-stages", @@ -8140,12 +8819,12 @@ dependencies = [ "reth-optimism-payload-builder", "reth-optimism-rpc", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", "reth-rpc-eth-api", "reth-rpc-eth-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-tracing", "reth-transaction-pool", @@ -8158,13 +8837,17 @@ dependencies = [ [[package]] name = "reth-node-telos" -version = "1.0.4" +version = "1.0.5" dependencies = [ - "antelope-client", + "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs?branch=finish_table_rows_params)", "clap", + "eyre", + "reth", "reth-auto-seal-consensus", "reth-basic-payload-builder", "reth-beacon-consensus", + "reth-chainspec", + "reth-e2e-test-utils", "reth-ethereum-engine-primitives", "reth-evm-ethereum", "reth-network", @@ -8172,12 +8855,18 @@ dependencies = [ "reth-node-builder", "reth-node-ethereum", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-rpc", "reth-tracing", "reth-transaction-pool", "serde", + "serde_json", + "telos-consensus-client", + "testcontainers", + "tokio", + "tracing", + "tracing-subscriber", ] [[package]] @@ -8206,13 +8895,13 @@ dependencies = [ "reth-node-core", "reth-node-events", "reth-optimism-primitives", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-prune", "reth-stages", "reth-stages-types", "reth-static-file", - "reth-static-file-types", + "reth-static-file-types 1.0.5", "serde_json", "shellexpand", "tempfile", @@ -8228,7 +8917,7 @@ dependencies = [ "reth-chainspec", "reth-consensus", "reth-consensus-common", - "reth-primitives", + "reth-primitives 1.0.5", "tracing", ] @@ -8245,10 +8934,10 @@ dependencies = [ "reth-execution-types", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-transaction-pool", "reth-trie", @@ -8275,13 +8964,13 @@ dependencies = [ "reth-evm-optimism", "reth-network-api", "reth-node-api", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-rpc", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-tasks", "reth-transaction-pool", "revm", @@ -8302,9 +8991,9 @@ dependencies = [ "reth-ethereum-engine-primitives", "reth-metrics", "reth-payload-primitives", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-transaction-pool", "revm", "thiserror", @@ -8320,8 +9009,8 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.5", + "reth-rpc-types 1.0.5", "reth-transaction-pool", "serde", "thiserror", @@ -8333,8 +9022,8 @@ name = "reth-payload-validator" version = "1.0.5" dependencies = [ "reth-chainspec", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.5", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", ] @@ -8362,11 +9051,11 @@ dependencies = [ "rand 0.8.5", "rayon", "reth-chainspec", - "reth-codecs", - "reth-ethereum-forks", - "reth-primitives-traits", - "reth-static-file-types", - "reth-trie-common", + "reth-codecs 1.0.5", + "reth-ethereum-forks 1.0.5", + "reth-primitives-traits 1.0.5", + "reth-static-file-types 1.0.5", + "reth-trie-common 1.0.5", "revm-primitives", "secp256k1", "serde", @@ -8377,6 +9066,36 @@ dependencies = [ "zstd", ] +[[package]] +name = "reth-primitives" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types", + "bytes", + "c-kzg", + "derive_more", + "k256", + "modular-bitfield", + "once_cell", + "rayon", + "reth-codecs 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "reth-ethereum-forks 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "reth-primitives-traits 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "reth-static-file-types 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "reth-trie-common 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "revm-primitives", + "secp256k1", + "serde", + "tempfile", + "thiserror", + "zstd", +] + [[package]] name = "reth-primitives-traits" version = "1.0.5" @@ -8395,7 +9114,7 @@ dependencies = [ "proptest", "proptest-arbitrary-interop", "rand 0.8.5", - "reth-codecs", + "reth-codecs 1.0.5", "revm-primitives", "roaring", "serde", @@ -8403,6 +9122,27 @@ dependencies = [ "test-fuzz", ] +[[package]] +name = "reth-primitives-traits" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-rlp", + "alloy-rpc-types-eth", + "byteorder", + "bytes", + "derive_more", + "modular-bitfield", + "reth-codecs 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "revm-primitives", + "roaring", + "serde", +] + [[package]] name = "reth-provider" version = "1.0.5" @@ -8420,7 +9160,7 @@ dependencies = [ "reth-blockchain-tree-api", "reth-chain-state", "reth-chainspec", - "reth-codecs", + "reth-codecs 1.0.5", "reth-db", "reth-db-api", "reth-errors", @@ -8430,7 +9170,7 @@ dependencies = [ "reth-metrics", "reth-network-p2p", "reth-nippy-jar", - "reth-primitives", + "reth-primitives 1.0.5", "reth-prune-types", "reth-stages-types", "reth-storage-api", @@ -8464,7 +9204,7 @@ dependencies = [ "reth-provider", "reth-prune-types", "reth-stages", - "reth-static-file-types", + "reth-static-file-types 1.0.5", "reth-testing-utils", "reth-tokio-util", "reth-tracing", @@ -8486,7 +9226,7 @@ dependencies = [ "modular-bitfield", "proptest", "proptest-arbitrary-interop", - "reth-codecs", + "reth-codecs 1.0.5", "serde", "serde_json", "test-fuzz", @@ -8501,9 +9241,9 @@ dependencies = [ "alloy-eips", "reth-chainspec", "reth-consensus-common", - "reth-ethereum-forks", + "reth-ethereum-forks 1.0.5", "reth-execution-errors", - "reth-primitives", + "reth-primitives 1.0.5", "reth-prune-types", "reth-storage-api", "reth-storage-errors", @@ -8540,7 +9280,7 @@ dependencies = [ "reth-network-peers", "reth-network-types", "reth-node-api", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", "reth-rpc-api", @@ -8548,7 +9288,7 @@ dependencies = [ "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-tasks", "reth-testing-utils", @@ -8575,9 +9315,9 @@ dependencies = [ "jsonrpsee", "reth-engine-primitives", "reth-network-peers", - "reth-primitives", + "reth-primitives 1.0.5", "reth-rpc-eth-api", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "serde_json", ] @@ -8587,10 +9327,10 @@ version = "1.0.5" dependencies = [ "futures", "jsonrpsee", - "reth-primitives", + "reth-primitives 1.0.5", "reth-rpc-api", "reth-rpc-eth-api", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "serde_json", "similar-asserts", "tokio", @@ -8618,7 +9358,7 @@ dependencies = [ "reth-node-api", "reth-node-core", "reth-payload-builder", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-rpc", "reth-rpc-api", @@ -8627,7 +9367,7 @@ dependencies = [ "reth-rpc-eth-types", "reth-rpc-layer", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-tasks", "reth-tokio-util", @@ -8660,10 +9400,10 @@ dependencies = [ "reth-metrics", "reth-payload-builder", "reth-payload-primitives", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-rpc-api", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", @@ -8692,12 +9432,12 @@ dependencies = [ "reth-evm", "reth-execution-types", "reth-network-api", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-revm", "reth-rpc-eth-types", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-tasks", "reth-transaction-pool", @@ -8725,10 +9465,10 @@ dependencies = [ "reth-evm", "reth-execution-types", "reth-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-revm", "reth-rpc-server-types", - "reth-rpc-types", + "reth-rpc-types 1.0.5", "reth-rpc-types-compat", "reth-storage-api", "reth-tasks", @@ -8770,8 +9510,8 @@ dependencies = [ "jsonrpsee-types", "reth-errors", "reth-network-api", - "reth-primitives", - "reth-rpc-types", + "reth-primitives 1.0.5", + "reth-rpc-types 1.0.5", "serde", "strum", ] @@ -8795,15 +9535,33 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "reth-rpc-types" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types", + "alloy-rpc-types-admin", + "alloy-rpc-types-anvil", + "alloy-rpc-types-beacon", + "alloy-rpc-types-engine", + "alloy-rpc-types-mev", + "alloy-rpc-types-trace", + "alloy-rpc-types-txpool", + "alloy-serde", + "jsonrpsee-types", +] + [[package]] name = "reth-rpc-types-compat" version = "1.0.5" dependencies = [ "alloy-rlp", "alloy-rpc-types", - "reth-primitives", - "reth-rpc-types", - "reth-trie-common", + "reth-primitives 1.0.5", + "reth-rpc-types 1.0.5", + "reth-trie-common 1.0.5", "serde_json", ] @@ -8822,7 +9580,7 @@ dependencies = [ "rand 0.8.5", "rayon", "reth-chainspec", - "reth-codecs", + "reth-codecs 1.0.5", "reth-config", "reth-consensus", "reth-db", @@ -8836,8 +9594,8 @@ dependencies = [ "reth-exex", "reth-network-p2p", "reth-network-peers", - "reth-primitives", - "reth-primitives-traits", + "reth-primitives 1.0.5", + "reth-primitives-traits 1.0.5", "reth-provider", "reth-prune", "reth-prune-types", @@ -8870,12 +9628,12 @@ dependencies = [ "reth-errors", "reth-metrics", "reth-network-p2p", - "reth-primitives-traits", + "reth-primitives-traits 1.0.5", "reth-provider", "reth-prune", "reth-stages-types", "reth-static-file", - "reth-static-file-types", + "reth-static-file-types 1.0.5", "reth-testing-utils", "reth-tokio-util", "thiserror", @@ -8895,8 +9653,8 @@ dependencies = [ "proptest", "proptest-arbitrary-interop", "rand 0.8.5", - "reth-codecs", - "reth-trie-common", + "reth-codecs 1.0.5", + "reth-trie-common 1.0.5", "serde", "test-fuzz", ] @@ -8916,7 +9674,7 @@ dependencies = [ "reth-prune-types", "reth-stages", "reth-stages-types", - "reth-static-file-types", + "reth-static-file-types 1.0.5", "reth-storage-errors", "reth-testing-utils", "reth-tokio-util", @@ -8935,6 +9693,17 @@ dependencies = [ "strum", ] +[[package]] +name = "reth-static-file-types" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-primitives", + "derive_more", + "serde", + "strum", +] + [[package]] name = "reth-storage-api" version = "1.0.5" @@ -8943,7 +9712,7 @@ dependencies = [ "reth-chainspec", "reth-db-api", "reth-execution-types", - "reth-primitives", + "reth-primitives 1.0.5", "reth-prune-types", "reth-stages-types", "reth-storage-errors", @@ -8957,7 +9726,7 @@ version = "1.0.5" dependencies = [ "alloy-rlp", "reth-fs-util", - "reth-primitives", + "reth-primitives 1.0.5", "thiserror-no-std", ] @@ -8980,9 +9749,9 @@ dependencies = [ [[package]] name = "reth-telos-rpc" -version = "1.0.4" +version = "1.0.5" dependencies = [ - "antelope-client", + "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs?branch=finish_table_rows_params)", "async-trait", "reth-node-telos", "reth-rpc-eth-api", @@ -8995,7 +9764,7 @@ version = "1.0.5" dependencies = [ "alloy-genesis", "rand 0.8.5", - "reth-primitives", + "reth-primitives 1.0.5", "secp256k1", ] @@ -9046,7 +9815,7 @@ dependencies = [ "reth-execution-types", "reth-fs-util", "reth-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-storage-api", "reth-tasks", @@ -9080,11 +9849,11 @@ dependencies = [ "reth-chainspec", "reth-execution-errors", "reth-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-stages-types", "reth-storage-errors", - "reth-trie-common", + "reth-trie-common 1.0.5", "revm", "serde", "serde_json", @@ -9113,14 +9882,34 @@ dependencies = [ "plain_hasher", "proptest", "proptest-arbitrary-interop", - "reth-codecs", - "reth-primitives-traits", + "reth-codecs 1.0.5", + "reth-primitives-traits 1.0.5", "revm-primitives", "serde", "test-fuzz", "toml", ] +[[package]] +name = "reth-trie-common" +version = "1.0.5" +source = "git+https://github.com/telosnetwork/telos-reth?branch=telos-main#603e39ab74509e0863fc023461a4c760fb2126d1" +dependencies = [ + "alloy-consensus", + "alloy-genesis", + "alloy-primitives", + "alloy-rlp", + "alloy-trie", + "bytes", + "derive_more", + "itertools 0.13.0", + "nybbles", + "reth-codecs 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "reth-primitives-traits 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "revm-primitives", + "serde", +] + [[package]] name = "reth-trie-db" version = "1.0.5" @@ -9139,12 +9928,12 @@ dependencies = [ "reth-db-api", "reth-execution-errors", "reth-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-stages-types", "reth-storage-errors", "reth-trie", - "reth-trie-common", + "reth-trie-common 1.0.5", "revm", "serde", "serde_json", @@ -9172,7 +9961,7 @@ dependencies = [ "reth-db-api", "reth-execution-errors", "reth-metrics", - "reth-primitives", + "reth-primitives 1.0.5", "reth-provider", "reth-tasks", "reth-trie", @@ -9361,6 +10150,18 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" +[[package]] +name = "ruint" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0430214a5bb015461c0628e93d07738af2866e77a3f3db71e8264c999dda03fc" +dependencies = [ + "itertools 0.10.5", + "ruint-macro 0.2.1", + "rustc_version 0.4.0", + "thiserror", +] + [[package]] name = "ruint" version = "1.12.3" @@ -9380,12 +10181,18 @@ dependencies = [ "proptest", "rand 0.8.5", "rlp", - "ruint-macro", + "ruint-macro 1.2.1", "serde", "valuable", "zeroize", ] +[[package]] +name = "ruint-macro" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f4dd8af87bc3b385595ce5f61887b5b8efd4def9eb1679ce4300ec4d89c308" + [[package]] name = "ruint-macro" version = "1.2.1" @@ -9453,6 +10260,7 @@ version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ + "aws-lc-rs", "log", "once_cell", "ring", @@ -9533,6 +10341,7 @@ version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -9788,6 +10597,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "serde_spanned" version = "0.6.7" @@ -10157,6 +10977,29 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive", + "syn 2.0.72", +] + +[[package]] +name = "structmeta-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "strum" version = "0.26.3" @@ -10323,12 +11166,82 @@ dependencies = [ "libc", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "telos-consensus-client" +version = "0.1.0" +source = "git+https://github.com/telosnetwork/telos-consensus-client?branch=translator_integration#bee84d9f86f9faff37b84f73eac48d8cb3aa59ed" +dependencies = [ + "alloy", + "alloy-consensus", + "alloy-rlp", + "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs?branch=serialization)", + "arrowbatch", + "base64 0.22.1", + "chrono", + "clap", + "csv", + "env_logger", + "hex", + "jsonwebtoken", + "log", + "rand 0.8.5", + "reqwest 0.11.27", + "reth-primitives 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "reth-rpc-types 1.0.5 (git+https://github.com/telosnetwork/telos-reth?branch=telos-main)", + "serde", + "serde_json", + "telos-translator-rs", + "thiserror", + "tokio", + "toml", + "tracing", + "tracing-subscriber", + "zeroize", +] + +[[package]] +name = "telos-translator-rs" +version = "0.1.0" +source = "git+https://github.com/telosnetwork/telos-translator-rs.git?branch=final_block_struct#99c42306fdf4c91cce3bc86d105b588dd45c5eb2" +dependencies = [ + "alloy", + "alloy-consensus", + "alloy-rlp", + "antelope-client 0.2.1 (git+https://github.com/telosnetwork/antelope-rs?branch=finish_table_rows_params)", + "bytes", + "clap", + "dashmap 5.5.3", + "eyre", + "futures-util", + "hex", + "k256", + "lazy_static", + "log", + "moka", + "num-bigint", + "rlp", + "ruint 0.3.0", + "serde", + "serde_json", + "tokio", + "tokio-tungstenite 0.23.1", + "toml", + "tracing", + "tracing-subscriber", +] + [[package]] name = "tempfile" version = "3.11.0" @@ -10408,6 +11321,34 @@ dependencies = [ "test-fuzz-internal", ] +[[package]] +name = "testcontainers" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7d80fe0008971413157e67062150cbf508b92f0eb525b9f49de1aec4267f24" +dependencies = [ + "async-trait", + "bollard", + "bollard-stubs", + "bytes", + "dirs", + "docker_credential", + "either", + "futures", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "url", +] + [[package]] name = "thin-vec" version = "0.2.13" @@ -10644,6 +11585,18 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", +] + [[package]] name = "tokio-tungstenite" version = "0.23.1" @@ -10656,7 +11609,7 @@ dependencies = [ "rustls-pki-types", "tokio", "tokio-rustls", - "tungstenite", + "tungstenite 0.23.0", "webpki-roots", ] @@ -10914,6 +11867,12 @@ dependencies = [ "rlp", ] +[[package]] +name = "triomphe" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" + [[package]] name = "trust-dns-proto" version = "0.23.2" @@ -10980,6 +11939,25 @@ dependencies = [ "toml", ] +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "tungstenite" version = "0.23.0" @@ -11361,6 +12339,18 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "widestring" version = "1.1.0" @@ -11815,9 +12805,9 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ "zstd-safe", ] diff --git a/crates/telos/node/src/args.rs b/crates/telos/node/src/args.rs index 9835b44c918b..708f48ebf7e8 100644 --- a/crates/telos/node/src/args.rs +++ b/crates/telos/node/src/args.rs @@ -42,4 +42,4 @@ mod tests { let args = CommandParser::::parse_from(["reth"]).args; assert_eq!(args, default_args); } -} \ No newline at end of file +} diff --git a/crates/telos/node/src/lib.rs b/crates/telos/node/src/lib.rs index cd7613e16701..d0d98a75db57 100644 --- a/crates/telos/node/src/lib.rs +++ b/crates/telos/node/src/lib.rs @@ -6,11 +6,10 @@ issue_tracker_base_url = "https://github.com/telosnetwork/telos-reth/issues/" )] #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] - #![cfg(feature = "telos")] pub mod args; pub mod node; pub use crate::args::TelosArgs; -pub use crate::node::TelosNode; \ No newline at end of file +pub use crate::node::TelosNode; diff --git a/crates/telos/node/src/node.rs b/crates/telos/node/src/node.rs index 688cf1c5c219..27034db4e6cf 100644 --- a/crates/telos/node/src/node.rs +++ b/crates/telos/node/src/node.rs @@ -1,10 +1,15 @@ -use reth_ethereum_engine_primitives::{EthBuiltPayload, EthEngineTypes, EthPayloadAttributes, EthPayloadBuilderAttributes}; +use crate::args::TelosArgs; +use reth_ethereum_engine_primitives::{ + EthBuiltPayload, EthEngineTypes, EthPayloadAttributes, EthPayloadBuilderAttributes, +}; use reth_evm_ethereum::EthEvmConfig; use reth_node_api::{FullNodeTypes, NodeTypes}; use reth_node_builder::components::ComponentsBuilder; use reth_node_builder::{Node, PayloadTypes}; -use reth_node_ethereum::node::{EthereumAddOns, EthereumConsensusBuilder, EthereumExecutorBuilder, EthereumNetworkBuilder, EthereumPayloadBuilder, EthereumPoolBuilder}; -use crate::args::TelosArgs; +use reth_node_ethereum::node::{ + EthereumAddOns, EthereumConsensusBuilder, EthereumExecutorBuilder, EthereumNetworkBuilder, + EthereumPayloadBuilder, EthereumPoolBuilder, +}; /// Type configuration for a regular Telos node. #[derive(Debug, Default, Clone)] @@ -71,4 +76,3 @@ where Self::components() } } - diff --git a/crates/telos/node/tests/integration.rs b/crates/telos/node/tests/integration.rs index 4f3cd0e44e08..68bad13f7daa 100644 --- a/crates/telos/node/tests/integration.rs +++ b/crates/telos/node/tests/integration.rs @@ -1,26 +1,21 @@ -use std::fs; -use std::path::PathBuf; use antelope::api::client::{APIClient, DefaultProvider}; -use reth_primitives::{B256, Genesis}; use reth::{ args::RpcServerArgs, builder::{NodeBuilder, NodeConfig, NodeHandle}, tasks::TaskManager, }; use reth_chainspec::{ChainSpecBuilder, MAINNET}; -use reth_e2e_test_utils::{ - node::NodeTestContext, setup, transaction::TransactionTestContext, wallet::Wallet, -}; +use reth_e2e_test_utils::node::NodeTestContext; +use reth_node_ethereum::EthereumNode; +use reth_primitives::{Genesis, B256}; +use std::fs; +use std::path::PathBuf; use std::sync::Arc; -use antelope::util::bytes_to_hex; use telos_consensus_client::client::ConsensusClient; use telos_consensus_client::config::AppConfig; use testcontainers::core::ContainerPort::Tcp; use testcontainers::{runners::AsyncRunner, ContainerAsync, GenericImage}; use tracing::info; -use reth::rpc::builder::config::RethRpcServerConfig; -use reth::rpc::types::engine::JwtSecret; -use reth_node_ethereum::EthereumNode; struct ShipHandle { ship_port: u16, @@ -29,7 +24,7 @@ struct ShipHandle { struct TelosRethNodeHandle { execution_port: u16, - jwt_secret: String + jwt_secret: String, } async fn start_ship() -> ShipHandle { @@ -42,11 +37,11 @@ async fn start_ship() -> ShipHandle { "ghcr.io/telosnetwork/testcontainer-nodeos-evm", "v0.1.4@sha256:a8dc857e46404d74b286f8c8d8646354ca6674daaaf9eb6f972966052c95eb4a", ) - .with_exposed_port(Tcp(8888)) - .with_exposed_port(Tcp(18999)) - .start() - .await - .unwrap(); + .with_exposed_port(Tcp(8888)) + .with_exposed_port(Tcp(18999)) + .start() + .await + .unwrap(); let port_8888 = container.get_host_port_ipv4(8888).await.unwrap(); let port_18999 = container.get_host_port_ipv4(18999).await.unwrap(); @@ -68,10 +63,7 @@ async fn start_ship() -> ShipHandle { last_block = info.head_block_num; } - ShipHandle { - ship_port: port_18999, - chain_port: port_8888, - } + ShipHandle { ship_port: port_18999, chain_port: port_8888 } } async fn start_reth() -> eyre::Result { @@ -80,7 +72,9 @@ async fn start_reth() -> eyre::Result { let exec = exec.executor(); // Chain spec with test allocs - let genesis: Genesis = serde_json::from_str(include_str!("../../../ethereum/node/tests/assets/genesis.json")).unwrap(); + let genesis: Genesis = + serde_json::from_str(include_str!("../../../ethereum/node/tests/assets/genesis.json")) + .unwrap(); let chain_spec = Arc::new( ChainSpecBuilder::default() .chain(MAINNET.chain) @@ -94,9 +88,7 @@ async fn start_reth() -> eyre::Result { //let _jwt = rpc_config.auth_server_config(JwtSecret::random()); // Node setup - let node_config = NodeConfig::test() - .with_chain(chain_spec) - .with_rpc(rpc_config.clone()); + let node_config = NodeConfig::test().with_chain(chain_spec).with_rpc(rpc_config.clone()); let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(node_config.clone()) .testing_node(exec) @@ -109,7 +101,7 @@ async fn start_reth() -> eyre::Result { let jwt = fs::read_to_string(node_config.rpc.auth_jwtsecret.clone().unwrap())?; Ok(TelosRethNodeHandle { execution_port: node.auth_server_handle().local_addr().port(), - jwt_secret: jwt + jwt_secret: jwt, }) } From 306226a252db8a0f43a1181b301cc07e2249dba2 Mon Sep 17 00:00:00 2001 From: Coa Date: Tue, 13 Aug 2024 16:04:51 +0200 Subject: [PATCH 2/2] Keep reth and ship instances in scope --- crates/telos/node/tests/integration.rs | 58 +++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/crates/telos/node/tests/integration.rs b/crates/telos/node/tests/integration.rs index 68bad13f7daa..1dc477a3125c 100644 --- a/crates/telos/node/tests/integration.rs +++ b/crates/telos/node/tests/integration.rs @@ -1,8 +1,8 @@ use antelope::api::client::{APIClient, DefaultProvider}; use reth::{ args::RpcServerArgs, - builder::{NodeBuilder, NodeConfig, NodeHandle}, - tasks::TaskManager, + builder::{NodeBuilder, NodeConfig}, + tasks::{TaskExecutor, TaskManager}, }; use reth_chainspec::{ChainSpecBuilder, MAINNET}; use reth_e2e_test_utils::node::NodeTestContext; @@ -17,17 +17,12 @@ use testcontainers::core::ContainerPort::Tcp; use testcontainers::{runners::AsyncRunner, ContainerAsync, GenericImage}; use tracing::info; -struct ShipHandle { - ship_port: u16, - chain_port: u16, -} - struct TelosRethNodeHandle { execution_port: u16, jwt_secret: String, } -async fn start_ship() -> ShipHandle { +async fn start_ship() -> ContainerAsync { // Change this container to a local image if using new ship data, // then make sure to update the ship data in the testcontainer-nodeos-evm repo and build a new version @@ -44,7 +39,6 @@ async fn start_ship() -> ShipHandle { .unwrap(); let port_8888 = container.get_host_port_ipv4(8888).await.unwrap(); - let port_18999 = container.get_host_port_ipv4(18999).await.unwrap(); let api_base_url = format!("http://localhost:{port_8888}"); let api_client = APIClient::::default_provider(api_base_url).unwrap(); @@ -63,14 +57,12 @@ async fn start_ship() -> ShipHandle { last_block = info.head_block_num; } - ShipHandle { ship_port: port_18999, chain_port: port_8888 } + container } -async fn start_reth() -> eyre::Result { - reth_tracing::init_test_tracing(); +fn init_reth() -> eyre::Result<(NodeConfig, TaskExecutor, String)> { let exec = TaskManager::current(); let exec = exec.executor(); - // Chain spec with test allocs let genesis: Genesis = serde_json::from_str(include_str!("../../../ethereum/node/tests/assets/genesis.json")) @@ -90,19 +82,8 @@ async fn start_reth() -> eyre::Result { // Node setup let node_config = NodeConfig::test().with_chain(chain_spec).with_rpc(rpc_config.clone()); - let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(node_config.clone()) - .testing_node(exec) - .node(EthereumNode::default()) - .launch() - .await?; - let _node_context = NodeTestContext::new(node.clone()).await?; - - info!("Started Reth!"); let jwt = fs::read_to_string(node_config.rpc.auth_jwtsecret.clone().unwrap())?; - Ok(TelosRethNodeHandle { - execution_port: node.auth_server_handle().local_addr().port(), - jwt_secret: jwt, - }) + Ok((node_config, exec, jwt)) } async fn start_consensus(reth_handle: TelosRethNodeHandle, ship_port: u16, chain_port: u16) { @@ -119,13 +100,32 @@ async fn start_consensus(reth_handle: TelosRethNodeHandle, ship_port: u16, chain }; let mut client_under_test = ConsensusClient::new(config).await; - client_under_test.run().await; + _ = client_under_test.run().await; } #[tokio::test] async fn testing_chain_sync() { tracing_subscriber::fmt::init(); - let ship_handle = start_ship().await; - let reth_handle = start_reth().await.unwrap(); - start_consensus(reth_handle, ship_handle.ship_port, ship_handle.chain_port).await; + + let container = start_ship().await; + let ship_port = container.get_host_port_ipv4(8888).await.unwrap(); + let chain_port = container.get_host_port_ipv4(18999).await.unwrap(); + + let (node_config, exec, jwt_secret) = init_reth().unwrap(); + + reth_tracing::init_test_tracing(); + + let node_handle = NodeBuilder::new(node_config.clone()) + .testing_node(exec) + .node(EthereumNode::default()) + .launch() + .await + .unwrap(); + + let execution_port = node_handle.node.auth_server_handle().local_addr().port(); + let reth_handle = TelosRethNodeHandle { execution_port, jwt_secret }; + _ = NodeTestContext::new(node_handle.node.clone()).await.unwrap(); + info!("Started Reth!"); + + start_consensus(reth_handle, ship_port, chain_port).await; }