feat: solana integration/tilt tests

.github/workflows/integration-tests.yml

@@ -0,0 +1,108 @@
+name: Integration Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  integration-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      # Install system dependencies
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y curl make gcc g++
+
+      # Install Go
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21.9"
+
+      # Install Foundry
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
+      # Install Bun
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      # Install Tilt
+      - name: Install Tilt
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/tilt-dev/tilt/master/scripts/install.sh | bash
+
+      # Clone Wormhole repo
+      - name: Clone Wormhole
+        run: |
+          git clone https://github.com/wormhole-foundation/wormhole.git
+          cd wormhole
+          git submodule update --init
+
+      # Cache dependencies
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+            node_modules
+            ~/.foundry
+            ~/.bun/install/cache
+          key: ${{ runner.os }}-deps-${{ hashFiles('**/go.sum', '**/package.json', '**/foundry.toml') }}
+
+      # Start Tilt environment
+      - name: Start Tilt environment
+        run: |
+          cd wormhole/testing
+          tilt up --stream --file Tiltfile -- --evm2=true --query_server=true &
+          # Wait for environment to be ready
+          timeout 300 bash -c 'until curl -s http://localhost:8545 > /dev/null; do sleep 5; done'
+
+      # Install project dependencies
+      - name: Install dependencies
+        run: |
+          cd integration-tests
+          bun install
+
+      # Generate artifacts
+      - name: Generate artifacts
+        run: |
+          cd integration-tests
+          bun run generate:artifacts
+
+      # Run integration tests (always with fresh deployment in CI)
+      - name: Run integration tests
+        run: |
+          cd integration-tests
+          CI=true bun test  # CI flag will force fresh deployment
+        env:
+          WORMHOLE_API_KEY: "my_secret_key_3"
+          ETHDEVNET_MNEMONIC: "myth like bonus scare over problem client lizard pioneer submit female collect"
+
+      # Upload test results (but not deployment cache)
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results
+          path: integration-tests/test-results/**
+
+      # Cleanup
+      - name: Cleanup
+        if: always()
+        run: |
+          cd wormhole/testing
+          tilt down

evm/script/DeployHubContractsBaseImpl.s.sol

@@ -76,6 +76,7 @@ abstract contract DeployHubContractsBaseImpl is Script {
     HubProposalExtender extender = new HubProposalExtender(
       config.voteExtenderAdmin, config.voteTimeExtension, address(timelock), wallet.addr, config.minimumExtensionTime
     );
+  }
 
     // Deploy `HubVotePool` which will revceive cross-chain votes.
     HubVotePool hubVotePool = new HubVotePool(config.wormholeCore, address(0), wallet.addr);
@@ -129,7 +130,9 @@ abstract contract DeployHubContractsBaseImpl is Script {
     timelock.grantRole(timelock.DEFAULT_ADMIN_ROLE(), address(timelock));
     timelock.renounceRole(timelock.DEFAULT_ADMIN_ROLE(), wallet.addr);
 
-    vm.stopBroadcast();
+    // Deploy HubEvmSpokeAggregateProposer
+    HubEvmSpokeAggregateProposer hubEvmSpokeAggregateProposer =
+      new HubEvmSpokeAggregateProposer(config.wormholeCore, address(gov), config.initialMaxQueryTimestampOffset);
 
     return DeployedContracts({
       timelock: timelock,

integration-tests/package.json

@@ -23,8 +23,10 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
+    "@coral-xyz/anchor": "^0.30.1",
     "@wormhole-foundation/sdk": "^0.15.0",
     "@wormhole-foundation/wormhole-query-sdk": "^0.0.13",
+    "axios": "^1.7.7",
     "dotenv": "^16.4.5",
     "viem": "^2.21.42"
   }

integration-tests/test/createProposalOnSolana/helpers.ts

@@ -0,0 +1,103 @@
+import { createArbitraryProposalData, createProposalViaAggregateProposer, createProposalViaHubGovernor, getProposal, getVoteStart } from 'test/helpers';
+import { createProposalOnSpoke, getProposalOnSpoke } from '../createProposalOnSpoke/helpers';
+import { Wallet, AnchorProvider, Program } from "@coral-xyz/anchor";
+import { Connection, Keypair, PublicKey } from "@solana/web3.js";
+import { DEPLOYER_AUTHORITY_KEYPAIR, HUB_ADDRESS, SOL_RPC_NODE, SOLANA_SPOKE_ADDRESS } from "../proposeFromSpoke/constants.ts";
+import idl from "../../../solana/target/idl/staking.json"
+import type {Staking} from "../../../solana/target/types/staking.ts"
+import { StakeConnection } from "../../../solana/app/StakeConnection.ts";
+import { createClients } from "test/config/clients.ts";
+import { queryHubProposalMetadata } from "test/createProposalOnSpoke/helpers.ts";
+import { getWormholeBridgeData } from "../../../solana/app/helpers/wormholeBridgeConfig.ts";
+
+
+export const createProposalOnSolana = async () => {
+    console.log("Starting create proposal on Solana....")
+
+    const proposalData = await createArbitraryProposalData();
+
+    console.log("Before create proposal...")
+    const proposalId = await createProposalViaHubGovernor(proposalData);
+    console.log("After create proposal...")
+
+    //const proposalId = 64486728149589802134402046581700694611161572255902220899113581080654785109148n;
+
+    console.log("Created Proposal ID:", proposalId.toString(16));
+
+    const { ethClient, eth2Client, ethWallet, account } = createClients();
+
+    const currentBlock = await ethClient.getBlock();
+    const queryResponse = await queryHubProposalMetadata({
+        proposalId,
+        proposalCreatedBlock: currentBlock.number,
+    });
+
+    console.log("Obtain CCQ data for proposal")
+
+    const client = new Connection(SOL_RPC_NODE);
+    const wallet = new Wallet(DEPLOYER_AUTHORITY_KEYPAIR)
+
+    // Prepare signatures for calling PostSig
+    var ccqData = queryResponse.queryResponseBytes.substring(2);
+    var sigs = queryResponse.queryResponseSignatures;
+    var byteSigs: string[] = [];
+    for( const sig of sigs) {
+        var hex_data = sig.r.substring(2);
+        hex_data = hex_data + sig.s.substring(2)
+
+        if(sig.v == 27){
+            hex_data = hex_data + "00"
+        }
+        else{ // 28
+            hex_data = hex_data + "01"
+        }
+
+        hex_data = hex_data + "00" //sig.guardianIndex.toString(16);
+        byteSigs.push(hex_data)
+    }
+
+    const stakeConnection = await StakeConnection.createStakeConnection(
+        client,
+        wallet,
+        new PublicKey(
+            idl.address,
+        ),
+    );
+
+    const CORE_BRIDGE_ADDRESS = new PublicKey(
+        "Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o",
+    );
+    const info = await getWormholeBridgeData(client, CORE_BRIDGE_ADDRESS);
+
+    // Add signatures for the call
+    const signaturesKeypair = Keypair.generate();
+    await stakeConnection.postSignatures(
+        byteSigs,
+        signaturesKeypair,
+    );
+    console.log("Posted signatures to Solana for CCQ")
+
+    await sleep(5000);
+
+    // Query to ensure that the sigs were posted
+    const bufferProposalId = Buffer.from(proposalId.toString(16), "hex");
+    await stakeConnection.addProposal(
+        bufferProposalId,
+        Uint8Array.from(Buffer.from(ccqData, "hex")),
+        signaturesKeypair.publicKey,
+        info.guardianSetIndex,
+        false,
+        CORE_BRIDGE_ADDRESS
+    );
+    console.log("Added proposal to Solana")
+
+    // Sleep to allow this proposal to be added. Otherwise, we run into a race condition.
+    await sleep(30000);
+    const proposalDataSolana = await stakeConnection.fetchProposalAccountData(bufferProposalId);
+
+    console.log("Getting proposal")
+
+    return [proposalId, proposalDataSolana];
+}
+
+export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));

integration-tests/test/createProposalOnSpoke/helpers.ts

@@ -32,7 +32,7 @@ export const createProposalOnSpoke = async (proposalId: bigint) => {
   return proposalId;
 };
 
-const queryHubProposalMetadata = async ({
+export const queryHubProposalMetadata = async ({
   proposalId,
   proposalCreatedBlock,
 }: {