Skip to content

Refactor: improve nonce and block injection in extrinsic params #2032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsdw merged 3 commits into from
Jul 4, 2025
Merged

Refactor: improve nonce and block injection in extrinsic params #2032

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d06abb8
Refactor: improve nonce and block injection in extrinsic params
puzzle-rusher Jul 2, 2025
b79f17c
remove excess import
puzzle-rusher Jul 2, 2025
1b0ad3e
Merge branch 'master' into refactor/inject-account-nonce-block
jsdw Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions subxt/src/tx/tx_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::{
};
use codec::{Compact, Decode, Encode};
use derive_where::derive_where;
use futures::future::try_join;
use subxt_core::tx::TransactionVersion;

/// A client for working with transactions.
Expand Down Expand Up @@ -605,13 +606,15 @@ async fn inject_account_nonce_and_block<T: Config, Client: OnlineClientT<T>>(
use subxt_core::config::transaction_extensions::Params;

let block_ref = client.backend().latest_finalized_block_ref().await?;
let block_header = client
.backend()
.block_header(block_ref.hash())
.await?
.ok_or_else(|| Error::Block(BlockError::not_found(block_ref.hash())))?;
let account_nonce =
crate::blocks::get_account_nonce(client, account_id, block_ref.hash()).await?;

let (block_header, account_nonce) = try_join(
client.backend().block_header(block_ref.hash()),
crate::blocks::get_account_nonce(client, account_id, block_ref.hash()),
)
.await?;

let block_header =
block_header.ok_or_else(|| Error::Block(BlockError::not_found(block_ref.hash())))?;

params.inject_account_nonce(account_nonce);
params.inject_block(block_header.number().into(), block_ref.hash());
Expand Down
Loading