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

Rpc: support extended config for getConfirmedBlock (#15827)

Browse Source 
* Add rpc confirmed-block config wrapper to support struct of extended config

* Update docs

* Make config wrapper generic and use in getConfirmedTransaction as well

* Update/clean confirmed-tx docs
This commit is contained in:
Tyera Eulberg
2021-03-12 15:19:45 -07:00
committed by GitHub
parent 79280b304b
commit 5b2da19c93
3 changed files with 69 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/rpc.rs
View File

@ -719,9 +719,12 @@ impl JsonRpcRequestProcessor {
pub fn get_confirmed_block(
&self,
slot: Slot,
encoding: Option<UiTransactionEncoding>,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedBlockConfig>>,
) -> Result<Option<EncodedConfirmedBlock>> {
let encoding = encoding.unwrap_or(UiTransactionEncoding::Json);
let config = config
.map(|config| config.convert_to_current())
.unwrap_or_default();
let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Json);
if self.config.enable_rpc_transaction_history
&& slot
<= self
@ -987,9 +990,12 @@ impl JsonRpcRequestProcessor {
pub fn get_confirmed_transaction(
&self,
signature: Signature,
encoding: Option<UiTransactionEncoding>,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedTransactionConfig>>,
) -> Option<EncodedConfirmedTransaction> {
let encoding = encoding.unwrap_or(UiTransactionEncoding::Json);
let config = config
.map(|config| config.convert_to_current())
.unwrap_or_default();
let encoding = config.encoding.unwrap_or(UiTransactionEncoding::Json);
if self.config.enable_rpc_transaction_history {
match self
.blockstore
@ -2178,7 +2184,7 @@ pub mod rpc_full {
&self,
meta: Self::Metadata,
slot: Slot,
encoding: Option<UiTransactionEncoding>,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedBlockConfig>>,
) -> Result<Option<EncodedConfirmedBlock>>;
#[rpc(meta, name = "getBlockTime")]
@ -2206,7 +2212,7 @@ pub mod rpc_full {
&self,
meta: Self::Metadata,
signature_str: String,
encoding: Option<UiTransactionEncoding>,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedTransactionConfig>>,
) -> Result<Option<EncodedConfirmedTransaction>>;
#[rpc(meta, name = "getConfirmedSignaturesForAddress")]
@ -2786,10 +2792,10 @@ pub mod rpc_full {
&self,
meta: Self::Metadata,
slot: Slot,
encoding: Option<UiTransactionEncoding>,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedBlockConfig>>,
) -> Result<Option<EncodedConfirmedBlock>> {
debug!("get_confirmed_block rpc request received: {:?}", slot);
meta.get_confirmed_block(slot, encoding)
meta.get_confirmed_block(slot, config)
}
fn get_confirmed_blocks(
@ -2830,14 +2836,14 @@ pub mod rpc_full {
&self,
meta: Self::Metadata,
signature_str: String,
encoding: Option<UiTransactionEncoding>,
config: Option<RpcEncodingConfigWrapper<RpcConfirmedTransactionConfig>>,
) -> Result<Option<EncodedConfirmedTransaction>> {
debug!(
"get_confirmed_transaction rpc request received: {:?}",
signature_str
);
let signature = verify_signature(&signature_str)?;
Ok(meta.get_confirmed_transaction(signature, encoding))
Ok(meta.get_confirmed_transaction(signature, config))
}
fn get_confirmed_signatures_for_address(