simplify solana side

Author: jackchuma

base/src/libraries/SVMBridgeLib.sol

@@ -37,7 +37,6 @@ library SVMBridgeLib {
             result = abi.encodePacked(
                 result,
                 uint8(0), // Sol
-                transfer.localToken, // remote_token
                 transfer.to, // to
                 SVMLib.toU64LittleEndian(transfer.remoteAmount) // amount
             );

base/test/libraries/SVMBridgeLib.t.sol

@@ -87,7 +87,6 @@ contract SVMBridgeLibTest is Test {
         bytes memory expected = abi.encodePacked(
             uint8(1), // Transfer variant
             uint8(0), // Sol token type
-            transfer.localToken, // remote_token (20 bytes)
             transfer.to, // to (32 bytes)
             SVMLib.toU64LittleEndian(transfer.remoteAmount), // amount (8 bytes)
             SVMLib.serializeIxs(ixs) // instructions
@@ -114,7 +113,6 @@ contract SVMBridgeLibTest is Test {
         bytes memory expected = abi.encodePacked(
             uint8(1), // Transfer variant
             uint8(0), // Sol token type
-            transfer.localToken, // remote_token (20 bytes)
             transfer.to,
             SVMLib.toU64LittleEndian(transfer.remoteAmount),
             SVMLib.serializeIxs(ixs)
@@ -257,7 +255,6 @@ contract SVMBridgeLibTest is Test {
         bytes memory expected = abi.encodePacked(
             uint8(1), // Transfer variant
             uint8(0), // Sol token type
-            transfer.localToken, // remote_token (20 bytes)
             transfer.to,
             SVMLib.toU64LittleEndian(type(uint64).max),
             SVMLib.serializeIxs(ixs)
@@ -337,7 +334,6 @@ contract SVMBridgeLibTest is Test {
         bytes memory expectedTransfer = abi.encodePacked(
             uint8(1),
             uint8(0),
-            transfer.localToken,
             transfer.to,
             SVMLib.toU64LittleEndian(1000),
             SVMLib.serializeIxs(ixs)

solana/Cargo.lock

@@ -37,3 +37,4 @@ solana-loader-v3-interface = { version = "3.0.0", features = ["serde"] }
 solana-message = "2.2.1"
 solana-signer = "2.2.1"
 solana-transaction = "2.2.1"
+hex-literal = "0.4.1"

solana/programs/bridge/Cargo.toml

@@ -187,6 +187,9 @@ pub struct ProtocolConfig {
     /// Block interval requirement for output root registration. Every Base block associated with a
     /// submitted output root must be a multiple of this number.
     pub block_interval_requirement: u64,
+
+    /// The Base evm address of SOL
+    pub sol_base_address: [u8; 20],
 }
 
 impl ProtocolConfig {
@@ -200,6 +203,8 @@ impl ProtocolConfig {
             self.block_interval_requirement <= 1000,
             BridgeError::InvalidBlockIntervalRequirement
         );
+
+        require!(self.sol_base_address != [0u8; 20], BridgeError::ZeroAddress);
         Ok(())
     }
 }

solana/programs/bridge/src/common/state/bridge.rs

@@ -143,4 +143,7 @@ pub enum BridgeError {
     // Call Type Validation (6900-6999)
     #[msg("Creation with non-zero target")]
     CreationWithNonZeroTarget = 6900,
+
+    #[msg("Zero address")]
+    ZeroAddress,
 }

solana/programs/bridge/src/errors.rs

@@ -190,12 +190,18 @@ mod tests {
         assert_eq!(outgoing_message_data.nonce, 0);
         assert_eq!(outgoing_message_data.sender, from.pubkey());
 
+        let bridge = svm.get_account(&bridge_pda).unwrap();
+        let bridge = Bridge::try_deserialize(&mut &bridge.data[..]).unwrap();
+
         // Verify the message content
         match outgoing_message_data.message {
             crate::solana_to_base::Message::Transfer(transfer) => {
                 assert_eq!(transfer.to, to);
                 assert_eq!(transfer.local_token, NATIVE_SOL_PUBKEY);
-                assert_eq!(transfer.remote_token, [0u8; 20]);
+                assert_eq!(
+                    transfer.remote_token,
+                    bridge.protocol_config.sol_base_address
+                );
                 assert_eq!(transfer.amount, amount);
                 assert!(transfer.call.is_none());
             }
@@ -287,12 +293,18 @@ mod tests {
         let outgoing_message_data =
             OutgoingMessage::try_deserialize(&mut &outgoing_message_account.data[..]).unwrap();
 
+        let bridge = svm.get_account(&bridge_pda).unwrap();
+        let bridge = Bridge::try_deserialize(&mut &bridge.data[..]).unwrap();
+
         // Verify the message content including call
         match outgoing_message_data.message {
             crate::solana_to_base::Message::Transfer(transfer) => {
                 assert_eq!(transfer.to, to);
                 assert_eq!(transfer.local_token, NATIVE_SOL_PUBKEY);
-                assert_eq!(transfer.remote_token, [0u8; 20]);
+                assert_eq!(
+                    transfer.remote_token,
+                    bridge.protocol_config.sol_base_address
+                );
                 assert_eq!(transfer.amount, amount);
 
                 let transfer_call = transfer.call.expect("Expected call to be present");

solana/programs/bridge/src/solana_to_base/instructions/bridge_sol.rs

@@ -259,12 +259,18 @@ mod tests {
         assert_eq!(outgoing_message_data.nonce, 0);
         assert_eq!(outgoing_message_data.sender, from.pubkey());
 
+        let bridge = svm.get_account(&bridge_pda).unwrap();
+        let bridge = Bridge::try_deserialize(&mut &bridge.data[..]).unwrap();
+
         // Verify the message content matches the call buffer data
         match outgoing_message_data.message {
             crate::solana_to_base::Message::Transfer(transfer) => {
                 assert_eq!(transfer.to, to);
                 assert_eq!(transfer.local_token, NATIVE_SOL_PUBKEY);
-                assert_eq!(transfer.remote_token, [0u8; 20]);
+                assert_eq!(
+                    transfer.remote_token,
+                    bridge.protocol_config.sol_base_address
+                );
                 assert_eq!(transfer.amount, amount);
 
                 let transfer_call = transfer.call.expect("Expected call to be present");

solana/programs/bridge/src/solana_to_base/instructions/buffered/bridge_sol.rs

@@ -33,7 +33,7 @@ pub fn bridge_sol_internal<'info>(
         TransferOp {
             to,
             local_token: NATIVE_SOL_PUBKEY,
-            remote_token: [0u8; 20],
+            remote_token: bridge.protocol_config.sol_base_address,
             amount,
             call,
         },

solana/programs/bridge/src/solana_to_base/internal/bridge_sol.rs

@@ -21,6 +21,7 @@ use anchor_spl::{
         spl_token_metadata_interface::state::TokenMetadata,
     },
 };
+use hex_literal::hex;
 use litesvm::LiteSVM;
 use solana_account::Account;
 use solana_keypair::Keypair;
@@ -69,6 +70,7 @@ impl ProtocolConfig {
     pub fn test_new() -> Self {
         Self {
             block_interval_requirement: 300,
+            sol_base_address: hex!("C5b9112382f3c87AFE8e1A28fa52452aF81085AD"),
         }
     }
 }