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

Jump to bottom

CLI: add basic versions of getHealth and getAccount #134

Merged
merged 4 commits into from
Sep 19, 2022
Merged

CLI: add basic versions of getHealth and getAccount #134

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f66abc2
Add a getHealth method to serve subcommand
Sep 15, 2022
615385e
Add a basic dummy 'getAccount' method to cli serve
Sep 16, 2022
fe2abe2
appease clippy
Sep 16, 2022
3a106a9
Merge branch 'main' into gethealth
Sep 19, 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
166 changes: 106 additions & 60 deletions src/serve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use soroban_env_host::{
},
Host, HostError,
};
use stellar_strkey::StrkeyPublicKeyEd25519;
use tokio::sync::Mutex;
use warp::{http::Response, Filter};

Expand Down Expand Up @@ -58,6 +59,7 @@ pub enum Error {
#[serde(rename_all = "snake_case")]
#[serde(untagged)]
enum Requests {
NoArg(),
GetContractData((String, String)),
StringArg(Box<[String]>),
}
Expand Down Expand Up @@ -127,74 +129,19 @@ async fn handler(
));
}
let result = match (request.method.as_str(), request.params) {
("getAccount", Some(Requests::StringArg(b))) => get_account(b),
("getHealth", Some(Requests::NoArg())) => Ok(get_health()),
("getContractData", Some(Requests::GetContractData((contract_id, key)))) => {
get_contract_data(&contract_id, key, &ledger_file)
}
("getTransactionStatus", Some(Requests::StringArg(b))) => {
if let Some(hash) = b.into_vec().first() {
let m = transaction_status_map.lock().await;
let status = m.get(hash);
Ok(match status {
Some(status) => status.clone(),
None => json!({
"error": {
"code":404,
"message": "Transaction not found",
},
}),
})
} else {
Err(Error::Xdr(XdrError::Invalid))
}
get_transaction_status(&transaction_status_map, b).await
}
("simulateTransaction", Some(Requests::StringArg(b))) => {
if let Some(txn_xdr) = b.into_vec().first() {
parse_transaction(txn_xdr, SANDBOX_NETWORK_PASSPHRASE)
// Execute and do NOT commit
.and_then(|(_, args)| execute_transaction(&args, &ledger_file, false))
} else {
Err(Error::Xdr(XdrError::Invalid))
}
simulate_transaction(&ledger_file, b)
}
("sendTransaction", Some(Requests::StringArg(b))) => {
if let Some(txn_xdr) = b.into_vec().first() {
// TODO: Format error object output if txn is invalid
let mut m = transaction_status_map.lock().await;
parse_transaction(txn_xdr, SANDBOX_NETWORK_PASSPHRASE).map(|(hash, args)| {
let id = hex::encode(hash);
// Execute and commit
let result = execute_transaction(&args, &ledger_file, true);
// Add it to our status tracker
m.insert(
id.clone(),
match result {
Ok(result) => {
json!({
"id": id,
"status": "success",
"results": vec![result],
})
}
Err(_err) => {
// TODO: Actually render the real error to the user
// Add it to our status tracker
json!({
"id": id,
"status": "error",
"error": {
"code":-32603,
"message": "Internal server error",
},
})
}
},
);
// Return the hash
json!({ "id": id, "status": "pending" })
})
} else {
Err(Error::Xdr(XdrError::Invalid))
}
send_transaction(&ledger_file, &transaction_status_map, b).await
}
_ => Err(Error::UnknownMethod),
};
Expand Down Expand Up @@ -473,3 +420,102 @@ fn hash_bytes(b: Vec<u8>) -> [u8; 32] {
output.copy_from_slice(&hasher.finalize());
output
}

fn get_account(b: Box<[String]>) -> Result<Value, Error> {
if let Some(address) = b.into_vec().first() {
if let Ok(_key) = StrkeyPublicKeyEd25519::from_string(address) {
Ok(json!({
"id": address,
"sequence": "1", // TODO: Increment and persist this in sendTransaction.
// TODO: Include balances
// "balances": vec![],
}))
} else {
Err(Error::Xdr(XdrError::Invalid))
}
} else {
Err(Error::Xdr(XdrError::Invalid))
}
}

fn get_health() -> Value {
json!({
"status": "healthy",
})
}

async fn get_transaction_status(
transaction_status_map: &Mutex<HashMap<String, Value>>,
b: Box<[String]>,
) -> Result<Value, Error> {
if let Some(hash) = b.into_vec().first() {
let m = transaction_status_map.lock().await;
let status = m.get(hash);
Ok(match status {
Some(status) => status.clone(),
None => json!({
"error": {
"code":404,
"message": "Transaction not found",
},
}),
})
} else {
Err(Error::Xdr(XdrError::Invalid))
}
}

fn simulate_transaction(ledger_file: &PathBuf, b: Box<[String]>) -> Result<Value, Error> {
if let Some(txn_xdr) = b.into_vec().first() {
parse_transaction(txn_xdr, SANDBOX_NETWORK_PASSPHRASE)
// Execute and do NOT commit
.and_then(|(_, args)| execute_transaction(&args, ledger_file, false))
} else {
Err(Error::Xdr(XdrError::Invalid))
}
}

async fn send_transaction(
ledger_file: &PathBuf,
transaction_status_map: &Mutex<HashMap<String, Value>>,
b: Box<[String]>,
) -> Result<Value, Error> {
if let Some(txn_xdr) = b.into_vec().first() {
// TODO: Format error object output if txn is invalid
let mut m = transaction_status_map.lock().await;
parse_transaction(txn_xdr, SANDBOX_NETWORK_PASSPHRASE).map(|(hash, args)| {
let id = hex::encode(hash);
// Execute and commit
let result = execute_transaction(&args, ledger_file, true);
// Add it to our status tracker
m.insert(
id.clone(),
match result {
Ok(result) => {
json!({
"id": id,
"status": "success",
"results": vec![result],
})
}
Err(_err) => {
// TODO: Actually render the real error to the user
// Add it to our status tracker
json!({
"id": id,
"status": "error",
"error": {
"code":-32603,
"message": "Internal server error",
},
})
}
},
);
// Return the hash
json!({ "id": id, "status": "pending" })
})
} else {
Err(Error::Xdr(XdrError::Invalid))
}
}