Skip to content

Commit

Permalink
Merge remote-tracking branch 'idky/zaino_serve_2' into zaino_serve_2
Browse files Browse the repository at this point in the history
  • Loading branch information
@AloeareV
AloeareV committed Feb 12, 2025
2 parents 6de7dc0 + ac52079 commit ad8790c
Show file tree
Hide file tree
Showing 5 changed files with 143 additions and 155 deletions.
2 changes: 1 addition & 1 deletion zaino-serve/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tracing = { workspace = true }

# Miscellaneous Workspace
tokio = { workspace = true, features = ["full"] }
tonic = { workspace = true }
tonic = { workspace = true, features = ["tls"] }
http = { workspace = true }
thiserror = { workspace = true }

Expand Down
1 change: 1 addition & 0 deletions zaino-serve/src/server/grpc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ impl TonicServer {

let task_status = status.clone();
let server_handle = tokio::task::spawn(async move {
task_status.store(StatusType::Ready.into());
server_future.await?;
task_status.store(StatusType::Offline.into());
Ok(())
Expand Down
1 change: 0 additions & 1 deletion zaino-state/src/local_cache/finalised_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ impl FinalisedState {
NetworkKind::Regtest => "local",
};
let db_path = config.db_path.join(db_path_dir);
dbg!(&db_path);
if !db_path.exists() {
fs::create_dir_all(&db_path)?;
}
Expand Down
285 changes: 137 additions & 148 deletions zainod/src/config.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,42 @@
use std::{
net::{IpAddr, SocketAddr, ToSocketAddrs},
path::PathBuf,
str::FromStr,
};

use toml::Value;
use tracing::warn;

use crate::error::IndexerError;

/// Arguments:
/// config: the config to parse
/// field: the name of the variable to define, which matches the name of
/// the config field
/// kind: the toml::Value variant to parse the config field as
/// default: the default config to fall back on
/// handle: a function which returns an Option. Usually, this is
/// simply [Some], to wrap the parsed value in Some when found
macro_rules! parse_field_or_warn_and_default {
($config:ident, $field:ident, $kind:ident, $default:ident, $handle:expr) => {
let $field = $config
.get(stringify!($field))
.map(|value| match value {
Value::String(string) if string == "None" => None,
Value::$kind(val_inner) => $handle(val_inner.clone()),
_ => {
warn!("Invalid `{}`, using default.", stringify!($field));
None
}
})
.unwrap_or_else(|| {
warn!("Missing `{}`, using default.", stringify!($field));
None
})
.unwrap_or_else(|| $default.$field);
};
}

/// Config information required for Zaino.
#[derive(Debug, Clone, serde::Deserialize)]
#[serde(default)]
Expand Down Expand Up @@ -271,166 +301,125 @@ pub fn load_config(file_path: &std::path::PathBuf) -> Result<IndexerConfig, Inde
let parsed_config: toml::Value = toml::from_str(&contents)
.map_err(|e| IndexerError::ConfigError(format!("TOML parsing error: {}", e)))?;

let grpc_listen_address = parsed_config
.get("grpc_listen_address")
.and_then(|v| v.as_str())
.map(|addr| {
fetch_socket_addr_from_hostname(addr).unwrap_or_else(|_| {
warn!("Invalid `grpc_listen_address`, using default.");
default_config.grpc_listen_address
})
})
.unwrap_or_else(|| {
warn!("Missing `grpc_listen_address`, using default.");
default_config.grpc_listen_address
});

let tls = parsed_config
.get("tls")
.and_then(|v| v.as_bool())
.unwrap_or_else(|| {
warn!("Missing `tls`, using default.");
default_config.grpc_tls
});

let tls_cert_path = parsed_config
.get("tls_cert_path")
.and_then(|v| v.as_str().map(|s| s.to_string()))
.or_else(|| {
warn!("Missing `tls_cert_path`, using default.");
default_config.tls_cert_path.clone()
});

let tls_key_path = parsed_config
.get("tls_key_path")
.and_then(|v| v.as_str().map(|s| s.to_string()))
.or_else(|| {
warn!("Missing `tls_key_path`, using default.");
default_config.tls_key_path.clone()
});

let validator_listen_address = parsed_config
.get("validator_listen_address")
.and_then(|v| v.as_str())
.map(|addr| {
fetch_socket_addr_from_hostname(addr).unwrap_or_else(|_| {
parse_field_or_warn_and_default!(
parsed_config,
grpc_listen_address,
String,
default_config,
|val: String| match fetch_socket_addr_from_hostname(val.as_str()) {
Ok(val) => Some(val),
Err(_) => {
warn!("Invalid `grpc_listen_address`, using default.");
default_config.validator_listen_address
})
})
.unwrap_or_else(|| {
warn!("Missing `grpc_listen_address`, using default.");
default_config.grpc_listen_address
});

let validator_cookie_auth = parsed_config
.get("validator_cookie_auth")
.and_then(|v| v.as_bool())
.unwrap_or_else(|| {
warn!("Missing `validator_cookie_auth`, using default.");
default_config.validator_cookie_auth
});

let validator_cookie_path = parsed_config
.get("validator_cookie_path")
.and_then(|v| v.as_str().map(|s| s.to_string()))
.or_else(|| {
warn!("Missing `validator_cookie_path`, using default.");
default_config.validator_cookie_path.clone()
});

let node_user = parsed_config
.get("node_user")
.and_then(|v| v.as_str().map(|s| s.to_string()))
.or_else(|| {
warn!("Missing `node_user`, using default.");
default_config.validator_user.clone()
});

let node_password = parsed_config
.get("node_password")
.and_then(|v| v.as_str().map(|s| s.to_string()))
.or_else(|| {
warn!("Missing `node_password`, using default.");
default_config.validator_password.clone()
});

let map_capacity = parsed_config
.get("map_capacity")
.and_then(|v| v.as_integer().map(|n| n as usize))
.or_else(|| {
warn!("Missing `map_capacity`, using default.");
default_config.map_capacity
});

let map_shard_amount = parsed_config
.get("map_shard_amount")
.and_then(|v| v.as_integer().map(|n| n as usize))
.or_else(|| {
warn!("Missing `map_shard_amount`, using default.");
default_config.map_shard_amount
});

let db_path = parsed_config
.get("db_path")
.and_then(|v| v.as_str())
.filter(|s| !s.trim().eq_ignore_ascii_case("None"))
.map(PathBuf::from)
.unwrap_or_else(|| {
warn!("Missing `db_path` or set to 'None', using default.");
default_config.db_path.clone()
});

let db_size = parsed_config
.get("db_size")
.and_then(|v| v.as_integer().map(|n| n as usize))
.or_else(|| {
warn!("Missing `db_size`, using default.");
default_config.db_size
});

let network = parsed_config
.get("network")
.and_then(|v| v.as_str().map(|s| s.to_string()))
.unwrap_or_else(|| {
warn!("Missing `network`, using default.");
default_config.network.clone()
});
None
}
}
);

let no_sync = parsed_config
.get("no_sync")
.and_then(|v| v.as_bool())
.unwrap_or_else(|| {
warn!("Missing `no_sync`, using default.");
default_config.no_sync
});
parse_field_or_warn_and_default!(parsed_config, grpc_tls, Boolean, default_config, Some);
parse_field_or_warn_and_default!(
parsed_config,
tls_cert_path,
String,
default_config,
|v| Some(Some(v))
);
parse_field_or_warn_and_default!(
parsed_config,
tls_key_path,
String,
default_config,
|v| Some(Some(v))
);

let no_db = parsed_config
.get("no_db")
.and_then(|v| v.as_bool())
.unwrap_or_else(|| {
warn!("Missing `no_db`, using default.");
default_config.no_db
});
parse_field_or_warn_and_default!(
parsed_config,
validator_listen_address,
String,
default_config,
|val: String| match fetch_socket_addr_from_hostname(val.as_str()) {
Ok(val) => Some(val),
Err(_) => {
warn!("Invalid `validator_listen_address`, using default.");
None
}
}
);

let no_state = parsed_config
.get("no_state")
.and_then(|v| v.as_bool())
.unwrap_or_else(|| {
warn!("Missing `no_state`, using default.");
default_config.no_state
});
parse_field_or_warn_and_default!(
parsed_config,
validator_cookie_auth,
Boolean,
default_config,
Some
);
parse_field_or_warn_and_default!(
parsed_config,
validator_cookie_path,
String,
default_config,
|v| Some(Some(v))
);
parse_field_or_warn_and_default!(
parsed_config,
validator_user,
String,
default_config,
|v| Some(Some(v))
);
parse_field_or_warn_and_default!(
parsed_config,
validator_password,
String,
default_config,
|v| Some(Some(v))
);
parse_field_or_warn_and_default!(
parsed_config,
map_capacity,
Integer,
default_config,
|v| Some(Some(v as usize))
);
parse_field_or_warn_and_default!(
parsed_config,
map_shard_amount,
Integer,
default_config,
|v| Some(Some(v as usize))
);
parse_field_or_warn_and_default!(
parsed_config,
db_path,
String,
default_config,
|v: String| {
match PathBuf::from_str(v.as_str()) {
Ok(path) => Some(path),
}
}
);
parse_field_or_warn_and_default!(
parsed_config,
db_size,
Integer,
default_config,
|v| Some(Some(v as usize))
);
parse_field_or_warn_and_default!(parsed_config, network, String, default_config, Some);
parse_field_or_warn_and_default!(parsed_config, no_sync, Boolean, default_config, Some);
parse_field_or_warn_and_default!(parsed_config, no_db, Boolean, default_config, Some);
parse_field_or_warn_and_default!(parsed_config, no_state, Boolean, default_config, Some);

let config = IndexerConfig {
grpc_listen_address,
grpc_tls: tls,
grpc_tls,
tls_cert_path,
tls_key_path,
validator_listen_address,
validator_cookie_auth,
validator_cookie_path,
validator_user: node_user,
validator_password: node_password,
validator_user,
validator_password,
map_capacity,
map_shard_amount,
db_path,
Expand Down
9 changes: 4 additions & 5 deletions zainod/zindexer.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
# Zainod's gRPC server listen address.
#
# Must use TLS when connecting to non localhost addresses.
gprc_listen_address = "localhost:8137"
grpc_listen_address = "localhost:8137"

# Enables TLS for the gRPC server.
gprc_tls = false
grpc_tls = false

# Path to the TLS certificate file in PEM format.
# Required if `tls` is true.
Expand All @@ -23,7 +23,7 @@ tls_key_path = "None"
# JsonRPC client config:

# Full node / validator listen address.
#
#
# Must be a "pravate" address as defined in [IETF RFC 1918] for ipv4 addreses and [IETF RFC 4193] for ipv6 addreses.
#
# Must use validator rpc cookie authentication when connecting to non localhost addresses.
Expand Down Expand Up @@ -99,6 +99,5 @@ no_db = false
#
# For use by lightweight wallets that do not want to run any extra processes.
#
# NOTE: Currently unimplemented as will require either a Tonic backend or a JsonRPC server.
# no_state = false
no_state = false

0 comments on commit ad8790c

Please sign in to comment.