Merge pull request #3 from wormhole-foundation/feat/solana-cross-vm

 feat: add evm <> solana cross-VM messaging support

Author: evgeniko

.github/workflows/test.yml

@@ -21,6 +21,18 @@ jobs:
           persist-credentials: false
           submodules: recursive
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: TypeScript check
+        run: npx tsc --noEmit
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 

README.md

@@ -2,6 +2,10 @@
 
 Cross-chain messaging with Wormhole Executor, demonstrating both **off-chain** and **on-chain** quote methods.
 
+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))
+
 > **License:** Code provided "AS IS", without warranties. Audit before mainnet deployment.
 
 ## Contracts
@@ -26,6 +30,9 @@ 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)
 
 | Chain        | HelloWormhole (Off-chain)                    | HelloWormholeOnChainQuote                    |
@@ -139,6 +146,77 @@ npx tsx testOnChainQuote.ts  # On-chain quote E2E
 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.
+
+See the [Solana demo repo](https://github.com/wormhole-foundation/demo-hello-executor-solana) for the Solana-side implementation.
+
+### Peer Registration
+
+For EVM ↔ Solana, peer registration on the EVM side requires **two separate addresses** because the Executor uses `peers[chainId]` as a routing address (must be an executable program), while incoming VAAs carry the **emitter PDA** as their source:
+
+```solidity
+// 1. Program ID → executor routing (must be an executable account on Solana)
+hello.setPeer(CHAIN_ID_SOLANA, solanaProgramIdBytes32);
+
+// 2. Emitter PDA → VAA verification (PDA(["emitter"], programId))
+hello.setVaaEmitter(CHAIN_ID_SOLANA, solanaEmitterPdaBytes32);
+```
+
+Run `script/SetupSolanaPeer.s.sol` to register both in one step. For EVM↔EVM, only `setPeer()` is needed.
+
+Derive both Solana addresses from your program ID:
+```typescript
+const programId = new PublicKey("7eiTqf1b1dNwpzn27qEr4eGSWnuon2fJTbnTuWcFifZG");
+const [emitterPda] = PublicKey.findProgramAddressSync([Buffer.from("emitter")], programId);
+
+const programIdBytes32  = '0x' + Buffer.from(programId.toBytes()).toString('hex');
+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:
+
+```solidity
+// msgValue covers rent + fees on Solana (~0.015 SOL = 15_000_000 lamports)
+sequence = sendGreetingWithMsgValue(
+    greeting,
+    1,              // Wormhole chain ID for Solana
+    500000,         // compute units (not gas)
+    15_000_000,     // msgValue in lamports
+    totalCost,
+    signedQuote
+);
+```
+
+> **Message size limit:** The Solana receiver enforces a **512-byte** max on greeting messages.
+> Messages longer than 512 bytes will revert on Sepolia with `PayloadTooLargeForSolana`.
+
+### Deployment
+
+```bash
+# Deploy HelloWormhole (cross-VM variant)
+forge script script/HelloWormhole.s.sol --rpc-url $SEPOLIA_RPC_URL --broadcast --verify
+
+# Register Solana as a peer (both program ID and emitter PDA)
+forge script script/SetupSolanaPeer.s.sol --rpc-url $SEPOLIA_RPC_URL --broadcast
+```
+
+### E2E Testing
+
+```bash
+cd e2e
+cp .env.example .env  # Fill in HELLO_WORMHOLE_SEPOLIA_CROSSVM and Solana peer addresses
+npx tsx sendToSolana.ts      # EVM → Solana
+# For Solana → EVM, run sendToSepolia.ts from the Solana demo repo
+```
+
+---
+
 ## Key Concepts
 
 | Concept                 | Description                                                                  |
@@ -152,3 +230,4 @@ npx tsx test.ts              # Off-chain quote E2E
 - [Wormhole Docs](https://wormhole.com/docs)
 - [Solidity SDK](https://github.com/wormhole-foundation/wormhole-solidity-sdk)
 - [Executor Documentation](https://wormhole.com/docs/protocol/infrastructure/relayer/#executor)
+- [Solana demo repo](https://github.com/wormhole-foundation/demo-hello-executor-solana)

e2e/.env.example

@@ -7,7 +7,6 @@ PRIVATE_KEY_BASE_SEPOLIA=0x01234...
 # BASE_SEPOLIA_RPC_URL=https://base-sepolia-rpc.publicnode.com
 
 # Pre-deployed HelloWormhole contract addresses (off-chain quotes version)
-# Deploy these using forge script or manually, then add addresses here
 HELLO_WORMHOLE_SEPOLIA=0x8f6E15d9A4d0abCe4814c7d86D5B741A91bDCC04
 HELLO_WORMHOLE_BASE_SEPOLIA=0xdF781F7473a1A7C20C1e5fC5f427Fa712dafB698
 
@@ -24,3 +23,17 @@ QUOTER_ADDRESS=0x5241c9276698439fef2780dbab76fec90b633fbd
 # - CoreBridge addresses (via SDK chain configs)
 # - Executor addresses (via SDK automatic relay)
 # - Default RPC URLs (can be overridden above)
+
+# =============================================================================
+# EVM ↔ Solana (Cross-VM) — additional setup required
+# Wormhole chain IDs reference: https://wormhole.com/docs/products/reference/chain-ids/
+# =============================================================================
+
+# Deploy with: forge script script/HelloWormhole.s.sol --rpc-url $SEPOLIA_RPC_URL --broadcast
+# For mainnet: use a mainnet RPC and update CHAIN_ID_SEPOLIA in sendToSolana.ts
+HELLO_WORMHOLE_SEPOLIA_CROSSVM=0x...
+
+# Solana peer addresses — see script/SetupSolanaPeer.s.sol for how to derive these
+# Update if you deployed your own Solana program (defaults point to the demo program)
+SOLANA_PROGRAM_ID_BYTES32=0x62cf7e5a219d24a831e51b2c2417fa898920b930fd1c6947f3a4fc8feec1020f
+SOLANA_EMITTER_PDA_BYTES32=0x58235d29729e44920df367836a92ab77fcee36b7a27b03304cd699f5eb0efae5

e2e/executor.ts

@@ -40,6 +40,63 @@ export async function getExecutorCapabilities(
     return (await response.json()) as Record<number, ExecutorCapabilities>;
 }
 
+/**
+ * Parse the signed quote bytes to extract cost parameters
+ * 
+ * EQ01 Quote Layout (from SDK signedQuoteLayout):
+ * - [0-4]    prefix (EQ01)
+ * - [4-24]   quoterAddress (20 bytes)
+ * - [24-56]  payeeAddress (32 bytes)
+ * - [56-58]  srcChain (uint16 BE)
+ * - [58-60]  dstChain (uint16 BE)
+ * - [60-68]  expiryTime (uint64 BE)
+ * - [68-76]  baseFee (uint64 BE)
+ * - [76-84]  dstGasPrice (uint64 BE)
+ * - [84-92]  srcPrice (uint64 BE)
+ * - [92-100] dstPrice (uint64 BE)
+ * - [100-165] signature (65 bytes)
+ */
+export function parseSignedQuote(signedQuoteHex: string): {
+    baseFee: bigint;
+    dstGasPrice: bigint;
+    srcPrice: bigint;
+    dstPrice: bigint;
+} {
+    // Remove 0x prefix if present
+    const hex = signedQuoteHex.startsWith('0x') ? signedQuoteHex.slice(2) : signedQuoteHex;
+    const bytes = Buffer.from(hex, 'hex');
+    
+    // Verify prefix
+    const prefix = bytes.slice(0, 4).toString('ascii');
+    if (prefix !== 'EQ01') {
+        throw new Error(`Invalid quote prefix: ${prefix}, expected EQ01`);
+    }
+    
+    // Parse big-endian uint64 values
+    const baseFee = bytes.readBigUInt64BE(68);
+    const dstGasPrice = bytes.readBigUInt64BE(76);
+    const srcPrice = bytes.readBigUInt64BE(84);
+    const dstPrice = bytes.readBigUInt64BE(92);
+    
+    return { baseFee, dstGasPrice, srcPrice, dstPrice };
+}
+
+/**
+ * Calculate the estimated cost from quote parameters
+ * Formula: baseFee + (gasLimit * dstGasPrice * srcPrice / dstPrice)
+ */
+export function calculateEstimatedCost(
+    quote: { baseFee: bigint; dstGasPrice: bigint; srcPrice: bigint; dstPrice: bigint },
+    gasLimit: bigint
+): bigint {
+    if (quote.dstPrice === 0n) {
+        throw new Error('Invalid quote: dstPrice is 0');
+    }
+    
+    const relayCost = (gasLimit * quote.dstGasPrice * quote.srcPrice) / quote.dstPrice;
+    return quote.baseFee + relayCost;
+}
+
 /**
  * Get a quote from the Executor API using SDK's fetchQuote function
  *