From 5d49fca21a2838a66a6b4b30a686368650f1a8dc Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Thu, 6 Jun 2024 16:33:54 +0100 Subject: [PATCH 1/5] includes bones per share in reward manifest --- src/reward_manifest.proto | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/reward_manifest.proto b/src/reward_manifest.proto index 2edcd701..cf38c366 100644 --- a/src/reward_manifest.proto +++ b/src/reward_manifest.proto @@ -2,10 +2,18 @@ syntax = "proto3"; package helium; +message mobile_reward_data { uint64 bones_per_coverage_point = 1; } + +message iot_reward_data { uint64 bones_per_share = 1; } + message reward_manifest { repeated string written_files = 1; // Unix timestamp in seconds of the start of the inventory period uint64 start_timestamp = 2; // Unix timestamp in seconds of the end of the inventory period uint64 end_timestamp = 3; + oneof reward_data { + mobile_reward_data mobile_reward_data = 4; + iot_reward_data iot_reward_data = 5; + } } From 0e932565dbba9f41fb97da5592d23a60b2d6ed60 Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Thu, 6 Jun 2024 16:50:15 +0100 Subject: [PATCH 2/5] use strings to represent bones per share --- src/reward_manifest.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/reward_manifest.proto b/src/reward_manifest.proto index cf38c366..3cba3437 100644 --- a/src/reward_manifest.proto +++ b/src/reward_manifest.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package helium; -message mobile_reward_data { uint64 bones_per_coverage_point = 1; } +message mobile_reward_data { string bones_per_coverage_point = 1; } -message iot_reward_data { uint64 bones_per_share = 1; } +message iot_reward_data { string bones_per_share = 1; } message reward_manifest { repeated string written_files = 1; From fa739b5cd0a29df5cb2cb62c8dc0db5f2346c22f Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Fri, 7 Jun 2024 10:10:28 +0100 Subject: [PATCH 3/5] add per beacon and witness fields, changes fields to double types until someone yells --- src/reward_manifest.proto | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/reward_manifest.proto b/src/reward_manifest.proto index 3cba3437..24698e6e 100644 --- a/src/reward_manifest.proto +++ b/src/reward_manifest.proto @@ -2,9 +2,12 @@ syntax = "proto3"; package helium; -message mobile_reward_data { string bones_per_coverage_point = 1; } +message mobile_reward_data { double poc_bones_per_coverage_point = 1; } -message iot_reward_data { string bones_per_share = 1; } +message iot_reward_data { + double poc_bones_per_beacon_reward_share = 1; + double poc_bones_per_witness_reward_share = 2; +} message reward_manifest { repeated string written_files = 1; From 7e7e2ebb559d1c73c8e5e6c1b990090aeb2d7a7c Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Fri, 7 Jun 2024 11:20:03 +0100 Subject: [PATCH 4/5] include dc bones per share --- src/reward_manifest.proto | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/reward_manifest.proto b/src/reward_manifest.proto index 24698e6e..24ee44ba 100644 --- a/src/reward_manifest.proto +++ b/src/reward_manifest.proto @@ -2,11 +2,15 @@ syntax = "proto3"; package helium; -message mobile_reward_data { double poc_bones_per_coverage_point = 1; } +message mobile_reward_data { + double poc_bones_per_coverage_point = 1; + double dc_bones_per_share = 2; +} message iot_reward_data { double poc_bones_per_beacon_reward_share = 1; double poc_bones_per_witness_reward_share = 2; + double dc_bones_per_share = 3; } message reward_manifest { From b18e075199b83455e67297f2c2c6264072208a61 Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Fri, 7 Jun 2024 11:30:50 +0100 Subject: [PATCH 5/5] back to string format --- src/reward_manifest.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/reward_manifest.proto b/src/reward_manifest.proto index 24ee44ba..858953aa 100644 --- a/src/reward_manifest.proto +++ b/src/reward_manifest.proto @@ -3,14 +3,14 @@ syntax = "proto3"; package helium; message mobile_reward_data { - double poc_bones_per_coverage_point = 1; - double dc_bones_per_share = 2; + string poc_bones_per_coverage_point = 1; + string dc_bones_per_share = 2; } message iot_reward_data { - double poc_bones_per_beacon_reward_share = 1; - double poc_bones_per_witness_reward_share = 2; - double dc_bones_per_share = 3; + string poc_bones_per_beacon_reward_share = 1; + string poc_bones_per_witness_reward_share = 2; + string dc_bones_per_share = 3; } message reward_manifest {