Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions message/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ anyhow = { workspace = true }
bitflags = { workspace = true }
borsh = { workspace = true }
itertools = { workspace = true }
proptest = { workspace = true }
serde_json = { workspace = true }
solana-address-lookup-table-interface = { workspace = true, features = [
"bincode",
Expand Down
18 changes: 17 additions & 1 deletion message/src/sanitized.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use {
compiled_instruction::CompiledInstruction,
legacy,
v0::{self, LoadedAddresses},
AccountKeys, AddressLoader, MessageHeader, SanitizedVersionedMessage, VersionedMessage,
v1, AccountKeys, AddressLoader, MessageHeader, SanitizedVersionedMessage, VersionedMessage,
},
solana_address::Address,
solana_hash::Hash,
Expand Down Expand Up @@ -79,6 +79,8 @@ pub enum SanitizedMessage {
Legacy(LegacyMessage<'static>),
/// Sanitized version #0 message with dynamically loaded addresses
V0(v0::LoadedMessage<'static>),
/// Sanitized version #1 message (4KB transactions, no address lookup tables)
V1(v1::LoadedMessage),
}

impl SanitizedMessage {
Expand All @@ -103,6 +105,10 @@ impl SanitizedMessage {
reserved_account_keys,
))
}
VersionedMessage::V1(message) => {
// V1 messages do not use address lookup tables - all addresses are inline
SanitizedMessage::V1(v1::LoadedMessage::new(message, reserved_account_keys))
}
})
}

Expand All @@ -123,6 +129,7 @@ impl SanitizedMessage {
match self {
SanitizedMessage::Legacy(message) => message.has_duplicates(),
SanitizedMessage::V0(message) => message.has_duplicates(),
SanitizedMessage::V1(message) => message.has_duplicates(),
}
}

Expand All @@ -132,6 +139,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(legacy_message) => &legacy_message.message.header,
Self::V0(loaded_msg) => &loaded_msg.message.header,
Self::V1(v1_msg) => &v1_msg.message().header,
}
}

Expand All @@ -156,6 +164,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(legacy_message) => &legacy_message.message.recent_blockhash,
Self::V0(loaded_msg) => &loaded_msg.message.recent_blockhash,
Self::V1(v1_msg) => &v1_msg.message().lifetime_specifier,
}
}

Expand All @@ -165,6 +174,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(legacy_message) => &legacy_message.message.instructions,
Self::V0(loaded_msg) => &loaded_msg.message.instructions,
Self::V1(v1_msg) => &v1_msg.message().instructions,
}
}

Expand All @@ -188,6 +198,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(legacy_message) => &legacy_message.message.account_keys,
Self::V0(loaded_msg) => &loaded_msg.message.account_keys,
Self::V1(v1_msg) => &v1_msg.message().account_keys,
}
}

Expand All @@ -196,6 +207,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(message) => message.account_keys(),
Self::V0(message) => message.account_keys(),
Self::V1(message) => message.account_keys(),
}
}

Expand All @@ -204,6 +216,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(_message) => &[],
Self::V0(message) => &message.message.address_table_lookups,
Self::V1(_message) => &[], // V1 does not use address lookup tables
}
}

Expand All @@ -225,6 +238,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(message) => message.is_key_called_as_program(key_index),
Self::V0(message) => message.is_key_called_as_program(key_index),
Self::V1(message) => message.is_key_called_as_program(key_index),
}
}

Expand All @@ -234,6 +248,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(message) => message.is_writable(index),
Self::V0(message) => message.is_writable(index),
Self::V1(message) => message.is_writable(index),
}
}

Expand Down Expand Up @@ -294,6 +309,7 @@ impl SanitizedMessage {
match self {
Self::Legacy(message) => message.is_upgradeable_loader_present(),
Self::V0(message) => message.is_upgradeable_loader_present(),
Self::V1(message) => message.is_upgradeable_loader_present(),
}
}

Expand Down
Loading