gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use jsonrpc git repo, allowing removal of Default bound for Metadata

Browse Source
This commit is contained in:
Tyera Eulberg
2018-08-15 10:37:02 -06:00
committed by Tyera Eulberg
parent 1eb8724a89
commit d9fac86015
2 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -75,9 +75,9 @@ futures = "0.1.21"
generic-array = { version = "0.11.1", default-features = false, features = ["serde"] } generic-array = { version = "0.11.1", default-features = false, features = ["serde"] }
getopts = "0.2" getopts = "0.2"
influx_db_client = "0.3.4" influx_db_client = "0.3.4"
jsonrpc-core = "8.0" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", rev = "4486300" }
jsonrpc-http-server = "8.0" jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc", rev = "4486300" }
jsonrpc-macros = "8.0" jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", rev = "4486300" }
itertools = "0.7.8" itertools = "0.7.8"
libc = "0.2.1" libc = "0.2.1"
log = "0.4.2" log = "0.4.2"

102
src/rpc.rs
View File

@ -19,29 +19,32 @@ pub struct JsonRpcService {
} }
impl JsonRpcService { impl JsonRpcService {
pub fn new(bank: Arc<Bank>, rpc_addr: SocketAddr) -> Self { pub fn new(
let request_processor = JsonRpcRequestProcessor::new(bank); bank: Arc<Bank>,
let thread_hdl = Builder::new() rpc_addr: SocketAddr,
.name("solana-jsonrpc".to_string()) ) -> Self {
.spawn(move || { let request_processor = JsonRpcRequestProcessor::new(bank);
let mut io = MetaIoHandler::default(); let thread_hdl = Builder::new()
let rpc = RpcSolImpl; .name("solana-jsonrpc".to_string())
io.extend_with(rpc.to_delegate()); .spawn(move || {
let mut io = MetaIoHandler::default();
let rpc = RpcSolImpl;
io.extend_with(rpc.to_delegate());
let server = ServerBuilder::new(io) let server = ServerBuilder::with_meta_extractor(io, move |_req: &hyper::Request| Meta {
.meta_extractor(move |_req: &hyper::Request| Meta { request_processor: request_processor.clone(),
request_processor: Some(request_processor.clone()), })
}) .threads(4)
.threads(4) .cors(DomainsValidation::AllowOnly(vec![
.cors(DomainsValidation::AllowOnly(vec![ AccessControlAllowOrigin::Any,
AccessControlAllowOrigin::Any, ]))
])) .start_http(
.start_http(&rpc_addr) &rpc_addr,
.unwrap(); ).unwrap();
server.wait(); server.wait();
() ()
}) })
.unwrap(); .unwrap();
JsonRpcService { thread_hdl } JsonRpcService { thread_hdl }
} }
} }
@ -58,16 +61,9 @@ impl Service for JsonRpcService {
#[derive(Clone)] #[derive(Clone)]
pub struct Meta { pub struct Meta {
pub request_processor: Option<JsonRpcRequestProcessor>, pub request_processor: JsonRpcRequestProcessor,
} }
impl Metadata for Meta {} impl Metadata for Meta {}
impl Default for Meta {
fn default() -> Self {
Meta {
request_processor: None,
}
}
}
build_rpc_trait! { build_rpc_trait! {
pub trait RpcSol { pub trait RpcSol {
@ -107,10 +103,10 @@ impl RpcSol for RpcSolImpl {
} else { } else {
let signature = Signature::new(&signature_vec); let signature = Signature::new(&signature_vec);
let req = JsonRpcRequest::GetSignature { signature }; let req = JsonRpcRequest::GetSignature { signature };
let resp = meta.request_processor.unwrap().process_request(req); let resp = meta.request_processor.process_request(req);
match resp { match resp {
Some(Response::SignatureStatus { signature_status }) => Ok(signature_status), Some(Response::SignatureStatus { signature_status }) => Ok(signature_status),
Some(_) => Err(Error { Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002), code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(), message: "Server error: bad response".to_string(),
data: None, data: None,
@ -133,10 +129,10 @@ impl RpcSol for RpcSolImpl {
} else { } else {
let pubkey = Pubkey::new(&pubkey_vec); let pubkey = Pubkey::new(&pubkey_vec);
let req = JsonRpcRequest::GetBalance { key: pubkey }; let req = JsonRpcRequest::GetBalance { key: pubkey };
let resp = meta.request_processor.unwrap().process_request(req); let resp = meta.request_processor.process_request(req);
match resp { match resp {
Some(Response::Balance { key, val }) => Ok((bs58::encode(key).into_string(), val)), Some(Response::Balance { key, val }) => Ok((bs58::encode(key).into_string(), val)),
Some(_) => Err(Error { Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002), code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(), message: "Server error: bad response".to_string(),
data: None, data: None,
@ -151,10 +147,10 @@ impl RpcSol for RpcSolImpl {
} }
fn get_finality(&self, meta: Self::Metadata) -> Result<usize> { fn get_finality(&self, meta: Self::Metadata) -> Result<usize> {
let req = JsonRpcRequest::GetFinality; let req = JsonRpcRequest::GetFinality;
let resp = meta.request_processor.unwrap().process_request(req); let resp = meta.request_processor.process_request(req);
match resp { match resp {
Some(Response::Finality { time }) => Ok(time), Some(Response::Finality { time }) => Ok(time),
Some(_) => Err(Error { Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002), code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(), message: "Server error: bad response".to_string(),
data: None, data: None,
@ -168,10 +164,10 @@ impl RpcSol for RpcSolImpl {
} }
fn get_last_id(&self, meta: Self::Metadata) -> Result<String> { fn get_last_id(&self, meta: Self::Metadata) -> Result<String> {
let req = JsonRpcRequest::GetLastId; let req = JsonRpcRequest::GetLastId;
let resp = meta.request_processor.unwrap().process_request(req); let resp = meta.request_processor.process_request(req);
match resp { match resp {
Some(Response::LastId { id }) => Ok(bs58::encode(id).into_string()), Some(Response::LastId { id }) => Ok(bs58::encode(id).into_string()),
Some(_) => Err(Error { Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002), code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(), message: "Server error: bad response".to_string(),
data: None, data: None,
@ -185,10 +181,10 @@ impl RpcSol for RpcSolImpl {
} }
fn get_transaction_count(&self, meta: Self::Metadata) -> Result<u64> { fn get_transaction_count(&self, meta: Self::Metadata) -> Result<u64> {
let req = JsonRpcRequest::GetTransactionCount; let req = JsonRpcRequest::GetTransactionCount;
let resp = meta.request_processor.unwrap().process_request(req); let resp = meta.request_processor.process_request(req);
match resp { match resp {
Some(Response::TransactionCount { transaction_count }) => Ok(transaction_count), Some(Response::TransactionCount { transaction_count }) => Ok(transaction_count),
Some(_) => Err(Error { Some(_) => Err(Error{
code: ErrorCode::ServerError(-32002), code: ErrorCode::ServerError(-32002),
message: "Server error: bad response".to_string(), message: "Server error: bad response".to_string(),
data: None, data: None,
@ -230,7 +226,10 @@ impl JsonRpcRequestProcessor {
} }
/// Process Request items sent via JSON-RPC. /// Process Request items sent via JSON-RPC.
fn process_request(&self, msg: JsonRpcRequest) -> Option<Response> { fn process_request(
&self,
msg: JsonRpcRequest,
) -> Option<Response> {
match msg { match msg {
JsonRpcRequest::GetBalance { key } => { JsonRpcRequest::GetBalance { key } => {
let val = self.bank.get_balance(&key); let val = self.bank.get_balance(&key);
@ -292,7 +291,7 @@ mod tests {
let rpc = RpcSolImpl; let rpc = RpcSolImpl;
io.extend_with(rpc.to_delegate()); io.extend_with(rpc.to_delegate());
let meta = Meta { let meta = Meta {
request_processor: Some(request_processor), request_processor: request_processor,
}; };
let req = format!( let req = format!(
@ -300,10 +299,7 @@ mod tests {
bob_pubkey bob_pubkey
); );
let res = io.handle_request_sync(&req, meta.clone()); let res = io.handle_request_sync(&req, meta.clone());
let expected = format!( let expected = format!(r#"{{"jsonrpc":"2.0","result":["{}", 20],"id":1}}"#, bob_pubkey);
r#"{{"jsonrpc":"2.0","result":["{}", 20],"id":1}}"#,
bob_pubkey
);
let expected: Response = let expected: Response =
serde_json::from_str(&expected).expect("expected response deserialization"); serde_json::from_str(&expected).expect("expected response deserialization");
@ -311,7 +307,9 @@ mod tests {
.expect("actual response deserialization"); .expect("actual response deserialization");
assert_eq!(expected, result); assert_eq!(expected, result);
let req = format!(r#"{{"jsonrpc":"2.0","id":1,"method":"solana_getTransactionCount"}}"#); let req = format!(
r#"{{"jsonrpc":"2.0","id":1,"method":"solana_getTransactionCount"}}"#
);
let res = io.handle_request_sync(&req, meta.clone()); let res = io.handle_request_sync(&req, meta.clone());
let expected = format!(r#"{{"jsonrpc":"2.0","result":1,"id":1}}"#); let expected = format!(r#"{{"jsonrpc":"2.0","result":1,"id":1}}"#);
let expected: Response = let expected: Response =
@ -323,12 +321,15 @@ mod tests {
} }
#[test] #[test]
fn test_rpc_request_bad_parameter_type() { fn test_rpc_request_bad_parameter_type() {
let alice = Mint::new(10_000);
let bank = Bank::new(&alice);
let mut io = MetaIoHandler::default(); let mut io = MetaIoHandler::default();
let rpc = RpcSolImpl; let rpc = RpcSolImpl;
io.extend_with(rpc.to_delegate()); io.extend_with(rpc.to_delegate());
let req = r#"{"jsonrpc":"2.0","id":1,"method":"solana_getBalance","params":[1234567890]}"#; let req = r#"{"jsonrpc":"2.0","id":1,"method":"solana_getBalance","params":[1234567890]}"#;
let meta = Meta { let meta = Meta {
request_processor: None, request_processor: JsonRpcRequestProcessor::new(Arc::new(bank)),
}; };
let res = io.handle_request_sync(req, meta); let res = io.handle_request_sync(req, meta);
@ -342,13 +343,16 @@ mod tests {
} }
#[test] #[test]
fn test_rpc_request_bad_signature() { fn test_rpc_request_bad_signature() {
let alice = Mint::new(10_000);
let bank = Bank::new(&alice);
let mut io = MetaIoHandler::default(); let mut io = MetaIoHandler::default();
let rpc = RpcSolImpl; let rpc = RpcSolImpl;
io.extend_with(rpc.to_delegate()); io.extend_with(rpc.to_delegate());
let req = let req =
r#"{"jsonrpc":"2.0","id":1,"method":"solana_confirmTransaction","params":["a1b2c3d4e5"]}"#; r#"{"jsonrpc":"2.0","id":1,"method":"solana_confirmTransaction","params":["a1b2c3d4e5"]}"#;
let meta = Meta { let meta = Meta {
request_processor: None, request_processor: JsonRpcRequestProcessor::new(Arc::new(bank)),
}; };
let res = io.handle_request_sync(req, meta); let res = io.handle_request_sync(req, meta);