-
Notifications
You must be signed in to change notification settings - Fork 221
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: new grpc method #6742
Merged
SWvheerden
merged 6 commits into
tari-project:development
from
SWvheerden:sw_new_grpc_method
Jan 16, 2025
Merged
feat: new grpc method #6742
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
// Copyright 2025. The Tari Project | ||
// | ||
// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the | ||
// following conditions are met: | ||
// | ||
// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following | ||
// disclaimer. | ||
// | ||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the | ||
// following disclaimer in the documentation and/or other materials provided with the distribution. | ||
// | ||
// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote | ||
// products derived from this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | ||
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
use std::sync::Arc; | ||
|
||
use tari_common_types::types::FixedHash; | ||
use tari_core::blocks::NewBlockTemplate; | ||
use tokio::sync::RwLock; | ||
|
||
pub struct DataCache { | ||
inner_data_cache: Arc<RwLock<InnerDataCache>>, | ||
} | ||
|
||
impl DataCache { | ||
pub fn new() -> Self { | ||
Self { | ||
inner_data_cache: Arc::new(RwLock::new(InnerDataCache::default())), | ||
} | ||
} | ||
|
||
pub async fn get_randomx_estimated_hash_rate(&self, current_tip: &FixedHash) -> Option<u64> { | ||
let res = self.inner_data_cache.read().await.randomx_estimated_hash_rate; | ||
if res.1 == *current_tip { | ||
Some(res.0) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
pub async fn get_sha3x_estimated_hash_rate(&self, current_tip: &FixedHash) -> Option<u64> { | ||
let res = self.inner_data_cache.read().await.sha3x_estimated_hash_rate; | ||
if res.1 == *current_tip { | ||
Some(res.0) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
pub async fn set_randomx_estimated_hash_rate(&self, hash_rate: u64, current_tip: FixedHash) { | ||
self.inner_data_cache.write().await.randomx_estimated_hash_rate = (hash_rate, current_tip); | ||
} | ||
|
||
pub async fn set_sha3x_estimated_hash_rate(&self, hash_rate: u64, current_tip: FixedHash) { | ||
self.inner_data_cache.write().await.sha3x_estimated_hash_rate = (hash_rate, current_tip); | ||
} | ||
|
||
pub async fn get_randomx_new_block_template(&self, current_tip: &FixedHash) -> Option<NewBlockTemplate> { | ||
let res = &self.inner_data_cache.read().await.randomx_new_block_template; | ||
if res.1 == *current_tip { | ||
Some(res.0.clone()) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
pub async fn get_sha3x_new_block_template(&self, current_tip: &FixedHash) -> Option<NewBlockTemplate> { | ||
let res = &self.inner_data_cache.read().await.sha3x_new_block_template; | ||
if res.1 == *current_tip { | ||
Some(res.0.clone()) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
pub async fn set_randomx_new_block_template(&self, new_block_template: NewBlockTemplate, current_tip: FixedHash) { | ||
self.inner_data_cache.write().await.randomx_new_block_template = (new_block_template, current_tip); | ||
} | ||
|
||
pub async fn set_sha3x_new_block_template(&self, new_block_template: NewBlockTemplate, current_tip: FixedHash) { | ||
self.inner_data_cache.write().await.sha3x_new_block_template = (new_block_template, current_tip); | ||
} | ||
} | ||
|
||
struct InnerDataCache { | ||
pub randomx_estimated_hash_rate: (u64, FixedHash), | ||
pub sha3x_estimated_hash_rate: (u64, FixedHash), | ||
pub sha3x_new_block_template: (NewBlockTemplate, FixedHash), | ||
pub randomx_new_block_template: (NewBlockTemplate, FixedHash), | ||
} | ||
impl Default for InnerDataCache { | ||
fn default() -> Self { | ||
Self { | ||
randomx_estimated_hash_rate: (0, FixedHash::default()), | ||
sha3x_estimated_hash_rate: (0, FixedHash::default()), | ||
sha3x_new_block_template: (NewBlockTemplate::empty(), FixedHash::default()), | ||
randomx_new_block_template: (NewBlockTemplate::empty(), FixedHash::default()), | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,5 +22,6 @@ | |
|
||
pub mod base_node_grpc_server; | ||
pub mod blocks; | ||
pub mod data_cache; | ||
pub mod hash_rate; | ||
pub mod helpers; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is just a nit and not a change request.
I always prefer a struct and names values over indexing from a tuple
res.1
orres.0
as they lose context and meaning in these functions.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
valid point, let me update