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.

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

Feat/675 on chain ouis devaddrs #909

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6b001b0
Rename tables to temp and update read sql
bryzettler Sep 11, 2024
9ea6c12
gitignore
bryzettler Sep 12, 2024
a250645
rm migrations for clean db slate
bryzettler Sep 12, 2024
d36b034
Reads refactored and working
bryzettler Sep 12, 2024
707f31e
cargo
bryzettler Nov 8, 2024
83e6966
remove unused update_payer and opt for not defaulting locked
bryzettler Sep 17, 2024
351a0c1
conflicts
bryzettler Nov 8, 2024
04f6a73
conflicts
bryzettler Nov 8, 2024
9c49421
conflicts
bryzettler Nov 8, 2024
d068ff6
fix lock file
bryzettler Nov 8, 2024
12bc361
cargo build
bryzettler Nov 8, 2024
9afae96
remove legacy code
bryzettler Nov 20, 2024
eb95520
Added migation for payer => escrow_key and swaped out all instances o…
bryzettler Nov 22, 2024
dd34010
escrow_key logic change and tests pasting for iot_config
bryzettler Dec 3, 2024
c9b28b8
add test table migrations and trigger
bryzettler Dec 3, 2024
d09ae0e
update migration timestamp
bryzettler Dec 3, 2024
73b6212
add triggers to solana_organization table
bryzettler Dec 3, 2024
24affd2
update DevAddrEuiValidator logic
bryzettler Dec 4, 2024
531a64e
Fix toggling of locked
bryzettler Dec 4, 2024
4aeb2c2
pass payer as string for escrow_key
bryzettler Dec 6, 2024
72eb9cd
remove cargo patches
bryzettler Dec 6, 2024
f04628d
self review
bryzettler Dec 6, 2024
a4dc309
clippy
bryzettler Dec 6, 2024
34637ae
pr feedback
bryzettler Dec 10, 2024
ec61111
use V2 of org proto
bryzettler Dec 11, 2024
54e8ee5
update from helium-lib pr feedback
bryzettler Dec 20, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ flamegraph.*

!/minio/bucket-policy.json
*.bak
*settings.toml
99 changes: 72 additions & 27 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,13 @@ 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 = [
"services",
] }
helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = ["services"] }
beacon = { git = "https://github.com/helium/proto", branch = "master" }
solana-client = "1.18"
solana-sdk = "1.18"
solana-program = "1.18"
spl-token = "3.5.0"
spl-associated-token-account = "1.1.1"
reqwest = { version = "0", default-features = false, features = [
"gzip",
"json",
Expand Down Expand Up @@ -128,10 +127,11 @@ sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df65

# 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.
#
#
# Patching for beacon must point directly to the crate, it will not look in the
# repo for sibling crates.
#
# [patch.'https://github.com/helium/proto']
#
#[patch.'https://github.com/helium/proto']
# helium-proto = { path = "../proto" }
# beacon = { path = "../proto/beacon" }

3 changes: 0 additions & 3 deletions file_store/src/traits/msg_verify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ impl_msg_verify!(LoraStreamSessionInitV1, signature);
impl_msg_verify!(DataTransferSessionReqV1, signature);
impl_msg_verify!(CoverageObjectReqV1, signature);
impl_msg_verify!(ServiceProviderBoostedRewardsBannedRadioReqV1, signature);
impl_msg_verify!(iot_config::OrgCreateHeliumReqV1, signature);
impl_msg_verify!(iot_config::OrgCreateRoamerReqV1, signature);
impl_msg_verify!(iot_config::OrgUpdateReqV1, signature);
impl_msg_verify!(iot_config::OrgDisableReqV1, signature);
impl_msg_verify!(iot_config::OrgEnableReqV1, signature);
impl_msg_verify!(iot_config::OrgDisableResV1, signature);
Expand Down
6 changes: 5 additions & 1 deletion iot_config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ db-store = { path = "../db_store" }
file-store = { path = "../file_store" }
futures = { workspace = true }
futures-util = { workspace = true }
helium-crypto = { workspace = true, features = ["sqlx-postgres"] }
helium-crypto = { workspace = true, features = ["sqlx-postgres", "solana"] }
helium-proto = { workspace = true }
helium-anchor-gen = { workspace = true }
hextree = { workspace = true }
http = { workspace = true }
http-serde = { workspace = true }
Expand All @@ -44,6 +45,9 @@ triggered = { workspace = true }
task-manager = { path = "../task_manager" }
humantime-serde = { workspace = true }
custom-tracing = { path = "../custom_tracing", features = ["grpc"] }
solana = { path = "../solana" }
solana-sdk = { workspace = true }
rust_decimal = { workspace = true }

[dev-dependencies]
rand = { workspace = true }
Expand Down
9 changes: 9 additions & 0 deletions iot_config/migrations/20241203190903_solana_net_ids.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-- Migration here solely for testing purposes
-- An instance of account-postgres-sink
-- Will alter this table depending on an on-chain struct
CREATE TABLE IF NOT EXISTS solana_net_ids (
address TEXT PRIMARY KEY,
id INTEGER NOT NULL,
authority TEXT NOT NULL,
macpie marked this conversation as resolved.
Show resolved Hide resolved
current_addr_offset NUMERIC NOT NULL
macpie marked this conversation as resolved.
Show resolved Hide resolved
);
Loading
Loading