Merge branch 'main' into latestledger-uint32-leftover

stellar · Feb 5, 2024 · f9e0c4a · f9e0c4a
2 parents bd36478 + 90f7cd9
commit f9e0c4a
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 78 deletions.
diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
@@ -112,7 +112,7 @@ jobs:
     env:
       SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
       SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 20.1.0-1656.114b833e7.focal
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 20.2.0-1716.rc3.34d82fc00.focal
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,31 +11,31 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-test"]
 exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]
 
 [workspace.package]
-version = "20.2.0"
+version = "20.3.0"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]
-version = "=20.1.0"
+version = "=20.2.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4"
+rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
 # path = "../rs-soroban-env/soroban-env-host"
 
 [workspace.dependencies.soroban-simulation]
-version = "=20.1.0"
+version = "=20.2.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "36d33cb6c986c9a8a9200b7eb04cf02e2c3f0ef4"
+rev = "1bfc0f2a2ee134efc1e1b0d5270281d0cba61c2e"
 # path = "../rs-soroban-env/soroban-simulation"
 
 [workspace.dependencies.soroban-spec]
-version = "=20.1.0"
+version = "=20.3.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb"
+rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
 # path = "../rs-soroban-sdk/soroban-spec"
 
 [workspace.dependencies.soroban-spec-rust]
-version = "=20.1.0"
+version = "=20.3.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb"
+rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
 # path = "../rs-soroban-sdk/soroban-spec-rust"
 
 [workspace.dependencies.soroban-spec-json]
@@ -51,26 +51,26 @@ version = "20.2.0"
 path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
-version = "=20.1.0"
+version = "=20.3.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb"
+rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
 
 [workspace.dependencies.soroban-token-sdk]
-version = "=20.1.0"
+version = "=20.3.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb"
+rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "=20.1.0"
+version = "=20.3.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "e6c2c900ab82b5f6eec48f69cb2cb519e19819cb"
+rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
 
 [workspace.dependencies.soroban-cli]
 version = "20.2.0"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.stellar-xdr]
-version = "=20.0.2"
+version = "=20.1.0"
 default-features = true
 
 [workspace.dependencies]

diff --git a/cmd/soroban-rpc/internal/daemon/daemon.go b/cmd/soroban-rpc/internal/daemon/daemon.go
@@ -146,7 +146,7 @@ func MustNew(cfg *config.Config) *Daemon {
 	}
 	historyArchive, err := historyarchive.Connect(
 		cfg.HistoryArchiveURLs[0],
-		historyarchive.ConnectOptions{
+		historyarchive.ArchiveOptions{
 			CheckpointFrequency: cfg.CheckpointFrequency,
 		},
 	)

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.1.0-1656.114b833e7.focal}
+    image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:20.2.0-1716.rc3.34d82fc00.focal}
     depends_on:
       - core-postgres
     restart: on-failure

diff --git a/cmd/soroban-rpc/lib/preflight/Cargo.toml b/cmd/soroban-rpc/lib/preflight/Cargo.toml
@@ -12,5 +12,5 @@ libc = "0.2.147"
 sha2 = { workspace = true }
 # we need the testutils feature in order to get backtraces in the preflight library
 # when soroban rpc is configured to run with --preflight-enable-debug
-soroban-env-host = { workspace = true,  features = ["recording_auth", "testutils"]}
+soroban-env-host = { workspace = true, features = ["recording_mode", "testutils"]}
 soroban-simulation = { workspace = true }