From 18ee3a5f34f288e440893929ece499e8214b4372 Mon Sep 17 00:00:00 2001 From: marta-lokhova Date: Mon, 19 Aug 2024 17:51:44 -0700 Subject: [PATCH 1/5] Bump core v21.3.0 --- .github/workflows/galexie-release.yml | 2 +- .github/workflows/galexie.yml | 2 +- .github/workflows/horizon.yml | 4 ++-- services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md | 4 ++-- services/horizon/internal/docs/TESTING_NOTES.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/galexie-release.yml b/.github/workflows/galexie-release.yml index 18c441eae3..cb4d87eb5b 100644 --- a/.github/workflows/galexie-release.yml +++ b/.github/workflows/galexie-release.yml @@ -16,7 +16,7 @@ jobs: # this is the multi-arch index sha, get it by 'docker buildx imagetools inspect stellar/quickstart:testing' GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE: docker.io/stellar/quickstart:testing@sha256:03c6679f838a92b1eda4cd3a9e2bdee4c3586e278a138a0acf36a9bc99a0041f GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE_PULL: "false" - STELLAR_CORE_VERSION: 21.1.0-1921.b3aeb14cc.focal + STELLAR_CORE_VERSION: 21.3.1-2006.4ede19620.focal steps: - name: Set VERSION run: | diff --git a/.github/workflows/galexie.yml b/.github/workflows/galexie.yml index 458f23ca37..957cf6dd4e 100644 --- a/.github/workflows/galexie.yml +++ b/.github/workflows/galexie.yml @@ -10,7 +10,7 @@ jobs: name: Test runs-on: ubuntu-latest env: - CAPTIVE_CORE_DEBIAN_PKG_VERSION: 21.1.0-1921.b3aeb14cc.focal + CAPTIVE_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal GALEXIE_INTEGRATION_TESTS_ENABLED: "true" GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core # this pins to a version of quickstart:testing that has the same version as GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 117e11bb6f..0dce67c722 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -33,7 +33,7 @@ jobs: HORIZON_INTEGRATION_TESTS_ENABLED: true HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }} HORIZON_INTEGRATION_TESTS_CAPTIVE_CORE_USE_DB: true - PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.0.0-1872.c6f474133.focal + PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:21 PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.0.0-rc2-73 PGHOST: localhost @@ -123,7 +123,7 @@ jobs: name: Test (and push) verify-range image runs-on: ubuntu-22.04 env: - STELLAR_CORE_VERSION: 21.0.0-1872.c6f474133.focal + STELLAR_CORE_VERSION: 21.3.1-2006.4ede19620.focal CAPTIVE_CORE_STORAGE_PATH: /tmp steps: - uses: actions/checkout@v3 diff --git a/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md b/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md index cdbc1b97c7..07048f1bad 100644 --- a/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md +++ b/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md @@ -171,14 +171,14 @@ By default, the Docker Compose file is configured to use version 21 of Protocol ```bash export PROTOCOL_VERSION="21" export CORE_IMAGE="stellar/stellar-core:21" -export STELLAR_CORE_VERSION="21.0.0-1872.c6f474133.focal" +export STELLAR_CORE_VERSION="21.3.1-2006.4ede19620.focal" ``` Example: Runs Stellar Protocol and Core version 21, for any mode of testnet, standalone, pubnet ```bash -PROTOCOL_VERSION=21 CORE_IMAGE=stellar/stellar-core:21 STELLAR_CORE_VERSION=21.0.0-1872.c6f474133.focal ./start.sh [standalone|pubnet] +PROTOCOL_VERSION=21 CORE_IMAGE=stellar/stellar-core:21 STELLAR_CORE_VERSION=21.3.1-2006.4ede19620.focal ./start.sh [standalone|pubnet] ``` ## **Logging** diff --git a/services/horizon/internal/docs/TESTING_NOTES.md b/services/horizon/internal/docs/TESTING_NOTES.md index c7db9cd465..c25db8e5e4 100644 --- a/services/horizon/internal/docs/TESTING_NOTES.md +++ b/services/horizon/internal/docs/TESTING_NOTES.md @@ -16,7 +16,7 @@ Before running integration tests, you also need to set some environment variable ```bash export HORIZON_INTEGRATION_TESTS_ENABLED=true export HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL=21 -export HORIZON_INTEGRATION_TESTS_DOCKER_IMG=stellar/stellar-core:21.0.0-1872.c6f474133.focal +export HORIZON_INTEGRATION_TESTS_DOCKER_IMG=stellar/stellar-core:21.3.1-2006.4ede19620.focal ``` Make sure to check [horizon.yml](/.github/workflows/horizon.yml) for the latest core image version. From 2ad6daf3f147103456d3c35d81479e985e38aa32 Mon Sep 17 00:00:00 2001 From: marta-lokhova Date: Tue, 20 Aug 2024 15:19:13 -0700 Subject: [PATCH 2/5] docker update --- .github/workflows/horizon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 0dce67c722..6f7b71afb4 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -34,7 +34,7 @@ jobs: HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }} HORIZON_INTEGRATION_TESTS_CAPTIVE_CORE_USE_DB: true PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal - PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:21 + PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.3.1-2006.4ede19620.focal PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.0.0-rc2-73 PGHOST: localhost PGPORT: 5432 From ac6262467fcaa714843a16830200104ecf2d212a Mon Sep 17 00:00:00 2001 From: George Date: Tue, 20 Aug 2024 15:47:21 -0700 Subject: [PATCH 3/5] Update RPC image and incorporate into cache-busting --- .github/workflows/horizon.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 6f7b71afb4..411f3cb9cd 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -35,7 +35,7 @@ jobs: HORIZON_INTEGRATION_TESTS_CAPTIVE_CORE_USE_DB: true PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.3.1-2006.4ede19620.focal - PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.0.0-rc2-73 + PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.4.1 PGHOST: localhost PGPORT: 5432 PGUSER: postgres @@ -98,7 +98,7 @@ jobs: - name: Calculate the source hash id: calculate_source_hash run: | - combined_hash=$(echo "horizon-hash-${{ hashFiles('./horizon') }}-${{ hashFiles('./clients/horizonclient/**') }}-${{ hashFiles('./protocols/horizon/**') }}-${{ hashFiles('./txnbuild/**') }}-${{ hashFiles('./ingest/**') }}-${{ hashFiles('./xdr/**') }}-${{ hashFiles('./services/**') }}-${{ env.PROTOCOL_21_CORE_DOCKER_IMG }}-${{ env.PREFIX }}" | sha256sum | cut -d ' ' -f 1) + combined_hash=$(echo "horizon-hash-${{ hashFiles('./horizon') }}-${{ hashFiles('./clients/horizonclient/**') }}-${{ hashFiles('./protocols/horizon/**') }}-${{ hashFiles('./txnbuild/**') }}-${{ hashFiles('./ingest/**') }}-${{ hashFiles('./xdr/**') }}-${{ hashFiles('./services/**') }}-${{ env.PROTOCOL_21_CORE_DOCKER_IMG }}-${{ env.PROTOCOL_21_RPC_DOCKER_IMG }}-${{ env.PROTOCOL_21_CORE_DEBIAN_PKG_VERSION }}-${{ env.PREFIX }}" | sha256sum | cut -d ' ' -f 1) echo "COMBINED_SOURCE_HASH=$combined_hash" >> "$GITHUB_ENV" - name: Restore Horizon binary and integration tests source hash to cache From e5cc587ecaf92f82b1cf2509b7329c83bce0ff30 Mon Sep 17 00:00:00 2001 From: George Date: Tue, 20 Aug 2024 16:33:32 -0700 Subject: [PATCH 4/5] Remove unsupported Captive Core flag --- .../docker/captive-core-integration-tests.soroban-rpc.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/horizon/docker/captive-core-integration-tests.soroban-rpc.cfg b/services/horizon/docker/captive-core-integration-tests.soroban-rpc.cfg index 8d76504de2..0ce81a7f5c 100644 --- a/services/horizon/docker/captive-core-integration-tests.soroban-rpc.cfg +++ b/services/horizon/docker/captive-core-integration-tests.soroban-rpc.cfg @@ -1,4 +1,4 @@ -EXPERIMENTAL_BUCKETLIST_DB = true +DEPRECATED_SQL_LEDGER_STATE=false PEER_PORT=11725 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true From 5f7683692aa739f64a1c0e353db43ef057554581 Mon Sep 17 00:00:00 2001 From: marta-lokhova Date: Thu, 22 Aug 2024 09:15:01 -0700 Subject: [PATCH 5/5] Bump to v21.3.1 --- .github/workflows/galexie-release.yml | 2 +- .github/workflows/galexie.yml | 2 +- .github/workflows/horizon.yml | 6 +++--- services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md | 4 ++-- services/horizon/internal/docs/TESTING_NOTES.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/galexie-release.yml b/.github/workflows/galexie-release.yml index cb4d87eb5b..b84f3c1cf0 100644 --- a/.github/workflows/galexie-release.yml +++ b/.github/workflows/galexie-release.yml @@ -16,7 +16,7 @@ jobs: # this is the multi-arch index sha, get it by 'docker buildx imagetools inspect stellar/quickstart:testing' GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE: docker.io/stellar/quickstart:testing@sha256:03c6679f838a92b1eda4cd3a9e2bdee4c3586e278a138a0acf36a9bc99a0041f GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE_PULL: "false" - STELLAR_CORE_VERSION: 21.3.1-2006.4ede19620.focal + STELLAR_CORE_VERSION: 21.3.1-2007.4ede19620.focal steps: - name: Set VERSION run: | diff --git a/.github/workflows/galexie.yml b/.github/workflows/galexie.yml index 957cf6dd4e..6406a7a897 100644 --- a/.github/workflows/galexie.yml +++ b/.github/workflows/galexie.yml @@ -10,7 +10,7 @@ jobs: name: Test runs-on: ubuntu-latest env: - CAPTIVE_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal + CAPTIVE_CORE_DEBIAN_PKG_VERSION: 21.3.1-2007.4ede19620.focal GALEXIE_INTEGRATION_TESTS_ENABLED: "true" GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core # this pins to a version of quickstart:testing that has the same version as GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 411f3cb9cd..f315e27791 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -33,8 +33,8 @@ jobs: HORIZON_INTEGRATION_TESTS_ENABLED: true HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }} HORIZON_INTEGRATION_TESTS_CAPTIVE_CORE_USE_DB: true - PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2006.4ede19620.focal - PROTOCOL_21_CORE_DOCKER_IMG: stellar/unsafe-stellar-core:21.3.1-2006.4ede19620.focal + PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2007.4ede19620.focal + PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:21.3.1-2007.4ede19620.focal PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.4.1 PGHOST: localhost PGPORT: 5432 @@ -123,7 +123,7 @@ jobs: name: Test (and push) verify-range image runs-on: ubuntu-22.04 env: - STELLAR_CORE_VERSION: 21.3.1-2006.4ede19620.focal + STELLAR_CORE_VERSION: 21.3.1-2007.4ede19620.focal CAPTIVE_CORE_STORAGE_PATH: /tmp steps: - uses: actions/checkout@v3 diff --git a/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md b/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md index 07048f1bad..9464aea2a5 100644 --- a/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md +++ b/services/horizon/internal/docs/GUIDE_FOR_DEVELOPERS.md @@ -171,14 +171,14 @@ By default, the Docker Compose file is configured to use version 21 of Protocol ```bash export PROTOCOL_VERSION="21" export CORE_IMAGE="stellar/stellar-core:21" -export STELLAR_CORE_VERSION="21.3.1-2006.4ede19620.focal" +export STELLAR_CORE_VERSION="21.3.1-2007.4ede19620.focal" ``` Example: Runs Stellar Protocol and Core version 21, for any mode of testnet, standalone, pubnet ```bash -PROTOCOL_VERSION=21 CORE_IMAGE=stellar/stellar-core:21 STELLAR_CORE_VERSION=21.3.1-2006.4ede19620.focal ./start.sh [standalone|pubnet] +PROTOCOL_VERSION=21 CORE_IMAGE=stellar/stellar-core:21 STELLAR_CORE_VERSION=21.3.1-2007.4ede19620.focal ./start.sh [standalone|pubnet] ``` ## **Logging** diff --git a/services/horizon/internal/docs/TESTING_NOTES.md b/services/horizon/internal/docs/TESTING_NOTES.md index c25db8e5e4..4dcc5ce6f2 100644 --- a/services/horizon/internal/docs/TESTING_NOTES.md +++ b/services/horizon/internal/docs/TESTING_NOTES.md @@ -16,7 +16,7 @@ Before running integration tests, you also need to set some environment variable ```bash export HORIZON_INTEGRATION_TESTS_ENABLED=true export HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL=21 -export HORIZON_INTEGRATION_TESTS_DOCKER_IMG=stellar/stellar-core:21.3.1-2006.4ede19620.focal +export HORIZON_INTEGRATION_TESTS_DOCKER_IMG=stellar/stellar-core:21.3.1-2007.4ede19620.focal ``` Make sure to check [horizon.yml](/.github/workflows/horizon.yml) for the latest core image version.