chore(solana): remove messenger layer [CHAIN-1567]

Author: xenoliss

base/src/Portal.sol

@@ -68,10 +68,13 @@ contract Portal is ReentrancyGuardTransient {
     // TODO: Re-estimate the constants.
     /// @notice Gas reserved for the execution logic between the `_hasMinGas` check and the actual Twin contract
     ///         execution in `relayCall`.
-    uint64 public constant RELAY_GAS_CHECK_BUFFER = 5_000;
+    uint64 public constant RELAY_CALL_CHECK_BUFFER_GAS = 5_000;
 
     /// @notice Gas reserved for finalizing the execution of `relayCall` after the safe call.
-    uint64 public constant POST_EXECUTION_RESERVED_GAS = 40_000;
+    uint64 public constant RELAY_CALL_POST_EXECUTION_RESERVED_GAS = 40_000;
+
+    /// @notice Gas reserved for the dynamic parts of the `CALL` opcode.
+    uint64 public constant RELAY_CALL_OVERHEAD_GAS = 40_000;
 
     /// @notice Address of the trusted relayer.
     address public immutable TRUSTED_RELAYER;
@@ -153,7 +156,7 @@ contract Portal is ReentrancyGuardTransient {
         if (
             !_hasMinGas({
                 minGas: minGasLimit,
-                reservedGas: gasUsedForDeployment + POST_EXECUTION_RESERVED_GAS + RELAY_GAS_CHECK_BUFFER
+                reservedGas: gasUsedForDeployment + RELAY_CALL_POST_EXECUTION_RESERVED_GAS + RELAY_CALL_CHECK_BUFFER_GAS
             })
         ) {
             failedCalls[callHash] = true;
@@ -168,7 +171,7 @@ contract Portal is ReentrancyGuardTransient {
         }
 
         // Relay the calls via the Twin contract.
-        try twin.executeBatch{gas: gasleft() - POST_EXECUTION_RESERVED_GAS, value: value}(call) {
+        try twin.executeBatch{gas: gasleft() - RELAY_CALL_POST_EXECUTION_RESERVED_GAS, value: value}(call) {
             successfulCalls[callHash] = true;
             emit RelayedCall(callHash);
         } catch {
@@ -226,37 +229,38 @@ contract Portal is ReentrancyGuardTransient {
     ///      https://github.com/ethereum-optimism/optimism/blob/4e9ef1aeffd2afd7a2378e2dc5efffa71f04207d/packages/contracts-bedrock/src/libraries/SafeCall.sol#L100
     ///
     /// @dev !!!!! FOOTGUN ALERT !!!!!
-    ///      1.) The 40_000 base buffer is to account for the worst case of the dynamic cost of the
-    ///          `CALL` opcode's `address_access_cost`, `positive_value_cost`, and
-    ///          `value_to_empty_account_cost` factors with an added buffer of 5,700 gas. It is
-    ///          still possible to self-rekt by initiating a withdrawal with a minimum gas limit
-    ///          that does not account for the `memory_expansion_cost` & `code_execution_cost`
-    ///          factors of the dynamic cost of the `CALL` opcode.
-    ///      2.) This function should *directly* precede the external call if possible. There is an
-    ///          added buffer to account for gas consumed between this check and the call, but it
-    ///          is only 5,700 gas.
-    ///      3.) Because EIP-150 ensures that a maximum of 63/64ths of the remaining gas in the call
-    ///          frame may be passed to a subcontext, we need to ensure that the gas will not be
-    ///          truncated.
+    ///      1.) The RELAY_CALL_OVERHEAD_GAS base buffer is to account for the worst case of the dynamic cost of the
+    ///          `CALL` opcode's `address_access_cost`, `positive_value_cost`, and `value_to_empty_account_cost` factors
+    ///          with an added buffer of 5,700 gas. It is still possible to self-rekt by initiating a withdrawal with a
+    ///          minimum gas limit that does not account for the `memory_expansion_cost` & `code_execution_cost` factors
+    ///          of the dynamic cost of the `CALL` opcode.
+    ///      2.) This function should *directly* precede the external call if possible. There is an added buffer to
+    ///          account for gas consumed between this check and the call, but it is only 5,700 gas.
+    ///      3.) Because EIP-150 ensures that a maximum of 63/64ths of the remaining gas in the call frame may be passed
+    ///          to a subcontext, we need to ensure that the gas will not be truncated.
     ///      4.) Use wisely. This function is not a silver bullet.
     ///
     /// @param minGas Minimum amount of gas that is forwarded to the Solana sender's Twin contract.
     /// @param reservedGas Amount of gas that is reserved for the caller after the execution of the target context.
     ///
     /// @return hasMinGas `true` if there is enough gas remaining to safely supply `minGas` to the target
-    ///         context as well as reserve `reservedGas` for the caller after the execution of
-    ///         the target context.
+    ///                    context as well as reserve `reservedGas` for the caller after the execution of
+    ///                    the target context.
     function _hasMinGas(uint256 minGas, uint256 reservedGas) private view returns (bool hasMinGas) {
         assembly {
             // Equation: gas × 63 ≥ minGas × 64 + 63(40_000 + reservedGas)
-            hasMinGas := iszero(lt(mul(gas(), 63), add(mul(minGas, 64), mul(add(40000, reservedGas), 63))))
+            hasMinGas :=
+                iszero(lt(mul(gas(), 63), add(mul(minGas, 64), mul(add(RELAY_CALL_OVERHEAD_GAS, reservedGas), 63))))
         }
     }
 
     /// @notice Checks whether the ISM verification is successful.
     ///
     /// @dev TODO: Plug some ISM verification here.
     function _ismVerify(bytes calldata call, bytes calldata ismData) private pure {
+        call; // Silence unused variable warning.
+        ismData; // Silence unused variable warning.
+
         // TODO: Plug some ISM verification here.
         require(true, ISMVerificationFailed());
     }

solana/programs/portal/src/constants.rs

@@ -1,5 +1,4 @@
 use anchor_lang::prelude::*;
-use hex_literal::hex;
 
 // Portal constants
 
@@ -13,10 +12,6 @@ pub const GAS_FEE_RECEIVER: Pubkey = pubkey!("CB8GXDdZDSD5uqfeow1qfp48ouayxXGpw7
 #[cfg(not(any(test, feature = "test-env")))]
 pub const GAS_FEE_RECEIVER: Pubkey = pubkey!("eEwCrQLBdQchykrkYitkYUZskd7MPrU2YxBXcPDPnMt");
 
-pub const GAS_PER_BYTE_COST: u64 = 40;
-
-pub const BASE_TRANSACTION_COST: u64 = 21000;
-
 pub const GAS_COST_SCALER_DP: u64 = 10u64.pow(6);
 pub const GAS_COST_SCALER: u64 = 1_000_000;
 
@@ -45,9 +40,3 @@ pub const EIP1559_DEFAULT_WINDOW_DURATION_SECONDS: u64 = 1; // 1 second windows
 pub const EIP1559_DEFAULT_GAS_TARGET_PER_WINDOW: u64 = 5_000_000; // 5M gas per window
 
 pub const EIP1559_DEFAULT_ADJUSTMENT_DENOMINATOR: u64 = 2;
-
-// Messenger constants
-
-pub const MESSENGER_SEED: &[u8] = b"messenger";
-
-pub const REMOTE_MESSENGER_ADDRESS: [u8; 20] = hex!("2c85Bb93B4c1F07E80a242FfB3Fa9c0e8b72BB00");

solana/programs/portal/src/instructions/initialize.rs

@@ -1,24 +1,12 @@
 use anchor_lang::prelude::*;
 
-use crate::{
-    constants::{EIP1559_SEED, MESSENGER_SEED},
-    state::{Eip1559, Messenger},
-};
+use crate::{constants::EIP1559_SEED, state::Eip1559};
 
 #[derive(Accounts)]
 pub struct Initialize<'info> {
     #[account(mut)]
     pub payer: Signer<'info>,
 
-    #[account(
-        init,
-        payer = payer,
-        seeds = [MESSENGER_SEED],
-        bump,
-        space = 8 + Messenger::INIT_SPACE
-    )]
-    pub messenger: Account<'info, Messenger>,
-
     #[account(
         init,
         payer = payer,
@@ -74,13 +62,11 @@ mod tests {
         mock_clock(&mut svm, 1747440000); // May 16th, 2025
 
         // Find the PDAs
-        let (messenger, _) = Pubkey::find_program_address(&[MESSENGER_SEED], &PORTAL_PROGRAM_ID);
         let (eip1559, _) = Pubkey::find_program_address(&[EIP1559_SEED], &PORTAL_PROGRAM_ID);
 
         // Build the instruction
         let initialize_accounts = crate::accounts::Initialize {
             payer: payer_pk,
-            messenger,
             eip1559,
             system_program: solana_sdk_ids::system_program::ID,
         }
@@ -102,13 +88,6 @@ mod tests {
         let result = svm.send_transaction(tx);
         assert!(result.is_ok(), "Transaction should succeed: {:?}", result);
 
-        // Assert the expected messenger account data
-        let messenger_account = svm.get_account(&messenger).unwrap();
-        assert_eq!(messenger_account.owner, PORTAL_PROGRAM_ID);
-
-        let messenger_data = Messenger::try_deserialize(&mut &messenger_account.data[..]).unwrap();
-        assert_eq!(messenger_data.nonce, 0);
-
         // Assert the expected Eip1559 account data
         let eip1559_account = svm.get_account(&eip1559).unwrap();
         assert_eq!(eip1559_account.owner, PORTAL_PROGRAM_ID);

solana/programs/portal/src/instructions/solana_to_base/mod.rs

@@ -1,15 +1,23 @@
 pub mod send_call;
-pub mod send_message;
 
 pub use send_call::*;
-pub use send_message::*;
 
-use anchor_lang::prelude::Pubkey;
+use anchor_lang::prelude::*;
 
+#[derive(Debug, Copy, Clone, AnchorSerialize, AnchorDeserialize)]
+#[repr(u8)]
+pub enum CallType {
+    Call,
+    DelegateCall,
+    Create,
+    Create2,
+}
+
+#[derive(Debug, Clone, AnchorSerialize, AnchorDeserialize)]
 pub struct Call {
+    pub ty: CallType,
     pub from: Pubkey,
     pub to: [u8; 20],
-    pub gas_limit: u64,
-    pub is_creation: bool,
+    pub min_gas_limit: u64,
     pub data: Vec<u8>,
 }