Skip to content

Optimistic mode #27

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.

Sign up for GitHub

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

Merged
freesig merged 1 commit into from
Dec 3, 2025
Merged

Optimistic mode #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions apps/increment/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{net::SocketAddr, path::PathBuf};
use clap::{Args, Parser, Subcommand};
use void_app_node::{
Mode, Options,
oracle::{ObserverOracle, Oracle, OracleStorageType},
oracle::{ObserverOracle, Oracle, OracleMode, OracleStorageType},
signing::get_signer,
};
use void_toolkit::load_config::load_config;
Expand Down Expand Up @@ -62,27 +62,25 @@ async fn main() {
let cli = Cli::parse();

let mode = match cli.command {
Commands::Publisher(publisher) => Mode::Publisher(
void_app_node::Publisher {
signer: get_signer(publisher.key).unwrap(),
oracle: Oracle {
oracle_config: load_config(&publisher.oracle_config).unwrap(),
oracle_bind_address: publisher.oracle_bind_address,
oracle_storage: cli
.oracle_db_path
.map_or(OracleStorageType::Memory, OracleStorageType::Db),
},
node_network_bind_address: publisher.node_network_bind_address,
}
.into(),
),
Commands::Publisher(publisher) => Mode::Publisher(void_app_node::Publisher {
signer: get_signer(publisher.key).unwrap(),
oracle: OracleMode::Publisher(Oracle {
oracle_config: load_config(&publisher.oracle_config).unwrap(),
oracle_bind_address: publisher.oracle_bind_address,
oracle_storage: cli
.oracle_db_path
.map_or(OracleStorageType::Memory, OracleStorageType::Db),
}),
node_network_bind_address: publisher.node_network_bind_address,
}),
Commands::Observer(observer) => Mode::Observer(void_app_node::Observer {
oracle: ObserverOracle {
oracle: OracleMode::Observer(ObserverOracle {
oracle_config: load_config(&observer.oracle_config).unwrap(),
oracle_storage: cli
.oracle_db_path
.map_or(OracleStorageType::Memory, OracleStorageType::Db),
},
}),
signer: None,
node_network_endpoint: observer.node_network_endpoint,
}),
};
Expand Down
41 changes: 18 additions & 23 deletions apps/increment/tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use tokio_util::{
io::StreamReader,
};
use void_app_node::{
oracle::{ObserverOracle, Oracle, OracleStorageType},
oracle::{ObserverOracle, Oracle, OracleMode, OracleStorageType},
proof::SignedProof,
};
use void_toolkit::types::Height;
Expand Down Expand Up @@ -125,13 +125,13 @@ async fn test_api(nodes: Option<Nodes>) {
};

let config = void_toolkit::oracle_types::config::Config { query, block };
let oracle = Oracle {
let oracle = OracleMode::Publisher(Oracle {
oracle_config: config,
oracle_bind_address: SocketAddr::from(([127, 0, 0, 1], 4000)),
oracle_storage: nodes.as_ref().map_or(OracleStorageType::Memory, |nodes| {
OracleStorageType::Db(nodes.publisher.oracle_db_file.clone())
}),
};
});

let increment_endpoint = "127.0.0.1:3500";

Expand All @@ -144,14 +144,11 @@ async fn test_api(nodes: Option<Nodes>) {
tracing: true,
server_bind_address: increment_endpoint.parse().unwrap(),
db_path,
mode: void_app_node::Mode::Publisher(
void_app_node::Publisher {
oracle,
signer,
node_network_bind_address: SocketAddr::from(([127, 0, 0, 1], 5000)),
}
.into(),
),
mode: void_app_node::Mode::Publisher(void_app_node::Publisher {
oracle,
signer,
node_network_bind_address: SocketAddr::from(([127, 0, 0, 1], 5000)),
}),
};
increment::run_signing_node(options).await.unwrap();
panic!("increment app closed unexpectedly");
Expand All @@ -177,12 +174,12 @@ async fn test_api(nodes: Option<Nodes>) {
// let oracle_db_file = observer_db_path.path().join("oracle.db");
// let data_type = increment::DataType::Db(db_file.to_str().unwrap().to_string());
// let oracle_db_path = oracle_db_file.to_str().unwrap().to_string();
let oracle = ObserverOracle {
let oracle = OracleMode::Observer(ObserverOracle {
oracle_config: config,
oracle_storage: nodes.as_ref().map_or(OracleStorageType::Memory, |nodes| {
OracleStorageType::Db(nodes.observer.oracle_db_file.clone())
}),
};
});

let db_path = nodes.as_ref().map(|nodes| nodes.observer.db_file.clone());
tokio::spawn({
Expand All @@ -194,6 +191,7 @@ async fn test_api(nodes: Option<Nodes>) {
db_path,
mode: void_app_node::Mode::Observer(void_app_node::Observer {
oracle,
signer: None,
node_network_endpoint: "http://localhost:5000".to_string(),
}),
};
Expand Down Expand Up @@ -344,11 +342,11 @@ async fn test_run_for_front_end() {

let config = void_toolkit::oracle_types::config::Config { query, block };

let oracle = Oracle {
let oracle = OracleMode::Publisher(Oracle {
oracle_config: config,
oracle_bind_address: SocketAddr::from(([127, 0, 0, 1], 4000)),
oracle_storage: OracleStorageType::Memory,
};
});

let increment_endpoint = "127.0.0.1:3500";

Expand All @@ -360,14 +358,11 @@ async fn test_run_for_front_end() {
tracing: true,
server_bind_address: increment_endpoint.parse().unwrap(),
db_path: None,
mode: void_app_node::Mode::Publisher(
void_app_node::Publisher {
oracle,
signer,
node_network_bind_address: SocketAddr::from(([127, 0, 0, 1], 5000)),
}
.into(),
),
mode: void_app_node::Mode::Publisher(void_app_node::Publisher {
oracle,
signer,
node_network_bind_address: SocketAddr::from(([127, 0, 0, 1], 5000)),
}),
};
increment::run_signing_node(options).await.unwrap();
panic!("increment app closed unexpectedly");
Expand Down
32 changes: 15 additions & 17 deletions apps/transfers/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{net::SocketAddr, path::PathBuf};
use clap::{Args, Parser, Subcommand};
use void_app_node::{
Mode, Options,
oracle::{ObserverOracle, Oracle, OracleStorageType},
oracle::{ObserverOracle, Oracle, OracleMode, OracleStorageType},
signing::get_signer,
};
use void_toolkit::load_config::load_config;
Expand Down Expand Up @@ -62,27 +62,25 @@ async fn main() {
let cli = Cli::parse();

let mode = match cli.command {
Commands::Publisher(publisher) => Mode::Publisher(
void_app_node::Publisher {
signer: get_signer(publisher.key).unwrap(),
oracle: Oracle {
oracle_config: load_config(&publisher.oracle_config).unwrap(),
oracle_bind_address: publisher.oracle_bind_address,
oracle_storage: cli
.oracle_db_path
.map_or(OracleStorageType::Memory, OracleStorageType::Db),
},
node_network_bind_address: publisher.node_network_bind_address,
}
.into(),
),
Commands::Publisher(publisher) => Mode::Publisher(void_app_node::Publisher {
signer: get_signer(publisher.key).unwrap(),
oracle: OracleMode::Publisher(Oracle {
oracle_config: load_config(&publisher.oracle_config).unwrap(),
oracle_bind_address: publisher.oracle_bind_address,
oracle_storage: cli
.oracle_db_path
.map_or(OracleStorageType::Memory, OracleStorageType::Db),
}),
node_network_bind_address: publisher.node_network_bind_address,
}),
Commands::Observer(observer) => Mode::Observer(void_app_node::Observer {
oracle: ObserverOracle {
oracle: OracleMode::Observer(ObserverOracle {
oracle_config: load_config(&observer.oracle_config).unwrap(),
oracle_storage: cli
.oracle_db_path
.map_or(OracleStorageType::Memory, OracleStorageType::Db),
},
}),
signer: None,
node_network_endpoint: observer.node_network_endpoint,
}),
};
Expand Down
19 changes: 8 additions & 11 deletions apps/transfers/tests/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use alloy::{
use std::str::FromStr;
use void_app_node::{
Mode, Options, Publisher,
oracle::{Oracle, OracleStorageType},
oracle::{Oracle, OracleMode, OracleStorageType},
};
use void_toolkit::oracle_types::config::{
BlockConfig, ChainContractLogsConfig, Config, ConnectionType, QueryConfig, StreamConfig,
Expand Down Expand Up @@ -120,19 +120,16 @@ async fn test_complete_bridge_flow() {
let transfers_endpoint = transfers_endpoint.to_string();
let signer = signer.clone();
let oracle_config = oracle_config.clone();
let oracle = Oracle {
let oracle = OracleMode::Publisher(Oracle {
oracle_config,
oracle_bind_address: transfers_oracle_endpoint.parse().unwrap(),
oracle_storage: OracleStorageType::Memory,
};
let mode = Mode::Publisher(
Publisher {
signer,
oracle,
node_network_bind_address: transfers_node_network_endpoint.parse().unwrap(),
}
.into(),
);
});
let mode = Mode::Publisher(Publisher {
signer,
oracle,
node_network_bind_address: transfers_node_network_endpoint.parse().unwrap(),
});
let options = Options {
tracing: true,
server_bind_address: transfers_endpoint.parse().unwrap(),
Expand Down
Loading