refactor: use function overloading instead of WithMsgValue variants

Replace quoteGreetingWithMsgValue/sendGreetingWithMsgValue with overloaded
quoteGreeting/sendGreeting in both contracts. The short-param overload
delegates to the full-param version, eliminating duplicated function bodies.

Update tests, e2e scripts, and README to match the new signatures.

Author: evgeniko

README.md

@@ -4,7 +4,7 @@ Cross-chain messaging with Wormhole Executor, demonstrating both **off-chain** a
 
 This repo covers two use cases:
 - **EVM ↔ EVM** — both off-chain and on-chain quotes, Sepolia ↔ Base Sepolia
-- **EVM ↔ Solana** — off-chain quotes only (see [Cross-VM section](#cross-vm-evm--solana))
+- **EVM ↔ Solana** — both off-chain and on-chain quotes (see [Cross-VM section](#cross-vm-evm--solana))
 
 > **License:** Code provided "AS IS", without warranties. Audit before mainnet deployment.
 
@@ -30,8 +30,6 @@ function quoteGreeting(uint16 targetChain, uint128 gasLimit, address quoterAddre
 function sendGreeting(..., address quoterAddress) external payable;
 ```
 
-> **Note:** On-chain quotes currently support EVM destination chains only.
-> For EVM → Solana, use `HelloWormhole` (off-chain signed quotes) instead.
 
 ## Deployed Contracts (Testnet)
 
@@ -150,7 +148,7 @@ npx tsx test.ts              # Off-chain quote E2E
 
 ## Cross-VM: EVM ↔ Solana
 
-Uses `HelloWormhole` (off-chain quotes) — on-chain quotes do not yet support Solana destinations.
+Both `HelloWormhole` (off-chain quotes) and `HelloWormholeOnChainQuote` (on-chain quotes) support Solana destinations.
 
 See the [Solana demo repo](https://github.com/wormhole-foundation/demo-hello-executor-solana) for the Solana-side implementation.
 
@@ -179,11 +177,11 @@ const emitterPdaBytes32 = '0x' + Buffer.from(emitterPda.toBytes()).toString('hex
 
 ### Sending to Solana
 
-Use `sendGreetingWithMsgValue` with `msgValue` in **lamports** to cover rent and fees on Solana:
+Use the overloaded `sendGreeting` with `msgValue` in **lamports** to cover rent and fees on Solana:
 
 ```solidity
 // msgValue covers rent + fees on Solana (~0.015 SOL = 15_000_000 lamports)
-sequence = sendGreetingWithMsgValue(
+sequence = sendGreeting(
     greeting,
     1,              // Wormhole chain ID for Solana
     500000,         // compute units (not gas)

e2e/sendToSolana.ts

@@ -35,8 +35,7 @@ const SOLANA_MSG_VALUE_LAMPORTS = 15_000_000n; // 0.015 SOL - a bit more for saf
 
 // HelloWormhole ABI (just the functions we need)
 const ABI = [
-    'function sendGreeting(string greeting, uint16 targetChain, uint128 gasLimit, uint256 totalCost, bytes signedQuote) external payable returns (uint64)',
-    'function sendGreetingWithMsgValue(string greeting, uint16 targetChain, uint128 gasLimit, uint128 msgValue, uint256 totalCost, bytes signedQuote) external payable returns (uint64)',
+    'function sendGreeting(string greeting, uint16 targetChain, uint128 gasLimit, uint128 msgValue, uint256 totalCost, bytes signedQuote) external payable returns (uint64)',
     'event GreetingSent(string greeting, uint16 targetChain, uint64 sequence)',
 ];
 
@@ -152,7 +151,7 @@ async function main() {
     // Send greeting with msgValue for Solana (in lamports)
     console.log('\nSending transaction with msgValue for Solana...');
     console.log(`   msgValue: ${SOLANA_MSG_VALUE_LAMPORTS} lamports (${Number(SOLANA_MSG_VALUE_LAMPORTS) / 1e9} SOL)`);
-    const tx = await contract.sendGreetingWithMsgValue(
+    const tx = await contract.sendGreeting(
         greeting,
         CHAIN_ID_SOLANA,
         gasLimit,

e2e/sendToSolanaOnChainQuote.ts

@@ -3,11 +3,11 @@
  * Send greeting from Sepolia to Solana via Executor using ON-CHAIN QUOTE
  *
  * This uses the updated HelloWormholeOnChainQuote contract which supports
- * Solana destinations via sendGreetingWithMsgValue + quoteGreetingWithMsgValue.
+ * Solana destinations via overloaded sendGreeting + quoteGreeting (with msgValue).
  *
  * Flow:
- *   1. quoteGreetingWithMsgValue  — get on-chain quote (includes msgValue for Solana rent)
- *   2. sendGreetingWithMsgValue   — publish Wormhole message + request relay via quoter router
+ *   1. quoteGreeting(targetChain, gasLimit, msgValue, quoter) — get on-chain quote
+ *   2. sendGreeting(greeting, targetChain, gasLimit, msgValue, totalCost, quoter) — publish + relay
  *
  * Usage:
  *   npx tsx e2e/sendToSolanaOnChainQuote.ts "Hello from Sepolia (on-chain quote)!"
@@ -51,8 +51,8 @@ const SOLANA_MSG_VALUE_LAMPORTS = 15_000_000n; // ~0.015 SOL
 const GAS_LIMIT = 500_000n;
 
 const ABI = [
-    'function quoteGreetingWithMsgValue(uint16 targetChain, uint128 gasLimit, uint128 msgValue, address quoterAddress) external view returns (uint256 totalCost)',
-    'function sendGreetingWithMsgValue(string calldata greeting, uint16 targetChain, uint128 gasLimit, uint128 msgValue, uint256 totalCost, address quoterAddress) external payable returns (uint64 sequence)',
+    'function quoteGreeting(uint16 targetChain, uint128 gasLimit, uint128 msgValue, address quoterAddress) external view returns (uint256 totalCost)',
+    'function sendGreeting(string calldata greeting, uint16 targetChain, uint128 gasLimit, uint128 msgValue, uint256 totalCost, address quoterAddress) external payable returns (uint64 sequence)',
     'function peers(uint16 chainId) external view returns (bytes32)',
     'event GreetingSent(string greeting, uint16 targetChain, uint64 sequence)',
 ];
@@ -85,7 +85,7 @@ async function main() {
     console.log(`  msgValue: ${SOLANA_MSG_VALUE_LAMPORTS} lamports (${Number(SOLANA_MSG_VALUE_LAMPORTS) / 1e9} SOL)`);
     console.log(`  Quoter: ${QUOTER_ADDRESS}`);
 
-    const totalCost = await contract.quoteGreetingWithMsgValue(
+    const totalCost = await contract.quoteGreeting(
         CHAIN_ID_SOLANA,
         GAS_LIMIT,
         SOLANA_MSG_VALUE_LAMPORTS,
@@ -100,7 +100,7 @@ async function main() {
 
     // Step 2: Send greeting
     console.log('\nSending greeting with on-chain quote...');
-    const tx = await contract.sendGreetingWithMsgValue(
+    const tx = await contract.sendGreeting(
         greeting,
         CHAIN_ID_SOLANA,
         GAS_LIMIT,

src/HelloWormhole.sol

@@ -104,47 +104,25 @@ contract HelloWormhole is ExecutorSendReceiveQuoteOffChain, AccessControl {
         emit GreetingReceived(greeting, peerChain, peerAddress);
     }
 
-    // msgValue: lamports for Solana destinations, 0 for EVM
-    function sendGreetingWithMsgValue(
+    function sendGreeting(
         string calldata greeting,
         uint16 targetChain,
         uint128 gasLimit,
-        uint128 msgValue,
         uint256 totalCost,
         bytes calldata signedQuote
-    ) public payable returns (uint64 sequence) {
-        // Encode the greeting as bytes
-        bytes memory payload = bytes(greeting);
-
-        // Solana enforces a 512-byte cap on incoming messages; fail early so the
-        // relay fee is not spent on a delivery that will be rejected on Solana.
-        if (targetChain == CHAIN_ID_SOLANA && payload.length > SOLANA_MAX_PAYLOAD_BYTES) {
-            revert PayloadTooLargeForSolana(payload.length, SOLANA_MAX_PAYLOAD_BYTES);
-        }
-
-        // Publish and relay the message to the target chain
-        sequence = _publishAndRelay(
-            payload,
-            CONSISTENCY_LEVEL_INSTANT, // choose safe or finalized based on your needs
-            totalCost,
-            targetChain,
-            msg.sender, // refund address
-            signedQuote,
-            gasLimit,
-            msgValue, // pass through for SVM destinations (in lamports)
-            "" // no extra relay instructions
-        );
-
-        emit GreetingSent(greeting, targetChain, sequence);
+    ) external payable returns (uint64 sequence) {
+        sequence = sendGreeting(greeting, targetChain, gasLimit, 0, totalCost, signedQuote);
     }
 
+    // msgValue: lamports for Solana destinations, 0 for EVM
     function sendGreeting(
         string calldata greeting,
         uint16 targetChain,
         uint128 gasLimit,
+        uint128 msgValue,
         uint256 totalCost,
         bytes calldata signedQuote
-    ) external payable returns (uint64 sequence) {
+    ) public payable returns (uint64 sequence) {
         // Encode the greeting as bytes
         bytes memory payload = bytes(greeting);
 
@@ -163,7 +141,7 @@ contract HelloWormhole is ExecutorSendReceiveQuoteOffChain, AccessControl {
             msg.sender, // refund address
             signedQuote,
             gasLimit,
-            0, // no msg.value forwarding
+            msgValue,
             "" // no extra relay instructions
         );
 

src/HelloWormholeOnChainQuote.sol

@@ -21,8 +21,8 @@ import {toUniversalAddress} from "wormhole-solidity-sdk/Utils.sol";
  * - Provides `quoteGreeting()` for on-chain cost estimation
  *
  * Supports both EVM and Solana destinations:
- * - EVM: use `sendGreeting` / `quoteGreeting` (msgValue = 0)
- * - Solana: use `sendGreetingWithMsgValue` / `quoteGreetingWithMsgValue`
+ * - EVM: use `sendGreeting` / `quoteGreeting` (no msgValue)
+ * - Solana: use overloaded `sendGreeting` / `quoteGreeting` with msgValue param
  *   (msgValue in lamports for rent/fees)
  */
 contract HelloWormholeOnChainQuote is ExecutorSendReceiveQuoteOnChain, AccessControl {
@@ -122,11 +122,12 @@ contract HelloWormholeOnChainQuote is ExecutorSendReceiveQuoteOnChain, AccessCon
             greeting = string(payload);
         }
 
+        // Emit an event with the greeting message and sender details
         emit GreetingReceived(greeting, peerChain, peerAddress);
     }
 
     /**
-     * @notice Get a quote for sending a greeting using on-chain quoter
+     * @notice Get a quote for sending a greeting using on-chain quoter (EVM destinations)
      * @param targetChain The Wormhole chain ID of the destination
      * @param gasLimit Gas limit for execution on target chain
      * @param quoterAddress The on-chain quoter contract address
@@ -137,47 +138,51 @@ contract HelloWormholeOnChainQuote is ExecutorSendReceiveQuoteOnChain, AccessCon
         view
         returns (uint256 totalCost)
     {
-        require(targetChain != CHAIN_ID_SOLANA, "Use quoteGreetingWithMsgValue for Solana");
-        return _quoteGreeting(targetChain, gasLimit, 0, quoterAddress);
+        return quoteGreeting(targetChain, gasLimit, 0, quoterAddress);
     }
 
     /**
      * @notice Get a quote for sending a greeting with msgValue (needed for Solana destinations)
+     * @param targetChain The Wormhole chain ID of the destination
+     * @param gasLimit Gas limit for execution on target chain
      * @param msgValue For Solana: lamports for rent/priority fees. For EVM: 0.
+     * @param quoterAddress The on-chain quoter contract address
+     * @return totalCost The total cost including Wormhole message fee and executor fee
      */
-    function quoteGreetingWithMsgValue(uint16 targetChain, uint128 gasLimit, uint128 msgValue, address quoterAddress)
-        external
-        view
-        returns (uint256 totalCost)
-    {
-        return _quoteGreeting(targetChain, gasLimit, msgValue, quoterAddress);
-    }
-
-    function _quoteGreeting(uint16 targetChain, uint128 gasLimit, uint128 msgValue, address quoterAddress)
-        internal
+    function quoteGreeting(uint16 targetChain, uint128 gasLimit, uint128 msgValue, address quoterAddress)
+        public
         view
         returns (uint256 totalCost)
     {
         bytes32 peerAddress = peers[targetChain];
         require(peerAddress != bytes32(0), "No peer set for target chain");
 
+        // Build relay instructions
         bytes memory relayInstructions = RelayInstructionLib.encodeGas(gasLimit, msgValue);
 
+        // Build request bytes (same format as _publishAndCompose uses)
         bytes memory requestBytes = RequestLib.encodeVaaMultiSigRequest(
             _chainId,
             toUniversalAddress(address(this)),
             0 // sequence placeholder - not needed for quote
         );
 
+        // Get executor quote from on-chain quoter
         uint256 executorFee = _executorQuoterRouter.quoteExecution(
-            targetChain, peerAddress, address(0), quoterAddress, requestBytes, relayInstructions
+            targetChain,
+            peerAddress,
+            address(0), // refund address not needed for quote
+            quoterAddress,
+            requestBytes,
+            relayInstructions
         );
 
+        // Total = executor fee + Wormhole message fee
         totalCost = executorFee + _coreBridge.messageFee();
     }
 
     /**
-     * @notice Send a cross-chain greeting using on-chain quote
+     * @notice Send a cross-chain greeting using on-chain quote (EVM destinations)
      * @param greeting The message to send
      * @param targetChain The Wormhole chain ID of the destination
      * @param gasLimit Gas limit for execution on target chain
@@ -192,49 +197,47 @@ contract HelloWormholeOnChainQuote is ExecutorSendReceiveQuoteOnChain, AccessCon
         uint256 totalCost,
         address quoterAddress
     ) external payable returns (uint64 sequence) {
-        require(targetChain != CHAIN_ID_SOLANA, "Use sendGreetingWithMsgValue for Solana");
-        sequence = _sendGreeting(greeting, targetChain, gasLimit, 0, totalCost, quoterAddress);
+        sequence = sendGreeting(greeting, targetChain, gasLimit, 0, totalCost, quoterAddress);
     }
 
     /**
      * @notice Send a cross-chain greeting with msgValue (needed for Solana destinations)
+     * @param greeting The message to send
+     * @param targetChain The Wormhole chain ID of the destination
+     * @param gasLimit Gas limit for execution on target chain
      * @param msgValue For Solana: lamports for rent/priority fees. For EVM: 0.
+     * @param totalCost Total cost (Wormhole fee + executor fee from quoteGreeting)
+     * @param quoterAddress The on-chain quoter contract address
+     * @return sequence The Wormhole sequence number
      */
-    function sendGreetingWithMsgValue(
-        string calldata greeting,
-        uint16 targetChain,
-        uint128 gasLimit,
-        uint128 msgValue,
-        uint256 totalCost,
-        address quoterAddress
-    ) external payable returns (uint64 sequence) {
-        sequence = _sendGreeting(greeting, targetChain, gasLimit, msgValue, totalCost, quoterAddress);
-    }
-
-    function _sendGreeting(
+    function sendGreeting(
         string calldata greeting,
         uint16 targetChain,
         uint128 gasLimit,
         uint128 msgValue,
         uint256 totalCost,
         address quoterAddress
-    ) internal returns (uint64 sequence) {
+    ) public payable returns (uint64 sequence) {
+        // Encode the greeting as bytes
         bytes memory payload = bytes(greeting);
 
+        // Solana enforces a 512-byte cap on incoming messages; fail early so the
+        // relay fee is not spent on a delivery that will be rejected on Solana.
         if (targetChain == CHAIN_ID_SOLANA && payload.length > SOLANA_MAX_PAYLOAD_BYTES) {
             revert PayloadTooLargeForSolana(payload.length, SOLANA_MAX_PAYLOAD_BYTES);
         }
 
+        // Publish and relay the message to the target chain using on-chain quote
         sequence = _publishAndRelay(
             payload,
             CONSISTENCY_LEVEL_INSTANT,
             totalCost,
             targetChain,
-            msg.sender,
-            quoterAddress,
+            msg.sender, // refund address
+            quoterAddress, // on-chain quoter instead of signedQuote
             gasLimit,
             msgValue,
-            ""
+            "" // no extra relay instructions
         );
         emit GreetingSent(greeting, targetChain, sequence);
     }

test/HelloWormhole.t.sol

@@ -120,7 +120,7 @@ contract HelloWormholeTest is Test {
 
         vm.deal(address(this), 1 ether);
         vm.expectRevert(abi.encodeWithSelector(HelloWormhole.PayloadTooLargeForSolana.selector, 513, 512));
-        helloWormholeSepolia.sendGreetingWithMsgValue{value: 0.01 ether}(
+        helloWormholeSepolia.sendGreeting{value: 0.01 ether}(
             tooBig, CHAIN_ID_SOLANA, 500_000, 15_000_000, 0.01 ether, ""
         );
     }
@@ -151,7 +151,7 @@ contract HelloWormholeTest is Test {
         harness.executeVaa(payload, CHAIN_ID_SOLANA, emitterPda);
     }
 
-    function test_SendGreetingWithMsgValueRevertsWithMockExecutor() public {
+    function test_SendGreetingOverloadedRevertsWithMockExecutor() public {
         vm.selectFork(sepoliaFork);
 
         // Register a Solana peer (program ID for executor routing)
@@ -168,7 +168,7 @@ contract HelloWormholeTest is Test {
         // but confirms ABI compatibility)
         vm.deal(address(this), 1 ether);
         vm.expectRevert(); // Expected: mock executor can't process
-        helloWormholeSepolia.sendGreetingWithMsgValue{value: 0.01 ether}(
+        helloWormholeSepolia.sendGreeting{value: 0.01 ether}(
             "Hello Solana!",
             CHAIN_ID_SOLANA,
             gasLimit,

test/HelloWormholeOnChainQuote.t.sol

@@ -228,23 +228,23 @@ contract HelloWormholeOnChainQuoteTest is Test {
 
         vm.deal(address(this), 1 ether);
         vm.expectRevert(abi.encodeWithSelector(HelloWormholeOnChainQuote.PayloadTooLargeForSolana.selector, 513, 512));
-        helloWormholeSepolia.sendGreetingWithMsgValue{value: 0.01 ether}(
+        helloWormholeSepolia.sendGreeting{value: 0.01 ether}(
             tooBig, CHAIN_ID_SOLANA, 500_000, 15_000_000, 0.01 ether, QUOTER_ADDRESS
         );
     }
 
-    // ── quoteGreetingWithMsgValue ────────────────────────────────────────────
+    // ── quoteGreeting (overloaded with msgValue) ─────────────────────────────
 
-    function test_QuoteGreetingWithMsgValueIncludesMsgValue() public {
+    function test_QuoteGreetingOverloadedIncludesMsgValue() public {
         vm.selectFork(sepoliaFork);
 
         bytes32 solanaProgramId = bytes32(0x62cf7e5a219d24a831e51b2c2417fa898920b930fd1c6947f3a4fc8feec1020f);
         helloWormholeSepolia.setPeer(CHAIN_ID_SOLANA, solanaProgramId);
 
         uint256 quoteWithoutMsgValue =
-            helloWormholeSepolia.quoteGreetingWithMsgValue(CHAIN_ID_SOLANA, 500_000, 0, QUOTER_ADDRESS);
+            helloWormholeSepolia.quoteGreeting(CHAIN_ID_SOLANA, 500_000, 0, QUOTER_ADDRESS);
         uint256 quoteWithMsgValue =
-            helloWormholeSepolia.quoteGreetingWithMsgValue(CHAIN_ID_SOLANA, 500_000, 15_000_000, QUOTER_ADDRESS);
+            helloWormholeSepolia.quoteGreeting(CHAIN_ID_SOLANA, 500_000, 15_000_000, QUOTER_ADDRESS);
 
         // Quote with msgValue should be higher than without
         assertGt(quoteWithMsgValue, quoteWithoutMsgValue, "msgValue should increase the quote");