From d3529680c4aa3cae3aad6c889da5c0a86270935a Mon Sep 17 00:00:00 2001 From: Shawn Reuland Date: Mon, 18 Sep 2023 23:07:15 -0700 Subject: [PATCH 1/9] updating soroban support to be available on testnet --- .github/workflows/build-latest.yml | 8 ++--- .github/workflows/build-soroban-dev.yml | 8 ++--- .github/workflows/build-testing.yml | 8 ++--- start | 8 ++--- testnet/horizon/etc/stellar-captive-core.cfg | 33 +++++++++++++++++ testnet/soroban-rpc/etc/soroban-rpc.cfg | 13 +++++++ .../soroban-rpc/etc/stellar-captive-core.cfg | 35 +++++++++++++++++++ .../etc/supervisord.conf.d/soroban-rpc.conf | 9 +++++ 8 files changed, 106 insertions(+), 16 deletions(-) create mode 100644 testnet/horizon/etc/stellar-captive-core.cfg create mode 100644 testnet/soroban-rpc/etc/soroban-rpc.cfg create mode 100644 testnet/soroban-rpc/etc/stellar-captive-core.cfg create mode 100644 testnet/supervisor/etc/supervisord.conf.d/soroban-rpc.conf diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 04d1b494..82dc9b65 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -37,8 +37,8 @@ jobs: arch: amd64 tag: latest-amd64 core_ref: v19.13.0 - go_ref: horizon-v2.26.1 - soroban_tools_ref: v0.4.0 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.0-rc2 test_matrix: | { "network": ["testnet", "pubnet", "local"], @@ -58,8 +58,8 @@ jobs: arch: arm64 tag: latest-arm64 core_ref: v19.13.0 - go_ref: horizon-v2.26.1 - soroban_tools_ref: v0.4.0 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.0-rc2 test_matrix: | { "network": ["testnet", "pubnet", "local"], diff --git a/.github/workflows/build-soroban-dev.yml b/.github/workflows/build-soroban-dev.yml index 4d4da37f..9d6baa94 100644 --- a/.github/workflows/build-soroban-dev.yml +++ b/.github/workflows/build-soroban-dev.yml @@ -37,8 +37,8 @@ jobs: core_ref: v20.0.0rc1 core_configure_flags: --disable-tests core_supports_testing_soroban_high_limit_override: 'true' - go_ref: soroban-v1.0.0-rc - soroban_tools_ref: v20.0.0-rc1 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.0-rc2 test_matrix: | { "network": ["local"], @@ -57,8 +57,8 @@ jobs: core_configure_flags: --disable-tests core_supports_testing_soroban_high_limit_override: 'true' core_build_runner_type: ubuntu-latest-16-cores - go_ref: soroban-v1.0.0-rc - soroban_tools_ref: v20.0.0-rc1 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.0-rc2 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 0e6ebd50..898c1b99 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -38,8 +38,8 @@ jobs: arch: amd64 tag: testing-amd64 core_ref: v19.13.0 - go_ref: horizon-v2.26.1 - soroban_tools_ref: v0.4.0 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.0-rc2 test_matrix: | { "network": ["testnet", "pubnet", "local"], @@ -59,8 +59,8 @@ jobs: arch: arm64 tag: testing-arm64 core_ref: v19.13.0 - go_ref: horizon-v2.26.1 - soroban_tools_ref: v0.4.0 + go_ref: horizon-v2.27.0 + soroban_tools_ref: v20.0.0-rc2 test_matrix: | { "network": ["testnet", "pubnet", "local"], diff --git a/start b/start index 2b725c25..1719ccdf 100644 --- a/start +++ b/start @@ -34,12 +34,12 @@ CURRENT_POSTGRES_PID="" function main() { process_args $* - if [ "$NETWORK" != "local" ] && [ "$NETWORK" != "futurenet" ] &&[ "$ENABLE_HORIZON_CAPTIVE_CORE" = "true" ]; then - echo "--enable-horizon-captive-core usage only supported on local/futurenet networks" >&2 + if [ "$NETWORK" != "local" ] && [ "$NETWORK" != "futurenet" ] && [ "$NETWORK" != "testnet" ] && [ "$ENABLE_HORIZON_CAPTIVE_CORE" = "true" ]; then + echo "--enable-horizon-captive-core usage only supported on local/futurenet/testnet networks" >&2 exit 1 fi - if [ "$NETWORK" != "local" ] && [ "$NETWORK" != "futurenet" ] && [ "$ENABLE_SOROBAN_RPC" = "true" ]; then - echo "--enable-soroban-rpc usage only supported on local/futurenet networks" >&2 + 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_RPC" != "true" ] && [ "$ENABLE_SOROBAN_DIAGNOSTIC_EVENTS" = "true" ]; then diff --git a/testnet/horizon/etc/stellar-captive-core.cfg b/testnet/horizon/etc/stellar-captive-core.cfg new file mode 100644 index 00000000..a6acf10d --- /dev/null +++ b/testnet/horizon/etc/stellar-captive-core.cfg @@ -0,0 +1,33 @@ +# captive core config for futurenet +NETWORK_PASSPHRASE="__NETWORK__" +# disable the web service port, not used +HTTP_PORT=0 +PUBLIC_HTTP_PORT=false +# To avoid conflicts with the core instance +PEER_PORT=11725 +DATABASE="__DATABASE__" + +NETWORK_PASSPHRASE="Test SDF Network ; September 2015" +UNSAFE_QUORUM=true + +[[HOME_DOMAINS]] +HOME_DOMAIN="testnet.stellar.org" +QUALITY="MEDIUM" +[[VALIDATORS]] +NAME="sdf_testnet_1" +HOME_DOMAIN="testnet.stellar.org" +PUBLIC_KEY="GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y" +ADDRESS="core-testnet1.stellar.org" +HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_001/{0} -o {1}" +[[VALIDATORS]] +NAME="sdf_testnet_2" +HOME_DOMAIN="testnet.stellar.org" +PUBLIC_KEY="GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP" +ADDRESS="core-testnet2.stellar.org" +HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_002/{0} -o {1}" +[[VALIDATORS]] +NAME="sdf_testnet_3" +HOME_DOMAIN="testnet.stellar.org" +PUBLIC_KEY="GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z" +ADDRESS="core-testnet3.stellar.org" +HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_003/{0} -o {1}" diff --git a/testnet/soroban-rpc/etc/soroban-rpc.cfg b/testnet/soroban-rpc/etc/soroban-rpc.cfg new file mode 100644 index 00000000..71bec1f7 --- /dev/null +++ b/testnet/soroban-rpc/etc/soroban-rpc.cfg @@ -0,0 +1,13 @@ +ENDPOINT="localhost:8003" +ADMIN_ENDPOINT="__SOROBAN_RPC_ADMIN_ENDPOINT__" +FRIENDBOT_URL="https://friendbot-testnet.stellar.org/" +NETWORK_PASSPHRASE="__NETWORK__" +STELLAR_CORE_URL="http://localhost:11626" +CAPTIVE_CORE_CONFIG_PATH="/opt/stellar/soroban-rpc/etc/stellar-captive-core.cfg" +CAPTIVE_CORE_STORAGE_PATH="/opt/stellar/soroban-rpc/captive-core" +CAPTIVE_CORE_USE_DB=true +STELLAR_CORE_BINARY_PATH="/usr/bin/stellar-core" +HISTORY_ARCHIVE_URLS="__ARCHIVE__" +DB_PATH="/opt/stellar/soroban-rpc/rpc_db.sqlite" +STELLAR_CAPTIVE_CORE_HTTP_PORT=0 +CHECKPOINT_FREQUENCY=64 diff --git a/testnet/soroban-rpc/etc/stellar-captive-core.cfg b/testnet/soroban-rpc/etc/stellar-captive-core.cfg new file mode 100644 index 00000000..a2b01a5e --- /dev/null +++ b/testnet/soroban-rpc/etc/stellar-captive-core.cfg @@ -0,0 +1,35 @@ +# captive core config for futurenet +NETWORK_PASSPHRASE="__NETWORK__" +# disable the web service port, not used +HTTP_PORT=0 +PUBLIC_HTTP_PORT=false +# To avoid conflicts with the core instance +PEER_PORT=11726 +DATABASE="__DATABASE__" + +EXPERIMENTAL_BUCKETLIST_DB=true +EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12 +ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__ +UNSAFE_QUORUM=true + +[[HOME_DOMAINS]] +HOME_DOMAIN="testnet.stellar.org" +QUALITY="MEDIUM" +[[VALIDATORS]] +NAME="sdf_testnet_1" +HOME_DOMAIN="testnet.stellar.org" +PUBLIC_KEY="GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y" +ADDRESS="core-testnet1.stellar.org" +HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_001/{0} -o {1}" +[[VALIDATORS]] +NAME="sdf_testnet_2" +HOME_DOMAIN="testnet.stellar.org" +PUBLIC_KEY="GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP" +ADDRESS="core-testnet2.stellar.org" +HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_002/{0} -o {1}" +[[VALIDATORS]] +NAME="sdf_testnet_3" +HOME_DOMAIN="testnet.stellar.org" +PUBLIC_KEY="GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z" +ADDRESS="core-testnet3.stellar.org" +HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_003/{0} -o {1}" diff --git a/testnet/supervisor/etc/supervisord.conf.d/soroban-rpc.conf b/testnet/supervisor/etc/supervisord.conf.d/soroban-rpc.conf new file mode 100644 index 00000000..68d2042b --- /dev/null +++ b/testnet/supervisor/etc/supervisord.conf.d/soroban-rpc.conf @@ -0,0 +1,9 @@ +[program:soroban-rpc] +user=stellar +directory=/opt/stellar/soroban-rpc +command=/opt/stellar/soroban-rpc/bin/start +autostart=true +startretries=50 +autorestart=true +priority=60 +redirect_stderr=true From 8eb8a5d1099df9dafbbcfa32eddb82b63620d733 Mon Sep 17 00:00:00 2001 From: Shawn Reuland Date: Mon, 18 Sep 2023 23:17:39 -0700 Subject: [PATCH 2/9] updated test matrix for testnet --- .github/workflows/build-latest.yml | 8 ++++---- .github/workflows/build-testing.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 82dc9b65..73fb0d37 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -42,10 +42,10 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"], + "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], "exclude": [ - { "network": "testnet", "options": "--enable-horizon-captive-core" }, { "network": "pubnet", "options": "--enable-horizon-captive-core" }, + { "network": "pubnet", "options": "--enable-soroban-rpc" }, ] } @@ -63,9 +63,9 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"], + "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], "exclude": [ - { "network": "testnet", "options": "--enable-horizon-captive-core" }, + { "network": "pubnet", "options": "--enable-soroban-rpc" }, { "network": "pubnet", "options": "--enable-horizon-captive-core" }, ] } diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index 898c1b99..7494b8a5 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -43,9 +43,9 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"], + "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], "exclude": [ - { "network": "testnet", "options": "--enable-horizon-captive-core" }, + { "network": "pubnet", "options": "--enable-soroban-rpc" }, { "network": "pubnet", "options": "--enable-horizon-captive-core" }, ] } @@ -64,9 +64,9 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"], + "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], "exclude": [ - { "network": "testnet", "options": "--enable-horizon-captive-core" }, + { "network": "pubnet", "options": "--enable-soroban-rpc" }, { "network": "pubnet", "options": "--enable-horizon-captive-core" }, ] } From 88f3d6f1d7a29becf1bc00ea8bccd414f879af38 Mon Sep 17 00:00:00 2001 From: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:19:31 -0400 Subject: [PATCH 3/9] fix tags --- .github/workflows/build-latest.yml | 4 ++-- .github/workflows/build-soroban-dev.yml | 4 ++-- .github/workflows/build-testing.yml | 11 +++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 0277e455..54786e6f 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -36,7 +36,7 @@ jobs: arch: amd64 tag: latest-amd64 core_ref: v19.13.0 - go_ref: horizon-v2.27.0 + go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | { @@ -57,7 +57,7 @@ jobs: arch: arm64 tag: latest-arm64 core_ref: v19.13.0 - go_ref: horizon-v2.27.0 + go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | { diff --git a/.github/workflows/build-soroban-dev.yml b/.github/workflows/build-soroban-dev.yml index a63ecbd9..594590b3 100644 --- a/.github/workflows/build-soroban-dev.yml +++ b/.github/workflows/build-soroban-dev.yml @@ -37,7 +37,7 @@ jobs: core_ref: v20.0.0rc1 core_configure_flags: --disable-tests core_supports_testing_soroban_high_limit_override: "true" - go_ref: horizon-v2.27.0 + go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | { @@ -57,7 +57,7 @@ jobs: core_configure_flags: --disable-tests core_supports_testing_soroban_high_limit_override: "true" core_build_runner_type: ubuntu-latest-16-cores - go_ref: horizon-v2.27.0 + go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 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 7494b8a5..7f287129 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -8,7 +8,7 @@ name: Testing on: push: branches: - - master + - master pull_request: # Prevent more than one build of this workflow for a branch to be running at the @@ -20,14 +20,13 @@ concurrency: cancel-in-progress: true jobs: - complete: if: always() needs: [manifest] runs-on: ubuntu-latest steps: - - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - run: exit 1 + - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') + run: exit 1 amd64: uses: ./.github/workflows/build.yml @@ -38,7 +37,7 @@ jobs: arch: amd64 tag: testing-amd64 core_ref: v19.13.0 - go_ref: horizon-v2.27.0 + go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | { @@ -59,7 +58,7 @@ jobs: arch: arm64 tag: testing-arm64 core_ref: v19.13.0 - go_ref: horizon-v2.27.0 + go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | { From 33ab4b661eacc1b87d79c5b434d2243319329cb3 Mon Sep 17 00:00:00 2001 From: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:52:17 -0400 Subject: [PATCH 4/9] fix double network definition. --- testnet/core/etc/stellar-core.cfg | 2 +- testnet/horizon/etc/stellar-captive-core.cfg | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/testnet/core/etc/stellar-core.cfg b/testnet/core/etc/stellar-core.cfg index f6664b45..0b5b9a8e 100644 --- a/testnet/core/etc/stellar-core.cfg +++ b/testnet/core/etc/stellar-core.cfg @@ -3,7 +3,7 @@ PUBLIC_HTTP_PORT=true LOG_FILE_PATH="" MANUAL_CLOSE=__MANUAL_CLOSE__ -NETWORK_PASSPHRASE="Test SDF Network ; September 2015" +NETWORK_PASSPHRASE="__NETWORK__" KNOWN_CURSORS=["HORIZON"] DATABASE="postgresql://dbname=core host=localhost user=stellar password=__PGPASS__" UNSAFE_QUORUM=true diff --git a/testnet/horizon/etc/stellar-captive-core.cfg b/testnet/horizon/etc/stellar-captive-core.cfg index a6acf10d..a1e9f72c 100644 --- a/testnet/horizon/etc/stellar-captive-core.cfg +++ b/testnet/horizon/etc/stellar-captive-core.cfg @@ -6,8 +6,6 @@ PUBLIC_HTTP_PORT=false # To avoid conflicts with the core instance PEER_PORT=11725 DATABASE="__DATABASE__" - -NETWORK_PASSPHRASE="Test SDF Network ; September 2015" UNSAFE_QUORUM=true [[HOME_DOMAINS]] From 42588ddaee16b1c35e082ee4a00206809e15ed5a Mon Sep 17 00:00:00 2001 From: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com> Date: Tue, 19 Sep 2023 16:16:47 -0400 Subject: [PATCH 5/9] rollback latest change. --- .github/workflows/build-latest.yml | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 54786e6f..af625312 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -7,7 +7,7 @@ name: Latest on: push: branches: - - master + - master pull_request: # Prevent more than one build of this workflow for a branch to be running at the @@ -19,13 +19,14 @@ concurrency: cancel-in-progress: true jobs: + complete: if: always() needs: [manifest] runs-on: ubuntu-latest steps: - - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - run: exit 1 + - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') + run: exit 1 amd64: uses: ./.github/workflows/build.yml @@ -36,16 +37,12 @@ jobs: arch: amd64 tag: latest-amd64 core_ref: v19.13.0 - go_ref: horizon-v2.27.0-rc1 - soroban_tools_ref: v20.0.0-rc2 + go_ref: horizon-v2.26.1 + soroban_tools_ref: v0.4.0 test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], - "exclude": [ - { "network": "pubnet", "options": "--enable-horizon-captive-core" }, - { "network": "pubnet", "options": "--enable-soroban-rpc" }, - ] + "options": ["", "--enable-horizon-captive-core"] } arm64: @@ -57,16 +54,12 @@ jobs: arch: arm64 tag: latest-arm64 core_ref: v19.13.0 - go_ref: horizon-v2.27.0-rc1 - soroban_tools_ref: v20.0.0-rc2 + go_ref: horizon-v2.26.1 + soroban_tools_ref: v0.4.0 test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], - "exclude": [ - { "network": "pubnet", "options": "--enable-soroban-rpc" }, - { "network": "pubnet", "options": "--enable-horizon-captive-core" }, - ] + "options": ["", "--enable-horizon-captive-core"] } manifest: From ff9cb2f33ce8aff302b9496a257288f2811168db Mon Sep 17 00:00:00 2001 From: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com> Date: Tue, 19 Sep 2023 16:43:17 -0400 Subject: [PATCH 6/9] use latest core in testing. --- .github/workflows/build-testing.yml | 4 ++-- Makefile | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index 7f287129..50c9975d 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -36,7 +36,7 @@ jobs: with: arch: amd64 tag: testing-amd64 - core_ref: v19.13.0 + core_ref: v20.0.0rc1 go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | @@ -57,7 +57,7 @@ jobs: with: arch: arm64 tag: testing-arm64 - core_ref: v19.13.0 + core_ref: v20.0.0rc1 go_ref: horizon-v2.27.0-rc1 soroban_tools_ref: v20.0.0-rc2 test_matrix: | diff --git a/Makefile b/Makefile index 854ff548..71640db6 100644 --- a/Makefile +++ b/Makefile @@ -25,16 +25,17 @@ build-latest: build-testing: $(MAKE) build TAG=testing \ - CORE_REF=v19.13.0 \ - HORIZON_REF=horizon-v2.26.1 \ - SOROBAN_RPC_REF=v0.4.0 + CORE_REF=v20.0.0rc1 \ + CORE_CONFIGURE_FLAGS='--disable-tests' \ + HORIZON_REF=horizon-v2.27.0-rc1 \ + SOROBAN_RPC_REF=v20.0.0-rc2 build-soroban-dev: $(MAKE) build TAG=soroban-dev \ CORE_REF=v20.0.0rc1 \ CORE_CONFIGURE_FLAGS='--disable-tests' \ CORE_SUPPORTS_TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true \ - HORIZON_REF=soroban-v1.0.0-rc \ + HORIZON_REF=horizon-v2.27.0-rc1 \ SOROBAN_RPC_REF=v20.0.0-rc2 build: From a9f153bf36dc87f273a3d69ff17b6319dc4a910a Mon Sep 17 00:00:00 2001 From: Tsachi Herman <24438559+tsachiherman@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:18:53 -0400 Subject: [PATCH 7/9] exclude enable-horizon-captive-core testing for pubnet. --- .github/workflows/build-latest.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index af625312..bad4a6a9 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -7,7 +7,7 @@ name: Latest on: push: branches: - - master + - master pull_request: # Prevent more than one build of this workflow for a branch to be running at the @@ -19,14 +19,13 @@ concurrency: cancel-in-progress: true jobs: - complete: if: always() needs: [manifest] runs-on: ubuntu-latest steps: - - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - run: exit 1 + - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') + run: exit 1 amd64: uses: ./.github/workflows/build.yml @@ -42,7 +41,10 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"] + "options": ["", "--enable-horizon-captive-core"], + "exclude": [ + { "network": "pubnet", "options": "--enable-horizon-captive-core" }, + ] } arm64: @@ -59,7 +61,10 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"] + "options": ["", "--enable-horizon-captive-core"], + "exclude": [ + { "network": "pubnet", "options": "--enable-horizon-captive-core" }, + ] } manifest: From a1acbd7a7e571987eb61c9bef587968883557152 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:47:29 -0700 Subject: [PATCH 8/9] remove unnecessary changes --- .github/workflows/build-latest.yml | 17 ++++++----------- .github/workflows/build-testing.yml | 9 ++++----- Makefile | 2 -- start | 4 ---- testnet/horizon/etc/stellar-captive-core.cfg | 14 +++++++++++--- .../soroban-rpc/etc/stellar-captive-core.cfg | 18 +++++++++++++----- 6 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index bad4a6a9..af625312 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -7,7 +7,7 @@ name: Latest on: push: branches: - - master + - master pull_request: # Prevent more than one build of this workflow for a branch to be running at the @@ -19,13 +19,14 @@ concurrency: cancel-in-progress: true jobs: + complete: if: always() needs: [manifest] runs-on: ubuntu-latest steps: - - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - run: exit 1 + - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') + run: exit 1 amd64: uses: ./.github/workflows/build.yml @@ -41,10 +42,7 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"], - "exclude": [ - { "network": "pubnet", "options": "--enable-horizon-captive-core" }, - ] + "options": ["", "--enable-horizon-captive-core"] } arm64: @@ -61,10 +59,7 @@ jobs: test_matrix: | { "network": ["testnet", "pubnet", "local"], - "options": ["", "--enable-horizon-captive-core"], - "exclude": [ - { "network": "pubnet", "options": "--enable-horizon-captive-core" }, - ] + "options": ["", "--enable-horizon-captive-core"] } manifest: diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index 50c9975d..0c7eb98b 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -8,7 +8,7 @@ name: Testing on: push: branches: - - master + - master pull_request: # Prevent more than one build of this workflow for a branch to be running at the @@ -20,13 +20,14 @@ concurrency: cancel-in-progress: true jobs: + complete: if: always() needs: [manifest] runs-on: ubuntu-latest steps: - - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') - run: exit 1 + - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') + run: exit 1 amd64: uses: ./.github/workflows/build.yml @@ -45,7 +46,6 @@ jobs: "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], "exclude": [ { "network": "pubnet", "options": "--enable-soroban-rpc" }, - { "network": "pubnet", "options": "--enable-horizon-captive-core" }, ] } @@ -66,7 +66,6 @@ jobs: "options": ["", "--enable-horizon-captive-core", "--enable-soroban-rpc"], "exclude": [ { "network": "pubnet", "options": "--enable-soroban-rpc" }, - { "network": "pubnet", "options": "--enable-horizon-captive-core" }, ] } diff --git a/Makefile b/Makefile index 71640db6..d1dfa847 100644 --- a/Makefile +++ b/Makefile @@ -26,14 +26,12 @@ build-latest: build-testing: $(MAKE) build TAG=testing \ CORE_REF=v20.0.0rc1 \ - CORE_CONFIGURE_FLAGS='--disable-tests' \ HORIZON_REF=horizon-v2.27.0-rc1 \ SOROBAN_RPC_REF=v20.0.0-rc2 build-soroban-dev: $(MAKE) build TAG=soroban-dev \ CORE_REF=v20.0.0rc1 \ - CORE_CONFIGURE_FLAGS='--disable-tests' \ CORE_SUPPORTS_TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true \ HORIZON_REF=horizon-v2.27.0-rc1 \ SOROBAN_RPC_REF=v20.0.0-rc2 diff --git a/start b/start index d054e180..4b53e12d 100644 --- a/start +++ b/start @@ -34,10 +34,6 @@ CURRENT_POSTGRES_PID="" function main() { process_args $* - if [ "$NETWORK" != "local" ] && [ "$NETWORK" != "futurenet" ] && [ "$NETWORK" != "testnet" ] && [ "$ENABLE_HORIZON_CAPTIVE_CORE" = "true" ]; then - echo "--enable-horizon-captive-core usage only supported on local/futurenet/testnet networks" >&2 - exit 1 - fi 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 diff --git a/testnet/horizon/etc/stellar-captive-core.cfg b/testnet/horizon/etc/stellar-captive-core.cfg index a1e9f72c..7e1caa14 100644 --- a/testnet/horizon/etc/stellar-captive-core.cfg +++ b/testnet/horizon/etc/stellar-captive-core.cfg @@ -6,23 +6,31 @@ PUBLIC_HTTP_PORT=false # To avoid conflicts with the core instance PEER_PORT=11725 DATABASE="__DATABASE__" -UNSAFE_QUORUM=true - + +# TODO: Connect only to the local node after +# https://github.com/stellar/go/pull/5053 is available. +# PREFERRED_PEERS=["127.0.0.1:11625"] +# PREFERRED_PEER_KEYS=["GCTI6HMWRH2QGMFKWVU5M5ZSOTKL7P7JAHZDMJJBKDHGWTEC4CJ7O3DU"] +# PREFERRED_PEERS_ONLY=true + [[HOME_DOMAINS]] HOME_DOMAIN="testnet.stellar.org" -QUALITY="MEDIUM" +QUALITY="HIGH" + [[VALIDATORS]] NAME="sdf_testnet_1" HOME_DOMAIN="testnet.stellar.org" PUBLIC_KEY="GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y" ADDRESS="core-testnet1.stellar.org" HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_001/{0} -o {1}" + [[VALIDATORS]] NAME="sdf_testnet_2" HOME_DOMAIN="testnet.stellar.org" PUBLIC_KEY="GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP" ADDRESS="core-testnet2.stellar.org" HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_002/{0} -o {1}" + [[VALIDATORS]] NAME="sdf_testnet_3" HOME_DOMAIN="testnet.stellar.org" diff --git a/testnet/soroban-rpc/etc/stellar-captive-core.cfg b/testnet/soroban-rpc/etc/stellar-captive-core.cfg index a2b01a5e..4db0a2ab 100644 --- a/testnet/soroban-rpc/etc/stellar-captive-core.cfg +++ b/testnet/soroban-rpc/etc/stellar-captive-core.cfg @@ -1,32 +1,40 @@ -# captive core config for futurenet +# captive core config for testnet NETWORK_PASSPHRASE="__NETWORK__" # disable the web service port, not used HTTP_PORT=0 PUBLIC_HTTP_PORT=false # To avoid conflicts with the core instance -PEER_PORT=11726 +PEER_PORT=11725 DATABASE="__DATABASE__" EXPERIMENTAL_BUCKETLIST_DB=true EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12 ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__ -UNSAFE_QUORUM=true - + +# TODO: Connect only to the local node after +# https://github.com/stellar/go/pull/5053 is available. +# PREFERRED_PEERS=["127.0.0.1:11625"] +# PREFERRED_PEER_KEYS=["GCTI6HMWRH2QGMFKWVU5M5ZSOTKL7P7JAHZDMJJBKDHGWTEC4CJ7O3DU"] +# PREFERRED_PEERS_ONLY=true + [[HOME_DOMAINS]] HOME_DOMAIN="testnet.stellar.org" -QUALITY="MEDIUM" +QUALITY="HIGH" + [[VALIDATORS]] NAME="sdf_testnet_1" HOME_DOMAIN="testnet.stellar.org" PUBLIC_KEY="GDKXE2OZMJIPOSLNA6N6F2BVCI3O777I2OOC4BV7VOYUEHYX7RTRYA7Y" ADDRESS="core-testnet1.stellar.org" HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_001/{0} -o {1}" + [[VALIDATORS]] NAME="sdf_testnet_2" HOME_DOMAIN="testnet.stellar.org" PUBLIC_KEY="GCUCJTIYXSOXKBSNFGNFWW5MUQ54HKRPGJUTQFJ5RQXZXNOLNXYDHRAP" ADDRESS="core-testnet2.stellar.org" HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_002/{0} -o {1}" + [[VALIDATORS]] NAME="sdf_testnet_3" HOME_DOMAIN="testnet.stellar.org" From 0aa8992739afebb098d940f28ebd788d81cec822 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:56:12 -0700 Subject: [PATCH 9/9] fix --- testnet/core/etc/stellar-core.cfg | 3 ++- testnet/horizon/etc/stellar-captive-core.cfg | 3 +++ testnet/soroban-rpc/etc/stellar-captive-core.cfg | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/testnet/core/etc/stellar-core.cfg b/testnet/core/etc/stellar-core.cfg index 0b5b9a8e..9d78078c 100644 --- a/testnet/core/etc/stellar-core.cfg +++ b/testnet/core/etc/stellar-core.cfg @@ -6,9 +6,10 @@ MANUAL_CLOSE=__MANUAL_CLOSE__ NETWORK_PASSPHRASE="__NETWORK__" KNOWN_CURSORS=["HORIZON"] DATABASE="postgresql://dbname=core host=localhost user=stellar password=__PGPASS__" +CATCHUP_RECENT=100 + UNSAFE_QUORUM=true FAILURE_SAFETY=1 -CATCHUP_RECENT=100 [[HOME_DOMAINS]] HOME_DOMAIN="testnet.stellar.org" diff --git a/testnet/horizon/etc/stellar-captive-core.cfg b/testnet/horizon/etc/stellar-captive-core.cfg index 7e1caa14..f8885471 100644 --- a/testnet/horizon/etc/stellar-captive-core.cfg +++ b/testnet/horizon/etc/stellar-captive-core.cfg @@ -13,6 +13,9 @@ DATABASE="__DATABASE__" # PREFERRED_PEER_KEYS=["GCTI6HMWRH2QGMFKWVU5M5ZSOTKL7P7JAHZDMJJBKDHGWTEC4CJ7O3DU"] # PREFERRED_PEERS_ONLY=true +UNSAFE_QUORUM=true +FAILURE_SAFETY=1 + [[HOME_DOMAINS]] HOME_DOMAIN="testnet.stellar.org" QUALITY="HIGH" diff --git a/testnet/soroban-rpc/etc/stellar-captive-core.cfg b/testnet/soroban-rpc/etc/stellar-captive-core.cfg index 4db0a2ab..08fdd694 100644 --- a/testnet/soroban-rpc/etc/stellar-captive-core.cfg +++ b/testnet/soroban-rpc/etc/stellar-captive-core.cfg @@ -17,6 +17,9 @@ ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__ # PREFERRED_PEER_KEYS=["GCTI6HMWRH2QGMFKWVU5M5ZSOTKL7P7JAHZDMJJBKDHGWTEC4CJ7O3DU"] # PREFERRED_PEERS_ONLY=true +UNSAFE_QUORUM=true +FAILURE_SAFETY=1 + [[HOME_DOMAINS]] HOME_DOMAIN="testnet.stellar.org" QUALITY="HIGH"