Allow the sendTransaction preflight commitment level to be configured

This commit is contained in:
Michael Vines
2020-08-21 20:22:14 -07:00
parent 4bd0ced87d
commit b660704faa
5 changed files with 16 additions and 2 deletions

View File

@ -567,6 +567,7 @@ impl CliConfig<'_> {
config.commitment = CommitmentConfig::recent(); config.commitment = CommitmentConfig::recent();
config.send_transaction_config = RpcSendTransactionConfig { config.send_transaction_config = RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}; };
config config
} }
@ -1183,6 +1184,7 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
&transaction, &transaction,
RpcSendTransactionConfig { RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}, },
) )
.ok(); .ok();
@ -1360,6 +1362,7 @@ fn process_deploy(
config.commitment, config.commitment,
RpcSendTransactionConfig { RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}, },
) )
.map_err(|e| { .map_err(|e| {

View File

@ -12,12 +12,14 @@ pub struct RpcSignatureStatusConfig {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct RpcSendTransactionConfig { pub struct RpcSendTransactionConfig {
pub skip_preflight: bool, pub skip_preflight: bool,
pub preflight_commitment: Option<CommitmentConfig>,
} }
#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct RpcSimulateTransactionConfig { pub struct RpcSimulateTransactionConfig {
pub sig_verify: bool, pub sig_verify: bool,
pub commitment: Option<CommitmentConfig>,
} }
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

View File

@ -2132,7 +2132,10 @@ impl RpcSol for RpcSolImpl {
.into()); .into());
} }
if let (Err(err), _log_output) = bank.simulate_transaction(transaction.clone()) { let preflight_bank = &*meta.bank(config.preflight_commitment);
if let (Err(err), _log_output) =
preflight_bank.simulate_transaction(transaction.clone())
{
// Note: it's possible that the transaction simulation failed but the actual // Note: it's possible that the transaction simulation failed but the actual
// transaction would succeed, such as when a transaction depends on an earlier // transaction would succeed, such as when a transaction depends on an earlier
// transaction that has yet to reach max confirmations. In these cases the user // transaction that has yet to reach max confirmations. In these cases the user
@ -2164,7 +2167,7 @@ impl RpcSol for RpcSolImpl {
Ok(()) Ok(())
}; };
let bank = &*meta.bank(None); let bank = &*meta.bank(config.commitment);
let logs = if result.is_ok() { let logs = if result.is_ok() {
let (transaction_result, log_messages) = bank.simulate_transaction(transaction); let (transaction_result, log_messages) = bank.simulate_transaction(transaction);
result = transaction_result; result = transaction_result;

View File

@ -1353,6 +1353,7 @@ Before submitting, the following preflight checks are performed:
- `<string>` - fully-signed Transaction, as base-58 encoded string - `<string>` - fully-signed Transaction, as base-58 encoded string
- `<object>` - (optional) Configuration object containing the following field: - `<object>` - (optional) Configuration object containing the following field:
- `skipPreflight: <bool>` - if true, skip the preflight transaction checks (default: false) - `skipPreflight: <bool>` - if true, skip the preflight transaction checks (default: false)
- `preflightCommitment: <object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment) level to use for preflight (default: max).
#### Results: #### Results:
@ -1377,6 +1378,7 @@ Simulate sending a transaction
- `<string>` - Transaction, as base-58 encoded string. The transaction must have a valid blockhash, but is not required to be signed. - `<string>` - Transaction, as base-58 encoded string. The transaction must have a valid blockhash, but is not required to be signed.
- `<object>` - (optional) Configuration object containing the following field: - `<object>` - (optional) Configuration object containing the following field:
- `sigVerify: <bool>` - if true the transaction signatures will be verified (default: false) - `sigVerify: <bool>` - if true the transaction signatures will be verified (default: false)
- `commitment: <object>` - (optional) [Commitment](jsonrpc-api.md#configuring-state-commitment) level to simulate the transaction at (default: max).
#### Results: #### Results:

View File

@ -494,6 +494,7 @@ mod test {
), ),
RpcSendTransactionConfig { RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}, },
) )
.unwrap(); .unwrap();
@ -549,6 +550,7 @@ mod test {
), ),
RpcSendTransactionConfig { RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}, },
) )
.unwrap(); .unwrap();
@ -594,6 +596,7 @@ mod test {
), ),
RpcSendTransactionConfig { RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}, },
) )
.unwrap(); .unwrap();
@ -632,6 +635,7 @@ mod test {
), ),
RpcSendTransactionConfig { RpcSendTransactionConfig {
skip_preflight: true, skip_preflight: true,
..RpcSendTransactionConfig::default()
}, },
) )
.unwrap(); .unwrap();