From 39143f19cadb5d53c7b47829acd5ad9f2cc9226c Mon Sep 17 00:00:00 2001 From: alan <652732310@qq.com> Date: Mon, 9 Jun 2025 17:58:49 +0800 Subject: [PATCH 1/2] rm useless --- .../src/runtime_transaction/sdk_transactions.rs | 7 +------ .../src/runtime_transaction/transaction_view.rs | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/runtime-transaction/src/runtime_transaction/sdk_transactions.rs b/runtime-transaction/src/runtime_transaction/sdk_transactions.rs index f8662918ff1..c3e9ada6e81 100644 --- a/runtime-transaction/src/runtime_transaction/sdk_transactions.rs +++ b/runtime-transaction/src/runtime_transaction/sdk_transactions.rs @@ -112,18 +112,13 @@ impl RuntimeTransaction { reserved_account_keys, )?; - let mut tx = Self { + let tx = Self { transaction: sanitized_transaction, meta: statically_loaded_runtime_tx.meta, }; - tx.load_dynamic_metadata()?; Ok(tx) } - - fn load_dynamic_metadata(&mut self) -> Result<()> { - Ok(()) - } } impl TransactionWithMeta for RuntimeTransaction { diff --git a/runtime-transaction/src/runtime_transaction/transaction_view.rs b/runtime-transaction/src/runtime_transaction/transaction_view.rs index 5f41103cf2e..103693657b7 100644 --- a/runtime-transaction/src/runtime_transaction/transaction_view.rs +++ b/runtime-transaction/src/runtime_transaction/transaction_view.rs @@ -95,15 +95,10 @@ impl RuntimeTransaction> { let transaction = ResolvedTransactionView::try_new(transaction, loaded_addresses, reserved_account_keys) .map_err(|_| TransactionError::SanitizeFailure)?; - let mut tx = Self { transaction, meta }; - tx.load_dynamic_metadata()?; + let tx = Self { transaction, meta }; Ok(tx) } - - fn load_dynamic_metadata(&mut self) -> Result<()> { - Ok(()) - } } impl TransactionWithMeta for RuntimeTransaction> { From 99770f847fc44651655c563b4e4e4d7379e5fb0f Mon Sep 17 00:00:00 2001 From: alan <652732310@qq.com> Date: Wed, 11 Jun 2025 10:17:27 +0800 Subject: [PATCH 2/2] rm DynamicMeta trait --- runtime-transaction/src/runtime_transaction.rs | 4 ++-- runtime-transaction/src/transaction_meta.rs | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/runtime-transaction/src/runtime_transaction.rs b/runtime-transaction/src/runtime_transaction.rs index 9626ff3638e..14c01a5ddb8 100644 --- a/runtime-transaction/src/runtime_transaction.rs +++ b/runtime-transaction/src/runtime_transaction.rs @@ -10,7 +10,7 @@ //! ALT, RuntimeTransaction transits into Dynamically Loaded state, //! with its dynamic metadata loaded. use { - crate::transaction_meta::{DynamicMeta, StaticMeta, TransactionMeta}, + crate::transaction_meta::{StaticMeta, TransactionMeta}, core::ops::Deref, solana_compute_budget_instruction::compute_budget_instruction_details::*, solana_hash::Hash, @@ -59,7 +59,7 @@ impl StaticMeta for RuntimeTransaction { } } -impl DynamicMeta for RuntimeTransaction {} + impl Deref for RuntimeTransaction { type Target = T; diff --git a/runtime-transaction/src/transaction_meta.rs b/runtime-transaction/src/transaction_meta.rs index 247d9c56239..642cb95207d 100644 --- a/runtime-transaction/src/transaction_meta.rs +++ b/runtime-transaction/src/transaction_meta.rs @@ -8,7 +8,7 @@ //! Hence they are not Option type. Their visibility at different states //! are defined in traits. //! -//! The StaticMeta and DynamicMeta traits are accessor traits on the +//! The StaticMeta trait is accessor traits on the //! RuntimeTransaction types, not the TransactionMeta itself. //! use { @@ -26,13 +26,6 @@ pub trait StaticMeta { fn instruction_data_len(&self) -> u16; } -/// Statically loaded meta is a supertrait of Dynamically loaded meta, when -/// transaction transited successfully into dynamically loaded, it should -/// have both meta data populated and available. -/// Dynamic metadata available after accounts addresses are loaded from -/// on-chain ALT, examples are: transaction usage costs, nonce account. -pub trait DynamicMeta: StaticMeta {} - #[cfg_attr(feature = "dev-context-only-utils", derive(Clone))] #[derive(Debug)] pub struct TransactionMeta {