Merge branch 'main' into rs-soroban-env#1311-2

stellar · Jan 10, 2024 · 28c682d · 28c682d
2 parents 0cc3e0b + 6250de2
commit 28c682d
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 41 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -22,7 +22,7 @@ jobs:
 
       # core git ref should be latest commit for stable soroban functionality
       # the core bin can either be compiled in-line here as part of ci,
-      SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#v20.0.2
+      SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#114b833e755400178a57142f45b7fb892ddb034f
       SYSTEM_TEST_CORE_COMPILE_CONFIGURE_FLAGS: "--disable-tests"
       # or set SYSTEM_TEST_CORE_GIT_REF to empty, and set SYSTEM_TEST_CORE_IMAGE
       # to pull a pre-compiled image from dockerhub instead

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.0.3-1648.7c7dcefd3.focal
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 20.0.3-1655.114b833e7.focal
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,9 +15,9 @@ version = "20.1.1"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]
-version = "=20.0.2"
+version = "=20.1.0"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "81f6eb1eefd299af3e03fa0db7b20eb355b2b55f"
+rev = "c1b238b65bfd13666be4ac14e0e390c31b549caf"
 
 [workspace.dependencies.soroban-spec]
 version = "=20.0.3"
@@ -44,19 +44,19 @@ version = "20.1.1"
 path = "./cmd/crates/soroban-spec-tools"
 
 [workspace.dependencies.soroban-sdk]
-version = "=20.0.3"
+version = "=20.1.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "93b09e42e4efa841cbd034c0bff0dc362765086c"
+rev = "811ce3da801c03a21d5fa80fda187c0f1012240f"
 
 [workspace.dependencies.soroban-token-sdk]
-version = "=20.0.3"
+version = "=20.1.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "93b09e42e4efa841cbd034c0bff0dc362765086c"
+rev = "811ce3da801c03a21d5fa80fda187c0f1012240f"
 
 [workspace.dependencies.soroban-ledger-snapshot]
-version = "=20.0.3"
+version = "=20.1.0"
 git = "https://github.com/stellar/rs-soroban-sdk"
-rev = "93b09e42e4efa841cbd034c0bff0dc362765086c"
+rev = "811ce3da801c03a21d5fa80fda187c0f1012240f"
 
 [workspace.dependencies.soroban-cli]
 version = "20.1.1"

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.0.3-1648.7c7dcefd3.focal}
+    image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:20.0.3-1655.114b833e7.focal}
     depends_on:
       - core-postgres
     restart: on-failure

diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stellar/go v0.0.0-20240102161234-51c1b1571944
+	github.com/stellar/go v0.0.0-20240109175136-3ca501f09055
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/mod v0.13.0
 	gotest.tools/v3 v3.5.0

diff --git a/go.sum b/go.sum
@@ -334,8 +334,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
 github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
-github.com/stellar/go v0.0.0-20240102161234-51c1b1571944 h1:zuaWX3KC9z7zVAmnX4nIrlnKMGUpNEQOsWAD7m+Bjl8=
-github.com/stellar/go v0.0.0-20240102161234-51c1b1571944/go.mod h1:PAWie4LYyDzJXqDVG4Qcj1Nt+uNk7sjzgSCXndQYsBA=
+github.com/stellar/go v0.0.0-20240109175136-3ca501f09055 h1:6/i5f/4CsoArb9eNe+Pr+ATQkBvWNK31at6qaw9zMH4=
+github.com/stellar/go v0.0.0-20240109175136-3ca501f09055/go.mod h1:PAWie4LYyDzJXqDVG4Qcj1Nt+uNk7sjzgSCXndQYsBA=
 github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2 h1:OzCVd0SV5qE3ZcDeSFCmOWLZfEWZ3Oe8KtmSOYKEVWE=
 github.com/stellar/go-xdr v0.0.0-20231122183749-b53fb00bcac2/go.mod h1:yoxyU/M8nl9LKeWIoBrbDPQ7Cy+4jxRcWcOayZ4BMps=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=