Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iot Config service use Helius for on-chain metadata #428

Merged
merged 15 commits into from
Apr 10, 2023
Merged

Iot Config service use Helius for on-chain metadata #428

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
632c8af
iot config helius integration
jeffgrunewald Mar 30, 2023
47e3f68
iot config service to use helius db
jeffgrunewald Mar 31, 2023
0a9a187
Update gateway_service::stream_all_gateways_info to not use stream co…
bbalser Apr 1, 2023
0f0fc54
Adding batching back into gateway_service::stream_all_gateways_info
bbalser Apr 2, 2023
e6143a0
order region query, cleanup some result/option matches
jeffgrunewald Apr 4, 2023
8c6b326
coupling iot config client under service crate
jeffgrunewald Apr 4, 2023
0af4857
add region params resolver to iot config client
jeffgrunewald Apr 4, 2023
47ece4e
swap iot config integrated client for standalone
jeffgrunewald Apr 5, 2023
85ee53e
iot config gateway service uses helium db pool
jeffgrunewald Apr 5, 2023
a432500
Update iot_config/src/client/settings.rs
jeffgrunewald Apr 6, 2023
de56959
specify admin-only api auth better where needed
jeffgrunewald Apr 6, 2023
328c143
implement cleanup nits
jeffgrunewald Apr 8, 2023
8ef0ebd
restore proto dep to master branch
jeffgrunewald Apr 10, 2023
7d7edfe
final format and clippy check after rebase
jeffgrunewald Apr 10, 2023
b0c265b
convert "or's" to "or_else's"
jeffgrunewald Apr 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ members = [
"iot_packet_verifier",
"iot_config",
"price",
"iot_config_client"
]

[workspace.package]
Expand Down Expand Up @@ -55,7 +54,7 @@ sqlx = {version = "0", features = [
"runtime-tokio-rustls"
]}

helium-crypto = {version = "0.6.3", features=["sqlx-postgres", "multisig"]}
helium-crypto = {version = "0.6.8", features=["sqlx-postgres", "multisig"]}
helium-proto = {git = "https://github.com/helium/proto", branch = "master", features = ["services"]}
hextree = "*"
solana-client = "1.14"
Expand Down
62 changes: 30 additions & 32 deletions file_store/src/traits/msg_verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
use crate::{Error, Result};
use helium_crypto::{PublicKey, Verify};
use helium_proto::services::{
iot_config::{
AdminAddKeyReqV1, AdminLoadRegionReqV1, AdminRemoveKeyReqV1, GatewayLocationReqV1,
GatewayRegionParamsReqV1, OrgCreateHeliumReqV1, OrgCreateRoamerReqV1, OrgDisableReqV1,
OrgEnableReqV1, RouteCreateReqV1, RouteDeleteReqV1, RouteGetDevaddrRangesReqV1,
RouteGetEuisReqV1, RouteGetReqV1, RouteListReqV1, RouteStreamReqV1,
RouteUpdateDevaddrRangesReqV1, RouteUpdateEuisReqV1, RouteUpdateReqV1,
SessionKeyFilterGetReqV1, SessionKeyFilterListReqV1, SessionKeyFilterStreamReqV1,
SessionKeyFilterUpdateReqV1,
},
iot_config,
poc_lora::{LoraBeaconReportReqV1, LoraWitnessReportReqV1},
};
use helium_proto::{
Expand Down Expand Up @@ -40,29 +32,35 @@ impl_msg_verify!(SpeedtestReqV1, signature);
impl_msg_verify!(LoraBeaconReportReqV1, signature);
impl_msg_verify!(LoraWitnessReportReqV1, signature);
impl_msg_verify!(DataTransferSessionReqV1, signature);
impl_msg_verify!(OrgCreateHeliumReqV1, signature);
impl_msg_verify!(OrgCreateRoamerReqV1, signature);
impl_msg_verify!(OrgDisableReqV1, signature);
impl_msg_verify!(OrgEnableReqV1, signature);
impl_msg_verify!(RouteStreamReqV1, signature);
impl_msg_verify!(RouteListReqV1, signature);
impl_msg_verify!(RouteGetReqV1, signature);
impl_msg_verify!(RouteCreateReqV1, signature);
impl_msg_verify!(RouteUpdateReqV1, signature);
impl_msg_verify!(RouteDeleteReqV1, signature);
impl_msg_verify!(RouteGetEuisReqV1, signature);
impl_msg_verify!(RouteUpdateEuisReqV1, signature);
impl_msg_verify!(RouteGetDevaddrRangesReqV1, signature);
impl_msg_verify!(RouteUpdateDevaddrRangesReqV1, signature);
impl_msg_verify!(GatewayLocationReqV1, signature);
impl_msg_verify!(GatewayRegionParamsReqV1, signature);
impl_msg_verify!(AdminAddKeyReqV1, signature);
impl_msg_verify!(AdminLoadRegionReqV1, signature);
impl_msg_verify!(AdminRemoveKeyReqV1, signature);
impl_msg_verify!(SessionKeyFilterGetReqV1, signature);
impl_msg_verify!(SessionKeyFilterListReqV1, signature);
impl_msg_verify!(SessionKeyFilterStreamReqV1, signature);
impl_msg_verify!(SessionKeyFilterUpdateReqV1, signature);
impl_msg_verify!(iot_config::OrgCreateHeliumReqV1, signature);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've started pathing these message types here since they will have very similar names between other services (like the mobile config service)

impl_msg_verify!(iot_config::OrgCreateRoamerReqV1, signature);
impl_msg_verify!(iot_config::OrgDisableReqV1, signature);
impl_msg_verify!(iot_config::OrgEnableReqV1, signature);
impl_msg_verify!(iot_config::RouteStreamReqV1, signature);
impl_msg_verify!(iot_config::RouteListReqV1, signature);
impl_msg_verify!(iot_config::RouteGetReqV1, signature);
impl_msg_verify!(iot_config::RouteCreateReqV1, signature);
impl_msg_verify!(iot_config::RouteUpdateReqV1, signature);
impl_msg_verify!(iot_config::RouteDeleteReqV1, signature);
impl_msg_verify!(iot_config::RouteGetEuisReqV1, signature);
impl_msg_verify!(iot_config::RouteUpdateEuisReqV1, signature);
impl_msg_verify!(iot_config::RouteGetDevaddrRangesReqV1, signature);
impl_msg_verify!(iot_config::RouteUpdateDevaddrRangesReqV1, signature);
impl_msg_verify!(iot_config::GatewayLocationReqV1, signature);
impl_msg_verify!(iot_config::GatewayRegionParamsReqV1, signature);
impl_msg_verify!(iot_config::AdminAddKeyReqV1, signature);
impl_msg_verify!(iot_config::AdminLoadRegionReqV1, signature);
impl_msg_verify!(iot_config::AdminRemoveKeyReqV1, signature);
impl_msg_verify!(iot_config::SessionKeyFilterGetReqV1, signature);
impl_msg_verify!(iot_config::SessionKeyFilterListReqV1, signature);
impl_msg_verify!(iot_config::SessionKeyFilterStreamReqV1, signature);
impl_msg_verify!(iot_config::SessionKeyFilterUpdateReqV1, signature);
impl_msg_verify!(iot_config::GatewayInfoReqV1, signature);
impl_msg_verify!(iot_config::GatewayInfoStreamReqV1, signature);
impl_msg_verify!(iot_config::RegionParamsReqV1, signature);
impl_msg_verify!(iot_config::GatewayInfoResV1, signature);
impl_msg_verify!(iot_config::GatewayInfoStreamResV1, signature);
impl_msg_verify!(iot_config::RegionParamsResV1, signature);

#[cfg(test)]
mod test {
Expand Down
5 changes: 3 additions & 2 deletions iot_config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ license.workspace = true
anyhow = {workspace = true}
async-trait = {workspace = true}
base64 = {workspace = true}
chrono = {workspace = true}
clap = {workspace = true}
config = {workspace = true}
db-store = {path = "../db_store"}
Expand All @@ -19,10 +20,11 @@ futures-util = {workspace = true}
helium-crypto = {workspace = true}
helium-proto = {workspace = true}
hextree = {workspace = true}
http = {workspace = true}
http-serde = {workspace = true}
libflate = "1"
metrics = {workspace = true}
metrics-exporter-prometheus = {workspace = true}
node-follower = {path = "../node_follower"}
poc-metrics = {path = "../metrics"}
prost = {workspace = true}
serde = {workspace = true}
Expand All @@ -35,4 +37,3 @@ tonic = {workspace = true}
tracing = {workspace = true}
tracing-subscriber = {workspace = true}
triggered = {workspace = true}
chrono = { workspace = true }
1 change: 1 addition & 0 deletions iot_config/migrations/7_oracle_key_type.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alter type key_type add value 'oracle';
14 changes: 0 additions & 14 deletions iot_config/pkg/settings-template.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,3 @@ max_connections = 20
# Endpoint for metrics. Default below
#
# endpoint = "127.0.0.1:19000"

[follower]

# Local grpc url to node follower for gateway location lookups
#[serde(with = "http_serde::uri", default = "default_url")]
# url = http://127.0.0.1:8080
# Start block to begin streaming followed transactions
block = 0
# Connect timeout for follower in seconds. Default 5
# connect = 5
# RPC timeout for follower in seconds. Default 5
# rpc = 5
# Batch size for gateway stream results. Default 100
# batch = 100
Loading