* Add support for versioned transactions, but disable by default * merge conflicts * trent's feedback * bump Cargo.lock * Fix transaction error encoding * Rename legacy_transaction method * cargo clippy * Clean up casts, int arithmetic, and unused methods * Check for duplicates in sanitized message conversion * fix clippy * fix new test * Fix bpf conditional compilation for message module
		
			
				
	
	
		
			336 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			336 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
| use {
 | |
|     crate::{
 | |
|         hash::Hash,
 | |
|         instruction::CompiledInstruction,
 | |
|         message::{v0, Message, MessageHeader},
 | |
|         pubkey::Pubkey,
 | |
|         sanitize::{Sanitize, SanitizeError},
 | |
|         short_vec,
 | |
|     },
 | |
|     serde::{
 | |
|         de::{self, Deserializer, SeqAccess, Visitor},
 | |
|         ser::{SerializeTuple, Serializer},
 | |
|         {Deserialize, Serialize},
 | |
|     },
 | |
|     std::fmt,
 | |
| };
 | |
| 
 | |
| /// Bit mask that indicates whether a serialized message is versioned.
 | |
| pub const MESSAGE_VERSION_PREFIX: u8 = 0x80;
 | |
| 
 | |
| /// Message versions supported by the Solana runtime.
 | |
| ///
 | |
| /// # Serialization
 | |
| ///
 | |
| /// If the first bit is set, the remaining 7 bits will be used to determine
 | |
| /// 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")]
 | |
| #[derive(Debug, PartialEq, Eq, Clone, AbiEnumVisitor, AbiExample)]
 | |
| pub enum VersionedMessage {
 | |
|     Legacy(Message),
 | |
|     V0(v0::Message),
 | |
| }
 | |
| 
 | |
| impl VersionedMessage {
 | |
|     pub fn header(&self) -> &MessageHeader {
 | |
|         match self {
 | |
|             Self::Legacy(message) => &message.header,
 | |
|             Self::V0(message) => &message.header,
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pub fn unmapped_keys(self) -> Vec<Pubkey> {
 | |
|         match self {
 | |
|             Self::Legacy(message) => message.account_keys,
 | |
|             Self::V0(message) => message.account_keys,
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pub fn unmapped_keys_iter(&self) -> impl Iterator<Item = &Pubkey> {
 | |
|         match self {
 | |
|             Self::Legacy(message) => message.account_keys.iter(),
 | |
|             Self::V0(message) => message.account_keys.iter(),
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pub fn unmapped_keys_len(&self) -> usize {
 | |
|         match self {
 | |
|             Self::Legacy(message) => message.account_keys.len(),
 | |
|             Self::V0(message) => message.account_keys.len(),
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pub fn recent_blockhash(&self) -> &Hash {
 | |
|         match self {
 | |
|             Self::Legacy(message) => &message.recent_blockhash,
 | |
|             Self::V0(message) => &message.recent_blockhash,
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pub fn set_recent_blockhash(&mut self, recent_blockhash: Hash) {
 | |
|         match self {
 | |
|             Self::Legacy(message) => message.recent_blockhash = recent_blockhash,
 | |
|             Self::V0(message) => message.recent_blockhash = recent_blockhash,
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pub fn serialize(&self) -> Vec<u8> {
 | |
|         bincode::serialize(self).unwrap()
 | |
|     }
 | |
| 
 | |
|     /// Compute the blake3 hash of this transaction's message
 | |
|     pub fn hash(&self) -> Hash {
 | |
|         let message_bytes = self.serialize();
 | |
|         Self::hash_raw_message(&message_bytes)
 | |
|     }
 | |
| 
 | |
|     /// Compute the blake3 hash of a raw transaction message
 | |
|     pub fn hash_raw_message(message_bytes: &[u8]) -> Hash {
 | |
|         use blake3::traits::digest::Digest;
 | |
|         use std::convert::TryFrom;
 | |
|         let mut hasher = blake3::Hasher::new();
 | |
|         hasher.update(b"solana-tx-message-v1");
 | |
|         hasher.update(message_bytes);
 | |
|         Hash(<[u8; crate::hash::HASH_BYTES]>::try_from(hasher.finalize().as_slice()).unwrap())
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Default for VersionedMessage {
 | |
|     fn default() -> Self {
 | |
|         Self::Legacy(Message::default())
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Sanitize for VersionedMessage {
 | |
|     fn sanitize(&self) -> Result<(), SanitizeError> {
 | |
|         match self {
 | |
|             Self::Legacy(message) => message.sanitize(),
 | |
|             Self::V0(message) => message.sanitize(),
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl Serialize for VersionedMessage {
 | |
|     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
 | |
|     where
 | |
|         S: Serializer,
 | |
|     {
 | |
|         match self {
 | |
|             Self::Legacy(message) => {
 | |
|                 let mut seq = serializer.serialize_tuple(1)?;
 | |
|                 seq.serialize_element(message)?;
 | |
|                 seq.end()
 | |
|             }
 | |
|             Self::V0(message) => {
 | |
|                 let mut seq = serializer.serialize_tuple(2)?;
 | |
|                 seq.serialize_element(&MESSAGE_VERSION_PREFIX)?;
 | |
|                 seq.serialize_element(message)?;
 | |
|                 seq.end()
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| enum MessagePrefix {
 | |
|     Legacy(u8),
 | |
|     Versioned(u8),
 | |
| }
 | |
| 
 | |
| impl<'de> Deserialize<'de> for MessagePrefix {
 | |
|     fn deserialize<D>(deserializer: D) -> Result<MessagePrefix, D::Error>
 | |
|     where
 | |
|         D: Deserializer<'de>,
 | |
|     {
 | |
|         struct PrefixVisitor;
 | |
| 
 | |
|         impl<'de> Visitor<'de> for PrefixVisitor {
 | |
|             type Value = MessagePrefix;
 | |
| 
 | |
|             fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
 | |
|                 formatter.write_str("message prefix byte")
 | |
|             }
 | |
| 
 | |
|             fn visit_u8<E>(self, byte: u8) -> Result<MessagePrefix, E> {
 | |
|                 if byte & MESSAGE_VERSION_PREFIX != 0 {
 | |
|                     Ok(MessagePrefix::Versioned(byte & !MESSAGE_VERSION_PREFIX))
 | |
|                 } else {
 | |
|                     Ok(MessagePrefix::Legacy(byte))
 | |
|                 }
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         deserializer.deserialize_u8(PrefixVisitor)
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl<'de> Deserialize<'de> for VersionedMessage {
 | |
|     fn deserialize<D>(deserializer: D) -> Result<VersionedMessage, D::Error>
 | |
|     where
 | |
|         D: Deserializer<'de>,
 | |
|     {
 | |
|         struct MessageVisitor;
 | |
| 
 | |
|         impl<'de> Visitor<'de> for MessageVisitor {
 | |
|             type Value = VersionedMessage;
 | |
| 
 | |
|             fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
 | |
|                 formatter.write_str("message bytes")
 | |
|             }
 | |
| 
 | |
|             fn visit_seq<A>(self, mut seq: A) -> Result<VersionedMessage, A::Error>
 | |
|             where
 | |
|                 A: SeqAccess<'de>,
 | |
|             {
 | |
|                 let prefix: MessagePrefix = seq
 | |
|                     .next_element()?
 | |
|                     .ok_or_else(|| de::Error::invalid_length(0, &self))?;
 | |
| 
 | |
|                 match prefix {
 | |
|                     MessagePrefix::Legacy(num_required_signatures) => {
 | |
|                         // The remaining fields of the legacy Message struct after the first byte.
 | |
|                         #[derive(Serialize, Deserialize)]
 | |
|                         struct RemainingLegacyMessage {
 | |
|                             pub num_readonly_signed_accounts: u8,
 | |
|                             pub num_readonly_unsigned_accounts: u8,
 | |
|                             #[serde(with = "short_vec")]
 | |
|                             pub account_keys: Vec<Pubkey>,
 | |
|                             pub recent_blockhash: Hash,
 | |
|                             #[serde(with = "short_vec")]
 | |
|                             pub instructions: Vec<CompiledInstruction>,
 | |
|                         }
 | |
| 
 | |
|                         let message: RemainingLegacyMessage =
 | |
|                             seq.next_element()?.ok_or_else(|| {
 | |
|                                 // will never happen since tuple length is always 2
 | |
|                                 de::Error::invalid_length(1, &self)
 | |
|                             })?;
 | |
| 
 | |
|                         Ok(VersionedMessage::Legacy(Message {
 | |
|                             header: MessageHeader {
 | |
|                                 num_required_signatures,
 | |
|                                 num_readonly_signed_accounts: message.num_readonly_signed_accounts,
 | |
|                                 num_readonly_unsigned_accounts: message
 | |
|                                     .num_readonly_unsigned_accounts,
 | |
|                             },
 | |
|                             account_keys: message.account_keys,
 | |
|                             recent_blockhash: message.recent_blockhash,
 | |
|                             instructions: message.instructions,
 | |
|                         }))
 | |
|                     }
 | |
|                     MessagePrefix::Versioned(version) => {
 | |
|                         if version == 0 {
 | |
|                             Ok(VersionedMessage::V0(seq.next_element()?.ok_or_else(
 | |
|                                 || {
 | |
|                                     // will never happen since tuple length is always 2
 | |
|                                     de::Error::invalid_length(1, &self)
 | |
|                                 },
 | |
|                             )?))
 | |
|                         } else {
 | |
|                             Err(de::Error::invalid_value(
 | |
|                                 de::Unexpected::Unsigned(version as u64),
 | |
|                                 &"supported versions: [0]",
 | |
|                             ))
 | |
|                         }
 | |
|                     }
 | |
|                 }
 | |
|             }
 | |
|         }
 | |
| 
 | |
|         deserializer.deserialize_tuple(2, MessageVisitor)
 | |
|     }
 | |
| }
 | |
| 
 | |
| #[cfg(test)]
 | |
| mod tests {
 | |
|     use super::*;
 | |
|     use crate::{
 | |
|         instruction::{AccountMeta, Instruction},
 | |
|         message::v0::AddressMapIndexes,
 | |
|     };
 | |
| 
 | |
|     #[test]
 | |
|     fn test_legacy_message_serialization() {
 | |
|         let program_id0 = Pubkey::new_unique();
 | |
|         let program_id1 = Pubkey::new_unique();
 | |
|         let id0 = Pubkey::new_unique();
 | |
|         let id1 = Pubkey::new_unique();
 | |
|         let id2 = Pubkey::new_unique();
 | |
|         let id3 = Pubkey::new_unique();
 | |
|         let instructions = vec![
 | |
|             Instruction::new_with_bincode(program_id0, &0, vec![AccountMeta::new(id0, false)]),
 | |
|             Instruction::new_with_bincode(program_id0, &0, vec![AccountMeta::new(id1, true)]),
 | |
|             Instruction::new_with_bincode(
 | |
|                 program_id1,
 | |
|                 &0,
 | |
|                 vec![AccountMeta::new_readonly(id2, false)],
 | |
|             ),
 | |
|             Instruction::new_with_bincode(
 | |
|                 program_id1,
 | |
|                 &0,
 | |
|                 vec![AccountMeta::new_readonly(id3, true)],
 | |
|             ),
 | |
|         ];
 | |
| 
 | |
|         let mut message = Message::new(&instructions, Some(&id1));
 | |
|         message.recent_blockhash = Hash::new_unique();
 | |
| 
 | |
|         let bytes1 = bincode::serialize(&message).unwrap();
 | |
|         let bytes2 = bincode::serialize(&VersionedMessage::Legacy(message.clone())).unwrap();
 | |
| 
 | |
|         assert_eq!(bytes1, bytes2);
 | |
| 
 | |
|         let message1: Message = bincode::deserialize(&bytes1).unwrap();
 | |
|         let message2: VersionedMessage = bincode::deserialize(&bytes2).unwrap();
 | |
| 
 | |
|         if let VersionedMessage::Legacy(message2) = message2 {
 | |
|             assert_eq!(message, message1);
 | |
|             assert_eq!(message1, message2);
 | |
|         } else {
 | |
|             panic!("should deserialize to legacy message");
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     #[test]
 | |
|     fn test_versioned_message_serialization() {
 | |
|         let message = v0::Message {
 | |
|             header: MessageHeader {
 | |
|                 num_required_signatures: 1,
 | |
|                 num_readonly_signed_accounts: 0,
 | |
|                 num_readonly_unsigned_accounts: 2,
 | |
|             },
 | |
|             recent_blockhash: Hash::new_unique(),
 | |
|             account_keys: vec![
 | |
|                 Pubkey::new_unique(),
 | |
|                 Pubkey::new_unique(),
 | |
|                 Pubkey::new_unique(),
 | |
|             ],
 | |
|             address_map_indexes: vec![
 | |
|                 AddressMapIndexes {
 | |
|                     writable: vec![1],
 | |
|                     readonly: vec![0],
 | |
|                 },
 | |
|                 AddressMapIndexes {
 | |
|                     writable: vec![0],
 | |
|                     readonly: vec![1],
 | |
|                 },
 | |
|             ],
 | |
|             instructions: vec![CompiledInstruction {
 | |
|                 program_id_index: 1,
 | |
|                 accounts: vec![0],
 | |
|                 data: vec![],
 | |
|             }],
 | |
|         };
 | |
| 
 | |
|         let bytes = bincode::serialize(&VersionedMessage::V0(message.clone())).unwrap();
 | |
|         let message_from_bytes: VersionedMessage = bincode::deserialize(&bytes).unwrap();
 | |
| 
 | |
|         if let VersionedMessage::V0(message_from_bytes) = message_from_bytes {
 | |
|             assert_eq!(message, message_from_bytes);
 | |
|         } else {
 | |
|             panic!("should deserialize to versioned message");
 | |
|         }
 | |
|     }
 | |
| }
 |