Merge pull request #2048 from dusk-network/minimum_stake

execution-core: centralize `MINIMUM_STAKE`
dusk-network · Aug 5, 2024 · fa4ebf1 · fa4ebf1
2 parents 7343706 + 057ed7d
commit fa4ebf1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/consensus/src/user/provisioners.rs b/consensus/src/user/provisioners.rs
@@ -6,6 +6,8 @@
 
 use crate::user::sortition;
 use crate::user::stake::Stake;
+use execution_core::dusk;
+use execution_core::stake::MINIMUM_STAKE;
 use node_data::bls::{PublicKey, PublicKeyBytes};
 use node_data::StepName;
 
@@ -16,8 +18,7 @@ use std::mem;
 
 use super::committee::Committee;
 
-pub const DUSK: u64 = 1_000_000_000;
-const MINIMUM_STAKE: u64 = 1_000 * DUSK;
+pub const DUSK: u64 = dusk(1.0);
 
 #[derive(Clone, Debug)]
 pub struct Provisioners {

diff --git a/contracts/stake/src/lib.rs b/contracts/stake/src/lib.rs
@@ -10,14 +10,11 @@
 
 extern crate alloc;
 
-use execution_core::{dusk, transfer::TRANSFER_CONTRACT, Dusk};
+use execution_core::transfer::TRANSFER_CONTRACT;
 
 mod state;
 use state::StakeState;
 
-/// The minimum amount of Dusk one can stake.
-pub const MINIMUM_STAKE: Dusk = dusk(1_000.0);
-
 static mut STATE: StakeState = StakeState::new();
 
 // Transactions

diff --git a/contracts/stake/src/state.rs b/contracts/stake/src/state.rs
@@ -13,7 +13,7 @@ use execution_core::{
     signatures::bls::PublicKey as BlsPublicKey,
     stake::{
         next_epoch, Stake, StakeAmount, StakeData, StakeEvent, Withdraw, EPOCH,
-        STAKE_CONTRACT, STAKE_WARNINGS,
+        MINIMUM_STAKE, STAKE_CONTRACT, STAKE_WARNINGS,
     },
     transfer::TRANSFER_CONTRACT,
 };

diff --git a/execution-core/src/stake.rs b/execution-core/src/stake.rs
@@ -21,6 +21,8 @@ use crate::{
     ContractId,
 };
 
+use crate::{dusk, Dusk};
+
 /// ID of the genesis stake contract
 pub const STAKE_CONTRACT: ContractId = crate::reserved(0x2);
 
@@ -188,6 +190,9 @@ pub struct StakeEvent {
     pub receiver: Option<WithdrawReceiver>,
 }
 
+/// The minimum amount of Dusk one can stake.
+pub const MINIMUM_STAKE: Dusk = dusk(1_000.0);
+
 /// The representation of a public key's stake.
 ///
 /// A user can stake for a particular `amount` larger in value than the

diff --git a/rusk/src/lib/chain.rs b/rusk/src/lib/chain.rs
@@ -21,8 +21,6 @@ use rusk_abi::VM;
 
 use crate::http::RuesEvent;
 
-pub const MINIMUM_STAKE: Dusk = dusk(1000.0);
-
 #[derive(Debug, Clone, Copy)]
 pub struct RuskTip {
     pub current: [u8; 32],

diff --git a/rusk/tests/services/stake.rs b/rusk/tests/services/stake.rs
@@ -7,6 +7,7 @@
 use std::path::Path;
 use std::sync::{Arc, RwLock};
 
+use execution_core::stake::MINIMUM_STAKE;
 use execution_core::{
     dusk,
     signatures::bls::PublicKey as BlsPublicKey,
@@ -15,7 +16,6 @@ use execution_core::{
 };
 use rand::prelude::*;
 use rand::rngs::StdRng;
-use rusk::node::MINIMUM_STAKE;
 use rusk::{Result, Rusk};
 use std::collections::HashMap;
 use tempfile::tempdir;