From c8b9e02aecdbdae88c58d070a6ac65cfbb22ca25 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Thu, 21 Dec 2023 02:39:17 +1000 Subject: [PATCH] Update versions of software (#538) * Update versions of software in latest image * remove unused settings * upd * excl * ujpd * upd --- .github/workflows/build-latest.yml | 24 ++++++++++++++++-------- .github/workflows/build-soroban-dev.yml | 8 ++++---- .github/workflows/build-testing.yml | 8 ++++---- Makefile | 16 +++++++++------- start | 21 ++------------------- 5 files changed, 35 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 1ffab462..96a1cb32 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -36,13 +36,17 @@ jobs: with: arch: amd64 tag: latest-amd64 - core_ref: v19.14.0 - go_ref: horizon-v2.26.1 - soroban_tools_ref: v0.4.0 + xdr_ref: v20.0.2 + core_ref: v20.0.2 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.2 test_matrix: | { "network": ["pubnet", "local"], - "options": [""] + "options": ["", "--enable-soroban-rpc"], + "exclude": [ + { "network": "pubnet", "options": "--enable-soroban-rpc" }, + ] } arm64: @@ -53,15 +57,19 @@ jobs: with: arch: arm64 tag: latest-arm64 - core_ref: v19.14.0 + xdr_ref: v20.0.2 + core_ref: v20.0.2 core_build_runner_type: ubuntu-latest-16-cores - go_ref: horizon-v2.26.1 - soroban_tools_ref: v0.4.0 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.2 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { "network": ["pubnet", "local"], - "options": [""] + "options": ["", "--enable-soroban-rpc"], + "exclude": [ + { "network": "pubnet", "options": "--enable-soroban-rpc" }, + ] } manifest: diff --git a/.github/workflows/build-soroban-dev.yml b/.github/workflows/build-soroban-dev.yml index 7ae79693..4cccfcff 100644 --- a/.github/workflows/build-soroban-dev.yml +++ b/.github/workflows/build-soroban-dev.yml @@ -35,10 +35,10 @@ jobs: with: arch: amd64 tag: soroban-dev-amd64 - core_ref: v20.0.0 + xdr_ref: v20.0.2 + core_ref: v20.0.2 core_supports_enable_soroban_diagnostic_events: "true" go_ref: horizon-v2.27.0 - xdr_ref: v20.0.1 soroban_tools_ref: v20.0.2 test_matrix: | { @@ -54,11 +54,11 @@ jobs: with: arch: arm64 tag: soroban-dev-arm64 - core_ref: v20.0.0 + xdr_ref: v20.0.2 + core_ref: v20.0.2 core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.27.0 - xdr_ref: v20.0.1 soroban_tools_ref: v20.0.2 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index d5dae2f5..ba5551a9 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -37,10 +37,10 @@ jobs: with: arch: amd64 tag: testing-amd64 - core_ref: v20.0.1 + xdr_ref: v20.0.2 + core_ref: v20.0.2 core_supports_enable_soroban_diagnostic_events: "true" go_ref: horizon-v2.27.0 - xdr_ref: v20.0.1 soroban_tools_ref: v20.0.2 test_matrix: | { @@ -59,11 +59,11 @@ jobs: with: arch: arm64 tag: testing-arm64 - core_ref: v20.0.1 + xdr_ref: v20.0.2 + core_ref: v20.0.2 core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.27.0 - xdr_ref: v20.0.1 soroban_tools_ref: v20.0.2 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | diff --git a/Makefile b/Makefile index 4db9578d..21b164ff 100644 --- a/Makefile +++ b/Makefile @@ -23,22 +23,24 @@ console: build-latest: $(MAKE) build TAG=latest \ - CORE_REF=v19.14.0 \ - HORIZON_REF=horizon-v2.26.1 \ - SOROBAN_RPC_REF=v0.4.0 + XDR_REF=v20.0.2 \ + CORE_REF=v20.0.2 \ + CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \ + HORIZON_REF=horizon-v2.27.0 \ + SOROBAN_RPC_REF=v20.0.2 build-testing: $(MAKE) build TAG=testing \ - XDR_REF=v20.0.1 \ - CORE_REF=v20.0.1 \ + XDR_REF=v20.0.2 \ + CORE_REF=v20.0.2 \ CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \ HORIZON_REF=horizon-v2.27.0 \ SOROBAN_RPC_REF=v20.0.2 build-soroban-dev: $(MAKE) build TAG=soroban-dev \ - XDR_REF=v20.0.1 \ - CORE_REF=v20.0.0 \ + XDR_REF=v20.0.2 \ + CORE_REF=v20.0.2 \ CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \ HORIZON_REF=horizon-v2.27.0 \ SOROBAN_RPC_REF=v20.0.2 diff --git a/start b/start index f10e05aa..3256deed 100644 --- a/start +++ b/start @@ -27,7 +27,6 @@ export PGPORT=5432 : "${DISABLE_SOROBAN_DIAGNOSTIC_EVENTS:=false}" : "${ENABLE_SOROBAN_RPC_ADMIN_ENDPOINT:=false}" : "${ENABLE_CORE_MANUAL_CLOSE:=false}" -: "${CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS:=false}" : "${LIMITS:=testnet}" QUICKSTART_INITIALIZED=false @@ -40,14 +39,6 @@ function main() { } function validate_before_start() { - if [ "$NETWORK" != "local" ] && [ "$NETWORK" != "futurenet" ] && [ "$NETWORK" != "testnet" ] && [ "$ENABLE_SOROBAN_RPC" = "true" ]; then - echo "--enable-soroban-rpc usage only supported on local/futurenet/testnet networks" >&2 - exit 1 - fi - if [ "$ENABLE_SOROBAN_DIAGNOSTIC_EVENTS" = "true" ] && [ "$CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS" != "true" ]; then - echo "--enable-soroban-diagnostic-events usage only supported with versions of stellar-core that support it" >&2 - exit 1 - fi if [ "$ENABLE_SOROBAN_RPC" != "true" ] && [ "$ENABLE_SOROBAN_RPC_ADMIN_ENDPOINT" = "true" ]; then echo "--enable-soroban-rpc-admin-endpoint usage only supported with --enable-soroban-rpc" >&2 exit 1 @@ -428,11 +419,7 @@ function init_horizon() { HORIZON_CAPTIVE_CORE_CFG=$HZHOME/etc/stellar-captive-core.cfg run_silent "finalize-horizon-captivecore-db" perl -pi -e "s*__DATABASE__*sqlite3://$HZHOME/captive-core/stellar.db*g" $HORIZON_CAPTIVE_CORE_CFG perl -pi -e "s/__NETWORK__/$NETWORK_PASSPHRASE/g" $HORIZON_CAPTIVE_CORE_CFG - if [ "${CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS}" = "true" ]; then - run_silent "finalize-horizon-captivecore-config-enable-soroban-diagnostic-events" perl -pi -e "s/__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__/ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=$ENABLE_SOROBAN_DIAGNOSTIC_EVENTS/g" $HORIZON_CAPTIVE_CORE_CFG - else - run_silent "finalize-horizon-captivecore-config-enable-soroban-diagnostic-events-unset" perl -pi -e "s/__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__//g" $HORIZON_CAPTIVE_CORE_CFG - fi + run_silent "finalize-horizon-captivecore-config-enable-soroban-diagnostic-events" perl -pi -e "s/__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__/ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=$ENABLE_SOROBAN_DIAGNOSTIC_EVENTS/g" $HORIZON_CAPTIVE_CORE_CFG cat << EOF >> etc/horizon.env export CAPTIVE_CORE_CONFIG_PATH=$HORIZON_CAPTIVE_CORE_CFG @@ -469,11 +456,7 @@ function init_soroban_rpc() { SOROBAN_RPC_CAPTIVE_CORE_CFG=$SOROBAN_RPC_HOME/etc/stellar-captive-core.cfg run_silent "finalize-soroban-rpc-captivecore-db" perl -pi -e "s*__DATABASE__*sqlite3://$SOROBAN_RPC_HOME/captive-core/stellar-rpc.db*g" $SOROBAN_RPC_CAPTIVE_CORE_CFG perl -pi -e "s/__NETWORK__/$NETWORK_PASSPHRASE/g" $SOROBAN_RPC_CAPTIVE_CORE_CFG - if [ "${CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS}" = "true" ]; then - run_silent "finalize-soroban-rpc-captivecore-config-enable-soroban-diagnostic-events" perl -pi -e "s/__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__/ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=$ENABLE_SOROBAN_DIAGNOSTIC_EVENTS/g" $SOROBAN_RPC_CAPTIVE_CORE_CFG - else - run_silent "finalize-soroban-rpc-captivecore-config-enable-soroban-diagnostic-events-unset" perl -pi -e "s/__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__//g" $SOROBAN_RPC_CAPTIVE_CORE_CFG - fi + run_silent "finalize-soroban-rpc-captivecore-config-enable-soroban-diagnostic-events" perl -pi -e "s/__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__/ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=$ENABLE_SOROBAN_DIAGNOSTIC_EVENTS/g" $SOROBAN_RPC_CAPTIVE_CORE_CFG local ADMIN_ENDPOINT=0.0.0.0:6061 if [ "$ENABLE_SOROBAN_RPC_ADMIN_ENDPOINT" != "true" ]; then