Merge pull request #5 from solana-developers/tests

Add tests

Author: ngundotra

.github/workflows/test.yaml

@@ -0,0 +1,34 @@
+name: Run Tests Matrix
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false # Continue with other tests even if one fails
+      matrix:
+        test_name:
+          - test_phoenix_v1
+          - test_squads_v3
+          - test_drift_v2
+          - test_marginfi_v2
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+
+      - name: Build
+        run: cargo build
+
+      - name: Run ${{ matrix.test_name }}
+        run: cargo test ${{ matrix.test_name }} -- --nocapture

Cargo.lock

@@ -18,6 +18,7 @@ indicatif = "0.17.7"
 lazy_static = "1.4.0"
 pathdiff = "0.2.0" # missing in workspace
 reqwest = "0.11.23"
+regex = "1.11.1"
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 sha256 = "1.1.1" # missing in workspace

Cargo.toml

@@ -51,7 +51,7 @@ If you're working in a repository with multiple programs, in order to build a sp
 solana-verify build --library-name $PROGRAM_LIB_NAME
 ```
 
-The string that's passed in must be the *lib* name and NOT the *package* name. These are usually the same, but the distinction is important.
+The string that's passed in must be the _lib_ name and NOT the _package_ name. These are usually the same, but the distinction is important.
 ![image](https://github.com/Ellipsis-Labs/solana-verifiable-build/assets/61092285/0427e88f-cc0f-465f-b2e9-747ea1b8d3af)
 
 (NOTE: These commands can take up to 30 minutes if you're running on an M1 Macbook Pro. This has to do with the architecture emulation required to ensure build determinism. For best performance, it is recommended to run builds on a Linux machine running x86)
@@ -105,8 +105,8 @@ solana-verify verify-from-repo -um --program-id PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR
 Final Output:
 
 ```
-Executable Program Hash from repo: 7c76ba11f8742d040b1a874d943c2096f1b3a48db14d2a5b411fd5dad5d1bc2d
-On-chain Program Hash: 7c76ba11f8742d040b1a874d943c2096f1b3a48db14d2a5b411fd5dad5d1bc2d
+Executable Program Hash from repo: 6877a5b732b3494b828a324ec846d526d962223959534dbaf4209e0da3b2d6a9
+On-chain Program Hash: 6877a5b732b3494b828a324ec846d526d962223959534dbaf4209e0da3b2d6a9
 Program hash matches ✅
 ```
 
@@ -143,7 +143,7 @@ Program hash matches ✅
 ### Marginfi V2
 
 ```
-solana-verify verify-from-repo -um --program-id MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA https://github.com/mrgnlabs/marginfi-v2 --library-name marginfi -- --features mainnet-beta
+solana-verify verify-from-repo -um --program-id MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA https://github.com/mrgnlabs/marginfi-v2 --commit-hash d33e649e415c354cc2a1e3c49131725552d69ba0 --library-name marginfi -- --features mainnet-beta
 ```
 
 Final Output:
@@ -154,20 +154,6 @@ On-chain Program Hash: 7b37482dd6b2159932b5c2595bc6ce62cf6e587ae67f237c8152b802b
 Program hash matches ✅
 ```
 
-### Solend
-
-```
-solana-verify verify-from-repo -um --program-id So1endDq2YkqhipRh3WViPa8hdiSpxWy6z3Z6tMCpAo https://github.com/solendprotocol/solana-program-library --library-name solend_program -b ellipsislabs/solana:1.14.10 --bpf
-```
-
-Final Output:
-
-```
-Executable Program Hash from repo: f89a43677ab106d2e50d3c41b656d067b6142c02a2508caca1c11c0a963d3b17
-On-chain Program Hash: f89a43677ab106d2e50d3c41b656d067b6142c02a2508caca1c11c0a963d3b17
-Program hash matches ✅
-```
-
 ## Example Walkthrough
 
 After installing the CLI, we can test the program verification against the following immutable mainnet program: `2ZrriTQSVekoj414Ynysd48jyn4AX6ZF4TTJRqHfbJfn`
@@ -213,7 +199,7 @@ Which will return the following hash:
 
 By default, this command will strip any trailing zeros away from the program executable and run the sha256 algorithm against it to compute the hash.
 
-To manually verify this program, one could run the following from the root of this repository, which builds a program from source code and computes a hash. *This command takes a long time because it is building the binary in a Docker container*
+To manually verify this program, one could run the following from the root of this repository, which builds a program from source code and computes a hash. _This command takes a long time because it is building the binary in a Docker container_
 
 ```
 solana-verify build $PWD/examples/hello_world

README.md

@@ -1,4 +1,4 @@
-use anyhow::anyhow;
+use anyhow::{anyhow, Context};
 use cargo_lock::Lockfile;
 use cargo_toml::Manifest;
 use clap::{App, Arg, SubCommand};
@@ -13,7 +13,7 @@ use solana_sdk::{
     pubkey::Pubkey,
 };
 use std::{
-    io::Read,
+    io::{Read, Write},
     path::PathBuf,
     process::{exit, Stdio},
     sync::{
@@ -1001,3 +1001,90 @@ pub fn get_pkg_name_from_cargo_toml(cargo_toml_file: &str) -> Option<String> {
     let pkg = manifest.package?;
     Some(pkg.name)
 }
+
+fn test_verify_program_hash_helper(expected_hash: &str, args: &[&str]) -> anyhow::Result<()> {
+    let mut child = std::process::Command::new("./target/debug/solana-verify")
+        .args(args)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .context("Failed to execute solana-verify command")?;
+
+    if let Some(mut stdin) = child.stdin.take() {
+        stdin.write_all(b"n")?;
+    }
+
+    let output = child
+        .wait_with_output()
+        .context("Failed to wait for solana-verify command")?;
+
+    if !output.status.success() {
+        let error = String::from_utf8_lossy(&output.stderr);
+        anyhow::bail!("Command failed: {}", error);
+    }
+
+    // Print the last 10 lines of the output
+    let output_str = String::from_utf8_lossy(&output.stdout);
+    let lines: Vec<&str> = output_str.split('\n').collect();
+    let last_10_lines: Vec<String> = lines.iter().rev().take(10).map(|s| s.to_string()).collect();
+    println!("Last 10 lines of output:\n{}", last_10_lines.join("\n"));
+
+    let re = regex::Regex::new(r"Executable Program Hash from repo: ([a-f0-9]{64})")
+        .context("Failed to compile regex")?;
+
+    let program_hash = re
+        .captures(&output_str)
+        .context("Could not find program hash in output")?
+        .get(1)
+        .context("Invalid capture group")?
+        .as_str();
+
+    assert_eq!(
+        program_hash, expected_hash,
+        "Program hash {} does not match expected value {}",
+        program_hash, expected_hash
+    );
+
+    Ok(())
+}
+
+#[test]
+fn test_phoenix_v1() -> anyhow::Result<()> {
+    const EXPECTED_HASH: &str = "6877a5b732b3494b828a324ec846d526d962223959534dbaf4209e0da3b2d6a9";
+
+    let args = &[
+        "verify-from-repo",
+        "-um",
+        "--program-id",
+        "PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY",
+        "https://github.com/Ellipsis-Labs/phoenix-v1",
+    ];
+
+    test_verify_program_hash_helper(EXPECTED_HASH, args)?;
+    Ok(())
+}
+
+#[test]
+fn test_squads_v3() -> anyhow::Result<()> {
+    const EXPECTED_HASH: &str = "72da599d9ee14b2a03a23ccfa6f06d53eea4a00825ad2191929cbd78fb69205c";
+    let args: Vec<&str> = "verify-from-repo https://github.com/Squads-Protocol/squads-mpl --commit-hash c95b7673d616c377a349ca424261872dfcf8b19d --program-id SMPLecH534NA9acpos4G6x7uf3LWbCAwZQE9e8ZekMu -um --library-name squads_mpl --bpf".split(" ").collect();
+    test_verify_program_hash_helper(EXPECTED_HASH, &args)?;
+    Ok(())
+}
+
+#[test]
+fn test_drift_v2() -> anyhow::Result<()> {
+    const EXPECTED_HASH: &str = "e31d58edeabc3c30bf6f2aa60bfaa5e492b41ec203e9006404b463e5adee5828";
+    let args: Vec<&str> = "verify-from-repo -um --program-id dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH https://github.com/drift-labs/protocol-v2 --commit-hash 110d3ff4f8ba07c178d69f9bfc7b30194fac56d6 --library-name drift".split(" ").collect();
+    test_verify_program_hash_helper(EXPECTED_HASH, &args)?;
+    Ok(())
+}
+
+#[test]
+fn test_marginfi_v2() -> anyhow::Result<()> {
+    const EXPECTED_HASH: &str = "7b37482dd6b2159932b5c2595bc6ce62cf6e587ae67f237c8152b802bf7d7bb8";
+    let args: Vec<&str> = "verify-from-repo -um --program-id MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA https://github.com/mrgnlabs/marginfi-v2 --commit-hash d33e649e415c354cc2a1e3c49131725552d69ba0 --library-name marginfi".split(" ").collect();
+    test_verify_program_hash_helper(EXPECTED_HASH, &args)?;
+    Ok(())
+}