Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testnet and soroban-dev to v20.0.0rc1/2 #494

Merged
merged 10 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-soroban-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: soroban-v1.0.0-rc
go_ref: horizon-v2.27.0-rc1
soroban_tools_ref: v20.0.0-rc2
test_matrix: |
{
Expand All @@ -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: soroban-v1.0.0-rc
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: |
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/build-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,15 @@ jobs:
with:
arch: amd64
tag: testing-amd64
core_ref: v19.13.0
go_ref: horizon-v2.26.1
soroban_tools_ref: v0.4.0
core_ref: v20.0.0rc1
go_ref: horizon-v2.27.0-rc1
soroban_tools_ref: v20.0.0-rc2
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" },
]
}

Expand All @@ -58,16 +57,15 @@ jobs:
with:
arch: arm64
tag: testing-arm64
core_ref: v19.13.0
go_ref: horizon-v2.26.1
soroban_tools_ref: v0.4.0
core_ref: v20.0.0rc1
go_ref: horizon-v2.27.0-rc1
soroban_tools_ref: v20.0.0-rc2
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" },
]
}

Expand Down
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@ 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 \
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:
Expand Down
4 changes: 2 additions & 2 deletions start
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ CURRENT_POSTGRES_PID=""

function main() {
process_args $*
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
Expand Down
5 changes: 3 additions & 2 deletions testnet/core/etc/stellar-core.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ 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__"
CATCHUP_RECENT=100

UNSAFE_QUORUM=true
FAILURE_SAFETY=1
CATCHUP_RECENT=100

[[HOME_DOMAINS]]
HOME_DOMAIN="testnet.stellar.org"
Expand Down
3 changes: 3 additions & 0 deletions testnet/horizon/etc/stellar-captive-core.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ DATABASE="__DATABASE__"
# PREFERRED_PEER_KEYS=["GCTI6HMWRH2QGMFKWVU5M5ZSOTKL7P7JAHZDMJJBKDHGWTEC4CJ7O3DU"]
# PREFERRED_PEERS_ONLY=true

UNSAFE_QUORUM=true
leighmcculloch marked this conversation as resolved.
Show resolved Hide resolved
FAILURE_SAFETY=1

[[HOME_DOMAINS]]
HOME_DOMAIN="testnet.stellar.org"
QUALITY="HIGH"
Expand Down
13 changes: 13 additions & 0 deletions testnet/soroban-rpc/etc/soroban-rpc.cfg
Original file line number Diff line number Diff line change
@@ -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
46 changes: 46 additions & 0 deletions testnet/soroban-rpc/etc/stellar-captive-core.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# 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=11725
DATABASE="__DATABASE__"

EXPERIMENTAL_BUCKETLIST_DB=true
EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12
ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__

# 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

UNSAFE_QUORUM=true
FAILURE_SAFETY=1

[[HOME_DOMAINS]]
HOME_DOMAIN="testnet.stellar.org"
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"
PUBLIC_KEY="GC2V2EFSXN6SQTWVYA5EPJPBWWIMSD2XQNKUOHGEKB535AQE2I6IXV2Z"
ADDRESS="core-testnet3.stellar.org"
HISTORY="curl -sf http://history.stellar.org/prd/core-testnet/core_testnet_003/{0} -o {1}"
9 changes: 9 additions & 0 deletions testnet/supervisor/etc/supervisord.conf.d/soroban-rpc.conf
Original file line number Diff line number Diff line change
@@ -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
Loading