Feat: multi threaded scheduler (#589)

Co-authored-by: Thorsten Lorenz <thlorenz@gmx.de>
Co-authored-by: Dodecahedr0x <hexadecifish@gmail.com>
Co-authored-by: taco-paco <edwinswatpako@gmail.com>

Author: 4 people

Cargo.lock

@@ -119,11 +119,12 @@ prometheus = "0.13.4"
 # Needs to match https://crates.io/crates/solana-storage-bigtable/2.1.13/dependencies
 prost = "0.11.9"
 protobuf-src = "1.1"
-rand = "0.8.5"
+rand = "0.9"
 reqwest = "0.11"
 # bundled sqlite 3.44
 rusqlite = { version = "0.37.0", features = ["bundled"] }
 rustc_version = "0.4"
+rustc-hash = "2.1"
 scc = "2.4"
 semver = "1.0.22"
 serde = "1.0.217"

Cargo.toml

@@ -63,7 +63,7 @@ log = { workspace = true }
 serde = { workspace = true }
 
 [dev-dependencies]
-rand = "0.9"
+rand = { workspace = true }
 test-kit = { workspace = true }
 reqwest = { workspace = true }
 solana-rpc-client = { workspace = true }

magicblock-aperture/Cargo.toml

@@ -21,9 +21,8 @@ impl HttpDispatcher {
             .min(MAX_DEFAULT_BLOCKS_LIMIT);
         let end_slot = start_slot + limit;
         // Calculate the end slot, ensuring it does not exceed the latest block height.
-        let end_slot = (end_slot).min(self.blocks.block_height());
+        let end_slot = (end_slot).min(self.blocks.block_height() + 1);
 
-        // The range is exclusive of the end slot, so `(start..end)` is correct.
         let slots = (start_slot..end_slot).collect::<Vec<Slot>>();
 
         Ok(ResponsePayload::encode_no_context(&request.id, slots))

magicblock-aperture/src/requests/http/get_blocks_with_limit.rs

@@ -1,7 +1,10 @@
 use std::mem::size_of;
 
 use solana_account::AccountSharedData;
-use solana_account_decoder::parse_token::UiTokenAmount;
+use solana_account_decoder::{
+    parse_account_data::SplTokenAdditionalDataV2,
+    parse_token::token_amount_to_ui_amount_v3,
+};
 
 use super::{
     prelude::*, MINT_DECIMALS_OFFSET, SPL_MINT_RANGE, SPL_TOKEN_AMOUNT_RANGE,
@@ -58,13 +61,14 @@ impl HttpDispatcher {
             u64::from_le_bytes(buffer)
         };
 
-        let ui_amount = (token_amount as f64) / 10f64.powi(decimals as i32);
-        let ui_token_amount = UiTokenAmount {
-            amount: token_amount.to_string(),
-            ui_amount: Some(ui_amount),
-            ui_amount_string: ui_amount.to_string(),
-            decimals,
-        };
+        let ui_token_amount = token_amount_to_ui_amount_v3(
+            token_amount,
+            &SplTokenAdditionalDataV2 {
+                decimals,
+                interest_bearing_config: None,
+                scaled_ui_amount_config: None,
+            },
+        );
 
         let slot = self.blocks.block_height();
         Ok(ResponsePayload::encode(&request.id, ui_token_amount, slot))

magicblock-aperture/src/requests/http/get_token_account_balance.rs

@@ -88,7 +88,7 @@ impl HttpDispatcher {
         Ok(ResponsePayload::encode(
             &request.id,
             Vec::<()>::new(),
-            self.blocks.get_latest().slot,
+            self.blocks.block_height(),
         ))
     }
 
@@ -107,7 +107,7 @@ impl HttpDispatcher {
         Ok(ResponsePayload::encode(
             &request.id,
             supply,
-            self.blocks.get_latest().slot,
+            self.blocks.block_height(),
         ))
     }
 
@@ -124,7 +124,7 @@ impl HttpDispatcher {
         Ok(ResponsePayload::encode(
             &request.id,
             supply,
-            self.blocks.get_latest().slot,
+            self.blocks.block_height(),
         ))
     }
 

magicblock-aperture/src/requests/http/mocked.rs

@@ -15,13 +15,18 @@ impl HttpDispatcher {
         // Airdrops are only supported if a faucet keypair is configured.
         // Which is never the case with *ephemeral* running mode of the validator
         let Some(ref faucet) = self.context.faucet else {
-            return Err(RpcError::invalid_request("method is not supported"));
+            return Err(RpcError::invalid_request(
+                "free airdrop faucet is disabled",
+            ));
         };
 
         let (pubkey, lamports) =
             parse_params!(request.params()?, Serde32Bytes, u64);
         let pubkey = some_or_err!(pubkey);
         let lamports = some_or_err!(lamports);
+        if lamports == 0 {
+            return Err(RpcError::invalid_params("lamports must be > 0"));
+        }
 
         // Build and execute the airdrop transfer transaction.
         let txn = solana_system_transaction::transfer(

magicblock-aperture/src/requests/http/request_airdrop.rs

@@ -52,6 +52,8 @@ fn chainlink(accounts_db: &Arc<AccountsDb>) -> ChainlinkImpl {
 }
 
 mod event_processor {
+    use magicblock_config::consts::DEFAULT_LEDGER_BLOCK_TIME_MS;
+
     use super::*;
     use crate::state::NodeContext;
 
@@ -62,8 +64,8 @@ mod event_processor {
         let env = ExecutionTestEnv::new();
         env.advance_slot();
         let node_context = NodeContext {
-            identity: env.payer.pubkey(),
-            blocktime: 50,
+            identity: env.get_payer().pubkey,
+            blocktime: DEFAULT_LEDGER_BLOCK_TIME_MS,
             ..Default::default()
         };
         let state = SharedState::new(

magicblock-aperture/src/tests.rs

@@ -1,6 +1,5 @@
 use setup::RpcTestEnv;
 use solana_pubkey::Pubkey;
-use test_kit::Signer;
 
 mod setup;
 
@@ -17,7 +16,7 @@ async fn test_get_slot_leaders() {
     assert_eq!(leaders.len(), 1, "should return a single leader");
     assert_eq!(
         leaders[0],
-        env.execution.payer.pubkey(),
+        env.execution.get_payer().pubkey,
         "leader should be the validator's own identity"
     );
 }
@@ -196,7 +195,7 @@ async fn test_get_cluster_nodes() {
     assert_eq!(nodes.len(), 1, "should be exactly one node in the cluster");
     assert_eq!(
         nodes[0].pubkey,
-        env.execution.payer.pubkey().to_string(),
+        env.execution.get_payer().pubkey.to_string(),
         "node pubkey should match validator identity"
     );
 }

magicblock-aperture/tests/mocked.rs

@@ -1,5 +1,4 @@
 use setup::RpcTestEnv;
-use test_kit::Signer;
 
 mod setup;
 
@@ -35,7 +34,7 @@ async fn test_get_identity() {
 
     assert_eq!(
         identity,
-        env.execution.payer.pubkey(),
+        env.execution.get_payer().pubkey,
         "identity should match the validator's public key"
     );
 }