From c8ee6e4af2b9caf2ea3d722250994c526e308dad Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Tue, 19 Dec 2023 17:11:15 +0100
Subject: [PATCH] contract/consensus: Avoid unnecessary db key serialization

---
 src/contract/consensus/src/entrypoint.rs       | 18 +++---------------
 .../src/entrypoint/genesis_stake_v1.rs         |  4 ++--
 .../consensus/src/entrypoint/proposal_v1.rs    |  4 ++--
 .../consensus/src/entrypoint/stake_v1.rs       |  4 ++--
 .../src/entrypoint/unstake_request_v1.rs       |  4 ++--
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/contract/consensus/src/entrypoint.rs b/src/contract/consensus/src/entrypoint.rs
index f636d1102..5e33e1028 100644
--- a/src/contract/consensus/src/entrypoint.rs
+++ b/src/contract/consensus/src/entrypoint.rs
@@ -144,26 +144,14 @@ fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
             coin_tree_data.write_u32(0)?;
             coin_tree.encode(&mut coin_tree_data)?;
 
-            db_set(
-                info_db,
-                &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE),
-                &coin_tree_data,
-            )?;
-            db_set(
-                info_db,
-                &serialize(&CONSENSUS_CONTRACT_UNSTAKED_COIN_MERKLE_TREE),
-                &coin_tree_data,
-            )?;
+            db_set(info_db, CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE, &coin_tree_data)?;
+            db_set(info_db, CONSENSUS_CONTRACT_UNSTAKED_COIN_MERKLE_TREE, &coin_tree_data)?;
             info_db
         }
     };
 
     // Update db version
-    db_set(
-        info_db,
-        &serialize(&CONSENSUS_CONTRACT_DB_VERSION),
-        &serialize(&env!("CARGO_PKG_VERSION")),
-    )?;
+    db_set(info_db, CONSENSUS_CONTRACT_DB_VERSION, &serialize(&env!("CARGO_PKG_VERSION")))?;
 
     Ok(())
 }
diff --git a/src/contract/consensus/src/entrypoint/genesis_stake_v1.rs b/src/contract/consensus/src/entrypoint/genesis_stake_v1.rs
index 3420592e5..de987b890 100644
--- a/src/contract/consensus/src/entrypoint/genesis_stake_v1.rs
+++ b/src/contract/consensus/src/entrypoint/genesis_stake_v1.rs
@@ -155,8 +155,8 @@ pub(crate) fn consensus_genesis_stake_process_update_v1(
     merkle_add(
         info_db,
         staked_coin_roots_db,
-        &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_LATEST_COIN_ROOT),
-        &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE),
+        CONSENSUS_CONTRACT_STAKED_COIN_LATEST_COIN_ROOT,
+        CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE,
         &coins,
     )?;
 
diff --git a/src/contract/consensus/src/entrypoint/proposal_v1.rs b/src/contract/consensus/src/entrypoint/proposal_v1.rs
index fee5400e7..3ad21ec58 100644
--- a/src/contract/consensus/src/entrypoint/proposal_v1.rs
+++ b/src/contract/consensus/src/entrypoint/proposal_v1.rs
@@ -240,8 +240,8 @@ pub(crate) fn consensus_proposal_process_update_v1(
     merkle_add(
         info_db,
         staked_coin_roots_db,
-        &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_LATEST_COIN_ROOT),
-        &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE),
+        CONSENSUS_CONTRACT_STAKED_COIN_LATEST_COIN_ROOT,
+        CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE,
         &coins,
     )?;
 
diff --git a/src/contract/consensus/src/entrypoint/stake_v1.rs b/src/contract/consensus/src/entrypoint/stake_v1.rs
index f401c3b84..7db36aa5c 100644
--- a/src/contract/consensus/src/entrypoint/stake_v1.rs
+++ b/src/contract/consensus/src/entrypoint/stake_v1.rs
@@ -193,8 +193,8 @@ pub(crate) fn consensus_stake_process_update_v1(
     merkle_add(
         info_db,
         staked_coin_roots_db,
-        &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_LATEST_COIN_ROOT),
-        &serialize(&CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE),
+        CONSENSUS_CONTRACT_STAKED_COIN_LATEST_COIN_ROOT,
+        CONSENSUS_CONTRACT_STAKED_COIN_MERKLE_TREE,
         &coins,
     )?;
 
diff --git a/src/contract/consensus/src/entrypoint/unstake_request_v1.rs b/src/contract/consensus/src/entrypoint/unstake_request_v1.rs
index d9d1cbe15..259bf66bf 100644
--- a/src/contract/consensus/src/entrypoint/unstake_request_v1.rs
+++ b/src/contract/consensus/src/entrypoint/unstake_request_v1.rs
@@ -184,8 +184,8 @@ pub(crate) fn consensus_unstake_request_process_update_v1(
     merkle_add(
         info_db,
         unstaked_coin_roots_db,
-        &serialize(&CONSENSUS_CONTRACT_UNSTAKED_COIN_LATEST_COIN_ROOT),
-        &serialize(&CONSENSUS_CONTRACT_UNSTAKED_COIN_MERKLE_TREE),
+        CONSENSUS_CONTRACT_UNSTAKED_COIN_LATEST_COIN_ROOT,
+        CONSENSUS_CONTRACT_UNSTAKED_COIN_MERKLE_TREE,
         &coins,
     )?;