Construction payloads

Cargo.toml

@@ -14,7 +14,9 @@ indoc = "2.0.5"
 
 [dependencies]
 anyhow = "1.0.86"
+ark-ff = { version = "0.4.2", features = ["parallel", "asm"] }
 axum = { version = "0.7.5", features = ["macros"] }
+bitvec = "1.0.1"
 bs58 = "0.5.1"
 clap = { version = "4.5.11", features = ["derive", "env"] }
 coinbase-mesh = "0.1.1"
@@ -29,13 +31,16 @@ hex = "0.4.3"
 http = "1.1.0"
 http-body-util = "0.1.2"
 mime = "0.3.17"
+mina-curves = { git = "https://github.com/o1-labs/proof-systems", rev = "872c8f2" }
+mina-hasher = { git = "https://github.com/o1-labs/proof-systems", rev = "872c8f2" }
 mina-signer = { git = "https://github.com/o1-labs/proof-systems", rev = "872c8f2" }
 o1-utils = { git = "https://github.com/o1-labs/proof-systems", rev = "872c8f2" }
 paste = "1.0.15"
 pretty_assertions = "1.4.1"
 reqwest = { version = "0.12.5", features = ["json", "blocking"] }
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = { version = "1.0.121" }
+serde_with = { version = "3.12.0", features = ["json"] }
 sha2 = "0.10.8"
 sqlx = { version = "0.8.0", features = ["runtime-tokio", "postgres", "json"] }
 strum = "0.26.3"
@@ -48,4 +53,5 @@ tracing-subscriber = "0.3.18"
 
 [dev-dependencies]
 insta = "1.39.0"
+proptest = "1.6.0"
 tokio = { version = "1.39.2", features = ["full", "test-util"] }

build.rs

@@ -11,7 +11,7 @@ fn main() -> Result<()> {
     .filter_map(|entry_result| match entry_result {
       Ok(entry) => {
         let entry_path = entry.path();
-        if entry_path.is_file() && entry_path.extension().map_or(false, |ext| ext == "graphql") {
+        if entry_path.is_file() && entry_path.extension().is_some_and(|ext| ext == "graphql") {
           Some(entry_path)
         } else {
           None

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-profile = "minimal"
+profile = "default"
 channel = "nightly-2024-09-24"
-components = ["rustfmt", "clippy"]
+components = ["rust-src"]

src/api/construction_derive.rs

@@ -1,10 +1,12 @@
 use anyhow::Result;
 use coinbase_mesh::models::{AccountIdentifier, ConstructionDeriveRequest, ConstructionDeriveResponse};
-use mina_signer::{BaseField, CompressedPubKey};
-use o1_utils::FieldHelpers;
 use serde_json::{json, Value};
 
-use crate::{base58::validate_base58_with_checksum, util::DEFAULT_TOKEN_ID, MinaMesh, MinaMeshError};
+use crate::{
+  signer_utils::{hex_to_compressed_pub_key, validate_base58_with_checksum},
+  util::DEFAULT_TOKEN_ID,
+  MinaMesh, MinaMeshError,
+};
 
 /// https://github.com/MinaProtocol/mina/blob/985eda49bdfabc046ef9001d3c406e688bc7ec45/src/app/rosetta/lib/construction.ml#L162
 impl MinaMesh {
@@ -16,7 +18,7 @@ impl MinaMesh {
     self.validate_network(&request.network_identifier).await?;
 
     // Decode the hex_bytes payload into an address
-    let compressed_pk = to_public_key_compressed(&request.public_key.hex_bytes)?;
+    let compressed_pk = hex_to_compressed_pub_key(&request.public_key.hex_bytes)?;
     let address = compressed_pk.into_address();
 
     // Decode the token ID from metadata (if present)
@@ -38,36 +40,6 @@ impl MinaMesh {
   }
 }
 
-/// Converts a hex string into a compressed public key
-/// https://github.com/MinaProtocol/mina/blob/985eda49bdfabc046ef9001d3c406e688bc7ec45/src/lib/rosetta_coding/coding.ml#L128
-fn to_public_key_compressed(hex: &str) -> Result<CompressedPubKey, MinaMeshError> {
-  if hex.len() != 64 {
-    return Err(MinaMeshError::MalformedPublicKey("Invalid length for hex".to_string()));
-  }
-
-  // Decode the hex string
-  let mut bytes =
-    hex::decode(hex).map_err(|_| MinaMeshError::MalformedPublicKey("Invalid hex encoding".to_string()))?;
-  // Reverse the bytes
-  bytes.reverse();
-
-  // Convert bytes to bits
-  let mut bits: Vec<bool> = bytes.iter().flat_map(|byte| (0 .. 8).rev().map(move |i| (byte >> i) & 1 == 1)).collect();
-
-  // Extract the `is_odd` bit
-  let is_odd = bits.remove(0);
-
-  // Reverse the remaining bits
-  bits.reverse();
-
-  // Create the x-coordinate as a BaseField element
-  let x =
-    BaseField::from_bits(&bits).map_err(|_| MinaMeshError::MalformedPublicKey("Invalid x-coordinate".to_string()))?;
-
-  // Construct the compressed public key
-  Ok(CompressedPubKey { x, is_odd })
-}
-
 /// Decodes the token ID from metadata, or returns a default value if not
 /// present
 fn decode_token_id(metadata: Option<Value>) -> Result<String, MinaMeshError> {

src/api/construction_metadata.rs

@@ -1,14 +1,14 @@
 use anyhow::Result;
 use coinbase_mesh::models::{Amount, ConstructionMetadataRequest, ConstructionMetadataResponse};
 use cynic::QueryBuilder;
-use serde_json::{json, Map, Value};
+use serde_json::{json, Value};
 
 use crate::{
-  base58::validate_base58_with_checksum,
   create_currency,
   graphql::{Block3, PublicKey, QueryConstructionMetadata, QueryConstructionMetadataVariables, TokenId},
+  signer_utils::validate_base58_with_checksum,
   util::{DEFAULT_TOKEN_ID, MINIMUM_USER_COMMAND_FEE},
-  MinaMesh, MinaMeshError,
+  MinaMesh, MinaMeshError, TransactionMetadata,
 };
 
 /// https://github.com/MinaProtocol/mina/blob/985eda49bdfabc046ef9001d3c406e688bc7ec45/src/app/rosetta/lib/construction.ml#L133
@@ -53,32 +53,18 @@ impl MinaMesh {
       .unwrap_or("0".to_string()); // Default to 0 if missing;
 
     // Extract account creation fee
-    let account_creation_fee = response.genesis_constants.account_creation_fee;
+    let account_creation_fee_value = response.genesis_constants.account_creation_fee;
 
     // Calculate suggested fee from best_chain
     let best_chain = response.best_chain.ok_or(MinaMeshError::ChainInfoMissing)?;
     let suggested_fee = self.suggested_fee(best_chain).unwrap_or(MINIMUM_USER_COMMAND_FEE);
 
     // Construct metadata
-    let mut metadata_map = Map::new();
-    metadata_map.insert("sender".to_string(), json!(sender));
-    metadata_map.insert("nonce".to_string(), json!(inferred_nonce));
-    metadata_map.insert("token_id".to_string(), json!(token_id));
-    metadata_map.insert("receiver".to_string(), json!(receiver));
-
-    if let Some(valid_until) = options.get("valid_until").and_then(|v| v.as_str()) {
-      metadata_map.insert("valid_until".to_string(), json!(valid_until));
-    }
-
-    if let Some(memo) = options.get("memo").and_then(|v| v.as_str()) {
-      metadata_map.insert("memo".to_string(), json!(memo));
-    }
-
-    if response.receiver.is_none() {
-      metadata_map.insert("account_creation_fee".to_string(), json!(account_creation_fee));
-    }
-
-    let metadata = json!(metadata_map);
+    let account_creation_fee = response.receiver.is_none().then_some(account_creation_fee_value.0);
+    let valid_until = options.get("valid_until").and_then(|v| v.as_str());
+    let memo = options.get("memo").and_then(|v| v.as_str());
+    let metadata =
+      TransactionMetadata::new(sender, receiver, inferred_nonce, token_id, account_creation_fee, valid_until, memo);
 
     // Construct suggested fee
     let suggested_fee_entry = Amount {
@@ -95,7 +81,7 @@ impl MinaMesh {
       })),
     };
 
-    Ok(ConstructionMetadataResponse { metadata, suggested_fee: Some(vec![suggested_fee_entry]) })
+    Ok(ConstructionMetadataResponse { metadata: metadata.to_json(), suggested_fee: Some(vec![suggested_fee_entry]) })
   }
 
   fn get_field_from_options<'a>(&self, options: &'a Value, field: &'a str) -> Result<&'a str, MinaMeshError> {