diff --git a/Cargo.lock b/Cargo.lock index ddbef271f..8c921c004 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,17 +1617,17 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#effd56a31ab83a1079c7819cd1f783f4141c9c9b" +source = "git+https://github.com/helium/proto?branch=master#9d1785d58c5db85a28ca511c02f01a26b58811a7" dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "prost", "rand 0.8.5", "rand_chacha 0.3.0", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", ] @@ -1776,7 +1776,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -2618,7 +2618,7 @@ dependencies = [ "axum 0.7.4", "bs58 0.4.0", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http 0.2.11", "notify", "serde", @@ -3200,7 +3200,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "hex-literal", "http 0.2.11", "lazy_static", @@ -3782,7 +3782,7 @@ dependencies = [ "h3o", "helium-anchor-gen", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)", + "helium-proto", "hex", "hex-literal", "itertools", @@ -3809,7 +3809,7 @@ dependencies = [ [[package]] name = "helium-proto" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#effd56a31ab83a1079c7819cd1f783f4141c9c9b" +source = "git+https://github.com/helium/proto?branch=master#9d1785d58c5db85a28ca511c02f01a26b58811a7" dependencies = [ "bytes", "prost", @@ -3822,20 +3822,6 @@ dependencies = [ "tonic-build", ] -[[package]] -name = "helium-proto" -version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#376765fe006051d6dcccf709def58e7ed291b845" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", - "serde_json", - "tonic", - "tonic-build", -] - [[package]] name = "helium-sub-daos" version = "0.1.8" @@ -3877,7 +3863,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4293,7 +4279,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http 0.2.11", "humantime-serde", "metrics", @@ -4362,7 +4348,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -4404,7 +4390,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -4446,7 +4432,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http-serde", "humantime-serde", "iot-config", @@ -5034,7 +5020,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -5074,7 +5060,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "mobile-config", "prost", "rand 0.8.5", @@ -5110,7 +5096,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -5154,7 +5140,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "hex-assignments", "hextree", "http-serde", @@ -5837,7 +5823,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -5920,7 +5906,7 @@ dependencies = [ "futures-util", "helium-anchor-gen", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6036,7 +6022,7 @@ dependencies = [ "custom-tracing", "file-store", "futures", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6553,7 +6539,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)", + "helium-proto", "humantime-serde", "lazy_static", "metrics", @@ -9923,7 +9909,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 2b636c8f6..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 = "map/subscriber-referral", features = [ +helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [ "services", ] } -beacon = { git = "https://github.com/helium/proto", branch = "map/subscriber-referral" } +beacon = { git = "https://github.com/helium/proto", branch = "master" } solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18"