stellar · leighmcculloch · May 21, 2025 · Dec 19, 2024 · May 18, 2025 · May 21, 2025
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -9,9 +9,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref_protected == 'true' && github.sha || github.ref }}
   cancel-in-progress: true
 
-env:
-  MINIMUM_RUST_VERSION: 1.80.0
-
 jobs:
 
   complete:
@@ -81,8 +78,11 @@ jobs:
     - name: Use the minimum supported Rust version
       if: matrix.rust == 'msrv'
       run: |
-        rustup override set $MINIMUM_RUST_VERSION
-        rustup component add clippy --toolchain $MINIMUM_RUST_VERSION
+        if [ -f "Cargo.toml" ]; then
+          msrv="$(cargo metadata --format-version 1 --no-deps | jq -r '.packages | map(.rust_version) | map(values) | min')"
+          rustup override set $msrv
+          rustup component add clippy --toolchain $msrv
+        fi
     - name: Error on warnings and clippy checks
       # Only error on warnings and checks for the msrv, because new versions of
       # Rust will frequently add new warnings and checks.
@@ -99,7 +99,7 @@ jobs:
         deno-version: v2.x
 
     # Setup Stellar CLI
-    - uses: stellar/stellar-cli@v22.5.0
+    - uses: stellar/stellar-cli@v22.8.0
 
     # Build and Test
     - run: make test

diff --git a/account/Cargo.toml b/account/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-account-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/alloc/Cargo.toml b/alloc/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-alloc-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/atomic_multiswap/Cargo.toml b/atomic_multiswap/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-atomic-multiswap-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/atomic_swap/Cargo.toml b/atomic_swap/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-atomic-swap-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/auth/Cargo.toml b/auth/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-auth-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/bls_signature/Cargo.toml b/bls_signature/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-bls-signature"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 description = """
 WARNING: DO NOT USE THIS LIBRARY IN PRODUCTION OR FOR SECURE APPLICATIONS!
 

diff --git a/bls_signature/src/test.rs b/bls_signature/src/test.rs
@@ -103,7 +103,6 @@ fn create_client(e: &Env) -> IncrementContractClient {
 #[test]
 fn test() {
     let env = Env::default();
-    env.cost_estimate().budget().reset_unlimited();
     let pk = aggregate_pk_bytes(&env);
     env.mock_all_auths();
 
@@ -112,7 +111,6 @@ fn test() {
     let payload = BytesN::random(&env);
     let sig_val = sign_and_aggregate(&env, &payload.clone().into()).to_val();
 
-    env.cost_estimate().budget().reset_default();
     env.try_invoke_contract_check_auth::<AccError>(&client.address, &payload, sig_val, &vec![&env])
         .unwrap();
     env.cost_estimate().budget().print();

diff --git a/cross_contract/contract_a/Cargo.toml b/cross_contract/contract_a/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-cross-contract-a-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/cross_contract/contract_b/Cargo.toml b/cross_contract/contract_b/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-cross-contract-b-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/custom_types/Cargo.toml b/custom_types/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-custom-types-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/deep_contract_auth/Cargo.toml b/deep_contract_auth/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-deployer-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/deployer/contract/Cargo.toml b/deployer/contract/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-deployer-test-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/deployer/deployer/Cargo.toml b/deployer/deployer/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-deployer-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/errors/Cargo.toml b/errors/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-errors-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/eth_abi/Cargo.toml b/eth_abi/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-eth-abi"
 version = "0.1.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/events/Cargo.toml b/events/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-events-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/fuzzing/Cargo.toml b/fuzzing/Cargo.toml
@@ -3,6 +3,7 @@ name = "soroban-fuzzing-contract"
 version = "0.0.0"
 edition = "2021"
 publish = false
+rust-version = "1.80.0"
 
 [lib]
 crate-type = ["cdylib", "rlib"]