Merge pull request #864 from SaitoTech/develop

0.2.31
SaitoTech · Nov 13, 2024 · e186241 · e186241
2 parents 282c446 + 9bb9699
commit e186241
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.30
+0.2.31
diff --git a/saito-core/src/core/consensus/mempool.rs b/saito-core/src/core/consensus/mempool.rs
@@ -289,9 +289,11 @@ impl Mempool {
             return None;
         }
         if !self.blocks_queue.is_empty() {
+            debug!("there are blocks in queue");
             return None;
         }
         if self.transactions.is_empty() || !self.new_tx_added {
+            debug!("there are no transactions in queue");
             return None;
         }
         if !blockchain.is_golden_ticket_count_valid(
@@ -300,7 +302,7 @@ impl Mempool {
             configs.is_browser(),
             configs.is_spv_mode(),
         ) {
-            trace!("waiting till more golden tickets come in");
+            debug!("waiting till more golden tickets come in");
             return None;
         }
 

diff --git a/saito-core/src/core/consensus_thread.rs b/saito-core/src/core/consensus_thread.rs
@@ -123,7 +123,8 @@ impl ConsensusThread {
         }
     }
 
-    pub async fn produce_block(&mut self, timestamp: Timestamp) {
+    pub async fn produce_block(&mut self, timestamp: Timestamp, produce_without_limits: bool) {
+        debug!("producing a block");
         let configs = self.network.config_lock.read().await;
 
         let mut blockchain = self.blockchain_lock.write().await;
@@ -154,7 +155,9 @@ impl ConsensusThread {
         }
 
         let mut block = None;
-        if !configs.is_browser() && !configs.is_spv_mode() && !blockchain.blocks.is_empty() {
+        if (produce_without_limits || (!configs.is_browser() && !configs.is_spv_mode()))
+            && !blockchain.blocks.is_empty()
+        {
             block = mempool
                 .bundle_block(
                     blockchain.deref_mut(),
@@ -164,6 +167,8 @@ impl ConsensusThread {
                     &self.storage,
                 )
                 .await;
+        } else {
+            info!("skipped bundling block");
         }
         if let Some(block) = block {
             debug!(
@@ -278,7 +283,7 @@ impl ProcessEvent<ConsensusEvent> for ConsensusThread {
         // generate blocks
         self.block_producing_timer += duration_value;
         if self.produce_blocks_by_timer && self.block_producing_timer >= BLOCK_PRODUCING_TIMER {
-            self.produce_block(timestamp).await;
+            self.produce_block(timestamp, false).await;
 
             work_done = true;
         }

diff --git a/saito-core/src/core/mining_thread.rs b/saito-core/src/core/mining_thread.rs
@@ -46,8 +46,7 @@ pub struct MiningThread {
 
 impl MiningThread {
     pub async fn mine(&mut self) -> Option<GoldenTicket> {
-        assert!(self.miner_active);
-
+        // assert!(self.miner_active, "Miner is not active");
         if self.public_key == [0; 33] {
             let wallet = self.wallet_lock.read().await;
             if wallet.public_key == [0; 33] {

diff --git a/saito-js/lib/block.ts b/saito-js/lib/block.ts
@@ -295,4 +295,12 @@ export default class Block extends WasmWrapper<WasmBlock> {
         return this.instance.fee_transaction_index;
     }
 
+    public get totalPayoutAtr(): bigint {
+        return this.instance.total_payout_atr;
+    }
+
+    public get avgPayoutMining(): bigint {
+        return this.instance.avg_payout_mining;
+    }
+
 }
diff --git a/saito-wasm/src/saitowasm.rs b/saito-wasm/src/saitowasm.rs
@@ -1150,13 +1150,14 @@ pub async fn write_issuance_file(threshold: Currency) {
 }
 
 #[wasm_bindgen]
-pub async fn disable_bundling_blocks_by_timer() {
+pub async fn disable_producing_blocks_by_timer() {
     let mut saito = SAITO.lock().await;
     saito
         .as_mut()
         .unwrap()
         .consensus_thread
         .produce_blocks_by_timer = false;
+    // saito.as_mut().unwrap().mining_thread.enabled = true;
 }
 #[wasm_bindgen]
 pub async fn produce_block_with_gt() {
@@ -1189,7 +1190,7 @@ pub async fn produce_block_with_gt() {
         .as_mut()
         .unwrap()
         .consensus_thread
-        .produce_block(timestamp)
+        .produce_block(timestamp, true)
         .await;
 }
 
@@ -1206,7 +1207,7 @@ pub async fn produce_block_without_gt() {
         .as_mut()
         .unwrap()
         .consensus_thread
-        .produce_block(timestamp)
+        .produce_block(timestamp, true)
         .await;
 }
 

diff --git a/saito-wasm/src/wasm_block.rs b/saito-wasm/src/wasm_block.rs
@@ -400,6 +400,16 @@ impl WasmBlock {
     pub fn fee_transaction_index(&self) -> u64 {
         self.block.fee_transaction_index
     }
+
+    #[wasm_bindgen(getter = total_payout_atr)]
+    pub fn total_payout_atr(&self) -> u64 {
+        self.block.total_payout_atr
+    }
+
+    #[wasm_bindgen(getter = avg_payout_mining)]
+    pub fn avg_payout_mining(&self) -> u64 {
+        self.block.avg_payout_mining
+    }
 }
 
 impl WasmBlock {