Merge branch 'main' into get-fee-stats

stellar · May 16, 2024 · fc3a9c2 · fc3a9c2
2 parents c05251f + 4bb5f9b
commit fc3a9c2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -84,13 +84,12 @@ jobs:
           - os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             cargo-hack-feature-options: --feature-powerset
-          # TODO: uncomment once this is resolved https://github.com/actions/runner-images/issues/9734#issuecomment-2074746599
-          # - os: macos-latest
-          #   target: x86_64-apple-darwin
-          #  cargo-hack-feature-options: --feature-powerset
-          # - os: macos-latest
-          #  target: aarch64-apple-darwin
-          #  cargo-hack-feature-options: --feature-powerset
+          - os: macos-latest
+            target: x86_64-apple-darwin
+            cargo-hack-feature-options: --feature-powerset
+          - os: macos-latest
+            target: aarch64-apple-darwin
+            cargo-hack-feature-options: --feature-powerset
           # Windows builds notes:
           #
           # The different features that need testing are split over unique

diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
@@ -113,10 +113,10 @@ jobs:
       SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
       SOROBAN_RPC_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
       SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 21.0.0-1812.rc1.a10329cca.focal
-      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1812.rc1.a10329cca.focal
-      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.0.0-1812.rc1.a10329cca.focal
-      PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1812.rc1.a10329cca.focal
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 21.0.0-1865.rc2.c6f474133.focal
+      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1865.rc2.c6f474133.focal
+      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.0.0-1865.rc2.c6f474133.focal
+      PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.0-1865.rc2.c6f474133.focal
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 default-members = ["cmd/crates/stellar-rpc-client"]
 
 [workspace.package]
-version = "21.1.0"
+version = "21.2.0"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]

diff --git a/cmd/soroban-rpc/internal/test/docker-compose.yml b/cmd/soroban-rpc/internal/test/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     # Note: Please keep the image pinned to an immutable tag matching the Captive Core version.
     #       This avoids implicit updates which break compatibility between
     #       the Core container and captive core.
-    image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:20.4.1-1807.b152dc51d.focal}
+    image: ${CORE_IMAGE:-stellar/stellar-core:21.0.0-1865.rc2.c6f474133.focal}
     depends_on:
       - core-postgres
     restart: on-failure

diff --git a/cmd/soroban-rpc/internal/test/stellar-core-integration-tests.cfg b/cmd/soroban-rpc/internal/test/stellar-core-integration-tests.cfg
@@ -1,5 +1,6 @@
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
 ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION=true
+DEPRECATED_SQL_LEDGER_STATE=false
 
 NETWORK_PASSPHRASE="Standalone Network ; February 2017"
 

diff --git a/cmd/soroban-rpc/lib/preflight/Cargo.toml b/cmd/soroban-rpc/lib/preflight/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "preflight"
-version = "21.1.0"
+version = "21.2.0"
 publish = false
 
 [lib]