Merge pull request #4121 from jbencin/fix/issue-4115

Fix: Use `VRFProof::consensus_serialize()`
stacks-network · Dec 7, 2023 · 2c1c777 · 2c1c777
2 parents 9ca75e1 + 396b34b
commit 2c1c777
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 34 deletions.
diff --git a/stackslib/src/chainstate/stacks/transaction.rs b/stackslib/src/chainstate/stacks/transaction.rs
@@ -282,7 +282,7 @@ impl StacksMessageCodec for TransactionPayload {
                         write_next(fd, &(TransactionPayloadID::NakamotoCoinbase as u8))?;
                         write_next(fd, buf)?;
                         write_next(fd, &Value::none())?;
-                        write_next(fd, &vrf_proof.to_bytes().to_vec())?;
+                        write_next(fd, vrf_proof)?;
                     }
                     (Some(recipient), Some(vrf_proof)) => {
                         write_next(fd, &(TransactionPayloadID::NakamotoCoinbase as u8))?;
@@ -293,7 +293,7 @@ impl StacksMessageCodec for TransactionPayload {
                                 "FATAL: failed to encode recipient principal as `optional`",
                             ),
                         )?;
-                        write_next(fd, &vrf_proof.to_bytes().to_vec())?;
+                        write_next(fd, vrf_proof)?;
                     }
                 }
             }
@@ -387,12 +387,7 @@ impl StacksMessageCodec for TransactionPayload {
                 } else {
                     return Err(codec_error::DeserializeError("Failed to parse nakamoto coinbase transaction -- did not receive an optional recipient principal value".to_string()));
                 };
-                let vrf_proof_bytes: Vec<u8> = read_next(fd)?;
-                let Some(vrf_proof) = VRFProof::from_bytes(&vrf_proof_bytes) else {
-                    return Err(codec_error::DeserializeError(
-                        "Failed to decode coinbase VRF proof".to_string(),
-                    ));
-                };
+                let vrf_proof: VRFProof = read_next(fd)?;
                 TransactionPayload::Coinbase(payload, recipient_opt, Some(vrf_proof))
             }
             TransactionPayloadID::TenureChange => {
@@ -2043,11 +2038,6 @@ mod test {
             0x12,
             // no alt recipient, so Value::none
             0x09,
-            // proof bytes length
-            0x00,
-            0x00,
-            0x00,
-            0x50,
             // proof bytes
             0x92,
             0x75,
@@ -2227,11 +2217,6 @@ mod test {
             0x61,
             0x63,
             0x74,
-            // proof bytes length
-            0x00,
-            0x00,
-            0x00,
-            0x50,
             // proof bytes
             0x92,
             0x75,

diff --git a/stackslib/src/core/mempool.rs b/stackslib/src/core/mempool.rs
@@ -43,8 +43,7 @@ use stacks_common::util::{get_epoch_time_ms, get_epoch_time_secs};
 use crate::burnchains::Txid;
 use crate::chainstate::burn::db::sortdb::SortitionDB;
 use crate::chainstate::burn::ConsensusHash;
-use crate::chainstate::nakamoto::NakamotoBlock;
-use crate::chainstate::nakamoto::NakamotoChainState;
+use crate::chainstate::nakamoto::{NakamotoBlock, NakamotoChainState};
 use crate::chainstate::stacks::db::blocks::MemPoolRejection;
 use crate::chainstate::stacks::db::{ClarityTx, StacksChainState};
 use crate::chainstate::stacks::events::StacksTransactionReceipt;

diff --git a/testnet/stacks-node/src/mockamoto.rs b/testnet/stacks-node/src/mockamoto.rs
@@ -68,15 +68,14 @@ use stacks_common::util::hash::{Hash160, MerkleTree, Sha512Trunc256Sum};
 use stacks_common::util::secp256k1::{MessageSignature, SchnorrSignature, Secp256k1PublicKey};
 use stacks_common::util::vrf::{VRFPrivateKey, VRFProof, VRFPublicKey, VRF};
 
+use self::signer::SelfSigner;
 use crate::neon::Counters;
 use crate::neon_node::{
     Globals, PeerThread, RelayerDirective, StacksNode, BLOCK_PROCESSOR_STACK_SIZE,
 };
 use crate::syncctl::PoxSyncWatchdogComms;
 use crate::{Config, EventDispatcher};
 
-use self::signer::SelfSigner;
-
 pub mod signer;
 #[cfg(test)]
 mod tests;

diff --git a/testnet/stacks-node/src/mockamoto/tests.rs b/testnet/stacks-node/src/mockamoto/tests.rs
@@ -1,25 +1,19 @@
 use std::thread;
-use std::time::Duration;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use clarity::vm::costs::ExecutionCost;
 use stacks::chainstate::nakamoto::NakamotoChainState;
 use stacks::chainstate::stacks::db::StacksChainState;
-use stacks_common::types::chainstate::StacksAddress;
-use stacks_common::types::chainstate::StacksPrivateKey;
+use stacks_common::types::chainstate::{StacksAddress, StacksPrivateKey};
 use stacks_common::types::StacksEpochId;
 use stacks_common::util::hash::to_hex;
 
-use crate::config::EventKeyType;
-use crate::config::EventObserverConfig;
+use super::MockamotoNode;
+use crate::config::{EventKeyType, EventObserverConfig};
 use crate::neon_node::PeerThread;
-use crate::tests::make_stacks_transfer;
 use crate::tests::neon_integrations::test_observer;
-use crate::tests::to_addr;
-use crate::Config;
-use crate::ConfigFile;
-
-use super::MockamotoNode;
+use crate::tests::{make_stacks_transfer, to_addr};
+use crate::{Config, ConfigFile};
 
 #[test]
 fn observe_100_blocks() {