From 3bb1b85c1cd5b17ab1229062a1a639a06222ca3a Mon Sep 17 00:00:00 2001 From: Justin Kilpatrick Date: Wed, 4 Dec 2024 15:28:37 -0500 Subject: [PATCH] Bump Clarity, Web30, and DeepSpace versions --- Cargo.lock | 323 +++++++++++++++------- Cargo.toml | 9 +- althea_types/Cargo.toml | 2 +- auto_bridge/Cargo.toml | 2 +- integration_tests/Cargo.toml | 2 +- integration_tests/src/utils.rs | 4 +- rita_client/Cargo.toml | 2 +- rita_common/Cargo.toml | 6 +- rita_common/src/payment_controller/mod.rs | 4 +- rita_exit/Cargo.toml | 2 +- settings/Cargo.toml | 2 +- test_runner/Cargo.toml | 4 +- 12 files changed, 249 insertions(+), 113 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25dc5a0dc..ff8bc368e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "actix" @@ -65,7 +65,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.12", "httparse", "httpdate", @@ -322,9 +322,9 @@ dependencies = [ [[package]] name = "althea_proto" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776fb0fcafc88fda8474fd5d2aaf5af94438ceb7e04322a3a3be7e36c7b05a00" +checksum = "706ded48f7c03dac1d24e3156cc7e7c31066828ef23b84e13e21e7058690a81c" dependencies = [ "cosmos-sdk-proto-althea", "prost", @@ -438,6 +438,12 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "auto-bridge" version = "0.1.5" @@ -479,7 +485,7 @@ dependencies = [ "derive_more", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "itoa", "log", @@ -496,18 +502,17 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -516,7 +521,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.2", "tower", "tower-layer", "tower-service", @@ -524,17 +529,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", ] @@ -608,6 +616,22 @@ dependencies = [ "serde", ] +[[package]] +name = "bitcoin-io" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -656,6 +680,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ed1ec45f6ef6e8d1125cc2c2fec8f8fe7d4fa5b262f15885fdccb9e26f0f15" dependencies = [ + "num-integer", "num-traits", ] @@ -740,9 +765,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bytestring" @@ -789,9 +814,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "clarity" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc231e36d58a7fc35e59d4177f5579428e3586992f93ebabeafb873ef89eb46" +checksum = "b8100ba88ab2204050607e86b2265ecb9079f72ac9d0f1ba075f978d74110daa" dependencies = [ "num-traits", "num256", @@ -873,9 +898,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cosmos-sdk-proto-althea" -version = "0.16.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02749095f4edf5ecb676a2a77a8ed0b2198a14ef0a5f819fd6ec15841a40c27f" +checksum = "0fcff930b3949e2bc81a2529af55d05bb8cf624ee34c36e6eaf6262cb9983a5d" dependencies = [ "prost", "prost-types", @@ -978,12 +1003,12 @@ dependencies = [ [[package]] name = "deep_space" -version = "2.24.2" +version = "2.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc7329547cb0c7a89c5810dd3576272278d09194b1e077c9455a6585ff6dd10" +checksum = "161c2f10dd65be981e88678d44c1343d0cb403d926375c19c73a2d547c744d6e" dependencies = [ "althea_proto", - "base64 0.21.7", + "base64 0.22.1", "bech32", "bytes", "clarity", @@ -1400,6 +1425,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.3.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "1.8.3" @@ -1447,6 +1491,15 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex-literal" version = "0.3.4" @@ -1506,6 +1559,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.9.4" @@ -1534,9 +1610,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1548,16 +1624,38 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ - "hyper", + "hyper 1.5.1", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] @@ -1567,12 +1665,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.5.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "idna" version = "0.3.0" @@ -2118,11 +2235,12 @@ dependencies = [ [[package]] name = "num256" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4d0cdb15f1e6bf76376510d4c2c6b059df1449f2e3717367988460f2467404" +checksum = "85228c87555ed4e5ddf024e9ef1908b27458b97e56b195af0d9cf1d7db890023" dependencies = [ "bnum", + "num-integer", "num-traits", "serde", ] @@ -2452,9 +2570,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ "bytes", "prost-derive", @@ -2462,9 +2580,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools", @@ -2475,9 +2593,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ "prost", ] @@ -2655,10 +2773,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-tls", "ipnet", "js-sys", @@ -2668,11 +2786,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -2939,9 +3057,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", @@ -2983,24 +3101,28 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.2.0", + "rustls-pki-types", "schannel", "security-framework", ] @@ -3014,13 +3136,29 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -3069,16 +3207,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "seahash" version = "4.1.0" @@ -3087,18 +3215,20 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "secp256k1" -version = "0.28.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ + "bitcoin_hashes", + "rand", "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -3387,6 +3517,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" + [[package]] name = "system-configuration" version = "0.5.1" @@ -3541,16 +3677,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.4.0" @@ -3586,19 +3712,20 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -3646,27 +3773,29 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.1", "bytes", "flate2", - "h2", - "http 0.2.12", - "http-body", - "hyper", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.5.1", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", - "rustls", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 2.2.0", + "socket2 0.5.7", "tokio", "tokio-rustls", "tokio-stream", @@ -3920,9 +4049,9 @@ dependencies = [ [[package]] name = "web30" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fedeab1a30bd13339b7319c76c3f99b1db064858a961a0841bb107f77dfb81" +checksum = "a756bea35ebe4e3758b89c3d25797f0c4a4af0e0232bcb6cedf6053b013f3557" dependencies = [ "awc", "clarity", @@ -4171,6 +4300,12 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + [[package]] name = "zstd" version = "0.13.2" diff --git a/Cargo.toml b/Cargo.toml index 56b81e1b3..c3b554997 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,8 +38,9 @@ inherits = "dev" opt-level = 2 [workspace.dependencies] -deep_space = {version = "2.24", features = ["althea"], default-features=false} -web30 = "1.2" -clarity = "1.3" +deep_space = {version = "2.27", features = ["althea"], default-features=false} +web30 = "1.6" +clarity = "1.5" +num256 = "0.6" awc = {version = "3.2", default-features = false, features=["openssl", "compress-gzip", "compress-zstd"]} -althea_proto = "0.7" \ No newline at end of file +althea_proto = "0.9" \ No newline at end of file diff --git a/althea_types/Cargo.toml b/althea_types/Cargo.toml index ec48a1ca4..c71265ad9 100644 --- a/althea_types/Cargo.toml +++ b/althea_types/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] babel_monitor = { path = "../babel_monitor" } -num256 = "0.5" +num256 = {workspace = true} base64 = "0.13" serde_derive = "1.0" serde = "1.0" diff --git a/auto_bridge/Cargo.toml b/auto_bridge/Cargo.toml index baa3b5914..a69868603 100644 --- a/auto_bridge/Cargo.toml +++ b/auto_bridge/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] web30 = {workspace = true} -num256 = "0.5" +num256 = {workspace = true} clarity = {workspace = true} rand = "0.8" num = "0.4" diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 0517063df..ceffeb791 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -32,7 +32,7 @@ deep_space = {workspace = true} clarity = {workspace = true} althea_proto = {workspace = true} futures = { version = "0.3", features = ["compat"] } -num256 = "0.5" +num256 = {workspace = true} num-traits="0.2" web30 = {workspace = true} lazy_static = "1.4" diff --git a/integration_tests/src/utils.rs b/integration_tests/src/utils.rs index c2ede6766..0600a0ed7 100644 --- a/integration_tests/src/utils.rs +++ b/integration_tests/src/utils.rs @@ -778,7 +778,7 @@ pub async fn vote_yes_with_retry( let res = res.unwrap(); info!( "Voting yes on governance proposal costing {} gas", - res.gas_used + res.gas_used() ); } @@ -854,7 +854,7 @@ pub async fn execute_register_coin_proposal( ) .await .unwrap(); - info!("Gov proposal executed with {:?}", res.raw_log); + info!("Gov proposal executed with {:?}", res.raw_log()); vote_yes_on_proposals(contact, keys, None).await; if wait { diff --git a/rita_client/Cargo.toml b/rita_client/Cargo.toml index 239f3ad73..5251a9be9 100644 --- a/rita_client/Cargo.toml +++ b/rita_client/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] compressed_log = "0.5" num-traits = "0.2" -num256 = "0.5" +num256 = {workspace = true} serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/rita_common/Cargo.toml b/rita_common/Cargo.toml index 2fef1676c..666c6bdc6 100644 --- a/rita_common/Cargo.toml +++ b/rita_common/Cargo.toml @@ -24,7 +24,7 @@ log = { version = "0.4", features = ["release_max_level_info"] } settings = { path = "../settings" } clarity = {workspace = true} futures = { version = "0.3", features = ["compat"] } -num256 = "0.5" +num256 = {workspace = true} num-traits = "0.2" bincode = "1.3" serde_cbor = "0.11" @@ -37,8 +37,8 @@ actix-service = "2.0.2" web30 = {workspace = true} althea_types = { path = "../althea_types" } deep_space = {workspace = true} -prost-types ="0.12" -cosmos-sdk-proto-althea = {package = "cosmos-sdk-proto-althea", version = "0.16", features = ["ethermint"]} +prost-types ="0.13" +cosmos-sdk-proto-althea = {package = "cosmos-sdk-proto-althea", version = "0.18", features = ["ethermint"]} althea_proto = {workspace = true} crossbeam = "0.8" diff --git a/rita_common/src/payment_controller/mod.rs b/rita_common/src/payment_controller/mod.rs index 321b15dbb..b2c4d4cbd 100644 --- a/rita_common/src/payment_controller/mod.rs +++ b/rita_common/src/payment_controller/mod.rs @@ -316,9 +316,9 @@ async fn make_althea_payment( // setup tx hash info!( "Making payment with txid {} that will be converted to hex", - transaction.txhash + transaction.txhash() ); - let pmt = pmt.publish(Uint256::from_str_radix(&transaction.txhash, 16).unwrap()); + let pmt = pmt.publish(Uint256::from_str_radix(&transaction.txhash(), 16).unwrap()); let retry = send_make_payment_endpoints( pmt, diff --git a/rita_exit/Cargo.toml b/rita_exit/Cargo.toml index 207dedcc0..aff19df09 100644 --- a/rita_exit/Cargo.toml +++ b/rita_exit/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] # debug is used here to make sure exit logs remain accessible locally sodiumoxide = "0.2" -num256 = "0.5" +num256 = {workspace = true} rita_common = { path = "../rita_common" } rita_client_registration = { path = "../rita_client_registration" } althea_kernel_interface = { path = "../althea_kernel_interface" } diff --git a/settings/Cargo.toml b/settings/Cargo.toml index 7b198324d..8522fbb41 100644 --- a/settings/Cargo.toml +++ b/settings/Cargo.toml @@ -9,7 +9,7 @@ althea_types = { path = "../althea_types"} babel_monitor = { path = "../babel_monitor"} althea_kernel_interface = { path = "../althea_kernel_interface" } auto-bridge = { path = "../auto_bridge" } -num256 = "0.5" +num256 = {workspace = true} serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/test_runner/Cargo.toml b/test_runner/Cargo.toml index acf129b98..706f62b30 100644 --- a/test_runner/Cargo.toml +++ b/test_runner/Cargo.toml @@ -19,8 +19,8 @@ althea_types = { path = "../althea_types" } althea_kernel_interface = { path = "../althea_kernel_interface" } deep_space = { version = "2", features = ["althea"] } rita_client_registration = { path = "../rita_client_registration" } -web30 = "1.0" -clarity = "1.2" +web30 = {workspace = true} +clarity = {workspace = true} [dev-dependencies] actix = "0.13"