Skip to content
This repository has been archived by the owner on Dec 2, 2022. It is now read-only.

0x kitsune/api flag #261

Merged
merged 11 commits into from
Aug 30, 2022
Merged

0x kitsune/api flag #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b19cf68
added --enable_api flag with pattern matching for eth, net, erigon ot…
0xKitsune Aug 24, 2022
9cef49a
updated min values for --enable-api flag
0xKitsune Aug 24, 2022
fccd1f4
Changed enable-api arguments to transform into a hashset instead a Ve…
0xKitsune Aug 26, 2022
308efe7
added lowercase conversion to inputs for enable_api flag
0xKitsune Aug 26, 2022
a45262a
Updated transformation from Vec<String> to HashSet. Updated logic to …
0xKitsune Aug 26, 2022
bfc829d
Merge branch 'master' into 0xKitsune/api-flag
vorot93 Aug 30, 2022
53af1f3
Duplicated logic to handle enable-api flag into akula-rpc
0xKitsune Aug 30, 2022
f9b9787
Merge branch 'master' into 0xKitsune/api-flag
vorot93 Aug 30, 2022
2c1a0c1
Updated to use std::HashSet in akula-rpc
0xKitsune Aug 30, 2022
a060037
fix condition
vorot93 Aug 30, 2022
a52b406
Merge branch 'master' into 0xKitsune/api-flag
vorot93 Aug 30, 2022
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
72 changes: 50 additions & 22 deletions bin/akula-rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use ethereum_jsonrpc::{
use jsonrpsee::{
core::server::rpc_module::Methods, http_server::HttpServerBuilder, ws_server::WsServerBuilder,
};
use std::{future::pending, net::SocketAddr, sync::Arc};
use std::{collections::HashSet, future::pending, net::SocketAddr, sync::Arc};
use tracing::*;
use tracing_subscriber::prelude::*;

Expand All @@ -33,6 +33,10 @@ pub struct Opt {

#[clap(long, default_value = "127.0.0.1:7545")]
pub grpc_listen_address: SocketAddr,

/// Enable API options
#[clap(long, min_values(1))]
pub enable_api: Vec<String>,
}

#[tokio::main]
Expand Down Expand Up @@ -65,29 +69,53 @@ async fn main() -> anyhow::Result<()> {
.await?;

let mut api = Methods::new();
api.merge(
EthApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(NetApiServerImpl { network_id }.into_rpc())
.unwrap();
api.merge(ErigonApiServerImpl { db: db.clone() }.into_rpc())

let api_options = opt
.enable_api
.into_iter()
.map(|s| s.to_lowercase())
.collect::<HashSet<String>>();

if api_options.is_empty() || api_options.contains("eth") {
api.merge(
EthApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(OtterscanApiServerImpl { db: db.clone() }.into_rpc())
}

if api_options.is_empty() || api_options.contains("net") {
api.merge(NetApiServerImpl { network_id }.into_rpc())
.unwrap();
}

if api_options.is_empty() || api_options.contains("erigon") {
api.merge(ErigonApiServerImpl { db: db.clone() }.into_rpc())
.unwrap();
}

if api_options.is_empty() || api_options.contains("otterscan") {
api.merge(OtterscanApiServerImpl { db: db.clone() }.into_rpc())
.unwrap();
}

if api_options.is_empty() || api_options.contains("trace") {
api.merge(
TraceApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(
TraceApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(Web3ApiServerImpl.into_rpc()).unwrap();
}

if api_options.is_empty() || api_options.contains("web3") {
api.merge(Web3ApiServerImpl.into_rpc()).unwrap();
}

let _http_server_handle = http_server.start(api.clone())?;
info!("HTTP server listening on {}", opt.rpc_listen_address);
Expand Down
73 changes: 51 additions & 22 deletions bin/akula.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ use jsonrpsee::{
core::server::rpc_module::Methods, http_server::HttpServerBuilder, ws_server::WsServerBuilder,
};
use std::{
fs::OpenOptions, future::pending, io::Write, net::SocketAddr, panic, sync::Arc, time::Duration,
collections::HashSet, fs::OpenOptions, future::pending, io::Write, net::SocketAddr, panic,
sync::Arc, time::Duration,
};
use tokio::time::sleep;
use tracing::*;
Expand Down Expand Up @@ -99,6 +100,10 @@ pub struct Opt {
#[clap(long)]
pub no_rpc: bool,

/// Enable API options
#[clap(long, min_values(1))]
pub enable_api: Vec<String>,
0xKitsune marked this conversation as resolved.
Show resolved Hide resolved

/// Enable JSONRPC at this IP address and port.
#[clap(long, default_value = "127.0.0.1:8545")]
pub rpc_listen_address: String,
Expand Down Expand Up @@ -227,29 +232,53 @@ fn main() -> anyhow::Result<()> {
.unwrap();

let mut api = Methods::new();
api.merge(
EthApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(NetApiServerImpl { network_id }.into_rpc())
.unwrap();
api.merge(ErigonApiServerImpl { db: db.clone() }.into_rpc())

let api_options = opt
.enable_api
.into_iter()
.map(|s| s.to_lowercase())
.collect::<HashSet<String>>();

if api_options.is_empty() || api_options.contains("eth") {
api.merge(
EthApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(OtterscanApiServerImpl { db: db.clone() }.into_rpc())
}

if api_options.is_empty() || api_options.contains("net") {
api.merge(NetApiServerImpl { network_id }.into_rpc())
.unwrap();
}

if api_options.is_empty() || api_options.contains("erigon") {
api.merge(ErigonApiServerImpl { db: db.clone() }.into_rpc())
.unwrap();
}

if api_options.is_empty() || api_options.contains("otterscan") {
api.merge(OtterscanApiServerImpl { db: db.clone() }.into_rpc())
.unwrap();
}

if api_options.is_empty() || api_options.contains("trace") {
api.merge(
TraceApiServerImpl {
db: db.clone(),
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(
TraceApiServerImpl {
db,
call_gas_limit: 100_000_000,
}
.into_rpc(),
)
.unwrap();
api.merge(Web3ApiServerImpl.into_rpc()).unwrap();
}

if api_options.is_empty() || api_options.contains("web3") {
api.merge(Web3ApiServerImpl.into_rpc()).unwrap();
}

let _http_server_handle = http_server.start(api.clone()).unwrap();
info!("HTTP server listening on {}", opt.rpc_listen_address);
Expand Down