Feature/use delegation rates

contracts/mixnet/src/contract.rs

@@ -55,6 +55,14 @@ fn default_initial_state(owner: Addr) -> State {
             INITIAL_DEFAULT_EPOCH_LENGTH,
             gateway_bond_reward_rate,
         ),
+        mixnode_epoch_delegation_reward: calculate_epoch_reward_rate(
+            INITIAL_DEFAULT_EPOCH_LENGTH,
+            mixnode_delegation_reward_rate,
+        ),
+        gateway_epoch_delegation_reward: calculate_epoch_reward_rate(
+            INITIAL_DEFAULT_EPOCH_LENGTH,
+            gateway_delegation_reward_rate,
+        ),
     }
 }
 

contracts/mixnet/src/queries.rs

@@ -552,6 +552,8 @@ mod tests {
             },
             mixnode_epoch_bond_reward: "1.23".parse().unwrap(),
             gateway_epoch_bond_reward: "4.56".parse().unwrap(),
+            mixnode_epoch_delegation_reward: "7.89".parse().unwrap(),
+            gateway_epoch_delegation_reward: "0.12".parse().unwrap(),
         };
 
         config(deps.as_mut().storage).save(&dummy_state).unwrap();

contracts/mixnet/src/state.rs

@@ -15,4 +15,6 @@ pub struct State {
     // helper values to avoid having to recalculate them on every single payment operation
     pub mixnode_epoch_bond_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
     pub gateway_epoch_bond_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
+    pub mixnode_epoch_delegation_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
+    pub gateway_epoch_delegation_reward: Decimal, // reward per epoch expressed as a decimal like 0.05
 }

contracts/mixnet/src/storage.rs

@@ -47,22 +47,38 @@ pub(crate) fn read_state_params(storage: &dyn Storage) -> StateParams {
     config_read(storage).load().unwrap().params
 }
 
-pub(crate) fn read_mixnode_epoch_reward_rate(storage: &dyn Storage) -> Decimal {
+pub(crate) fn read_mixnode_epoch_bond_reward_rate(storage: &dyn Storage) -> Decimal {
     // same justification as in `read_state_params` for the unwrap
     config_read(storage)
         .load()
         .unwrap()
         .mixnode_epoch_bond_reward
 }
 
-pub(crate) fn read_gateway_epoch_reward_rate(storage: &dyn Storage) -> Decimal {
+pub(crate) fn read_gateway_epoch_bond_reward_rate(storage: &dyn Storage) -> Decimal {
     // same justification as in `read_state_params` for the unwrap
     config_read(storage)
         .load()
         .unwrap()
         .gateway_epoch_bond_reward
 }
 
+pub(crate) fn read_mixnode_epoch_delegation_reward_rate(storage: &dyn Storage) -> Decimal {
+    // same justification as in `read_state_params` for the unwrap
+    config_read(storage)
+        .load()
+        .unwrap()
+        .mixnode_epoch_delegation_reward
+}
+
+pub(crate) fn read_gateway_epoch_delegation_reward_rate(storage: &dyn Storage) -> Decimal {
+    // same justification as in `read_state_params` for the unwrap
+    config_read(storage)
+        .load()
+        .unwrap()
+        .gateway_epoch_delegation_reward
+}
+
 pub fn layer_distribution(storage: &mut dyn Storage) -> Singleton<LayerDistribution> {
     singleton(storage, LAYER_DISTRIBUTION_KEY)
 }
@@ -240,6 +256,17 @@ pub(crate) fn read_mixnode_bond(
     Ok(node.bond_amount.amount)
 }
 
+// currently not used outside tests
+#[cfg(test)]
+pub(crate) fn read_mixnode_delegation(
+    storage: &dyn Storage,
+    identity: &[u8],
+) -> StdResult<cosmwasm_std::Uint128> {
+    let bucket = mixnodes_read(storage);
+    let node = bucket.load(identity)?;
+    Ok(node.total_delegation.amount)
+}
+
 // Gateway-related stuff
 
 pub fn gateways(storage: &mut dyn Storage) -> Bucket<GatewayBond> {
@@ -305,6 +332,17 @@ pub(crate) fn read_gateway_bond(
     Ok(node.bond_amount.amount)
 }
 
+// currently not used outside tests
+#[cfg(test)]
+pub(crate) fn read_gateway_delegation(
+    storage: &dyn Storage,
+    identity: &[u8],
+) -> StdResult<cosmwasm_std::Uint128> {
+    let bucket = gateways_read(storage);
+    let node = bucket.load(identity)?;
+    Ok(node.total_delegation.amount)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;