run examples

.github/workflows/check.yml

@@ -152,7 +152,6 @@ jobs:
       - name: cargo hack
         run: cargo hack --feature-powerset check
 
-
   cargo_sort:
     runs-on: ${{ vars.RUNNER }}
     steps:
@@ -193,4 +192,31 @@ jobs:
         run: cargo install cargo-machete
       - name: Check unused Cargo dependencies
         run: cargo machete
-
+
+  examples:
+    runs-on: ${{ vars.RUNNER }}
+    if: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+      - uses: ubicloud/rust-cache@v2
+        with:
+          cache-on-failure: "true"
+          cache-all-crates: "true"
+          cache-workspace-crates: "true"
+      - name: Stable Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Run examples
+        env:
+          RUST_BACKTRACE: 1
+          RUST_LOG: info,cctp_bridge=debug
+          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
+          EVM_SECRET_KEY: ${{ secrets.EVM_SECRET_KEY }}
+          TEST_PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY }}
+          SOLANA_RPC_URL: ${{ secrets.RPC_URL }}
+        run: |
+          cargo run --example evm_sol
+          cargo run --example sol_evm
+          cargo run --example reclaim

.github/workflows/pr-review.yml

@@ -44,7 +44,8 @@ jobs:
                - Check API documentation accuracy
 
             Provide detailed feedback using inline comments for specific issues.
-            Use top-level comments for general observations or praise.
+            Use top-level comments for general observations or praise, but do not praise individual lines of code.
+            Do not be shy, I am a big boy and can handle criticism gracefully. I welcome feedback and suggestions.
 
           # Tools for comprehensive PR review
           claude_args: |

.github/workflows/test.yml

@@ -17,41 +17,6 @@ concurrency:
   cancel-in-progress: true
 name: test
 jobs:
-  required:
-    runs-on: ${{ vars.RUNNER }}
-    name: ubuntu / ${{ matrix.toolchain }}
-    strategy:
-      matrix:
-        # run on stable and beta to ensure that tests won't break on the next version of the rust
-        # toolchain
-        toolchain: [stable]
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          submodules: true
-      - uses: ubicloud/rust-cache@v2
-        with:
-          cache-on-failure: "true"
-          cache-all-crates: "true"
-          workspaces: |
-            . -> target
-          # Specifies what to use as the backend providing cache
-          # Can be set to "github", "buildjet", or "warpbuild"
-          # default: "github"
-      - name: Install ${{ matrix.toolchain }}
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.toolchain }}
-      - name: cargo generate-lockfile
-        # enable this ci template to run regardless of whether the lockfile is checked in or not
-        if: hashFiles('Cargo.lock') == ''
-        run: cargo generate-lockfile
-      # https://twitter.com/jonhoo/status/1571290371124260865
-      - name: cargo test --locked
-        run: cargo test --locked --all-features --all-targets
-      # https://github.com/rust-lang/cargo/issues/6669
-      - name: cargo test --doc
-        run: cargo test --locked --all-features --doc
   os-check:
     # run cargo test on mac and windows
     runs-on: ${{ matrix.os }}
@@ -80,6 +45,13 @@ jobs:
   coverage:
     runs-on: ${{ vars.RUNNER }}
     name: ubuntu / stable / coverage / ${{ matrix.features }}
+    env:
+      RUST_BACKTRACE: 1
+      RUST_LOG: info,cctp_bridge=debug
+      ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
+      EVM_SECRET_KEY: ${{ secrets.EVM_SECRET_KEY }}
+      TEST_PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY }}
+      SOLANA_RPC_URL: ${{ secrets.RPC_URL }}
     strategy:
       fail-fast: false
       matrix:
@@ -105,9 +77,9 @@ jobs:
       - name: cargo llvm-cov (${{ matrix.features }})
         run: |
           if [ "${{ matrix.features }}" == "default" ]; then
-            cargo llvm-cov --locked --lcov --output-path lcov-${{ matrix.features }}.info
+            cargo llvm-cov --locked --lcov --output-path lcov-${{ matrix.features }}.info -- --test-threads=1
           else
-            cargo llvm-cov --locked --features "${{ matrix.features }}" --lcov --output-path lcov-${{ matrix.features }}.info
+            cargo llvm-cov --locked --features "${{ matrix.features }}" --lcov --output-path lcov-${{ matrix.features }}.info -- --test-threads=1
           fi
       - name: Record Rust version
         run: echo "RUST=$(rustc --version)" >> "$GITHUB_ENV"

.gitignore

@@ -1,5 +1,5 @@
 /target
 .cargo-ok
 .DS_Store
-
+.env
 Cargo.lock

Cargo.toml

@@ -47,16 +47,11 @@ tracing = "0.1"
 [dev-dependencies]
 alloy-signer-local = "1"
 anyhow = "1"
-dotenv = "0.15"
+dotenvy = "0.15"
 rstest = "0.26"
 solana-commitment-config = "2"
 tokio = { version = "1", features = ["test-util", "macros", "rt-multi-thread"] }
-tracing-subscriber = "0.3"
-
-#[lints.rust]
-#unused_imports = "allow"
-#unused_variables = "allow"
-#dead_code = "allow"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 [lints.clippy]
 match_like_matches_macro = "allow"

README.md

@@ -55,13 +55,6 @@ cargo +nightly fmt --all
 cargo +nightly fmt --all -- --check
 ```
 
-## License
-
- * MIT license
-   ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
 ## Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted

examples/common/mod.rs

@@ -0,0 +1,39 @@
+use {
+    alloy_provider::{Provider, ProviderBuilder, WalletProvider},
+    alloy_signer_local::PrivateKeySigner,
+    solana_commitment_config::CommitmentConfig,
+    solana_keypair::Keypair,
+    solana_rpc_client::nonblocking::rpc_client::RpcClient,
+    solana_signer::Signer,
+    std::{env, str::FromStr},
+    tracing::info,
+};
+
+#[allow(dead_code)]
+pub fn evm_setup() -> anyhow::Result<impl WalletProvider + Provider + Clone> {
+    let secret_key = env::var("EVM_SECRET_KEY").expect("EVM_SECRET_KEY not set");
+    let wallet = PrivateKeySigner::from_str(&secret_key).expect("Invalid private key");
+    let api_key = env::var("ALCHEMY_API_KEY").expect("ALCHEMY_API_KEY not set");
+    let base_provider = ProviderBuilder::new().wallet(wallet).connect_http(
+        format!("https://base-sepolia.g.alchemy.com/v2/{api_key}")
+            .parse()
+            .unwrap(),
+    );
+    Ok(base_provider)
+}
+pub fn solana_setup() -> anyhow::Result<(Keypair, RpcClient)> {
+    let kp_file = env::var("KEYPAIR_FILE").ok();
+    let owner = if let Some(kp) = kp_file {
+        solana_keypair::read_keypair_file(&kp)
+            .map_err(|e| anyhow::format_err!("unable to load keypair file {kp} {e}"))?
+    } else {
+        let kp = env::var("TEST_PRIVATE_KEY").expect("TEST_PRIVATE_KEY is not set");
+        Keypair::from_base58_string(&kp)
+    };
+    let url = env::var("SOLANA_RPC_URL").expect("SOLANA_RPC_URL is not set");
+    info!("using RPC {url}");
+    info!("solana address {}", owner.pubkey(),);
+    let rpc = RpcClient::new_with_commitment(url, CommitmentConfig::finalized());
+    // Your Solana setup code here
+    Ok((owner, rpc))
+}

examples/evm_sol.rs

@@ -1,44 +1,27 @@
+mod common;
+
 use {
     alloy_chains::NamedChain,
     alloy_primitives::U256,
-    alloy_provider::{ProviderBuilder, WalletProvider},
-    alloy_signer_local::PrivateKeySigner,
+    alloy_provider::WalletProvider,
     cctp_bridge::{Cctp, SolanaWrapper},
-    solana_commitment_config::CommitmentConfig,
-    solana_rpc_client::nonblocking::rpc_client::RpcClient,
     solana_signer::Signer,
-    std::{env, str::FromStr},
     tracing::info,
 };
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    // Initialize tracing for better debugging
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     tracing_subscriber::fmt::init();
-    let secret_key = env::var("EVM_SECRET").expect("EVM_SECRET not set");
-    let wallet = PrivateKeySigner::from_str(&secret_key).expect("Invalid private key");
-    let api_key = env::var("ALCHEMY_API_KEY").expect("ALCHEMY_API_KEY not set");
-    let kp_file = env::var("KEYPAIR_FILE").expect("KEYPAIR_FILE environment variable not set");
-    let owner = solana_keypair::read_keypair_file(&kp_file)
-        .map_err(|e| anyhow::format_err!("unable to load keypair file {kp_file} {e}"))?;
-
-    let base_provider = ProviderBuilder::new().wallet(wallet).connect_http(
-        format!("https://base-sepolia.g.alchemy.com/v2/{api_key}")
-            .parse()
-            .unwrap(),
-    );
-
+    let base_provider = common::evm_setup()?;
+    let (owner, rpc) = common::solana_setup()?;
     info!(
         "solana address {} sends to base address {}",
         owner.pubkey(),
         base_provider.default_signer_address()
     );
 
-    let url = env::var("SOLANA_RPC_URL").expect("SOLANA_RPC_URL is not set");
-    info!("using RPC {url}");
-    let rpc: SolanaWrapper =
-        RpcClient::new_with_commitment(url, CommitmentConfig::finalized()).into();
+    let rpc: SolanaWrapper = rpc.into();
 
     let bridge = Cctp::new_evm_sol(
         base_provider,

examples/reclaim.rs

@@ -0,0 +1,24 @@
+mod common;
+
+use {
+    cctp_bridge::{Cctp, SolanaWrapper},
+    solana_signer::Signer,
+    tracing::info,
+};
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    dotenvy::dotenv().ok();
+    tracing_subscriber::fmt::init();
+    let (owner, rpc) = common::solana_setup()?;
+    info!("solana address {}", owner.pubkey(),);
+    let rpc: SolanaWrapper = rpc.into();
+
+    let bridge = Cctp::new_reclaim(rpc.clone(), rpc, cctp_bridge::SOLANA_DEVNET);
+    let result = bridge.reclaim(&owner).await?;
+    println!("reclaimed {} accounts", result.len());
+    for (sig, addr) in result {
+        println!("reclaimed account {} with signature {}", addr, sig);
+    }
+    Ok(())
+}

examples/recv_message.rs

@@ -1,24 +1,16 @@
+mod common;
+
 use {
     alloy_chains::NamedChain,
     cctp_bridge::{Cctp, SolanaWrapper},
-    solana_commitment_config::CommitmentConfig,
-    solana_rpc_client::nonblocking::rpc_client::RpcClient,
-    std::env,
-    tracing::info,
 };
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    // Initialize tracing for better debugging
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     tracing_subscriber::fmt::init();
-    let kp_file = env::var("KEYPAIR_FILE").expect("KEYPAIR_FILE environment variable not set");
-    let owner = solana_keypair::read_keypair_file(&kp_file)
-        .map_err(|e| anyhow::format_err!("unable to load keypair file {kp_file} {e}"))?;
-    let url = env::var("SOLANA_RPC_URL").expect("SOLANA_RPC_URL is not set");
-    info!("using RPC {url}");
-    let rpc: SolanaWrapper =
-        RpcClient::new_with_commitment(url, CommitmentConfig::finalized()).into();
+    let (owner, rpc) = common::solana_setup()?;
+    let rpc: SolanaWrapper = rpc.into();
     let bridge = Cctp::new_recv(
         rpc.clone(),
         rpc,

examples/sol_evm.rs

@@ -1,41 +1,26 @@
+mod common;
+
 use {
     alloy_chains::NamedChain,
-    alloy_provider::{ProviderBuilder, WalletProvider},
-    alloy_signer_local::PrivateKeySigner,
+    alloy_provider::WalletProvider,
     cctp_bridge::{Cctp, SolanSigners, SolanaWrapper},
-    solana_commitment_config::CommitmentConfig,
-    solana_rpc_client::nonblocking::rpc_client::RpcClient,
     solana_signer::Signer,
-    std::{env, str::FromStr},
     tracing::info,
 };
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    // Initialize tracing for better debugging
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     tracing_subscriber::fmt::init();
-    let secret_key = env::var("EVM_SECRET").expect("EVM_SECRET not set");
-    let wallet = PrivateKeySigner::from_str(&secret_key).expect("Invalid private key");
-    let api_key = env::var("ALCHEMY_API_KEY").expect("ALCHEMY_API_KEY not set");
-    let kp_file = env::var("KEYPAIR_FILE").expect("KEYPAIR_FILE environment variable not set");
-    let owner = solana_keypair::read_keypair_file(&kp_file)
-        .map_err(|e| anyhow::format_err!("unable to load keypair file {kp_file} {e}"))?;
-
-    let base_provider = ProviderBuilder::new()
-        .wallet(wallet)
-        .connect_http(format!("https://base-sepolia.g.alchemy.com/v2/{api_key}").parse()?);
-
+    let base_provider = common::evm_setup()?;
+    let (owner, rpc) = common::solana_setup()?;
     info!(
         "solana address {} sends to base address {}",
         owner.pubkey(),
         base_provider.default_signer_address()
     );
 
-    let url = env::var("SOLANA_RPC_URL").expect("SOLANA_RPC_URL is not set");
-    info!("using RPC {url}");
-    let rpc: SolanaWrapper =
-        RpcClient::new_with_commitment(url, CommitmentConfig::finalized()).into();
+    let rpc: SolanaWrapper = rpc.into();
 
     let bridge = Cctp::new_solana_evm(
         rpc,