Feat/675 on chain ouis devaddrs

.gitignore

@@ -11,3 +11,4 @@ flamegraph.*
 
 !/minio/bucket-policy.json
 *.bak
+*settings.toml

Cargo.toml

@@ -67,9 +67,7 @@ helium-crypto = { version = "0.9.2", features = ["multisig", "sqlx-postgres"] }
 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" }
 reqwest = { version = "0", default-features = false, features = [
   "gzip",
@@ -119,13 +117,12 @@ anchor-lang = { git = "https://github.com/madninja/anchor.git", branch = "madnin
 
 # 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']
-# helium-proto = { path = "../proto" }
-# beacon = { path = "../proto/beacon" }
+#
+#[patch.'https://github.com/helium/proto']
+#helium-proto = { path = "../proto" }
 
-# [patch.'https://github.com/helium/proto']
-# helium-proto = { git = "https://www.github.com/helium/proto.git", branch = "bbalser/deprecate-radio-reward-v1" }
+#[patch.'https://github.com/helium/helium-wallet-rs']
+#helium-lib = { path = "../helium-wallet-rs/helium-lib" }

file_store/src/traits/msg_verify.rs

@@ -44,15 +44,14 @@ 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);
 impl_msg_verify!(iot_config::OrgEnableResV1, signature);
 impl_msg_verify!(iot_config::OrgResV1, signature);
 impl_msg_verify!(iot_config::OrgListResV1, signature);
+impl_msg_verify!(iot_config::OrgResV2, signature);
+impl_msg_verify!(iot_config::OrgListResV2, signature);
 impl_msg_verify!(iot_config::RouteStreamReqV1, signature);
 impl_msg_verify!(iot_config::RouteListReqV1, signature);
 impl_msg_verify!(iot_config::RouteGetReqV1, signature);

iot_config/Cargo.toml

@@ -43,6 +43,7 @@ tracing-subscriber = { workspace = true }
 triggered = { workspace = true }
 
 custom-tracing = { path = "../custom_tracing", features = ["grpc"] }
+solana = { path = "../solana" }
 db-store = { path = "../db_store" }
 file-store = { path = "../file_store" }
 poc-metrics = { path = "../metrics" }

iot_config/migrations/20241203190903_solana_net_ids.sql

@@ -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,
+    current_addr_offset NUMERIC NOT NULL
+);

iot_config/migrations/20241203190910_solana_organizations.sql

@@ -0,0 +1,39 @@
+-- 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_organizations (
+    address TEXT PRIMARY KEY,
+    net_id TEXT NOT NULL,
+    authority TEXT NOT NULL,
+    oui BIGINT NOT NULL,
+    escrow_key TEXT NOT NULL,
+    approved BOOLEAN NOT NULL
+);
+
+CREATE OR REPLACE FUNCTION delete_routes_on_solana_organizations_delete() RETURNS trigger AS $$
+BEGIN
+    DELETE FROM routes WHERE routes.oui = OLD.oui;
+    RETURN OLD;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER delete_routes_on_solana_organizations_delete
+AFTER DELETE ON solana_organizations
+FOR EACH ROW
+EXECUTE FUNCTION delete_routes_on_solana_organizations_delete();
+
+CREATE OR REPLACE FUNCTION add_lock_record_on_solana_organizations_insert() RETURNS trigger AS $$
+BEGIN
+    INSERT INTO organization_locks (organization, locked)
+    SELECT sol_org.address, COALESCE(org.locked, TRUE)
+    FROM solana_organizations sol_org
+    LEFT JOIN organizations org ON sol_org.oui = org.oui
+    WHERE sol_org.address = NEW.address;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER add_lock_record_on_solana_organizations_insert
+AFTER INSERT ON solana_organizations
+FOR EACH ROW
+EXECUTE FUNCTION add_lock_record_on_solana_organizations_insert();

iot_config/migrations/20241203190923_solana_organization_devaddr_constraints.sql

@@ -0,0 +1,10 @@
+-- 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_organization_devaddr_constraints (
+    address TEXT PRIMARY KEY,
+    net_id TEXT NOT NULL,
+    organization TEXT NOT NULL,
+    start_addr NUMERIC NOT NULL,
+    end_addr NUMERIC NOT NULL
+)

iot_config/migrations/20241203190936_solana_organization_delegate_keys.sql

@@ -0,0 +1,8 @@
+-- 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_organization_delegate_keys (
+    address TEXT PRIMARY KEY,
+    organization TEXT NOT NULL,
+    delegate TEXT NOT NULL
+);

iot_config/migrations/20241203190945_update_oui_references.sql

@@ -0,0 +1 @@
+ALTER TABLE routes DROP CONSTRAINT IF EXISTS routes_oui_fkey;

iot_config/migrations/20241203193310_add_organization_locks.sql

@@ -0,0 +1,22 @@
+create table organization_locks (
+    organization TEXT PRIMARY KEY NOT NULL,
+    locked BOOL DEFAULT false,
+    inserted_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+select trigger_updated_at('organization_locks');
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT FROM information_schema.tables
+        WHERE table_name = 'solana_organizations'
+    ) THEN
+        INSERT INTO organization_locks (organization, locked)
+            SELECT sol_org.address, org.locked
+            FROM solana_organizations sol_org
+            LEFT JOIN organizations org ON sol_org.oui = org.oui;
+    END IF;
+END;
+$$;

iot_config/pkg/settings-template.toml

@@ -1,5 +1,5 @@
 # log settings for the application (RUST_LOG format). Default below
-# 
+#
 # log = "iot-config=debug,poc_store=info"