fix: issue #21

Author: jojoin

chain/src/engine/config.rs

@@ -94,7 +94,7 @@ impl EngineConf {
         };
         // setup lowest_fee
         if ini_must(sec_server, "lowest_fee", "").len() > 0 {
-            let lfepr = ini_must_amount(sec_server, "lowest_fee").compress(2, true)
+            let lfepr = ini_must_amount(sec_server, "lowest_fee").compress(2, AmtCpr::Grow)
                 .unwrap().to_238_u64().unwrap() / 166; //  =6024, simple hac trs size
             cnf.lowest_fee_purity = lfepr;
             println!("[Config] Node accepted lowest fee purity {}.", lfepr);
@@ -125,9 +125,9 @@ impl EngineConf {
         if cnf.dmer_enable {
             cnf.dmer_reward_address = ini_must_address(sec_dmer, "reward");
             cnf.dmer_bid_account = ini_must_account(sec_dmer, "bid_password");
-            cnf.dmer_bid_min =  ini_must_amount(sec_dmer, "bid_min").compress(2, true).unwrap();
-            cnf.dmer_bid_max =  ini_must_amount(sec_dmer, "bid_max").compress(2, true).unwrap();
-            cnf.dmer_bid_step = ini_must_amount(sec_dmer, "bid_step").compress(2, true).unwrap();
+            cnf.dmer_bid_min =  ini_must_amount(sec_dmer, "bid_min").compress(2, AmtCpr::Grow).unwrap();
+            cnf.dmer_bid_max =  ini_must_amount(sec_dmer, "bid_max").compress(2, AmtCpr::Grow).unwrap();
+            cnf.dmer_bid_step = ini_must_amount(sec_dmer, "bid_step").compress(2, AmtCpr::Grow).unwrap();
         }
 
         // ok

field/src/core/amount.rs

@@ -22,6 +22,11 @@ pub enum AmtMode {
     BIGINT,
 }
 
+pub enum AmtCpr {
+    Discard,
+    Grow,
+}
+
 
 
 #[derive(Default, Hash, Clone, PartialEq, Eq)]
@@ -618,7 +623,7 @@ impl Amount {
         }
     }
 
-    pub fn compress(&self, btn: usize, upvalue: bool) -> Ret<Amount> {
+    pub fn compress(&self, btn: usize, cpr: AmtCpr) -> Ret<Amount> {
         if self.dist < 0 {
             return errf!("cannot compress negative amount")
         }
@@ -631,7 +636,7 @@ impl Amount {
                 return errf!("amount uint too big to compress")
             }
             let mut numpls = u128::from_be_bytes(add_left_padding(&amt.byte, U128S).try_into().unwrap()) / 10;
-            if upvalue {
+            if let AmtCpr::Grow = cpr {
                 numpls += 1;
             }
             let nbts = drop_left_zero(&numpls.to_be_bytes());

node/src/diamondbid/bidding.rs

@@ -45,7 +45,7 @@ fn check_bidding_step(hnode: Arc<dyn HNode>, engcnf: &EngineConf, pending_height
     if *first_bid_fee > engcnf.dmer_bid_max {
         retry!(10); // my max too low
     }
-    let Ok(first_bid_fee) = first_bid_fee.compress(2, true) else {
+    let Ok(first_bid_fee) = first_bid_fee.compress(2, AmtCpr::Grow) else {
         printerr!("cannot compress fee {} to 4 legnth", &first_bid_fee);
         retry!(10); // move step fail
     };
@@ -70,7 +70,7 @@ fn check_bidding_step(hnode: Arc<dyn HNode>, engcnf: &EngineConf, pending_height
         );
         retry!(10); // move step fail
     };
-    let Ok(mut new_bid_fee) = new_bid_fee.compress(2, true) else {
+    let Ok(mut new_bid_fee) = new_bid_fee.compress(2, AmtCpr::Grow) else {
         printerr!("cannot compress fee {} to 4 legnth", &new_bid_fee);
         retry!(10); // move step fail
     };

node/src/handler/txblock.rs

@@ -28,7 +28,7 @@ async fn handle_new_tx(this: Arc<MsgHandler>, peer: Option<Arc<Peer>>, body: Vec
     if let Err(..) = this.engine.try_execute_tx(txpr) {
         return // tx execute fail
     }
-    if let Err(..) = this.engine.mint_checker().tx_submit(this.engine.as_read(), &txpkg) {
+    if let Err(..) = minter.tx_submit(this.engine.as_read(), &txpkg) {
         return // tx check fail
     }
     // add to tx pool

server/src/api/diamond_miner.rs

@@ -58,9 +58,38 @@ async fn diamondminer_success(State(ctx): State<ApiCtx>, q: Query<Q6396>, body:
         return api_error("diamond prev hash error");
     }
 
-    // create trs
+    // check current highest diamond offer
     let bid_addr = Address::from(cnf.dmer_bid_account.address().clone());
-    let mut tx = TransactionType2::new_by(bid_addr, cnf.dmer_bid_min.clone(), curtimes());
+    let mut bid_offer = cnf.dmer_bid_min.clone();
+    if let Ok(Some(fbtx)) = ctx.hcshnd.txpool().first_at(mint::TXGID_DIAMINT) {
+        let hbfe = fbtx.objc.fee().clone();
+        let mmax = cnf.dmer_bid_max.clone();
+        let step = cnf.dmer_bid_step.clone();
+        if hbfe > mmax {
+            bid_offer = mmax; // higher than my max
+        } else if hbfe > bid_offer {
+            if fbtx.objc.main() == bid_addr {
+                // high is my self
+                bid_offer = hbfe;
+            } else {
+                // my = other high + step
+                if let Ok(new_bid) = hbfe.add_mode_u64(&step) {
+                    bid_offer = new_bid;
+                } else {
+                    println!("[diamond miner error] cannot add fee {} with {}, ", &hbfe, step);
+                }
+            }
+        }
+    }
+    // compress amount
+    if let Ok(new_bid) = bid_offer.compress(2, AmtCpr::Grow) {
+        bid_offer = new_bid;
+    } else {
+        println!("[diamond miner error] cannot compress fee {} to 4 legnth", &bid_offer);
+    };
+
+    // create trs
+    let mut tx = TransactionType2::new_by(bid_addr, bid_offer, curtimes());
     tx.push_action(Box::new(mint)).unwrap();
     tx.fill_sign(&cnf.dmer_bid_account).unwrap();
 

src/version.rs

@@ -1,7 +1,7 @@
 
 
-const HACASH_NODE_VERSION: &str    = "0.2.13";
-const HACASH_NODE_BUILD_TIME: &str = "2025/8/18(1)";
+const HACASH_NODE_VERSION: &str    = "0.2.14";
+const HACASH_NODE_BUILD_TIME: &str = "2025/8/23(1)";
 #[allow(unused)]
 const HACASH_STATE_DB_UPDT: u32    = 3;