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

Increase timeout when confirming airdrop for max commitment (#6858)

Browse Source 
* Increase timeout when confirming airdrop for max commitment

* Add commitment to airdrop rpc trace

* Flip commitment check
This commit is contained in:
Justin Starry
2019-11-10 12:20:52 -05:00
committed by GitHub
parent 62eea636b0
commit 5835b3b8eb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/rpc.rs
View File

@ -757,7 +757,12 @@ impl RpcSol for RpcSolImpl {
lamports: u64, lamports: u64,
commitment: Option<CommitmentConfig>, commitment: Option<CommitmentConfig>,
) -> Result<String> { ) -> Result<String> {
trace!("request_airdrop id={} lamports={}", pubkey_str, lamports); trace!(
"request_airdrop id={} lamports={} commitment: {:?}",
pubkey_str,
lamports,
&commitment
);
let drone_addr = meta let drone_addr = meta
.request_processor .request_processor
@ -798,6 +803,10 @@ impl RpcSol for RpcSolImpl {
let signature = transaction.signatures[0]; let signature = transaction.signatures[0];
let now = Instant::now(); let now = Instant::now();
let mut signature_status; let mut signature_status;
let signature_timeout = match &commitment {
Some(config) if config.commitment == CommitmentLevel::Recent => 5,
_ => 30,
};
loop { loop {
signature_status = meta signature_status = meta
.request_processor .request_processor
@ -809,7 +818,7 @@ impl RpcSol for RpcSolImpl {
if signature_status == Some(Ok(())) { if signature_status == Some(Ok(())) {
info!("airdrop signature ok"); info!("airdrop signature ok");
return Ok(signature.to_string()); return Ok(signature.to_string());
} else if now.elapsed().as_secs() > 5 { } else if now.elapsed().as_secs() > signature_timeout {
info!("airdrop signature timeout"); info!("airdrop signature timeout");
return Err(Error::internal_error()); return Err(Error::internal_error());
} }