From 752f3c955db72aaa1290dbe90d3b3ea01df6471f Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Thu, 7 Nov 2024 14:08:53 +0100 Subject: [PATCH] protocol22: Bump dependencies to stable 22.0.0 --- .github/workflows/soroban-rpc.yml | 8 ++--- Cargo.lock | 42 +++++++++++------------ Cargo.toml | 6 ++-- cmd/soroban-rpc/docker/Dockerfile.release | 6 ++-- scripts/check-dependencies.bash | 5 --- 5 files changed, 31 insertions(+), 36 deletions(-) diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml index 74e12d56..b40915d2 100644 --- 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 index 6d0d032b..70bd0edb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -905,9 +905,9 @@ dependencies = [ "serde_json", "sha2", "soroban-env-host 21.2.1", - "soroban-env-host 22.0.0-rc.3", + "soroban-env-host 22.0.0", "soroban-simulation 21.2.1", - "soroban-simulation 22.0.0-rc.3", + "soroban-simulation 22.0.0", ] [[package]] @@ -1129,9 +1129,9 @@ dependencies = [ [[package]] name = "soroban-builtin-sdk-macros" -version = "22.0.0-rc.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c45d2492cd44f05cc79eeb857985f153f12a4423ce51b4b746b5925024c473b1" +checksum = "5ad0f684e195abe1f485f1649a7a97f4ad3d7249747e49affa4a06f5f87eb45e" dependencies = [ "itertools 0.10.5", "proc-macro2", @@ -1159,19 +1159,19 @@ dependencies = [ [[package]] name = "soroban-env-common" -version = "22.0.0-rc.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b6d2ec8955243394278e1fae88be3b367fcfed9cf74e5044799a90786a8642" +checksum = "b561dc8e75cecd2ea06bf4fb0b50050693f4eb4b23a1afaac5c98c5720eba3ab" dependencies = [ "arbitrary", "crate-git-revision", "ethnum", "num-derive", "num-traits", - "soroban-env-macros 22.0.0-rc.3", + "soroban-env-macros 22.0.0", "soroban-wasmi", "static_assertions", - "stellar-xdr 22.0.0-rc.1.1", + "stellar-xdr 22.0.0", "wasmparser", ] @@ -1210,9 +1210,9 @@ dependencies = [ [[package]] name = "soroban-env-host" -version = "22.0.0-rc.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cb9be0260d39a648db0d33e1c6f8f494ec0c4f5be2b8a0a4e15ed4b7c6a92b0" +checksum = "6bc74ec827b224eb5960e8ef0e43b88820bf7deca295d0bb493924490aec68b8" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1236,8 +1236,8 @@ dependencies = [ "sec1", "sha2", "sha3", - "soroban-builtin-sdk-macros 22.0.0-rc.3", - "soroban-env-common 22.0.0-rc.3", + "soroban-builtin-sdk-macros 22.0.0", + "soroban-env-common 22.0.0", "soroban-wasmi", "static_assertions", "stellar-strkey 0.0.9", @@ -1261,16 +1261,16 @@ dependencies = [ [[package]] name = "soroban-env-macros" -version = "22.0.0-rc.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a328297a568ae98999fdb06902e3362dfd8a2bfa9abea40beaeb7dc93a402fe7" +checksum = "7e85b674e29ae33f8e79d2f47de1af2f83a54cbaeca31c9602402d3392ae3bfe" dependencies = [ "itertools 0.10.5", "proc-macro2", "quote", "serde", "serde_json", - "stellar-xdr 22.0.0-rc.1.1", + "stellar-xdr 22.0.0", "syn 2.0.39", ] @@ -1289,13 +1289,13 @@ dependencies = [ [[package]] name = "soroban-simulation" -version = "22.0.0-rc.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419aa45f2fa3eeb27e556d82c8c6f7b76a102444d27022e9facdba25cd20094a" +checksum = "9ac1a70b7fbffe4f35b7ba725473f4800ec2fcddf0a011102cd7c3160ae94864" dependencies = [ "anyhow", "rand", - "soroban-env-host 22.0.0-rc.3", + "soroban-env-host 22.0.0", "static_assertions", "thiserror", ] @@ -1373,9 +1373,9 @@ dependencies = [ [[package]] name = "stellar-xdr" -version = "22.0.0-rc.1.1" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88dc0e928b9cb65ea43836b52560bb4ead3e32895f5019ca223dc7cd1966cbf" +checksum = "20c2130275cc730d042b3082f51145f0486f5a543d6d72fced02ed9048b82b57" dependencies = [ "arbitrary", "base64 0.13.1", @@ -1671,7 +1671,7 @@ dependencies = [ "rand", "serde_json", "sha2", - "stellar-xdr 22.0.0-rc.1.1", + "stellar-xdr 22.0.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 26091af1..09200616 100644 --- 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 index ca67a03f..ec57e6e8 100644 --- 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 index dc6bf6cd..b32e20be 100755 --- 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