limit minimum deposit

FindoraNetwork · Oct 22, 2023 · cbdb45e · cbdb45e
1 parent 1788d1b
commit cbdb45e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 14 deletions.
diff --git a/eth/contracts/IRandao.sol b/eth/contracts/IRandao.sol
@@ -6,11 +6,13 @@ interface IRandao {
     event LogCampaignAdded(
         uint256 indexed campaignID,
         address indexed from,
+        uint256 currbNum,
         uint256 indexed bnum,
         uint256 deposit,
         uint16 commitBalkline,
         uint16 commitDeadline,
-        uint256 bountypot
+        uint256 bountypot,
+        uint256 maxParticipant
     );
 
     event LogFollow(
@@ -65,6 +67,7 @@ interface IRandao {
         uint256 bountypot;
         uint32 commitNum;
         uint32 revealsNum;
+        uint256 maxParticipant;
         mapping(address => Consumer) consumers;
         mapping(address => Participant) participants;
         mapping(bytes32 => bool) commitments;
@@ -74,7 +77,8 @@ interface IRandao {
         uint256 _bnum,
         uint256 _deposit,
         uint16 _commitBalkline,
-        uint16 _commitDeadline
+        uint16 _commitDeadline,
+        uint256 _maxTxFee
     ) external payable returns (uint256 _campaignID);
 
     function getCampaign(

diff --git a/eth/contracts/Randao.sol b/eth/contracts/Randao.sol
@@ -60,14 +60,18 @@ contract Randao is IRandao {
         uint256 _bnum,
         uint256 _deposit,
         uint16 _commitBalkline,
-        uint16 _commitDeadline
+        uint16 _commitDeadline,
+        uint256 _maxTxFee
     )
         external
         payable
         timeLineCheck(_bnum, _commitBalkline, _commitDeadline)
         moreThanZero(_deposit)
         returns (uint256 _campaignID)
     {
+        uint256 maxParticipant = _deposit / _maxTxFee / 4;
+        require(maxParticipant > 0, "_deposit is too less!!!");
+
         _campaignID = numCampaigns++;
         Campaign storage c = campaigns[_campaignID];
         c.bnum = _bnum;
@@ -76,14 +80,18 @@ contract Randao is IRandao {
         c.commitDeadline = _commitDeadline;
         c.bountypot = msg.value;
         c.consumers[msg.sender] = Consumer(msg.sender, msg.value);
+        c.maxParticipant = maxParticipant;
+
         emit LogCampaignAdded(
             _campaignID,
             msg.sender,
+            block.number,
             _bnum,
             _deposit,
             _commitBalkline,
             _commitDeadline,
-            msg.value
+            msg.value,
+            maxParticipant
         );
     }
 
@@ -175,11 +183,14 @@ contract Randao is IRandao {
         beBlank(c.participants[msg.sender].commitment)
     {
         if (c.commitments[_hs]) {
-            revert("Already committed to compaign");
+            revert("Already committed to compaign!!!");
+        } else if (c.maxParticipant == 0) {
+            revert("More than maxParticipant!!!");
         } else {
             c.participants[msg.sender] = Participant(0, _hs, 0, false, false);
             c.commitNum++;
             c.commitments[_hs] = true;
+            c.maxParticipant--;
             emit LogCommit(_campaignID, msg.sender, _hs);
         }
     }

diff --git a/randao/src/config.rs b/randao/src/config.rs
@@ -89,16 +89,22 @@ impl Detokenize for CampaignInfo {
 #[derive(clap::Parser, Debug)]
 pub struct Opts {
     /// Config file
-    #[clap(short = 'c', long = "config", default_value = "/tmp/.randao/config/config.json")]
+    #[clap(
+        short = 'c',
+        long = "config",
+        default_value = "/tmp/.randao/config/config.json"
+    )]
     pub config: String,
-    #[clap(short = 'p', long = "campaigns", default_value = "/tmp/.randao/campaigns")]
+    #[clap(
+        short = 'p',
+        long = "campaigns",
+        default_value = "/tmp/.randao/campaigns"
+    )]
     pub campaigns: String,
     #[clap(short = 'k', long = "keys", default_value = "/tmp/.randao/keys")]
     pub keys: String,
     #[clap(short = 'a', long = "is_campagin")]
     pub is_campagin: bool,
-
-
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]

diff --git a/randao/src/lib.rs b/randao/src/lib.rs
@@ -48,9 +48,12 @@ const _FRC20_ADDRESS: u64 = 0x1000;
 pub const BLOCK_TIME: u64 = 16;
 
 lazy_static! {
-    pub static ref RANDAO_CAMPAIGNS: std::sync::Mutex<String> = std::sync::Mutex::new("campaigns/".to_string());
-    pub static ref RANDAO_CONF: std::sync::Mutex<String> = std::sync::Mutex::new("/tmp/.randao/config/config.json".to_string());
-    pub static ref RANDAO_KEYS: std::sync::Mutex<String> = std::sync::Mutex::new("keys/".to_string());
+    pub static ref RANDAO_CAMPAIGNS: std::sync::Mutex<String> =
+        std::sync::Mutex::new("campaigns/".to_string());
+    pub static ref RANDAO_CONF: std::sync::Mutex<String> =
+        std::sync::Mutex::new("/tmp/.randao/config/config.json".to_string());
+    pub static ref RANDAO_KEYS: std::sync::Mutex<String> =
+        std::sync::Mutex::new("keys/".to_string());
 }
 
 lazy_static! {

diff --git a/randao/src/utils.rs b/randao/src/utils.rs
@@ -92,8 +92,7 @@ pub fn check_campaign_info(
 
     println!("{:?}, block_number :{:?}", campaign_info, block_number);
 
-    if campaign_info.deposit.as_u128() == 0 
-    {
+    if campaign_info.deposit.as_u128() == 0 {
         println!("check_campaign_info err 2");
         return false;
     }