feat: wrap revealed pk data into struct

anoma · Jul 3, 2024 · b135add · b135add
1 parent eaa6ef8
commit b135add
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/shared/src/block.rs b/shared/src/block.rs
@@ -508,7 +508,7 @@ impl Block {
             .flat_map(|(_, txs)| txs)
             .filter_map(|tx| match &tx.kind {
                 TransactionKind::RevealPk(data) => {
-                    let namada_public_key = data.clone();
+                    let namada_public_key = data.public_key.clone();
 
                     Some((
                         PublicKey::from(namada_public_key.clone()),

diff --git a/shared/src/transaction.rs b/shared/src/transaction.rs
@@ -20,6 +20,13 @@ use crate::block_result::{BlockResult, TxEventStatusCode};
 use crate::checksums::Checksums;
 use crate::id::Id;
 
+// We wrap public key in a struct so we serialize data as object instead of
+// string
+#[derive(Serialize, Debug, Clone)]
+pub struct RevealPkData {
+    pub public_key: PublicKey,
+}
+
 #[derive(Serialize, Debug, Clone)]
 #[serde(untagged)]
 pub enum TransactionKind {
@@ -36,7 +43,7 @@ pub enum TransactionKind {
     InitProposal(InitProposalData),
     MetadataChange(MetaDataChange),
     CommissionChange(CommissionChange),
-    RevealPk(PublicKey),
+    RevealPk(RevealPkData),
     Unknown,
 }
 
@@ -86,10 +93,10 @@ impl TransactionKind {
                 CommissionChange::try_from_slice(data)
                     .expect("Cannot deserialize CommissionChange"),
             ),
-            "tx_reveal_pk" => TransactionKind::RevealPk(
-                PublicKey::try_from_slice(data)
+            "tx_reveal_pk" => TransactionKind::RevealPk(RevealPkData {
+                public_key: PublicKey::try_from_slice(data)
                     .expect("Cannot deserialize PublicKey"),
-            ),
+            }),
             _ => TransactionKind::Unknown,
         }
     }