Skip to content

fix(core): Fix metadata fields parsing #223

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
MicaiahReid merged 8 commits into from
Jul 16, 2025
Merged

fix(core): Fix metadata fields parsing #223

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e4e9f83
fix(core): improve error handling and block retrieval logic
BretasArthur1 Jul 11, 2025
1e80006
refactor(core): update transaction handling and improve UI message se…
BretasArthur1 Jul 14, 2025
2e4a0fc
fix(core): correct absolute_slot handling in tests and improve get_fi…
BretasArthur1 Jul 14, 2025
a16b970
fix(core): update transaction confirmation status handling in GetTran…
BretasArthur1 Jul 14, 2025
f4d04b2
fix(core): improve transaction metadata serialization and handling to…
BretasArthur1 Jul 15, 2025
b89b6f0
fix(core): remove unnecessary context manipulation in block retrieval…
BretasArthur1 Jul 15, 2025
dea07c6
refactor(core): Refactor `transform_tx_metadata_to_ui_accounts` to ta…
BretasArthur1 Jul 16, 2025
4b39be5
fix: fmt
BretasArthur1 Jul 16, 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
29 changes: 18 additions & 11 deletions crates/core/src/rpc/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,25 @@ pub fn transform_tx_metadata_to_ui_accounts(
meta.inner_instructions
Copy link
Copy Markdown
Collaborator

@lgalabru lgalabru Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this method take ownership of meta and transform the data, instead of cloning?
So

pub fn transform_tx_metadata_to_ui_accounts(
    meta: TransactionMetadata,
)

and then use into_iter()
?

.iter()
.enumerate()
.map(|(i, ixs)| {
InnerInstructions {
index: i as u8,
instructions: ixs
.iter()
.map(|ix| InnerInstruction {
instruction: ix.instruction.clone(),
stack_height: Some(ix.stack_height as u32),
})
.collect(),
.filter_map(|(i, ixs)| {
let instructions: Vec<InnerInstruction> = ixs
.iter()
.map(|ix| InnerInstruction {
instruction: ix.instruction.clone(),
stack_height: Some(ix.stack_height as u32),
})
.collect();
if instructions.is_empty() {
None
} else {
Some(
InnerInstructions {
index: i as u8,
instructions,
}
.into(),
)
}
.into()
})
.collect()
}
Expand Down
18 changes: 14 additions & 4 deletions crates/core/src/surfnet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,24 @@ impl GetTransactionResult {
tx: EncodedConfirmedTransactionWithStatusMeta,
latest_absolute_slot: u64,
) -> Self {
let is_finalized = latest_absolute_slot >= tx.slot + FINALIZATION_SLOT_THRESHOLD;
let (confirmation_status, confirmations) = if is_finalized {
(
Some(solana_transaction_status::TransactionConfirmationStatus::Finalized),
None,
)
} else {
(
Some(solana_transaction_status::TransactionConfirmationStatus::Confirmed),
Some((latest_absolute_slot - tx.slot) as usize),
)
};
let status = TransactionStatus {
slot: tx.slot,
confirmations: Some((latest_absolute_slot - tx.slot) as usize),
confirmations,
status: tx.transaction.clone().meta.map_or(Ok(()), |m| m.status),
err: tx.transaction.clone().meta.and_then(|m| m.err),
confirmation_status: Some(
solana_transaction_status::TransactionConfirmationStatus::Confirmed,
),
confirmation_status,
};

Self::FoundTransaction(signature, tx, status)
Expand Down
51 changes: 34 additions & 17 deletions crates/core/src/surfnet/svm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,16 +989,27 @@ impl SurfnetSvm {
status: err.map(|e| Err(e)).unwrap_or(Ok(())),
inner_instructions,
log_messages: OptionSerializer::Some(meta.logs.clone()),
return_data,
return_data: if return_data.is_none() {
OptionSerializer::None
} else {
OptionSerializer::Some(UiTransactionReturnData {
program_id: meta.return_data.program_id.to_string(),
data: (
base64::engine::general_purpose::STANDARD
.encode(&meta.return_data.data),
UiReturnDataEncoding::Base64,
),
})
},
compute_units_consumed: OptionSerializer::Some(
meta.compute_units_consumed,
),
pre_token_balances: OptionSerializer::None, // todo
post_token_balances: OptionSerializer::None, // todo
rewards: OptionSerializer::None, // todo
loaded_addresses: OptionSerializer::None, // todo
pre_balances: vec![],
post_balances: vec![],
pre_token_balances: OptionSerializer::Some(vec![]),
post_token_balances: OptionSerializer::Some(vec![]),
rewards: OptionSerializer::Some(vec![]),
loaded_addresses: OptionSerializer::None,
pre_balances: vec![], // TODO: track real balances
post_balances: vec![], // TODO: track real balances
fee: 0,
}),
version: Some(get_transaction_version(&tx)),
Expand Down Expand Up @@ -1196,17 +1207,23 @@ fn to_ui_inner_instructions(
meta.inner_instructions
.iter()
.enumerate()
.map(|(i, inner_ixs)| UiInnerInstructions {
index: i as u8,
instructions: inner_ixs
.iter()
.map(|ix| {
UiInstruction::Compiled(UiCompiledInstruction::from(
&ix.instruction,
Some(ix.stack_height as u32),
))
.filter_map(|(i, inner_ixs)| {
if inner_ixs.is_empty() {
None
} else {
Some(UiInnerInstructions {
index: i as u8,
instructions: inner_ixs
.iter()
.map(|ix| {
UiInstruction::Compiled(UiCompiledInstruction::from(
&ix.instruction,
Some(ix.stack_height as u32),
))
})
.collect(),
})
.collect(),
}
})
.collect(),
)
Expand Down
24 changes: 14 additions & 10 deletions crates/core/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,21 @@ impl From<TransactionWithStatusMeta> for EncodedConfirmedTransactionWithStatusMe
),
),
log_messages: OptionSerializer::Some(meta.logs),
pre_token_balances: OptionSerializer::None,
post_token_balances: OptionSerializer::None,
rewards: OptionSerializer::None,
pre_token_balances: OptionSerializer::Some(vec![]),
post_token_balances: OptionSerializer::Some(vec![]),
rewards: OptionSerializer::Some(vec![]),
loaded_addresses: OptionSerializer::None,
return_data: OptionSerializer::Some(UiTransactionReturnData {
program_id: meta.return_data.program_id.to_string(),
data: (
BASE64_STANDARD.encode(meta.return_data.data),
UiReturnDataEncoding::Base64,
),
}),
return_data: if meta.return_data.data.is_empty() {
OptionSerializer::None
} else {
OptionSerializer::Some(UiTransactionReturnData {
program_id: meta.return_data.program_id.to_string(),
data: (
BASE64_STANDARD.encode(meta.return_data.data),
UiReturnDataEncoding::Base64,
),
})
},
compute_units_consumed: OptionSerializer::Some(meta.compute_units_consumed),
}),
version: Some(tx.version()),
Expand Down