From 05731a78630a3712940824cc90bcf0696b8c98c4 Mon Sep 17 00:00:00 2001 From: Arrowana Date: Tue, 16 May 2023 15:57:06 +0800 Subject: [PATCH 1/3] fix: remove skip preflight from cli --- cli/src/lib.rs | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/cli/src/lib.rs b/cli/src/lib.rs index b63dbc7a4f..17c83b8ab2 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -1934,10 +1934,7 @@ fn idl_set_buffer(cfg_override: &ConfigOverride, program_id: Pubkey, buffer: Pub client.send_and_confirm_transaction_with_spinner_and_config( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, + RpcSendTransactionConfig::default(), )?; Ok(()) @@ -2023,10 +2020,7 @@ fn idl_set_authority( client.send_and_confirm_transaction_with_spinner_and_config( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, + RpcSendTransactionConfig::default(), )?; println!("Authority update complete."); @@ -2080,10 +2074,7 @@ fn idl_close_account(cfg: &Config, program_id: &Pubkey, idl_address: Pubkey) -> client.send_and_confirm_transaction_with_spinner_and_config( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, + RpcSendTransactionConfig::default(), )?; Ok(()) @@ -2144,10 +2135,7 @@ fn idl_write(cfg: &Config, program_id: &Pubkey, idl: &Idl, idl_address: Pubkey) client.send_and_confirm_transaction_with_spinner_and_config( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, + RpcSendTransactionConfig::default(), )?; offset += MAX_WRITE_SIZE; } @@ -3178,10 +3166,7 @@ fn create_idl_account( client.send_and_confirm_transaction_with_spinner_and_config( &tx, CommitmentConfig::finalized(), - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, + RpcSendTransactionConfig::default(), )?; } @@ -3246,10 +3231,7 @@ fn create_idl_buffer( client.send_and_confirm_transaction_with_spinner_and_config( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig { - skip_preflight: true, - ..RpcSendTransactionConfig::default() - }, + RpcSendTransactionConfig::default(), )?; Ok(buffer.pubkey()) From e8c96cbe930429ae888b6d15bda58b71faec716f Mon Sep 17 00:00:00 2001 From: acheron Date: Tue, 16 May 2023 13:53:36 +0200 Subject: [PATCH 2/3] Remove config --- cli/src/lib.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 17c83b8ab2..b1df254e4a 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -20,7 +20,6 @@ use semver::{Version, VersionReq}; use serde::{Deserialize, Serialize}; use serde_json::{json, Map, Value as JsonValue}; use solana_client::rpc_client::RpcClient; -use solana_client::rpc_config::RpcSendTransactionConfig; use solana_program::instruction::{AccountMeta, Instruction}; use solana_sdk::account_utils::StateMut; use solana_sdk::bpf_loader; @@ -1931,10 +1930,9 @@ fn idl_set_buffer(cfg_override: &ConfigOverride, program_id: Pubkey, buffer: Pub ); // Send the transaction. - client.send_and_confirm_transaction_with_spinner_and_config( + client.send_and_confirm_transaction_with_spinner_and_commitment( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig::default(), )?; Ok(()) @@ -2017,10 +2015,9 @@ fn idl_set_authority( &[&keypair], latest_hash, ); - client.send_and_confirm_transaction_with_spinner_and_config( + client.send_and_confirm_transaction_with_spinner_and_commitment( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig::default(), )?; println!("Authority update complete."); @@ -2071,10 +2068,9 @@ fn idl_close_account(cfg: &Config, program_id: &Pubkey, idl_address: Pubkey) -> &[&keypair], latest_hash, ); - client.send_and_confirm_transaction_with_spinner_and_config( + client.send_and_confirm_transaction_with_spinner_and_commitment( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig::default(), )?; Ok(()) @@ -2132,10 +2128,9 @@ fn idl_write(cfg: &Config, program_id: &Pubkey, idl: &Idl, idl_address: Pubkey) &[&keypair], latest_hash, ); - client.send_and_confirm_transaction_with_spinner_and_config( + client.send_and_confirm_transaction_with_spinner_and_commitment( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig::default(), )?; offset += MAX_WRITE_SIZE; } @@ -3163,10 +3158,9 @@ fn create_idl_account( &[&keypair], latest_hash, ); - client.send_and_confirm_transaction_with_spinner_and_config( + client.send_and_confirm_transaction_with_spinner_and_commitment( &tx, CommitmentConfig::finalized(), - RpcSendTransactionConfig::default(), )?; } @@ -3228,10 +3222,9 @@ fn create_idl_buffer( ); // Send the transaction. - client.send_and_confirm_transaction_with_spinner_and_config( + client.send_and_confirm_transaction_with_spinner_and_commitment( &tx, CommitmentConfig::confirmed(), - RpcSendTransactionConfig::default(), )?; Ok(buffer.pubkey()) From 20730bfe2f1e7540fc4cd5bef253e335fcf903f0 Mon Sep 17 00:00:00 2001 From: acheron Date: Tue, 16 May 2023 14:12:25 +0200 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 398f7d1de8..63f5bd5364 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The minor version will be incremented upon a breaking change and the patch versi - ts: Narrowed `AccountClient` type to it's appropriate account type ([#2440](https://github.com/coral-xyz/anchor/pull/2440)) - lang: Fix inability to use identifiers `program_id`, `accounts`, `ix_data`, `remaining_accounts` in instruction arguments ([#2464](https://github.com/coral-xyz/anchor/pull/2464)) - cli: Fix incorrect `metadata.address` generation in IDL after deploying with a custom keypair ([#2485](https://github.com/coral-xyz/anchor/pull/2485)) +- cli: IDL commands no longer hang when the payer doesn't have funds to pay for the transaction fee ([#2492](https://github.com/coral-xyz/anchor/pull/2492)) ### Breaking