From b2bf897bd7671783b97b4a1408477878cd5ffd47 Mon Sep 17 00:00:00 2001 From: Macpie Date: Thu, 12 Sep 2024 14:03:27 -0700 Subject: [PATCH 1/8] Start on radio_location_estimates --- src/service/poc_mobile.proto | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index 0e95ffb2..efcc139c 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -891,3 +891,30 @@ message verified_subscriber_verified_mapping_event_ingest_report_v1 { // Timestamp in milliseconds since unix epoch uint64 timestamp = 3; } + +enum EventType { + TOWER = 1; + DISCO_MAPPING = 2; + VERIFICATION_MAPPING = 3; +} + +message rle_event_v1 { + EventType type = 1; + uint64 timestamp = 2; +} + +message radio_location_estimate_v1 { + uint32 radius = 1; + uint32 confidence = 2; + repeated rle_event_v1 events = 3; +} + +message radio_location_estimates_v1 { + string radio_id = 1; + repeated radio_location_estimate_v1 estimates = 2; + // unix epoch timestamp in seconds + uint64 timestamp = 3; + // pubkey binary of the signing keypair + bytes signer = 4; + bytes signature = 5; +} From 4e6ad44e13b868dc3898706c9244c32d2e15c532 Mon Sep 17 00:00:00 2001 From: Macpie Date: Thu, 12 Sep 2024 14:48:22 -0700 Subject: [PATCH 2/8] Remove event type --- src/service/poc_mobile.proto | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index efcc139c..fbcf1c5e 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -892,14 +892,8 @@ message verified_subscriber_verified_mapping_event_ingest_report_v1 { uint64 timestamp = 3; } -enum EventType { - TOWER = 1; - DISCO_MAPPING = 2; - VERIFICATION_MAPPING = 3; -} - message rle_event_v1 { - EventType type = 1; + string id = 1; uint64 timestamp = 2; } From e3719aa1b9529781e5b53336e641ab509e2b5caa Mon Sep 17 00:00:00 2001 From: Macpie Date: Fri, 13 Sep 2024 15:12:42 -0700 Subject: [PATCH 3/8] Add submit_radio_location_estimates api --- src/service/poc_mobile.proto | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index fbcf1c5e..a8f185e2 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -347,6 +347,8 @@ service poc_mobile { returns (subscriber_verified_mapping_event_res_v1); rpc submit_promotion_reward(promotion_reward_req_v1) returns (promotion_reward_resp_v1); + rpc submit_radio_location_estimates(radio_location_estimates_req_v1) + returns (radio_location_estimates_resp_v1); } message file_info { @@ -903,7 +905,7 @@ message radio_location_estimate_v1 { repeated rle_event_v1 events = 3; } -message radio_location_estimates_v1 { +message radio_location_estimates_req_v1 { string radio_id = 1; repeated radio_location_estimate_v1 estimates = 2; // unix epoch timestamp in seconds @@ -912,3 +914,5 @@ message radio_location_estimates_v1 { bytes signer = 4; bytes signature = 5; } + +message radio_location_estimates_resp_v1 { string id = 1; } \ No newline at end of file From 7af16771ac00765b4633fc3f90e54352d89c6763 Mon Sep 17 00:00:00 2001 From: Macpie Date: Tue, 17 Sep 2024 12:11:53 -0700 Subject: [PATCH 4/8] Update radius and confidence to Decimal --- src/service/poc_mobile.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index a8f185e2..ac5e8fc6 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -900,8 +900,8 @@ message rle_event_v1 { } message radio_location_estimate_v1 { - uint32 radius = 1; - uint32 confidence = 2; + Decimal radius = 1; + Decimal confidence = 2; repeated rle_event_v1 events = 3; } From dd7fa96e1eb92b7c1c81a7fcaf1651fba095614f Mon Sep 17 00:00:00 2001 From: Macpie Date: Tue, 1 Oct 2024 11:00:22 -0700 Subject: [PATCH 5/8] Add reports --- src/service/poc_mobile.proto | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index ac5e8fc6..00677bb6 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -901,6 +901,7 @@ message rle_event_v1 { message radio_location_estimate_v1 { Decimal radius = 1; + // TODO: lat long Decimal confidence = 2; repeated rle_event_v1 events = 3; } @@ -911,8 +912,26 @@ message radio_location_estimates_req_v1 { // unix epoch timestamp in seconds uint64 timestamp = 3; // pubkey binary of the signing keypair - bytes signer = 4; + bytes carrier_key = 4; bytes signature = 5; } -message radio_location_estimates_resp_v1 { string id = 1; } \ No newline at end of file +message radio_location_estimates_resp_v1 { string id = 1; } + +message radio_location_estimates_ingest_report_v1 { + // unix epoch timestamp in seconds + uint64 received_timestamp = 1; + radio_location_estimates_req_v1 report = 2; +} + +enum radio_location_estimates_verification_status { + radio_location_estimates_verification_status_valid = 0; + radio_location_estimates_verification_status_invalid_key = 1; +} + +message verified_radio_location_estimates_report_v1 { + radio_location_estimates_ingest_report_v1 report = 1; + radio_location_estimates_verification_status status = 2; + // unix epoch timestamp in seconds + uint64 timestamp = 3; +} From 571c0781bf2c06db375a3ff9f837cc94fd11053d Mon Sep 17 00:00:00 2001 From: Macpie Date: Wed, 2 Oct 2024 15:07:56 -0700 Subject: [PATCH 6/8] Add lat long to estimates --- src/service/poc_mobile.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index 00677bb6..1c31af2e 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -901,9 +901,10 @@ message rle_event_v1 { message radio_location_estimate_v1 { Decimal radius = 1; - // TODO: lat long - Decimal confidence = 2; - repeated rle_event_v1 events = 3; + Decimal lat = 2; + Decimal long = 3; + Decimal confidence = 4; + repeated rle_event_v1 events = 5; } message radio_location_estimates_req_v1 { From 4cefc5d337a4dddebd3fa3896b3c29f12e86f1ef Mon Sep 17 00:00:00 2001 From: Macpie Date: Mon, 14 Oct 2024 10:15:59 -0700 Subject: [PATCH 7/8] Make radio_id into entity so we can make diff between wifi and cbrs --- src/service/poc_mobile.proto | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index 1c31af2e..c3c16988 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -908,13 +908,16 @@ message radio_location_estimate_v1 { } message radio_location_estimates_req_v1 { - string radio_id = 1; - repeated radio_location_estimate_v1 estimates = 2; + oneof entity { + string cbrs_id = 1; + bytes wifi_pub_key = 2; + } + repeated radio_location_estimate_v1 estimates = 3; // unix epoch timestamp in seconds - uint64 timestamp = 3; + uint64 timestamp = 4; // pubkey binary of the signing keypair - bytes carrier_key = 4; - bytes signature = 5; + bytes carrier_key = 5; + bytes signature = 6; } message radio_location_estimates_resp_v1 { string id = 1; } From 289b2095198b63ed5fb7e69dea1c3b8e1a1cb991 Mon Sep 17 00:00:00 2001 From: Macpie Date: Wed, 16 Oct 2024 16:46:42 -0700 Subject: [PATCH 8/8] change long to lon --- src/service/poc_mobile.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index c3c16988..f8b7880e 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -902,7 +902,7 @@ message rle_event_v1 { message radio_location_estimate_v1 { Decimal radius = 1; Decimal lat = 2; - Decimal long = 3; + Decimal lon = 3; Decimal confidence = 4; repeated rle_event_v1 events = 5; }