|
1 | 1 | use super::{instructions, swap, transaction}; |
2 | | -use crate::decode_transaction; |
| 2 | +use crate::{decode_transaction, transaction::is_transaction_bytes}; |
3 | 3 | use gem_encoding::encode_base64; |
4 | 4 | use primitives::{ChainSigner, SignerError, SignerInput, TransferDataOutputType}; |
5 | 5 | use solana_primitives::{Pubkey, sign_message as sign_solana_message}; |
6 | 6 |
|
7 | 7 | #[derive(Default)] |
8 | 8 | pub struct SolanaChainSigner; |
9 | 9 |
|
| 10 | +const SIGN_MESSAGE_PAYLOAD_REJECTION: &str = "Serialized Solana transaction or transaction message received in signMessage request; use signTransaction instead"; |
| 11 | + |
10 | 12 | impl ChainSigner for SolanaChainSigner { |
11 | 13 | fn sign_transfer(&self, input: &SignerInput, private_key: &[u8]) -> Result<String, SignerError> { |
12 | 14 | let sender = Pubkey::from_base58(&input.sender_address).map_err(SignerError::from_display)?; |
@@ -38,6 +40,9 @@ impl ChainSigner for SolanaChainSigner { |
38 | 40 | } |
39 | 41 |
|
40 | 42 | fn sign_message(&self, message: &[u8], private_key: &[u8]) -> Result<String, SignerError> { |
| 43 | + if is_transaction_bytes(message) { |
| 44 | + return Err(SignerError::invalid_input(SIGN_MESSAGE_PAYLOAD_REJECTION)); |
| 45 | + } |
41 | 46 | let signature = sign_solana_message(private_key, message).map_err(|e| SignerError::signing_error(format!("sign: {e}")))?; |
42 | 47 | Ok(bs58::encode(signature.as_bytes()).into_string()) |
43 | 48 | } |
@@ -69,7 +74,7 @@ impl ChainSigner for SolanaChainSigner { |
69 | 74 | #[cfg(test)] |
70 | 75 | mod tests { |
71 | 76 | use super::*; |
72 | | - use crate::signer::testkit::{DOUBLE_SIG_TX, EXPECTED_MESSAGE_HEX, SINGLE_SIG_TX}; |
| 77 | + use crate::signer::testkit::{DOUBLE_SIG_TX, EXPECTED_MESSAGE_HEX, SINGLE_SIG_TX, mock_legacy_transaction}; |
73 | 78 | use gem_encoding::decode_base64; |
74 | 79 | use primitives::testkit::signer_mock::TEST_PRIVATE_KEY; |
75 | 80 | use primitives::{Chain, ChainSigner, SignerInput, TransactionLoadInput, TransferDataOutputType}; |
@@ -125,10 +130,27 @@ mod tests { |
125 | 130 |
|
126 | 131 | #[test] |
127 | 132 | fn test_sign_message() { |
128 | | - let signer = SolanaChainSigner; |
129 | | - |
130 | | - let result = signer.sign_message(b"hello", &TEST_PRIVATE_KEY).unwrap(); |
| 133 | + let result = SolanaChainSigner.sign_message(b"hello", &TEST_PRIVATE_KEY).unwrap(); |
131 | 134 |
|
132 | 135 | assert_eq!(bs58::decode(result).into_vec().unwrap().len(), 64); |
133 | 136 | } |
| 137 | + |
| 138 | + #[test] |
| 139 | + fn test_sign_message_rejects_transaction_payloads() { |
| 140 | + let bytes = decode_base64(SINGLE_SIG_TX).unwrap(); |
| 141 | + let result = SolanaChainSigner.sign_message(&bytes, &TEST_PRIVATE_KEY); |
| 142 | + |
| 143 | + assert_eq!(result.unwrap_err().to_string(), format!("Invalid input: {SIGN_MESSAGE_PAYLOAD_REJECTION}")); |
| 144 | + |
| 145 | + let transaction = VersionedTransaction::deserialize_with_version(&bytes).unwrap(); |
| 146 | + let message = transaction.serialize_message().unwrap(); |
| 147 | + let result = SolanaChainSigner.sign_message(&message, &TEST_PRIVATE_KEY); |
| 148 | + |
| 149 | + assert_eq!(result.unwrap_err().to_string(), format!("Invalid input: {SIGN_MESSAGE_PAYLOAD_REJECTION}")); |
| 150 | + |
| 151 | + let message = mock_legacy_transaction().serialize_message().unwrap(); |
| 152 | + let result = SolanaChainSigner.sign_message(&message, &TEST_PRIVATE_KEY); |
| 153 | + |
| 154 | + assert_eq!(result.unwrap_err().to_string(), format!("Invalid input: {SIGN_MESSAGE_PAYLOAD_REJECTION}")); |
| 155 | + } |
134 | 156 | } |
0 commit comments