diff --git a/Cargo.lock b/Cargo.lock index 74c492ed7..f49f6b66a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1625,7 +1625,7 @@ dependencies = [ "rand_chacha 0.3.0", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", ] @@ -1788,7 +1788,6 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto", "helium-proto", "http 0.2.11", "http-serde", @@ -2908,6 +2907,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "shell-words", + "tempfile", + "thiserror", + "zeroize", +] + [[package]] name = "digest" version = "0.9.0" @@ -3755,7 +3767,7 @@ dependencies = [ "bs58 0.5.0", "byteorder", "ed25519-compact", - "getrandom 0.1.16", + "getrandom 0.2.10", "k256", "lazy_static", "multihash", @@ -5069,7 +5081,7 @@ dependencies = [ "anyhow", "base64 0.21.7", "clap 4.4.8", - "dialoguer", + "dialoguer 0.11.0", "futures", "h3o", "helium-crypto", @@ -5521,7 +5533,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.58", @@ -6061,7 +6073,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ "bytes", - "heck 0.4.0", + "heck 0.5.0", "itertools", "log", "multimap", @@ -7335,9 +7347,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4973213a11c2e1b924b36e0c6688682b5aa4623f8d4eeaa1204c32cee524e6d6" +checksum = "b109fd3a106e079005167e5b0e6f6d2c88bbedec32530837b584791a8b5abf36" dependencies = [ "Inflector", "base64 0.21.7", @@ -7360,9 +7372,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909f4553d0b31bb5b97533a6b64cc321a4eace9112d6efbabcf4408ea1b3f1db" +checksum = "074ef478856a45d5627270fbc6b331f91de9aae7128242d9e423931013fb8a2a" dependencies = [ "chrono", "clap 2.34.0", @@ -7377,9 +7389,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5cc431df6cc1dd964134fa4ec7df765d3af3fae9c2148f96a3c4fb500290633" +checksum = "24a9f32c42402c4b9484d5868ac74b7e0a746e3905d8bfd756e1203e50cbb87e" dependencies = [ "async-trait", "bincode", @@ -7410,9 +7422,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38b040d3a42e8f7d80c4a86bb0d49d7aed663b56b0fe0ae135d2d145fb7ae3a" +checksum = "9d75b803860c0098e021a26f0624129007c15badd5b0bc2fbd9f0e1a73060d3b" dependencies = [ "bincode", "chrono", @@ -7424,9 +7436,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae02622c63943485f0af3d0896626eaf6478e734f0b6bc61c7cc5320963c6e75" +checksum = "b9306ede13e8ceeab8a096bcf5fa7126731e44c201ca1721ea3c38d89bcd4111" dependencies = [ "async-trait", "bincode", @@ -7446,9 +7458,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4867f66e9527fa44451c861c1dc6d9b2a7c7a668d7c6a297cdefbe39f4395b33" +checksum = "03ab2c30c15311b511c0d1151e4ab6bc9a3e080a37e7c6e7c2d96f5784cf9434" dependencies = [ "block-buffer 0.10.4", "bs58 0.4.0", @@ -7471,9 +7483,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168f24d97347b85f05192df58d6be3e3047a4aadc4001bc1b9e711a5ec878eea" +checksum = "c142f779c3633ac83c84d04ff06c70e1f558c876f13358bed77ba629c7417932" dependencies = [ "proc-macro2", "quote", @@ -7483,9 +7495,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0511082fc62f2d086520fff5aa1917c389d8c840930c08ad255ae05952c08a2" +checksum = "121d36ffb3c6b958763312cbc697fbccba46ee837d3a0aa4fc0e90fcb3b884f3" dependencies = [ "env_logger", "lazy_static", @@ -7494,9 +7506,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55a3df105431d25f86f2a7da0cbbde5f54c1f0782ca59367ea4a8037bc6797" +checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" dependencies = [ "log", "solana-sdk", @@ -7504,9 +7516,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddec097ed7572804389195128dbd57958b427829153c6cd8ec3343c86fe3cd22" +checksum = "71e36052aff6be1536bdf6f737c6e69aca9dbb6a2f3f582e14ecb0ddc0cd66ce" dependencies = [ "crossbeam-channel", "gethostname", @@ -7519,9 +7531,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258fa7c29fb7605b8d2ed89aa0d43c640d14f4147ad1f5b3fdad19a1ac145ca5" +checksum = "2a1f5c6be9c5b272866673741e1ebc64b2ea2118e5c6301babbce526fdfb15f4" dependencies = [ "bincode", "clap 3.2.25", @@ -7541,9 +7553,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca422edcf16a6e64003ca118575ea641f7b750f14a0ad28c71dd84f33dcb912a" +checksum = "28acaf22477566a0fbddd67249ea5d859b39bacdb624aff3fadd3c5745e2643c" dependencies = [ "ahash 0.8.11", "bincode", @@ -7570,9 +7582,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc5a636dc75e5c25651e34f7a36afc9ae60d38166687c5b0375abb580ac81a2" +checksum = "c10f4588cefd716b24a1a40dd32c278e43a560ab8ce4de6b5805c9d113afdfa1" dependencies = [ "ark-bn254", "ark-ec", @@ -7625,9 +7637,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf373c3da0387f47fee4c5ed2465a9628b9db026a62211a692a9285aa9251544" +checksum = "fbf0c3eab2a80f514289af1f422c121defb030937643c43b117959d6f1932fb5" dependencies = [ "base64 0.21.7", "bincode", @@ -7653,9 +7665,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b9abc76168d19927561db6a3685b98752bd0961b4ce4f8b7f85ee12238c017" +checksum = "b064e76909d33821b80fdd826e6757251934a52958220c92639f634bea90366d" dependencies = [ "crossbeam-channel", "futures-util", @@ -7678,9 +7690,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7952c5306a0be5f5276448cd20246b31265bfa884f29a077a24303c6a16aeb34" +checksum = "5a90e40ee593f6e9ddd722d296df56743514ae804975a76d47e7afed4e3da244" dependencies = [ "async-mutex", "async-trait", @@ -7705,9 +7717,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4fa0cc66f8e73d769bca2ede3012ba2ef8ab67963e832808665369f2cf81743" +checksum = "66468f9c014992167de10cc68aad6ac8919a8c8ff428dc88c0d2b4da8c02b8b7" dependencies = [ "lazy_static", "num_cpus", @@ -7715,12 +7727,12 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289803796d4ff7b4699504d3ab9e9d9c5205ea3892b2ebe397b377494dbd75d4" +checksum = "c191019f4d4f84281a6d0dd9a43181146b33019627fc394e42e08ade8976b431" dependencies = [ "console", - "dialoguer", + "dialoguer 0.10.4", "log", "num-derive 0.4.2", "num-traits", @@ -7734,9 +7746,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb55a08018776a62ecff52139fbcdab1a7baa4e8f077202be58156e8dde4d5f" +checksum = "36ed4628e338077c195ddbf790693d410123d17dec0a319b5accb4aaee3fb15c" dependencies = [ "async-trait", "base64 0.21.7", @@ -7760,9 +7772,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a8403038f4d6ab65bc7e7afb3afe8d9824c592232553c5cef55cf3de36025d" +checksum = "83c913551faa4a1ae4bbfef6af19f3a5cf847285c05b4409e37c8993b3444229" dependencies = [ "base64 0.21.7", "bs58 0.4.0", @@ -7782,9 +7794,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caca735caf76d51c074c3bacbfe38094bf7f92cfbe7b5b13f3bc4946e64f889" +checksum = "1a47b6bb1834e6141a799db62bbdcf80d17a7d58d7bc1684c614e01a7293d7cf" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -7795,9 +7807,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df43d3a1e1637397ab43cbc216a5a8f977ec8a3cc3f3ae8c3851c83a3255dbcf" +checksum = "580ad66c2f7a4c3cb3244fe21440546bd500f5ecb955ad9826e92a78dded8009" dependencies = [ "assert_matches", "base64 0.21.7", @@ -7850,9 +7862,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c76414183a325038ff020b22c07d1e9d2da0703ddc0244acfed37ee2921d96" +checksum = "1b75d0f193a27719257af19144fdaebec0415d1c9e9226ae4bd29b791be5e9bd" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -7869,9 +7881,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-streamer" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad1bdb955ec6d23a1dbf87e403ff3e610d68616275693125a893d7ed4b2d323" +checksum = "f8476e41ad94fe492e8c06697ee35912cf3080aae0c9e9ac6430835256ccf056" dependencies = [ "async-channel", "bytes", @@ -7902,9 +7914,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc301310ba0755c449a8800136f67f8ad14419b366404629894cd10021495360" +checksum = "d8c02245d0d232430e79dc0d624aa42d50006097c3aec99ac82ac299eaa3a73f" dependencies = [ "bincode", "log", @@ -7917,9 +7929,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb887bd5078ff015e103e9ee54a6713380590efa8ff1804b3a653f07188928c6" +checksum = "67251506ed03de15f1347b46636b45c47da6be75015b4a13f0620b21beb00566" dependencies = [ "async-trait", "bincode", @@ -7941,9 +7953,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0cdfdf63192fb60de094fae8e81159e4e3e9aac9659fe3f9ef0e707023fb32" +checksum = "2d3d36db1b2ab2801afd5482aad9fb15ed7959f774c81a77299fdd0ddcf839d4" dependencies = [ "Inflector", "base64 0.21.7", @@ -7966,9 +7978,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea0d6d8d66e36371577f51c4d1d6192a66f1fa4efe7161a36d94677640dcadb" +checksum = "3a754a3c2265eb02e0c35aeaca96643951f03cee6b376afe12e0cf8860ffccd1" dependencies = [ "async-trait", "solana-connection-cache", @@ -7981,9 +7993,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4c2f531c22ce806b211118be8928a791425f97de4592371fb57b246ed33e34" +checksum = "f44776bd685cc02e67ba264384acc12ef2931d01d1a9f851cb8cdbd3ce455b9e" dependencies = [ "log", "rustc_version 0.4.0", @@ -7997,9 +8009,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d8a6486017e71a3714a8e1a635e17209135cc20535ba9808ccf106d80ff6e8b" +checksum = "25810970c91feb579bd3f67dca215fce971522e42bfd59696af89c5dfebd997c" dependencies = [ "bincode", "log", @@ -8019,9 +8031,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.18.17" +version = "1.18.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513407f88394e437b4ff5aad892bc5bf51a655ae2401e6e63549734d3695c46f" +checksum = "7cbdf4249b6dfcbba7d84e2b53313698043f60f8e22ce48286e6fbe8a17c8d16" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -8048,9 +8060,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" +checksum = "da5d083187e3b3f453e140f292c09186881da8a02a7b5e27f645ee26de3d9cc5" dependencies = [ "byteorder", "combine", @@ -8593,7 +8605,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "sqlx-core", "sqlx-macros", @@ -8602,7 +8614,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "ahash 0.7.6", "atoi", @@ -8658,7 +8670,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "dotenvy", "either", @@ -8676,7 +8688,7 @@ dependencies = [ [[package]] name = "sqlx-rt" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "once_cell", "tokio", @@ -9316,7 +9328,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -9986,7 +9998,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", "twox-hash", "xorf", diff --git a/Cargo.toml b/Cargo.toml index 9860df9a0..2e013feec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,9 +74,9 @@ helium-proto = { git = "https://github.com/helium/proto", branch = "master", fea "services", ] } beacon = { git = "https://github.com/helium/proto", branch = "master" } -solana-client = "1.18" -solana-sdk = "1.18" -solana-program = "1.18" +solana-client = "1.18.26" +solana-sdk = "1.18.26" +solana-program = "1.18.26" spl-token = "3.5.0" reqwest = { version = "0", default-features = false, features = [ "gzip", @@ -122,7 +122,7 @@ tower-http = { version = "0", features = ["trace"] } derive_builder = "0" [patch.crates-io] -sqlx = { git = "https://github.com/helium/sqlx.git", rev = "92a2268f02e0cac6fccb34d3e926347071dbb88d" } +sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } # When attempting to test proto changes without needing to push a branch you can # patch the github url to point to your local proto repo. diff --git a/boost_manager/Cargo.toml b/boost_manager/Cargo.toml index 1a3115a70..07ca4029d 100644 --- a/boost_manager/Cargo.toml +++ b/boost_manager/Cargo.toml @@ -37,11 +37,6 @@ chrono = { workspace = true, features = ["serde"] } metrics = { workspace = true } metrics-exporter-prometheus = { workspace = true } helium-proto = { workspace = true } -helium-crypto = { workspace = true, features = [ - "sqlx-postgres", - "multisig", - "solana", -] } rust_decimal = { workspace = true } rust_decimal_macros = { workspace = true } tonic = { workspace = true } diff --git a/mobile_config_cli/Cargo.toml b/mobile_config_cli/Cargo.toml index f94ee5971..8cd11bfaf 100644 --- a/mobile_config_cli/Cargo.toml +++ b/mobile_config_cli/Cargo.toml @@ -11,7 +11,7 @@ angry-purple-tiger = {version = "1", features = ["helium_crypto"]} anyhow = {workspace = true} base64 = {workspace = true} clap = {workspace = true, features = ["derive", "env"]} -dialoguer = "0.10" +dialoguer = "0.11" futures = {workspace = true} helium-crypto = {workspace = true} helium-proto = {workspace = true}