Bump Rust, Go and Core dependencies (#193)

stellar · Jun 3, 2024 · 5ca0b19 · 5ca0b19
1 parent 4c9fdda
commit 5ca0b19
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
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-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
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 21.0.1-1897.dfd3dbff1.focal
+      PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.1-1897.dfd3dbff1.focal
+      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.0.1-1897.dfd3dbff1.focal
+      PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.0.1-1897.dfd3dbff1.focal
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,13 +11,13 @@ version = "21.2.0"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]
-version = "=21.0.1"
+version = "=21.1.0"
 
 [workspace.dependencies.soroban-simulation]
-version = "=21.0.1"
+version = "=21.1.0"
 
 [workspace.dependencies.stellar-xdr]
-version = "=21.0.1"
+version = "=21.1.0"
 
 [workspace.dependencies]
 base64 = "0.22.0"

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/stellar-core:21.0.0-1865.rc2.c6f474133.focal}
+    image: ${CORE_IMAGE:-stellar/unsafe-stellar-core:21.0.1-1897.dfd3dbff1.focal}
     depends_on:
       - core-postgres
     restart: on-failure

diff --git a/cmd/soroban-rpc/internal/test/simulate_transaction_test.go b/cmd/soroban-rpc/internal/test/simulate_transaction_test.go
@@ -597,7 +597,7 @@ func TestSimulateTransactionError(t *testing.T) {
 	result := simulateTransactionFromTxParams(t, client, params)
 	assert.Greater(t, result.LatestLedger, uint32(0))
 	assert.Contains(t, result.Error, "MissingValue")
-	require.Len(t, result.Events, 1)
+	require.GreaterOrEqual(t, len(result.Events), 1)
 	var event xdr.DiagnosticEvent
 	require.NoError(t, xdr.SafeUnmarshalBase64(result.Events[0], &event))
 }

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-20240516142849-5a41b35abe54
+	github.com/stellar/go v0.0.0-20240603200326-f03edd0aab37
 	github.com/stretchr/testify v1.9.0
 )
 

diff --git a/go.sum b/go.sum
@@ -340,8 +340,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-20240516142849-5a41b35abe54 h1:Zis/V6FgETTtHf4U4bGII3aSz6uVG6314y8bJZZ1cL0=
-github.com/stellar/go v0.0.0-20240516142849-5a41b35abe54/go.mod h1:TuXKLL7WViqwrvpWno2I4UYGn2Ny9KZld1jUIN6fnK8=
+github.com/stellar/go v0.0.0-20240603200326-f03edd0aab37 h1:JczaIDb2jjnG+ZxLpByCN+gTfVVYuJkTve+eLW4qdI0=
+github.com/stellar/go v0.0.0-20240603200326-f03edd0aab37/go.mod h1:TuXKLL7WViqwrvpWno2I4UYGn2Ny9KZld1jUIN6fnK8=
 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=

diff --git a/scripts/check-dependencies.bash b/scripts/check-dependencies.bash
@@ -107,8 +107,6 @@ for P in $PROTOCOL_VERSIONS; do
 	    echo
 	    echo "Current repository's revision $RS_STELLAR_XDR_REVISION"
 	    echo "Core's revision $RS_STELLAR_XDR_REVISION_FROM_CORE"
-	    # Temporarily skip check since Core is not currently using the exact version rs-stellar-xdr revision
-	    # exit 1
     fi
 done