Merge pull request #468 from helium/connor/move-msg-verify

Move MsgVerify from oracles to proto

Author: michaeldjeffrey

Cargo.toml

@@ -10,7 +10,7 @@ name = "helium_proto"
 path = "src/lib.rs"
 
 [workspace]
-members = ["beacon"]
+members = ["beacon", "msg-signature", "msg-signature-macro"]
 
 [workspace.dependencies]
 tonic = "0.14"
@@ -30,9 +30,9 @@ tonic-prost = { workspace = true, optional = true }
 bytes = { workspace = true }
 prost = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
 strum = { version = "0.27", features = ["derive"] }
 strum_macros = "0.27"
+msg-signature = { path = "msg-signature" }
 
 [build-dependencies]
 tonic-prost-build = "0.14"

build.rs

@@ -37,6 +37,7 @@ const MESSAGES: &[&str] = &[
 macro_rules! config {
     ($config:expr) => {
         $config
+            .type_attribute(".", "#[derive(msg_signature::MsgHasSignature)]")
             .type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
             .enum_attribute(
                 ".helium.service_provider",

msg-signature-macro/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "msg-signature-macro"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { version = "2" }
+quote = "1"

msg-signature-macro/src/lib.rs

@@ -0,0 +1,48 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{DeriveInput, parse_macro_input};
+
+#[proc_macro_derive(MsgHasSignature)]
+pub fn msg_signature_derive(input: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(input as DeriveInput);
+    let name = input.ident;
+
+    let has_signature = match &input.data {
+        syn::Data::Struct(data_struct) => match &data_struct.fields {
+            syn::Fields::Named(fields_named) => fields_named
+                .named
+                .iter()
+                .any(|field| field.ident.as_ref().unwrap() == "signature"),
+            _ => false,
+        },
+        _ => false,
+    };
+
+    if has_signature {
+        let expanded = quote! {
+            impl msg_signature::MsgHasSignature for #name {
+                fn signature(&self) -> &[u8] {
+                    &self.signature
+                }
+
+                fn without_signature(&self) -> Self {
+                    let mut clone = self.clone();
+                    clone.signature = vec![];
+                    clone
+                }
+
+                fn set_signature(&mut self, signature: Vec<u8>) {
+                    self.signature = signature;
+                }
+
+                fn clear_signature(&mut self) {
+                    self.signature = vec![];
+                }
+            }
+        };
+
+        return TokenStream::from(expanded);
+    }
+
+    TokenStream::new()
+}

msg-signature/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "msg-signature"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+msg-signature-macro = { path = "../msg-signature-macro" }

msg-signature/src/lib.rs

@@ -0,0 +1,8 @@
+pub use msg_signature_macro::MsgHasSignature;
+
+pub trait MsgHasSignature {
+    fn signature(&self) -> &[u8];
+    fn without_signature(&self) -> Self;
+    fn set_signature(&mut self, signature: Vec<u8>);
+    fn clear_signature(&mut self);
+}