protocol22: Bump dependencies to stable 22.0.0

stellar · Nov 7, 2024 · 752f3c9 · 752f3c9
1 parent b1582f3
commit 752f3c9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 36 deletions.
diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
@@ -104,10 +104,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_21_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal
-      PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal
-      PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2126.rc3.92923c2db.focal
-      PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2126.rc3.92923c2db.focal
+      PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 22.0.0-2138.721fd0a65.jammy
+      PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2138.721fd0a65.jammy
+      PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2138.721fd0a65.jammy
+      PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2138.721fd0a65.jammy
 
     steps:
       - uses: actions/checkout@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ version = "=21.2.1"
 
 [workspace.dependencies.soroban-env-host-curr]
 package = "soroban-env-host"
-version = "=22.0.0-rc.3"
+version = "=22.0.0"
 #git = "https://github.com/stellar/rs-soroban-env"
 #rev = "0497816694bef2b103494c8c61b7c8a06a72c7d3"
 
@@ -25,12 +25,12 @@ version = "=21.2.1"
 
 [workspace.dependencies.soroban-simulation-curr]
 package = "soroban-simulation"
-version = "=22.0.0-rc.3"
+version = "=22.0.0"
 # git = "https://github.com/stellar/rs-soroban-env"
 # rev = "0497816694bef2b103494c8c61b7c8a06a72c7d3"
 
 [workspace.dependencies.stellar-xdr]
-version = "=22.0.0-rc.1.1"
+version = "=22.0.0"
 features = [ "serde" ]
 
 [workspace.dependencies]

diff --git a/cmd/soroban-rpc/docker/Dockerfile.release b/cmd/soroban-rpc/docker/Dockerfile.release
@@ -10,9 +10,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 # ca-certificates are required to make tls connections
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl jq wget gnupg apt-utils gpg && \
     curl -sSL https://apt.stellar.org/SDF.asc | gpg --dearmor >/etc/apt/trusted.gpg.d/SDF.gpg && \
-    echo "deb https://apt.stellar.org focal stable" >/etc/apt/sources.list.d/SDF.list && \
-    echo "deb https://apt.stellar.org focal testing" >/etc/apt/sources.list.d/SDF-testing.list && \
-    echo "deb https://apt.stellar.org focal unstable" >/etc/apt/sources.list.d/SDF-unstable.list && \
+    echo "deb https://apt.stellar.org jammy stable" >/etc/apt/sources.list.d/SDF.list && \
+    echo "deb https://apt.stellar.org jammy testing" >/etc/apt/sources.list.d/SDF-testing.list && \
+    echo "deb https://apt.stellar.org jammy unstable" >/etc/apt/sources.list.d/SDF-unstable.list && \
     apt-get update && \
     apt-get install -y stellar-core=${STELLAR_CORE_VERSION} stellar-soroban-rpc=${SOROBAN_RPC_VERSION} && \
     apt-get clean

diff --git a/scripts/check-dependencies.bash b/scripts/check-dependencies.bash
@@ -2,9 +2,6 @@
 
 set -e
 
-# FIXME version checking is broken for RC releases after multi-protocol support
-exit 0
-
 SED=sed
 if [ -z "$(sed --version 2>&1 | grep GNU)" ]; then
     SED=gsed
@@ -19,8 +16,6 @@ PROTOS=$($SED -n ':pkg; /"soroban-env-host"/ {n; /version/ { s/[^0-9]*\([0-9]\+\
 if [ -z "$PROTOS" ]; then
   echo "Cannot find soroban-env-host dependencies in Cargo.toml"
   exit 1
-else
-  echo "Found supported protocols: $PROTOS"
 fi
 
 for PROTO in $PROTOS