From bd6c73417d50b7775f9537e6cc3ce047bf0fa6bc Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Fri, 29 Mar 2019 08:45:56 +0000 Subject: [PATCH] [1.1.0] Serialize Blockfees struct consistenly with grin-wallet (#2717) * ser blockfees consistently with grin-wallet * rustfmt --- servers/src/mining/mine_block.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers/src/mining/mine_block.rs b/servers/src/mining/mine_block.rs index 2d18de2f5c..312dbacaf5 100644 --- a/servers/src/mining/mine_block.rs +++ b/servers/src/mining/mine_block.rs @@ -27,6 +27,7 @@ use crate::chain; use crate::common::types::Error; use crate::core::core::verifier_cache::VerifierCache; use crate::core::core::{Output, TxKernel}; +use crate::core::libtx::secp_ser; use crate::core::{consensus, core, global}; use crate::keychain::{ExtKeychain, Identifier, Keychain}; use crate::pool; @@ -36,8 +37,10 @@ use crate::pool; #[derive(Serialize, Deserialize, Debug, Clone)] pub struct BlockFees { /// fees + #[serde(with = "secp_ser::string_or_u64")] pub fees: u64, /// height + #[serde(with = "secp_ser::string_or_u64")] pub height: u64, /// key id pub key_id: Option,