Skip to content
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

Support specifying RPC address via --node in CLI commands #188

Merged
merged 7 commits into from
Aug 31, 2023
Merged

Support specifying RPC address via --node in CLI commands #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82bf506
Support specifying RPC address via --node in CLI commands
mappum Aug 31, 2023
af0800e
Fix --node changes for all features
mappum Aug 31, 2023
6be765b
Fix imports
mappum Aug 31, 2023
338df2a
Fix rest build
mappum Aug 31, 2023
6621b25
Merge branch 'develop' into node-cli-option
mappum Aug 31, 2023
f904ee7
Set default node config value
mappum Aug 31, 2023
feb3b6f
Fix update-status command for --node option
mappum Aug 31, 2023
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
27 changes: 16 additions & 11 deletions rest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ extern crate rocket;

use nomic::{
app::{App, InnerApp, Nom},
app_client_testnet,
orga::{
client::{wallet::Unsigned, AppClient},
coins::{Address, Amount, Decimal},
plugins::*,
query::Query,
tendermint::client::HttpClient,
},
};
use rocket::response::status::BadRequest;
Expand All @@ -23,11 +24,15 @@ lazy_static::lazy_static! {
static ref QUERY_CACHE: Arc<RwLock<HashMap<String, (u64, String)>>> = Arc::new(RwLock::new(HashMap::new()));
}

fn app_client() -> AppClient<InnerApp, InnerApp, HttpClient, Nom, Unsigned> {
nomic::app_client("http://localhost:26657")
}

#[get("/cosmos/bank/v1beta1/balances/<address>")]
async fn bank_balances(address: &str) -> Result<Value, BadRequest<String>> {
let address: Address = address.parse().unwrap();

let balance: u64 = app_client_testnet()
let balance: u64 = app_client()
.query(|app| app.accounts.balance(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?
Expand Down Expand Up @@ -55,7 +60,7 @@ async fn bank_balances(address: &str) -> Result<Value, BadRequest<String>> {
async fn bank_balances_2(address: &str) -> Result<Value, BadRequest<String>> {
let address: Address = address.parse().unwrap();

let balance: u64 = app_client_testnet()
let balance: u64 = app_client()
.query(|app| app.accounts.balance(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?
Expand All @@ -76,13 +81,13 @@ async fn bank_balances_2(address: &str) -> Result<Value, BadRequest<String>> {
async fn auth_accounts(addr_str: &str) -> Result<Value, BadRequest<String>> {
let address: Address = addr_str.parse().unwrap();

let balance: u64 = app_client_testnet()
let balance: u64 = app_client()
.query(|app| app.accounts.balance(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?
.into();

let mut nonce: u64 = app_client_testnet()
let mut nonce: u64 = app_client()
.query_root(|app| app.inner.inner.borrow().inner.inner.inner.nonce(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?
Expand Down Expand Up @@ -111,13 +116,13 @@ async fn auth_accounts(addr_str: &str) -> Result<Value, BadRequest<String>> {
async fn auth_accounts2(addr_str: &str) -> Result<Value, BadRequest<String>> {
let address: Address = addr_str.parse().unwrap();

let balance: u64 = app_client_testnet()
let balance: u64 = app_client()
.query(|app| app.accounts.balance(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?
.into();

let mut nonce: u64 = app_client_testnet()
let mut nonce: u64 = app_client()
.query_root(|app| app.inner.inner.borrow().inner.inner.inner.nonce(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?
Expand Down Expand Up @@ -286,7 +291,7 @@ async fn query(query: &str, height: Option<u32>) -> Result<String, BadRequest<St
async fn staking_delegators_delegations(address: &str) -> Result<Value, BadRequest<String>> {
let address: Address = address.parse().unwrap();

let delegations = app_client_testnet()
let delegations = app_client()
.query(|app| app.staking.delegations(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?;
Expand Down Expand Up @@ -315,7 +320,7 @@ async fn staking_delegators_delegations(address: &str) -> Result<Value, BadReque
async fn staking_delegators_delegations_2(address: &str) -> Result<Value, BadRequest<String>> {
let address: Address = address.parse().unwrap();

let delegations = app_client_testnet()
let delegations = app_client()
.query(|app| app.staking.delegations(address))
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?;
Expand Down Expand Up @@ -439,7 +444,7 @@ async fn distribution_delegatrs_rewards_2(_address: &str) -> Value {

#[get("/cosmos/mint/v1beta1/inflation")]
async fn minting_inflation() -> Result<Value, BadRequest<String>> {
let validators = app_client_testnet()
let validators = app_client()
.query(|app| app.staking.all_validators())
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?;
Expand All @@ -459,7 +464,7 @@ async fn minting_inflation() -> Result<Value, BadRequest<String>> {

#[get("/minting/inflation")]
async fn minting_inflation_2() -> Result<Value, BadRequest<String>> {
let validators = app_client_testnet()
let validators = app_client()
.query(|app| app.staking.all_validators())
.await
.map_err(|e| BadRequest(Some(format!("{:?}", e))))?;
Expand Down
Loading