Merge pull request #1401 from mintlayer/feature/mempool-feerate-points

Add mempool RPC for fetching feerate points
mintlayer · Jan 5, 2024 · 768351b · 768351b
2 parents 4fe66bb + 767437a
commit 768351b
Show file tree

Hide file tree

Showing 46 changed files with 1,101 additions and 168 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api-server/api-server-common/Cargo.toml b/api-server/api-server-common/Cargo.toml
@@ -13,6 +13,7 @@ crypto = { path = '../../crypto/' }
 logging = { path = '../../logging'}
 pos_accounting = { path = '../../pos_accounting' }
 serialization = { path = "../../serialization" }
+mempool = { path = "../../mempool" }
 
 async-trait.workspace = true
 bb8-postgres = "0.8"

diff --git a/api-server/scanner-lib/Cargo.toml b/api-server/scanner-lib/Cargo.toml
@@ -17,6 +17,7 @@ pos_accounting = { path = "../../pos_accounting" }
 utils = { path = "../../utils" }
 tx-verifier = { path = "../../chainstate/tx-verifier" }
 constraints-value-accumulator = { path = "../../chainstate/constraints-value-accumulator" }
+mempool = { path = "../../mempool" }
 
 async-trait.workspace = true
 thiserror.workspace = true

diff --git a/api-server/scanner-lib/src/sync/remote_node.rs b/api-server/scanner-lib/src/sync/remote_node.rs
@@ -18,6 +18,7 @@ use common::{
     chain::{Block, GenBlock},
     primitives::{BlockHeight, Id},
 };
+use mempool::FeeRate;
 use node_comm::{
     node_traits::NodeInterface,
     rpc_client::{NodeRpcClient, NodeRpcError},
@@ -39,6 +40,8 @@ pub trait RemoteNode {
         from: BlockHeight,
         max_count: usize,
     ) -> Result<Vec<Block>, Self::Error>;
+
+    async fn mempool_feerate_points(&self) -> Result<Vec<(usize, FeeRate)>, Self::Error>;
 }
 
 #[async_trait::async_trait]
@@ -63,4 +66,8 @@ impl RemoteNode for NodeRpcClient {
     ) -> Result<Vec<Block>, Self::Error> {
         self.get_mainchain_blocks(from, max_count).await
     }
+
+    async fn mempool_feerate_points(&self) -> Result<Vec<(usize, FeeRate)>, Self::Error> {
+        self.mempool_get_fee_rate_points().await
+    }
 }
diff --git a/api-server/scanner-lib/src/sync/tests.rs b/api-server/scanner-lib/src/sync/tests.rs
@@ -15,6 +15,7 @@
 
 use crate::blockchain_state::BlockchainState;
 
+use mempool::FeeRate;
 use serialization::Encode;
 
 use super::*;
@@ -169,6 +170,13 @@ impl RemoteNode for MockRemoteNode {
             .get_mainchain_blocks(from, max_count)
             .unwrap())
     }
+
+    async fn mempool_feerate_points(&self) -> Result<Vec<(usize, FeeRate)>, Self::Error> {
+        Ok(vec![(
+            1,
+            FeeRate::from_amount_per_kb(Amount::from_atoms(1)),
+        )])
+    }
 }
 
 fn create_chain(

diff --git a/api-server/stack-test-suite/Cargo.toml b/api-server/stack-test-suite/Cargo.toml
@@ -17,6 +17,7 @@ serialization = { path = "../../serialization" }
 utils = { path = "../../utils" }
 pos_accounting = {path = '../../pos_accounting'}
 node-comm = { path = "../../wallet/wallet-node-client" }
+mempool = { path = "../../mempool" }
 
 async-trait.workspace = true
 axum.workspace = true

diff --git a/api-server/stack-test-suite/tests/in_memory.rs b/api-server/stack-test-suite/tests/in_memory.rs
@@ -16,20 +16,29 @@
 mod v1;
 
 use api_server_common::storage::impls::in_memory::transactional::TransactionalApiServerInMemoryStorage;
-use api_web_server::{api::web_server, ApiServerWebServerState, TxSubmitClient};
-use common::chain::{config::create_unit_test_config, SignedTransaction};
-use std::{net::TcpListener, sync::Arc};
+use api_web_server::{api::web_server, ApiServerWebServerState, CachedValues, TxSubmitClient};
+use common::{
+    chain::{config::create_unit_test_config, SignedTransaction},
+    primitives::time::get_time,
+};
+use mempool::FeeRate;
+use node_comm::rpc_client::NodeRpcError;
+use std::{
+    net::TcpListener,
+    sync::{Arc, RwLock},
+};
 
 struct DummyRPC {}
 
 #[async_trait::async_trait]
 impl TxSubmitClient for DummyRPC {
-    async fn submit_tx(
-        &self,
-        _: SignedTransaction,
-    ) -> Result<(), node_comm::rpc_client::NodeRpcError> {
+    async fn submit_tx(&self, _: SignedTransaction) -> Result<(), NodeRpcError> {
         Ok(())
     }
+
+    async fn get_feerate_points(&self) -> Result<Vec<(usize, FeeRate)>, NodeRpcError> {
+        Ok(vec![])
+    }
 }
 
 pub async fn spawn_webserver(url: &str) -> (tokio::task::JoinHandle<()>, reqwest::Response) {
@@ -44,11 +53,15 @@ pub async fn spawn_webserver(url: &str) -> (tokio::task::JoinHandle<()>, reqwest
             ApiServerWebServerState {
                 db: Arc::new(storage),
                 chain_config: Arc::clone(&chain_config),
-                rpc: Some(Arc::new(DummyRPC {})),
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await.unwrap();
+        web_server(listener, web_server_state, true).await.unwrap();
     });
 
     // Given that the listener port is open, this will block until a

diff --git a/api-server/stack-test-suite/tests/v1/address.rs b/api-server/stack-test-suite/tests/v1/address.rs
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::sync::RwLock;
+
+use api_web_server::CachedValues;
+use common::primitives::time::get_time;
+
 use crate::DummyRPC;
 
 use super::*;
@@ -243,11 +248,15 @@ async fn multiple_outputs_to_single_address(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: Arc::clone(&chain_config),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     for (address, expected_balance) in rx.await.unwrap() {
@@ -460,11 +469,15 @@ async fn ok(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: Arc::clone(&chain_config),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     for (address, expected_values) in rx.await.unwrap() {

diff --git a/api-server/stack-test-suite/tests/v1/address_available_utxos.rs b/api-server/stack-test-suite/tests/v1/address_available_utxos.rs
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, sync::RwLock};
 
-use common::chain::UtxoOutPoint;
+use api_web_server::CachedValues;
+use common::{chain::UtxoOutPoint, primitives::time::get_time};
 
 use crate::DummyRPC;
 
@@ -274,11 +275,15 @@ async fn multiple_utxos_to_single_address(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: Arc::clone(&chain_config),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     for (address, expected) in rx.await.unwrap() {
@@ -513,11 +518,15 @@ async fn ok(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: Arc::clone(&chain_config),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     for (address, expected_values) in rx.await.unwrap() {

diff --git a/api-server/stack-test-suite/tests/v1/address_delegations.rs b/api-server/stack-test-suite/tests/v1/address_delegations.rs
@@ -13,7 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use common::chain::{AccountNonce, UtxoOutPoint};
+use std::sync::RwLock;
+
+use api_web_server::CachedValues;
+use common::{
+    chain::{AccountNonce, UtxoOutPoint},
+    primitives::time::get_time,
+};
 
 use crate::DummyRPC;
 
@@ -200,11 +206,15 @@ async fn ok(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: Arc::clone(&chain_config),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     for (address, expected) in rx.await.unwrap() {

diff --git a/api-server/stack-test-suite/tests/v1/block.rs b/api-server/stack-test-suite/tests/v1/block.rs
@@ -13,12 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use api_web_server::api::json_helpers::{block_header_to_json, tx_to_json, txoutput_to_json};
 use common::{
     chain::{stakelock::StakePoolData, CoinUnit, GenBlock, PoolId},
-    primitives::{per_thousand::PerThousand, H256},
+    primitives::{per_thousand::PerThousand, time::get_time, H256},
 };
 use crypto::vrf::{VRFKeyKind, VRFPrivateKey};
+use std::sync::RwLock;
+
+use api_web_server::{
+    api::json_helpers::{block_header_to_json, tx_to_json, txoutput_to_json},
+    CachedValues,
+};
 
 use crate::DummyRPC;
 
@@ -211,11 +216,15 @@ async fn ok(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: tf.chain_config().clone(),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     let (block_id, new_expected_block, old_block_id, old_expected_block) = rx.await.unwrap();

diff --git a/api-server/stack-test-suite/tests/v1/block_header.rs b/api-server/stack-test-suite/tests/v1/block_header.rs
@@ -13,12 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use api_web_server::api::json_helpers::block_header_to_json;
+use api_web_server::{api::json_helpers::block_header_to_json, CachedValues};
 use common::{
     chain::{stakelock::StakePoolData, CoinUnit, PoolId},
-    primitives::{per_thousand::PerThousand, H256},
+    primitives::{per_thousand::PerThousand, time::get_time, H256},
 };
 use crypto::vrf::{VRFKeyKind, VRFPrivateKey};
+use std::sync::RwLock;
 
 use crate::DummyRPC;
 
@@ -131,11 +132,15 @@ async fn ok(#[case] seed: Seed) {
             ApiServerWebServerState {
                 db: Arc::new(local_node.storage().clone_storage().await),
                 chain_config: Arc::clone(&chain_config),
-                rpc: None::<std::sync::Arc<DummyRPC>>,
+                rpc: Arc::new(DummyRPC {}),
+                cached_values: Arc::new(CachedValues {
+                    feerate_points: RwLock::new((get_time(), vec![])),
+                }),
+                time_getter: Default::default(),
             }
         };
 
-        web_server(listener, web_server_state).await
+        web_server(listener, web_server_state, true).await
     });
 
     let (block_id, expected_header) = rx.await.unwrap();