From 95797fc9957828ce18e5dc2e3accc4a9fa64bee2 Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Mon, 18 Nov 2024 13:48:59 +0200 Subject: [PATCH] Use deployment-info branch --- Cargo.lock | 52 ++++++++++++++++++++----------- Cargo.toml | 4 +-- mobile_config/src/gateway_info.rs | 1 + 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fbcebc3ee..924c277a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1615,11 +1615,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#ad4db785573778069b559f916b9329ab40854700" +source = "git+https://github.com/helium/proto?branch=deployment-info#730e1db74c8fc5c7e878f39760b8fa4598a5dff3" dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "prost", "rand 0.8.5", "rand_chacha 0.3.0", @@ -1788,7 +1788,7 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http 0.2.11", "http-serde", "humantime-serde", @@ -2630,7 +2630,7 @@ dependencies = [ "axum 0.7.4", "bs58 0.4.0", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http 0.2.11", "notify", "serde", @@ -3212,7 +3212,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "hex-literal", "http 0.2.11", "lazy_static", @@ -3794,7 +3794,7 @@ dependencies = [ "h3o", "helium-anchor-gen", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)", "hex", "hex-literal", "itertools", @@ -3818,6 +3818,22 @@ dependencies = [ "url", ] +[[package]] +name = "helium-proto" +version = "0.1.0" +source = "git+https://github.com/helium/proto?branch=deployment-info#730e1db74c8fc5c7e878f39760b8fa4598a5dff3" +dependencies = [ + "bytes", + "prost", + "prost-build", + "serde", + "serde_json", + "strum", + "strum_macros", + "tonic", + "tonic-build", +] + [[package]] name = "helium-proto" version = "0.1.0" @@ -3875,7 +3891,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4291,7 +4307,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http 0.2.11", "humantime-serde", "metrics", @@ -4360,7 +4376,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "hextree", "http 0.2.11", "http-serde", @@ -4402,7 +4418,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http 0.2.11", "http-serde", "humantime-serde", @@ -4444,7 +4460,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http-serde", "humantime-serde", "iot-config", @@ -5032,7 +5048,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "hextree", "http 0.2.11", "http-serde", @@ -5072,7 +5088,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "mobile-config", "prost", "rand 0.8.5", @@ -5108,7 +5124,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http 0.2.11", "http-serde", "humantime-serde", @@ -5152,7 +5168,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "hex-assignments", "hextree", "http-serde", @@ -5836,7 +5852,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -5919,7 +5935,7 @@ dependencies = [ "futures-util", "helium-anchor-gen", "helium-lib", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6558,7 +6574,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=deployment-info)", "humantime-serde", "lazy_static", "metrics", diff --git a/Cargo.toml b/Cargo.toml index 7388ff0ad..222b54532 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,10 +70,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 = "master", features = [ +helium-proto = { git = "https://github.com/helium/proto", branch = "deployment-info", features = [ "services", ] } -beacon = { git = "https://github.com/helium/proto", branch = "master" } +beacon = { git = "https://github.com/helium/proto", branch = "deployment-info" } solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18" diff --git a/mobile_config/src/gateway_info.rs b/mobile_config/src/gateway_info.rs index 30a49b9e4..99ffbc1aa 100644 --- a/mobile_config/src/gateway_info.rs +++ b/mobile_config/src/gateway_info.rs @@ -83,6 +83,7 @@ impl TryFrom for GatewayInfoProto { let metadata = if let Some(metadata) = info.metadata { Some(GatewayMetadataProto { location: hextree::Cell::from_raw(metadata.location)?.to_string(), + deployment_info: None, // TODO }) } else { None