Merge branch 'main' into fix/troubleshooting-emulator-tests

.github/workflows/rpc-tests.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
     services:
       rpc:
-        image: stellar/quickstart:v423-testing
+        image: stellar/quickstart:v438-testing
         ports:
           - 8000:8000
         env:

cmd/crates/soroban-test/tests/it/integration/fund.rs

@@ -15,5 +15,9 @@ async fn fund() {
         .arg("fund")
         .arg("test")
         .assert()
-        .stderr(predicates::str::contains("funding failed"));
+        // Don't expect error if friendbot indicated that the account is
+        // already fully funded to the starting balance, because the
+        // user's goal is to get funded, and the account is funded
+        // so it is success much the same.
+        .success();
 }

cmd/soroban-cli/src/config/network.rs

@@ -156,9 +156,18 @@ impl Network {
         tracing::debug!("{res:#?}");
         if !request_successful {
             if let Some(detail) = res.get("detail").and_then(Value::as_str) {
-                return Err(Error::FundingFailed(detail.to_string()));
+                if detail.contains("account already funded to starting balance") {
+                    // Don't error if friendbot indicated that the account is
+                    // already fully funded to the starting balance, because the
+                    // user's goal is to get funded, and the account is funded
+                    // so it is success much the same.
+                    tracing::debug!("already funded error ignored because account is funded");
+                } else {
+                    return Err(Error::FundingFailed(detail.to_string()));
+                }
+            } else {
+                return Err(Error::FundingFailed("unknown cause".to_string()));
             }
-            return Err(Error::FundingFailed("unknown cause".to_string()));
         }
         Ok(())
     }