diff --git a/Cargo.lock b/Cargo.lock index 6b75519eb..cca63fbcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,11 +1617,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions#151c7fd3f7bd5d1b7ba9954a0c8c5b54b8438f5d" +source = "git+https://github.com/helium/proto?branch=master#942d7f255f647681970e6883e36a0e09530e7ab1" dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "prost", "rand 0.8.5", "rand_chacha 0.3.0", @@ -1791,7 +1791,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -2642,7 +2642,7 @@ dependencies = [ "axum 0.7.4", "bs58 0.4.0", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http 0.2.11", "notify", "serde", @@ -3242,7 +3242,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "hex-literal", "http 0.2.11", "lazy_static", @@ -3855,7 +3855,7 @@ dependencies = [ "h3o", "helium-anchor-gen 0.1.0 (git+https://github.com/helium/helium-anchor-gen.git?branch=main)", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)", + "helium-proto", "hex", "hex-literal", "itertools", @@ -3895,22 +3895,6 @@ dependencies = [ "tonic-build", ] -[[package]] -name = "helium-proto" -version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions#151c7fd3f7bd5d1b7ba9954a0c8c5b54b8438f5d" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", - "serde_json", - "strum", - "strum_macros", - "tonic", - "tonic-build", -] - [[package]] name = "helium-sub-daos" version = "0.1.8" @@ -3961,7 +3945,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4386,7 +4370,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http 0.2.11", "humantime-serde", "metrics", @@ -4455,7 +4439,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -4497,7 +4481,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -4539,7 +4523,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http-serde", "humantime-serde", "iot-config", @@ -5145,7 +5129,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -5185,7 +5169,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "mobile-config", "prost", "rand 0.8.5", @@ -5230,7 +5214,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -5274,7 +5258,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "hex-assignments", "hextree", "http-serde", @@ -5958,7 +5942,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -6041,7 +6025,7 @@ dependencies = [ "futures-util", "helium-anchor-gen 0.1.0 (git+https://github.com/helium/helium-anchor-gen.git)", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6166,7 +6150,7 @@ dependencies = [ "custom-tracing", "file-store", "futures", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6718,7 +6702,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=mj/soft-revert-sp-promotions)", + "helium-proto", "humantime-serde", "lazy_static", "metrics", diff --git a/Cargo.toml b/Cargo.toml index 8a1ee3692..d891570a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,10 +71,10 @@ helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ "disktree", ] } -helium-proto = { git = "https://github.com/helium/proto", branch = "mj/soft-revert-sp-promotions", features = [ +helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [ "services", ] } -beacon = { git = "https://github.com/helium/proto", branch = "mj/soft-revert-sp-promotions" } +beacon = { git = "https://github.com/helium/proto", branch = "master" } solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18"