Reorder serialized mapped message fields for improved compat

This commit is contained in:
Justin Starry 2021-09-25 12:00:06 -04:00 committed by Justin Starry
parent 071cfd7484
commit f220386917
2 changed files with 11 additions and 11 deletions

View File

@ -30,16 +30,6 @@ pub struct Message {
#[serde(with = "short_vec")]
pub account_keys: Vec<Pubkey>,
/// List of address map indexes used to succinctly load additional accounts
/// for this transaction.
///
/// # Notes
///
/// The last `address_map_indexes.len()` accounts of the read-only unsigned
/// accounts are loaded as address maps.
#[serde(with = "short_vec")]
pub address_map_indexes: Vec<AddressMapIndexes>,
/// The blockhash of a recent block.
pub recent_blockhash: Hash,
@ -54,6 +44,16 @@ pub struct Message {
/// map indexes.
#[serde(with = "short_vec")]
pub instructions: Vec<CompiledInstruction>,
/// List of address map indexes used to succinctly load additional accounts
/// for this transaction.
///
/// # Notes
///
/// The last `address_map_indexes.len()` accounts of the read-only unsigned
/// accounts are loaded as address maps.
#[serde(with = "short_vec")]
pub address_map_indexes: Vec<AddressMapIndexes>,
}
impl Sanitize for Message {

View File

@ -26,7 +26,7 @@ pub const MESSAGE_VERSION_PREFIX: u8 = 0x80;
/// which message version is serialized starting from version `0`. If the first
/// is bit is not set, all bytes are used to encode the legacy `Message`
/// format.
#[frozen_abi(digest = "qKNCqQpsBZYQxS9P3hVcFr8hAF4VnqV6ZBdC6KoUvHJ")]
#[frozen_abi(digest = "x2F3RG2RhJQWN6L2N3jebvcAvNYFrhE3sKTPJ4sENvL")]
#[derive(Debug, PartialEq, Eq, Clone, AbiEnumVisitor, AbiExample)]
pub enum VersionedMessage {
Legacy(Message),