feat!: aggregate v2 receipts into v2 rav

justfile

@@ -0,0 +1,11 @@
+fmt:
+    cargo +nightly fmt
+
+clippy:
+    cargo +nightly clippy --all-targets --all-features
+
+build:
+    cargo build
+
+test:
+    cargo nextest run

tap_aggregator/Cargo.toml

@@ -39,7 +39,7 @@ tokio.workspace = true
 tonic = { version = "0.12.3", features = ["transport", "zstd"] }
 tower = { version = "0.5.2", features = ["util", "steer"] }
 tracing-subscriber = "0.3.17"
-tap_graph = { version = "0.2.0", path = "../tap_graph" }
+tap_graph = { version = "0.2.0", path = "../tap_graph", features = ["v2"] }
 
 [build-dependencies]
 tonic-build = "0.12.3"

tap_aggregator/build.rs

@@ -6,6 +6,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let out_dir = std::env::var("OUT_DIR").expect("OUT_DIR not set by Cargo");
     println!("OUT_DIR: {}", out_dir); // This should print the output directory
 
-    tonic_build::compile_protos("./proto/tap_aggregator.proto")?;
+    tonic_build::configure().compile_protos(
+        &[
+            "proto/uint128.proto",
+            "proto/tap_aggregator.proto",
+            "proto/v2.proto",
+        ],
+        &["proto"],
+    )?;
+
     Ok(())
 }

tap_aggregator/proto/tap_aggregator.proto

@@ -4,11 +4,13 @@
 syntax = "proto3";
 package tap_aggregator.v1;
 
+import "uint128.proto";
+
 message Receipt {
   bytes allocation_id = 1;
   uint64 timestamp_ns = 2;
   uint64 nonce = 3;
-  Uint128 value = 4;
+  grpc.uint128.Uint128 value = 4;
 }
 
 message SignedReceipt {
@@ -19,7 +21,7 @@ message SignedReceipt {
 message ReceiptAggregateVoucher {
   bytes allocation_id = 1;
   uint64 timestamp_ns = 2;
-  Uint128 value_aggregate = 3;
+  grpc.uint128.Uint128 value_aggregate = 3;
 }
 
 message SignedRav {
@@ -39,10 +41,3 @@ message RavResponse {
 service TapAggregator {
   rpc AggregateReceipts(RavRequest) returns (RavResponse);
 }
-
-message Uint128 {
-  // Highest 64 bits of a 128 bit number.
-  uint64 high = 1;
-  // Lowest 64 bits of a 128 bit number.
-  uint64 low = 2;
-}

tap_aggregator/proto/uint128.proto

@@ -0,0 +1,12 @@
+// Copyright 2023-, Semiotic AI, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+syntax = "proto3";
+package grpc.uint128;
+
+message Uint128 {
+  // Highest 64 bits of a 128 bit number.
+  uint64 high = 1;
+  // Lowest 64 bits of a 128 bit number.
+  uint64 low = 2;
+}

tap_aggregator/proto/v2.proto

@@ -0,0 +1,51 @@
+// Copyright 2023-, Semiotic AI, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+syntax = "proto3";
+package tap_aggregator.v2;
+
+import "uint128.proto";
+
+message Receipt {
+  bytes allocation_id = 1;
+  bytes payer = 2;
+  bytes data_service = 3;
+  bytes service_provider = 4;
+  uint64 timestamp_ns = 5;
+  uint64 nonce = 6;
+  grpc.uint128.Uint128 value = 7;
+}
+
+message SignedReceipt {
+  Receipt message = 1;
+  bytes signature = 2;
+}
+
+message ReceiptAggregateVoucher {
+  bytes allocation_id = 1;
+  bytes payer = 2;
+  bytes data_service = 3;
+  bytes service_provider = 4;
+  uint64 timestamp_ns = 5;
+  grpc.uint128.Uint128 value_aggregate = 6;
+  bytes metadata = 7;
+}
+
+message SignedRav {
+  ReceiptAggregateVoucher message = 1;
+  bytes signature = 2;
+}
+
+message RavRequest {
+  repeated SignedReceipt receipts = 1;
+  optional SignedRav previous_rav = 2;
+}
+
+message RavResponse {
+  SignedRav rav = 1;
+}
+
+service TapAggregator {
+  rpc AggregateReceipts(RavRequest) returns (RavResponse);
+}
+