general/hacker-challenge
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug on comparing SystemTime

Browse Source
This commit is contained in:
ghe0 2024-09-29 13:40:40 +03:00
parent 7671610bbe
commit 64e9479092
Signed by: ghe0
GPG Key ID: 451028EE56A0FBB4
3 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rewrite/src/datastore.rs
View File

@ -1,9 +1,7 @@
#![allow(dead_code)] #![allow(dead_code)]
use crate::solana::Client as SolClient; use crate::solana::Client as SolClient;
use dashmap::DashMap; use dashmap::{DashMap, DashSet};
use dashmap::DashSet; use std::time::{Duration, SystemTime};
use std::time::Duration;
use std::time::SystemTime;
type IP = String; type IP = String;
pub const LOCALHOST: &str = "localhost"; pub const LOCALHOST: &str = "localhost";
@ -21,8 +19,12 @@ pub struct NodeInfo {
impl NodeInfo { impl NodeInfo {
pub fn newer_than(&self, other_node: &Self) -> bool { pub fn newer_than(&self, other_node: &Self) -> bool {
if self.keepalive > other_node.keepalive if let Ok(duration) = self.keepalive.duration_since(other_node.keepalive) {
|| self.mint_requests > other_node.mint_requests if duration > Duration::from_secs(30) {
return true;
}
}
if self.mint_requests > other_node.mint_requests
|| self.ratls_attacks > other_node.ratls_attacks || self.ratls_attacks > other_node.ratls_attacks
|| self.ratls_conns > other_node.ratls_conns || self.ratls_conns > other_node.ratls_conns
|| self.mints > other_node.mints || self.mints > other_node.mints
@ -45,11 +47,7 @@ pub struct Store {
impl Store { impl Store {
pub fn init(sol_client: SolClient) -> Self { pub fn init(sol_client: SolClient) -> Self {
let store = Self { let store = Self { sol_client, nodes: DashMap::new(), conns: DashSet::new() };
sol_client,
nodes: DashMap::new(),
conns: DashSet::new(),
};
store.nodes.insert( store.nodes.insert(
LOCALHOST.to_string(), LOCALHOST.to_string(),
NodeInfo { NodeInfo {
@ -124,6 +122,7 @@ impl Store {
} }
node_info.public = node_info.public || old_node.public; node_info.public = node_info.public || old_node.public;
} }
println!("Inserting: {}, {:?}", ip, node_info);
self.nodes.insert(ip, node_info); self.nodes.insert(ip, node_info);
true true
} }
@ -150,10 +149,8 @@ impl Store {
pub fn remove_inactive_nodes(&self) { pub fn remove_inactive_nodes(&self) {
self.nodes.retain(|_, v| { self.nodes.retain(|_, v| {
let age = SystemTime::now() let age =
.duration_since(v.keepalive) SystemTime::now().duration_since(v.keepalive).unwrap_or(Duration::ZERO).as_secs();
.unwrap_or(Duration::ZERO)
.as_secs();
if age > 600 { if age > 600 {
false false
} else { } else {

27
rewrite/src/grpc/client.rs
View File

@ -1,17 +1,16 @@
#![allow(dead_code)] #![allow(dead_code)]
use super::challenge::NodeUpdate; use super::challenge::NodeUpdate;
use crate::datastore::Store; use crate::{
use crate::datastore::LOCALHOST; datastore::{Store, LOCALHOST},
use crate::grpc::challenge::update_client::UpdateClient; grpc::challenge::{update_client::UpdateClient, Empty},
use crate::grpc::challenge::Empty; };
use solana_sdk::pubkey::Pubkey; use solana_sdk::{pubkey::Pubkey, signature::keypair::Keypair};
use solana_sdk::signature::keypair::Keypair; use std::{str::FromStr, sync::Arc};
use std::str::FromStr; use tokio::{
use std::sync::Arc; sync::broadcast::Sender,
use tokio::sync::broadcast::Sender; time::{sleep, Duration},
use tokio::time::{sleep, Duration}; };
use tokio_stream::wrappers::BroadcastStream; use tokio_stream::{wrappers::BroadcastStream, StreamExt};
use tokio_stream::StreamExt;
#[derive(Clone)] #[derive(Clone)]
pub struct ConnManager { pub struct ConnManager {
@ -57,9 +56,7 @@ impl ConnManager {
let response = client.get_updates(rx_stream).await?; let response = client.get_updates(rx_stream).await?;
let mut resp_stream = response.into_inner(); let mut resp_stream = response.into_inner();
let _ = self let _ = self.tx.send((LOCALHOST.to_string(), self.ds.get_localhost()).into());
.tx
.send((LOCALHOST.to_string(), self.ds.get_localhost()).into());
while let Some(mut update) = resp_stream.message().await? { while let Some(mut update) = resp_stream.message().await? {
// "localhost" IPs need to be changed to the real IP of the counterpart // "localhost" IPs need to be changed to the real IP of the counterpart

15
rewrite/src/grpc/server.rs
View File

@ -1,11 +1,8 @@
#![allow(dead_code)] #![allow(dead_code)]
use super::challenge::update_server::UpdateServer; use super::challenge::{update_server::UpdateServer, Empty, Keys, NodeUpdate};
use super::challenge::{Empty, Keys, NodeUpdate}; use crate::{datastore::Store, grpc::challenge::update_server::Update};
use crate::datastore::Store; use std::{pin::Pin, sync::Arc};
use crate::grpc::challenge::update_server::Update;
use std::pin::Pin;
use std::sync::Arc;
use tokio::sync::broadcast::Sender; use tokio::sync::broadcast::Sender;
use tokio_stream::{Stream, StreamExt}; use tokio_stream::{Stream, StreamExt};
use tonic::{transport::Server, Request, Response, Status, Streaming}; use tonic::{transport::Server, Request, Response, Status, Streaming};
@ -22,11 +19,7 @@ impl MyServer {
pub async fn start(self) { pub async fn start(self) {
let addr = "0.0.0.0:31373".parse().unwrap(); let addr = "0.0.0.0:31373".parse().unwrap();
if let Err(e) = Server::builder() if let Err(e) = Server::builder().add_service(UpdateServer::new(self)).serve(addr).await {
.add_service(UpdateServer::new(self))
.serve(addr)
.await
{
println!("gRPC server failed: {e:?}"); println!("gRPC server failed: {e:?}");
}; };
} }