diff --git a/Cargo.lock b/Cargo.lock index 7ed4ae17..1499da4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -296,12 +296,11 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", + "async-io 1.13.0", "async-lock", "blocking", "futures-lite", "once_cell", - "tokio", ] [[package]] @@ -313,7 +312,7 @@ dependencies = [ "async-channel", "async-dup", "async-global-executor", - "async-io", + "async-io 1.13.0", "futures-lite", "http-types", "httparse", @@ -334,13 +333,33 @@ dependencies = [ "futures-lite", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10da8f3146014722c89e7859e1d7bb97873125d7346d10ca642ffab794355828" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling 3.3.0", + "rustix 0.38.21", + "slab", + "tracing", + "waker-fn", + "windows-sys 0.48.0", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -356,7 +375,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ - "async-io", + "async-io 1.13.0", "blocking", "futures-lite", ] @@ -367,12 +386,12 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", + "async-io 1.13.0", "async-lock", "async-signal", "blocking", "cfg-if", - "event-listener 3.0.0", + "event-listener 3.0.1", "futures-lite", "rustix 0.38.21", "windows-sys 0.48.0", @@ -380,11 +399,11 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io", + "async-io 2.1.0", "async-lock", "atomic-waker", "cfg-if", @@ -396,20 +415,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "async-sse" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53bba003996b8fd22245cd0c59b869ba764188ed435392cf2796d03b805ade10" -dependencies = [ - "async-channel", - "async-std", - "http-types", - "log", - "memchr", - "pin-project-lite 0.1.12", -] - [[package]] name = "async-std" version = "1.12.0" @@ -418,9 +423,8 @@ checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-channel", "async-global-executor", - "async-io", + "async-io 1.13.0", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -431,7 +435,7 @@ dependencies = [ "log", "memchr", "once_cell", - "pin-project-lite 0.2.13", + "pin-project-lite", "pin-utils", "slab", "wasm-bindgen-futures", @@ -475,7 +479,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite", ] [[package]] @@ -1044,13 +1048,14 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37be52ef5e3b394db27a2341010685ad5103c72ac15ce2e9420a7e8f93f342c" +checksum = "a5104de16b218eddf8e34ffe2f86f74bfa4e61e95a1b89732fccf6325efd0557" dependencies = [ "cfg-if", "cpufeatures", "hex 0.4.3", + "proptest", "serde", ] @@ -1798,19 +1803,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - [[package]] name = "environmental" version = "1.1.4" @@ -2167,13 +2159,13 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" dependencies = [ "concurrent-queue", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite", ] [[package]] @@ -2241,9 +2233,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" [[package]] name = "filetime" @@ -2433,7 +2425,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.13", + "pin-project-lite", "waker-fn", ] @@ -2493,7 +2485,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite", "pin-utils", "slab", ] @@ -2799,7 +2791,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.13", + "pin-project-lite", ] [[package]] @@ -2832,7 +2824,7 @@ dependencies = [ "cookie", "futures-lite", "infer", - "pin-project-lite 0.2.13", + "pin-project-lite", "rand 0.7.3", "serde", "serde_json", @@ -2853,12 +2845,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.27" @@ -2875,7 +2861,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.13", + "pin-project-lite", "socket2 0.4.10", "tokio", "tower-service", @@ -3230,7 +3216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3752,6 +3738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -3766,20 +3753,20 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb" +checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" +checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.38", @@ -3941,7 +3928,7 @@ version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -4145,12 +4132,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.13" @@ -4208,7 +4189,21 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.13", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", "windows-sys 0.48.0", ] @@ -4304,7 +4299,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -4346,6 +4350,22 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +dependencies = [ + "bitflags 2.4.1", + "lazy_static", + "num-traits", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_xorshift", + "regex-syntax 0.7.5", + "unarray", +] + [[package]] name = "psm" version = "0.1.21" @@ -4441,6 +4461,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "rayon" version = "1.8.0" @@ -4591,7 +4620,7 @@ dependencies = [ "mime", "once_cell", "percent-encoding", - "pin-project-lite 0.2.13", + "pin-project-lite", "rustls", "rustls-pemfile", "serde", @@ -4681,7 +4710,7 @@ dependencies = [ [[package]] name = "rosetta-client" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "async-trait", @@ -4709,7 +4738,7 @@ dependencies = [ [[package]] name = "rosetta-config-astar" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "rosetta-core", @@ -4718,7 +4747,7 @@ dependencies = [ [[package]] name = "rosetta-config-bitcoin" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "rosetta-core", @@ -4726,7 +4755,7 @@ dependencies = [ [[package]] name = "rosetta-config-ethereum" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "rosetta-config-astar", @@ -4736,7 +4765,7 @@ dependencies = [ [[package]] name = "rosetta-config-polkadot" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "rosetta-core", @@ -4746,7 +4775,7 @@ dependencies = [ [[package]] name = "rosetta-core" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "async-trait", @@ -4761,7 +4790,7 @@ dependencies = [ [[package]] name = "rosetta-crypto" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "bech32 0.9.1", @@ -4788,12 +4817,11 @@ dependencies = [ [[package]] name = "rosetta-docker" -version = "0.4.1" +version = "0.5.0" dependencies = [ "anyhow", "dirs", "docker-api", - "env_logger", "futures", "getrandom 0.2.10", "hex 0.4.3", @@ -4826,7 +4854,7 @@ dependencies = [ [[package]] name = "rosetta-server" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "async-trait", @@ -4842,20 +4870,19 @@ dependencies = [ "serde", "serde_json", "subxt", - "tide", "tokio", "tokio-retry", "tokio-tungstenite", "tracing", + "url", "vergen", ] [[package]] name = "rosetta-server-astar" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", - "async-std", "async-trait", "ethers", "ethers-solc", @@ -4881,10 +4908,9 @@ dependencies = [ [[package]] name = "rosetta-server-bitcoin" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", - "async-std", "async-trait", "bitcoincore-rpc-async", "hex 0.4.3", @@ -4897,10 +4923,9 @@ dependencies = [ [[package]] name = "rosetta-server-ethereum" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", - "async-std", "async-trait", "ethabi", "ethers", @@ -4924,10 +4949,9 @@ dependencies = [ [[package]] name = "rosetta-server-polkadot" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", - "async-std", "async-trait", "hex 0.4.3", "parity-scale-codec", @@ -4946,7 +4970,7 @@ dependencies = [ [[package]] name = "rosetta-tx-ethereum" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "ethabi", @@ -4959,7 +4983,7 @@ dependencies = [ [[package]] name = "rosetta-tx-polkadot" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "blake2-rfc", @@ -4972,18 +4996,12 @@ dependencies = [ [[package]] name = "rosetta-types" -version = "0.4.0" +version = "0.5.0" dependencies = [ "serde", "serde_json", ] -[[package]] -name = "route-recognizer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56770675ebc04927ded3e60633437841581c285dc6236109ea25fbf3beb7b59e" - [[package]] name = "rust-bip39" version = "1.0.0" @@ -5212,7 +5230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27873eb6005868f8cc72dcfe109fae664cf51223d35387bc2f28be4c28d94c47" dependencies = [ "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5240,7 +5258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "995491f110efdc6bea96d6a746140e32bfceb4ea47510750a5467295a4707a25" dependencies = [ "darling 0.14.4", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5266,7 +5284,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5763,7 +5781,7 @@ dependencies = [ "async-channel", "async-executor", "async-fs", - "async-io", + "async-io 1.13.0", "async-lock", "async-net", "async-process", @@ -6142,7 +6160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5d5bd5566fe5633ec48dfa35ab152fd29f8a577c21971e1c6db9f28afb9bbb9" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.38", @@ -6564,7 +6582,7 @@ dependencies = [ "log", "mime_guess", "once_cell", - "pin-project-lite 0.2.13", + "pin-project-lite", "serde", "serde_json", ] @@ -6747,15 +6765,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.50" @@ -6806,28 +6815,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tide" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c459573f0dd2cc734b539047f57489ea875af8ee950860ded20cf93a79a1dee0" -dependencies = [ - "async-h1", - "async-sse", - "async-std", - "async-trait", - "femme", - "futures-util", - "http-client", - "http-types", - "kv-log-macro", - "log", - "pin-project-lite 0.2.13", - "route-recognizer", - "serde", - "serde_json", -] - [[package]] name = "time" version = "0.2.27" @@ -6952,7 +6939,7 @@ dependencies = [ "mio", "num_cpus", "parking_lot", - "pin-project-lite 0.2.13", + "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", "tokio-macros", @@ -7008,7 +6995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.13", + "pin-project-lite", "tokio", ] @@ -7039,7 +7026,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.13", + "pin-project-lite", "tokio", "tracing", ] @@ -7053,7 +7040,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -7078,6 +7065,17 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -7087,7 +7085,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project", - "pin-project-lite 0.2.13", + "pin-project-lite", "tower-layer", "tower-service", "tracing", @@ -7112,7 +7110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.13", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -7270,6 +7268,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicase" version = "2.7.0" @@ -7967,18 +7971,18 @@ checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf" [[package]] name = "zerocopy" -version = "0.7.15" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" +checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.15" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" +checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 69c0e929..42951cfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,3 +19,34 @@ members = [ "rosetta-types", ] resolver = "2" + +# Specifying a workspace dependency is similar to package dependencies except: +# - Dependencies from this table cannot be declared as optional +# - features declared in this table are additive with the features from [dependencies] +[workspace.dependencies] +rosetta-config-astar = { path = "chains/astar/config", default-features = false } +rosetta-server-astar = { path = "chains/astar/server" } +rosetta-config-bitcoin = { path = "chains/bitcoin/config" } +rosetta-server-bitcoin = { path = "chains/bitcoin/server" } +rosetta-config-ethereum = { path = "chains/ethereum/config" } +rosetta-server-ethereum = { path = "chains/ethereum/server" } +rosetta-ethereum-rpc-client = { path = "chains/ethereum/rpc-client" } +rosetta-tx-ethereum = { path = "chains/ethereum/tx" } +rosetta-config-polkadot = { path = "chains/polkadot/config" } +rosetta-server-polkadot = { path = "chains/polkadot/server" } +rosetta-tx-polkadot = { path = "chains/polkadot/tx" } +rosetta-client = { path = "rosetta-client" } +rosetta-core = { path = "rosetta-core" } +rosetta-crypto = { path = "rosetta-crypto" } +rosetta-docker = { path = "rosetta-docker" } +rosetta-server = { path = "rosetta-server", default-features = false } +rosetta-types = { path = "rosetta-types" } + +## Crates we want all members to use the same version +jsonrpsee = { version = "0.20", default-features = false } +parity-scale-codec = { version = "3.6" } +tokio = { version = "1.32" } +subxt = { version = "0.32", default-features = false } +serde = { version = "1.0", features = ["derive"] } +serde_json = { version = "1.0" } +scale-info = { version = "2.3" } diff --git a/chains/astar/config/Cargo.toml b/chains/astar/config/Cargo.toml index e4f08b4f..c9c0efa0 100644 --- a/chains/astar/config/Cargo.toml +++ b/chains/astar/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-config-astar" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -12,5 +12,5 @@ astar-metadata = ["subxt"] [dependencies] anyhow = "1.0" -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } -subxt = { version = "0.32", default-features = false, features = ["substrate-compat", "native"], optional = true } +rosetta-core.workspace = true +subxt = { workspace = true, features = ["substrate-compat", "native"], optional = true } diff --git a/chains/astar/server/Cargo.toml b/chains/astar/server/Cargo.toml index 77a3dcf2..86e3b3d1 100644 --- a/chains/astar/server/Cargo.toml +++ b/chains/astar/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-server-astar" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,27 +8,26 @@ description = "Astar rosetta server." [dependencies] anyhow = "1.0" -async-std = { version = "1.12.0", features = ["tokio1"] } async-trait = "0.1" -ethers = "2.0.7" +ethers = "2.0" futures = { version = "0.3", default-features = false, features = ["std"] } -hex = "0.4.3" +hex = "0.4" log = "0.4" -parity-scale-codec = "3.6" -rosetta-config-astar = { version = "0.4.0", path = "../config" } -rosetta-config-ethereum = { version = "0.4.0", path = "../../ethereum/config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } -rosetta-server = { version = "0.4.0", path = "../../../rosetta-server", default-features = false, features = ["ws", "webpki-tls"] } -rosetta-server-ethereum = { version = "0.4.0", path = "../../ethereum/server" } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +parity-scale-codec = { workspace = true, features = ["derive"] } +rosetta-config-astar.workspace = true +rosetta-config-ethereum.workspace = true +rosetta-core.workspace = true +rosetta-server = { workspace = true, features = ["ws", "webpki-tls"] } +rosetta-server-ethereum.workspace = true +serde.workspace = true +serde_json.workspace = true sp-core = { version = "21.0", default-features = false, features = ["blake2", "std"] } sp-keyring = "24.0" -subxt = { version = "0.32", default-features = false, features = ["substrate-compat"] } -tokio = { version = "1.32", features = ["rt-multi-thread", "macros"] } +subxt = { workspace = true, features = ["substrate-compat"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } [dev-dependencies] -ethers-solc = "2.0.1" -rosetta-client = { version = "0.4.0", path = "../../../rosetta-client" } -rosetta-docker = { version = "0.4.0", path = "../../../rosetta-docker", features = ["tests"] } -sha3 = "0.10.6" +ethers-solc = "2.0" +rosetta-client.workspace = true +rosetta-docker = { workspace = true, features = ["tests"] } +sha3 = "0.10" diff --git a/chains/bitcoin/config/Cargo.toml b/chains/bitcoin/config/Cargo.toml index 484a9286..982a0d9f 100644 --- a/chains/bitcoin/config/Cargo.toml +++ b/chains/bitcoin/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-config-bitcoin" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,4 +8,4 @@ description = "Bitcoin configuration." [dependencies] anyhow = "1.0" -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } +rosetta-core.workspace = true diff --git a/chains/bitcoin/server/Cargo.toml b/chains/bitcoin/server/Cargo.toml index 1ae86d8b..8361cfdc 100644 --- a/chains/bitcoin/server/Cargo.toml +++ b/chains/bitcoin/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-server-bitcoin" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,14 +8,13 @@ description = "Bitcoin rosetta server." [dependencies] anyhow = "1.0" -async-std = { version = "1.12.0", features = ["tokio1"] } async-trait = "0.1" -bitcoincore-rpc-async = "3.0.1" -hex = "0.4.3" -rosetta-config-bitcoin = { version = "0.4.0", path = "../config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } +bitcoincore-rpc-async = "3.0" +hex = "0.4" +rosetta-config-bitcoin.workspace = true +rosetta-core.workspace = true serde_json = "1.0" -tokio = { version = "1.32", features = ["rt-multi-thread", "macros"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } [dev-dependencies] -rosetta-docker = { version = "0.4.0", path = "../../../rosetta-docker", features = ["tests"] } +rosetta-docker = { workspace = true, features = ["tests"] } diff --git a/chains/ethereum/config/Cargo.toml b/chains/ethereum/config/Cargo.toml index a1064f13..06254933 100644 --- a/chains/ethereum/config/Cargo.toml +++ b/chains/ethereum/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-config-ethereum" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,6 +8,6 @@ description = "Ethereum configuration." [dependencies] anyhow = "1.0" -rosetta-config-astar = { version = "0.4.0", default-features = false, path = "../../astar/config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } -serde = { version = "1.0", features = ["derive"] } +rosetta-config-astar = { workspace = true } +rosetta-core.workspace = true +serde.workspace = true diff --git a/chains/ethereum/rpc-client/Cargo.toml b/chains/ethereum/rpc-client/Cargo.toml index 2e5e98e7..54f0d125 100644 --- a/chains/ethereum/rpc-client/Cargo.toml +++ b/chains/ethereum/rpc-client/Cargo.toml @@ -11,9 +11,9 @@ async-trait = "0.1" dashmap = "5.5" ethers = { version = "2.0", default-features = true } futures-util = "0.3" -jsonrpsee = { version = "0.20", default-features = false, features = ["macros"] } +jsonrpsee = { workspace = true, features = ["macros"] } pin-project = "1.1" -serde = "1.0" -serde_json = "1.0" +serde.workspace = true +serde_json.workspace = true thiserror = "1.0" tracing = "0.1" diff --git a/chains/ethereum/server/Cargo.toml b/chains/ethereum/server/Cargo.toml index 9cd01862..fed5b16d 100644 --- a/chains/ethereum/server/Cargo.toml +++ b/chains/ethereum/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-server-ethereum" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,25 +8,24 @@ description = "Ethereum rosetta server." [dependencies] anyhow = "1.0" -async-std = { version = "1.12", features = ["tokio1"] } async-trait = "0.1" -ethabi = "18.0.0" +ethabi = "18.0" ethers = { version = "2.0", default-features = true, features = ["abigen", "rustls"] } futures-timer = "3.0" futures-util = "0.3" hex = "0.4" -rosetta-config-ethereum = { version = "0.4.0", path = "../config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } -rosetta-ethereum-rpc-client = { version = "0.1.0", path = "../rpc-client" } -rosetta-server = { version = "0.4.0", path = "../../../rosetta-server", default-features = false, features = ["ws", "webpki-tls"] } -serde = "1.0" -serde_json = "1.0" -tokio = { version = "1.32", features = ["rt-multi-thread", "macros"] } +rosetta-config-ethereum.workspace = true +rosetta-core.workspace = true +rosetta-ethereum-rpc-client.workspace = true +rosetta-server = { workspace = true, features = ["ws", "webpki-tls"] } +serde.workspace = true +serde_json.workspace = true +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing = "0.1" -url = "2.4.0" +url = "2.4" [dev-dependencies] -ethers-solc = "2.0.1" -rosetta-client = { version = "0.4.0", path = "../../../rosetta-client" } -rosetta-docker = { version = "0.4.0", path = "../../../rosetta-docker", features = ["tests"] } -sha3 = "0.10.6" +ethers-solc = "2.0" +rosetta-client.workspace = true +rosetta-docker = { workspace = true, features = ["tests"] } +sha3 = "0.10" diff --git a/chains/ethereum/tx/Cargo.toml b/chains/ethereum/tx/Cargo.toml index 132d7978..ee3eb049 100644 --- a/chains/ethereum/tx/Cargo.toml +++ b/chains/ethereum/tx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-tx-ethereum" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,9 +8,9 @@ description = "Ethereum transaction builder." [dependencies] anyhow = "1.0" -ethabi = "18.0.0" -ethers-core = "2.0.0" -rosetta-config-ethereum = { version = "0.4.0", path = "../config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } +ethabi = "18.0" +ethers-core = "2.0" +rosetta-config-ethereum.workspace = true +rosetta-core.workspace = true serde_json = "1.0" -sha3 = "0.10.6" +sha3 = "0.10" diff --git a/chains/polkadot/config/Cargo.toml b/chains/polkadot/config/Cargo.toml index 3b4daae1..d7cfc2c6 100644 --- a/chains/polkadot/config/Cargo.toml +++ b/chains/polkadot/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-config-polkadot" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,6 +8,6 @@ description = "Polkadot configuration." [dependencies] anyhow = "1.0" -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } -serde = { version = "1.0", features = ["derive"] } -subxt = { version = "0.32", default-features = false, features = ["substrate-compat", "native"] } +rosetta-core.workspace = true +serde.workspace = true +subxt = { workspace = true, features = ["substrate-compat", "native"] } diff --git a/chains/polkadot/server/Cargo.toml b/chains/polkadot/server/Cargo.toml index cbca1b42..d68fbd7c 100644 --- a/chains/polkadot/server/Cargo.toml +++ b/chains/polkadot/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-server-polkadot" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -8,20 +8,19 @@ description = "Polkadot rosetta server." [dependencies] anyhow = "1.0" -async-std = { version = "1.12.0", features = ["tokio1"] } async-trait = "0.1" -hex = "0.4.3" -parity-scale-codec = "3.4.0" -rosetta-config-polkadot = { version = "0.4.0", path = "../config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } -rosetta-server = { version = "0.4.0", path = "../../../rosetta-server", default-features = false, features = ["ws", "webpki-tls"] } -scale-info = "2.3" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +hex = "0.4" +parity-scale-codec = { workspace = true, features = ["derive"] } +rosetta-config-polkadot.workspace = true +rosetta-core.workspace = true +rosetta-server = { workspace = true, default-features = false, features = ["ws", "webpki-tls"] } +scale-info.workspace = true +serde.workspace = true +serde_json.workspace = true sp-keyring = "24.0" -subxt = { version = "0.32", default-features = false, features = ["substrate-compat", "native"] } -tokio = { version = "1.32", features = ["rt-multi-thread", "macros"] } +subxt = { workspace = true, features = ["substrate-compat", "native"] } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tracing = "0.1" [dev-dependencies] -rosetta-docker = { version = "0.4.0", path = "../../../rosetta-docker", features = ["tests"] } +rosetta-docker = { workspace = true, features = ["tests"] } diff --git a/chains/polkadot/tx/Cargo.toml b/chains/polkadot/tx/Cargo.toml index 0d5f950d..8a5cda70 100644 --- a/chains/polkadot/tx/Cargo.toml +++ b/chains/polkadot/tx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-tx-polkadot" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -10,7 +10,7 @@ description = "Polkadot transaction builder." anyhow = "1.0" blake2-rfc = "0.2" bs58 = "0.5" -parity-scale-codec = { version = "3.6", features = ["derive"] } -rosetta-config-polkadot = { version = "0.4.0", path = "../config" } -rosetta-core = { version = "0.4.0", path = "../../../rosetta-core" } +parity-scale-codec = { workspace = true, features = ["derive"] } +rosetta-config-polkadot.workspace = true +rosetta-core.workspace = true serde_json = "1.0" diff --git a/rosetta-client/Cargo.toml b/rosetta-client/Cargo.toml index 055f6b10..88b79699 100644 --- a/rosetta-client/Cargo.toml +++ b/rosetta-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-client" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -10,25 +10,25 @@ description = "Client library for interacting with connectors." anyhow = "1.0" async-trait = "0.1" derive_more = "0.99" -dirs-next = "2.0.0" -fraction = { version = "0.13.1", default-features = false, features = ["with-bigint", "with-decimal"] } +dirs-next = "2.0" +fraction = { version = "0.13", default-features = false, features = ["with-bigint", "with-decimal"] } futures = "0.3" -getrandom = "0.2.8" -hex = "0.4.3" +getrandom = "0.2" +hex = "0.4" log = "0.4" num-traits = "0.2" -rosetta-core = { version = "0.4.0", path = "../rosetta-core" } -rosetta-server-astar = { version = "0.4.0", path = "../chains/astar/server" } -rosetta-server-bitcoin = { version = "0.4.0", path = "../chains/bitcoin/server" } -rosetta-server-ethereum = { version = "0.4.0", path = "../chains/ethereum/server" } -rosetta-server-polkadot = { version = "0.4.0", path = "../chains/polkadot/server" } -rosetta-tx-ethereum = { version = "0.4.0", path = "../chains/ethereum/tx" } -rosetta-tx-polkadot = { version = "0.4.0", path = "../chains/polkadot/tx" } -serde = "1.0" -serde_json = "1.0" +rosetta-core.workspace = true +rosetta-server-astar.workspace = true +rosetta-server-bitcoin.workspace = true +rosetta-server-ethereum.workspace = true +rosetta-server-polkadot.workspace = true +rosetta-tx-ethereum.workspace = true +rosetta-tx-polkadot.workspace = true +serde.workspace = true +serde_json.workspace = true [target.'cfg(target_family = "wasm")'.dependencies] -getrandom = { version = "0.2.8", features = ["js"] } +getrandom = { version = "0.2", features = ["js"] } js-sys = "0.3" wasm-bindgen = "0.2" web-sys = { version = "0.3", features = ["Storage", "Window"] } diff --git a/rosetta-core/Cargo.toml b/rosetta-core/Cargo.toml index 866a66a5..3fd1ef6b 100644 --- a/rosetta-core/Cargo.toml +++ b/rosetta-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-core" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -11,8 +11,8 @@ anyhow = "1.0" async-trait = "0.1" fluent-uri = "0.1.4" futures-util = "0.3" -rosetta-crypto = { version = "0.4.0", path = "../rosetta-crypto" } -rosetta-types = { version = "0.4.0", path = "../rosetta-types" } -serde = "1.0" -serde_json = "1.0" +rosetta-crypto.workspace = true +rosetta-types.workspace = true +serde.workspace = true +serde_json.workspace = true thiserror = "1.0" diff --git a/rosetta-crypto/Cargo.toml b/rosetta-crypto/Cargo.toml index cb0c9694..083ea49f 100644 --- a/rosetta-crypto/Cargo.toml +++ b/rosetta-crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-crypto" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" diff --git a/rosetta-docker/Cargo.toml b/rosetta-docker/Cargo.toml index fa870fed..5f87dec3 100644 --- a/rosetta-docker/Cargo.toml +++ b/rosetta-docker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-docker" -version = "0.4.1" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -12,20 +12,19 @@ tests = ["dep:nanoid"] [dependencies] anyhow = "1.0" dirs = "5.0" -docker-api = "0.14.0" -env_logger = "0.10.0" +docker-api = "0.14" futures = "0.3" -getrandom = "0.2.8" -hex = "0.4.3" +getrandom = "0.2" +hex = "0.4" log = "0.4" -nanoid = { version = "0.4.0", optional = true } -rosetta-client = { version = "0.4.0", path = "../rosetta-client" } -rosetta-core = { version = "0.4.0", path = "../rosetta-core" } +nanoid = { version = "0.4", optional = true } +rosetta-client.workspace = true +rosetta-core.workspace = true serde_json = "1.0" -sha2 = "0.10.7" +sha2 = "0.10" surf = { version = "2.3", default-features = false, features = ["h1-client-no-tls"] } -tokio = "1.32" +tokio = { workspace = true } tokio-retry = "0.3" [dev-dependencies] -tokio = { version = "1.32", features = ["macros"] } +tokio = { workspace = true, features = ["macros"] } diff --git a/rosetta-docker/src/lib.rs b/rosetta-docker/src/lib.rs index 32005b1b..95d9c7eb 100644 --- a/rosetta-docker/src/lib.rs +++ b/rosetta-docker/src/lib.rs @@ -30,7 +30,6 @@ impl Env { Fut: Future> + Send, F: FnMut(BlockchainConfig) -> Fut + Send, { - env_logger::try_init().ok(); let builder = EnvBuilder::new(prefix)?; let node_port = random_port(); config.node_uri.port = node_port; diff --git a/rosetta-server/Cargo.toml b/rosetta-server/Cargo.toml index 058fd6e5..30f6a03f 100644 --- a/rosetta-server/Cargo.toml +++ b/rosetta-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rosetta-server" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" @@ -24,24 +24,24 @@ ws = [ [dependencies] anyhow = "1.0" async-trait = { version = "0.1", optional = true } -femme = "2.2.1" +femme = "2.2" futures = { version = "0.3", optional = true } futures-timer = { version = "3.0", optional = true } futures-util = { version = "0.3", optional = true } -hex = "0.4.3" -jsonrpsee = { version = "0.20.0", default-features = false, features = ["ws-client"], optional = true } +hex = "0.4" +jsonrpsee = { workspace = true, features = ["ws-client"], optional = true } log = "0.4" -nanoid = { version = "0.4.0", optional = true } +nanoid = { version = "0.4", optional = true } pin-project = { version = "1.1", optional = true } -serde = "1.0" -serde_json = "1.0" -subxt = { version = "0.32", default-features = false, features = ["native", "substrate-compat"], optional = true } -tide = { version = "0.16.0", default-features = false, features = ["h1-server", "logger"] } -tokio = { version = "1.32", features = ["full"] } +serde.workspace = true +serde_json.workspace = true +subxt = { workspace = true, features = ["native", "substrate-compat"], optional = true } +tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } tokio-retry = "0.3" -tokio-tungstenite = { version = "0.20.0", default-features = false, features = ["handshake", "connect"] } +tokio-tungstenite = { version = "0.20", default-features = false, features = ["handshake", "connect"] } tracing = "0.1" +url = "2.4" [build-dependencies] anyhow = "1.0" -vergen = { version = "8.1.1", features = ["build", "git", "gitcl"] } +vergen = { version = "8.1", features = ["build", "git", "gitcl"] } diff --git a/rosetta-server/src/ws.rs b/rosetta-server/src/ws.rs index 3565e115..6ce8ac07 100644 --- a/rosetta-server/src/ws.rs +++ b/rosetta-server/src/ws.rs @@ -22,8 +22,8 @@ use jsonrpsee::{ }, }; use std::time::Duration; -use tide::http::url::Url; pub use tungstenite_jsonrpsee::{TungsteniteClient, WsError}; +use url::Url; pub type DefaultClient = AutoReconnectClient>; diff --git a/rosetta-server/src/ws/tungstenite_jsonrpsee.rs b/rosetta-server/src/ws/tungstenite_jsonrpsee.rs index 76979768..e636b29d 100644 --- a/rosetta-server/src/ws/tungstenite_jsonrpsee.rs +++ b/rosetta-server/src/ws/tungstenite_jsonrpsee.rs @@ -5,7 +5,6 @@ use futures::{ SinkExt, }; use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT}; -use tide::http::url::Url; use tokio::net::TcpStream; pub use tokio_tungstenite::tungstenite::Error as WsError; use tokio_tungstenite::{ @@ -16,6 +15,7 @@ use tokio_tungstenite::{ }, MaybeTlsStream, WebSocketStream, }; +use url::Url; impl From<&RpcClientConfig> for WebSocketConfig { fn from(config: &RpcClientConfig) -> Self { diff --git a/rosetta-types/Cargo.toml b/rosetta-types/Cargo.toml index dbde33ae..3aa918d4 100644 --- a/rosetta-types/Cargo.toml +++ b/rosetta-types/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "rosetta-types" -version = "0.4.0" +version = "0.5.0" edition = "2021" license = "MIT" repository = "https://github.com/analog-labs/chain-connectors" description = "Rosetta API request and response structs." [dependencies] -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +serde.workspace = true +serde_json.workspace = true