Merge branch 'master' into use-arm-runners

stellar · Oct 10, 2024 · 1028b76 · 1028b76
2 parents e903329 + a7d6714
commit 1028b76
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 50 deletions.
diff --git a/.github/workflows/build-future.yml b/.github/workflows/build-future.yml
@@ -32,10 +32,10 @@ jobs:
       arch: amd64
       tag: ${{ inputs.tag-prefix }}future-amd64
       protocol_version_default: 21
-      xdr_ref: v21.1.0
-      core_ref: v21.2.0
-      horizon_ref: horizon-v2.31.0
-      soroban_rpc_ref: v21.2.0
+      xdr_ref: v22.0.0-rc.1.1
+      core_ref: v22.0.0rc2
+      horizon_ref: horizon-v2.32.0
+      soroban_rpc_ref: v21.5.1
       friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9
       test_matrix: |
         {
@@ -56,10 +56,10 @@ jobs:
       arch: arm64
       tag: ${{ inputs.tag-prefix }}future-arm64
       protocol_version_default: 21
-      xdr_ref: v21.1.0
-      core_ref: v21.2.0
-      horizon_ref: horizon-v2.31.0
-      soroban_rpc_ref: v21.2.0
+      xdr_ref: v22.0.0-rc.1.1
+      core_ref: v22.0.0rc2
+      horizon_ref: horizon-v2.32.0
+      soroban_rpc_ref: v21.5.1
       friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9
       test_matrix: |
         {

diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml
@@ -32,11 +32,11 @@ jobs:
       sha: ${{ inputs.sha }}
       arch: amd64
       tag: ${{ inputs.tag-prefix }}latest-amd64
-      protocol_version_default: 20
+      protocol_version_default: 21
       xdr_ref: v21.1.0
-      core_ref: v21.2.0
-      horizon_ref: horizon-v2.31.0
-      soroban_rpc_ref: v21.2.0
+      core_ref: v21.3.1
+      horizon_ref: horizon-v2.32.0
+      soroban_rpc_ref: v21.5.1
       friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9
       test_matrix: |
         {
@@ -56,11 +56,11 @@ jobs:
       sha: ${{ inputs.sha }}
       arch: arm64
       tag: ${{ inputs.tag-prefix }}latest-arm64
-      protocol_version_default: 20
+      protocol_version_default: 21
       xdr_ref: v21.1.0
-      core_ref: v21.2.0
-      horizon_ref: horizon-v2.31.0
-      soroban_rpc_ref: v21.2.0
+      core_ref: v21.3.1
+      horizon_ref: horizon-v2.32.0
+      soroban_rpc_ref: v21.5.1
       friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9
       test_matrix: |
         {

diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml
@@ -34,10 +34,10 @@ jobs:
       arch: amd64
       tag: ${{ inputs.tag-prefix }}testing-amd64
       protocol_version_default: 21
-      xdr_ref: v21.1.0
-      core_ref: v21.2.0
-      horizon_ref: horizon-v2.31.0
-      soroban_rpc_ref: v21.2.0
+      xdr_ref: v22.0.0-rc.1.1
+      core_ref: v22.0.0rc2
+      horizon_ref: horizon-v2.32.0
+      soroban_rpc_ref: v21.5.1
       friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9
       test_matrix: |
         {
@@ -58,10 +58,10 @@ jobs:
       arch: arm64
       tag: ${{ inputs.tag-prefix }}testing-arm64
       protocol_version_default: 21
-      xdr_ref: v21.1.0
-      core_ref: v21.2.0
-      horizon_ref: horizon-v2.31.0
-      soroban_rpc_ref: v21.2.0
+      xdr_ref: v22.0.0-rc.1.1
+      core_ref: v22.0.0rc2
+      horizon_ref: horizon-v2.32.0
+      soroban_rpc_ref: v21.5.1
       friendbot_ref: 31fc8f4236388f12fc609228b7a7f5494867a1f9
       test_matrix: |
         {

diff --git a/Makefile b/Makefile
@@ -23,29 +23,29 @@ console:
 
 build-latest:
 	$(MAKE) build TAG=latest \
-		PROTOCOL_VERSION_DEFAULT=20 \
+		PROTOCOL_VERSION_DEFAULT=21 \
 		XDR_REF=v21.1.0 \
-		CORE_REF=v21.2.0 \
-		HORIZON_REF=horizon-v2.31.0 \
-		SOROBAN_RPC_REF=v21.2.0 \
+		CORE_REF=v21.3.1 \
+		HORIZON_REF=horizon-v2.32.0 \
+		SOROBAN_RPC_REF=v21.5.1 \
 		FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9
 
 build-testing:
 	$(MAKE) build TAG=testing \
 	    PROTOCOL_VERSION_DEFAULT=21 \
-		XDR_REF=v21.1.0 \
-		CORE_REF=v21.2.0 \
-		HORIZON_REF=horizon-v2.31.0 \
-		SOROBAN_RPC_REF=v21.2.0 \
+		XDR_REF=v22.0.0-rc.1.1 \
+		CORE_REF=v22.0.0rc2 \
+		HORIZON_REF=horizon-v2.32.0 \
+		SOROBAN_RPC_REF=v21.5.1 \
 		FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9
 
 build-future:
 	$(MAKE) build TAG=future \
 		PROTOCOL_VERSION_DEFAULT=21 \
-		XDR_REF=v21.1.0 \
-		CORE_REF=v21.2.0 \
-		HORIZON_REF=horizon-v2.31.0 \
-		SOROBAN_RPC_REF=v21.2.0 \
+		XDR_REF=v22.0.0-rc.1.1 \
+		CORE_REF=v22.0.0rc2 \
+		HORIZON_REF=horizon-v2.32.0 \
+		SOROBAN_RPC_REF=v21.5.1 \
 		FRIENDBOT_REF=31fc8f4236388f12fc609228b7a7f5494867a1f9
 
 build:

diff --git a/README.md b/README.md
@@ -1,8 +1,12 @@
 # Stellar Quickstart Docker Image
 
-This docker image provides a simple way to run stellar-core and horizon locally for development and testing.
+This docker image provides a simple way to run all the components of a Stellar network locally or in CI for development and testing.
 
-**Looking for instructions for how to run stellar-core or horizon in production? Take a look at the docs [here](https://developers.stellar.org/docs/run-core-node/).**
+> [!IMPORTANT]  
+> This docker image is intended for use in development, not production. See these docs for how to run Stellar services in production:
+> - [How to run Stellar Core in production](https://developers.stellar.org/docs/run-core-node/)
+> - [How to run Horizon in production](https://developers.stellar.org/docs/data/horizon/admin-guide/overview)
+> - [How to run RPC in production](https://developers.stellar.org/docs/data/rpc/admin-guide)
 
 This image provides a default, non-validating, ephemeral configuration that should work for most developers. By configuring a container using this image with a host-based volume (described below in the "Usage" section) an operator gains access to full configuration customization and persistence of data.
 

diff --git a/futurenet/soroban-rpc/etc/stellar-captive-core.cfg b/futurenet/soroban-rpc/etc/stellar-captive-core.cfg
@@ -10,9 +10,6 @@ DATABASE="__DATABASE__"
 ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
-EXPERIMENTAL_BUCKETLIST_DB=true
-EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12
-
 FAILURE_SAFETY=0
 UNSAFE_QUORUM=true
 

diff --git a/local/nginx/etc/conf.d/history-archive.conf b/local/nginx/etc/conf.d/history-archive.conf
@@ -0,0 +1,5 @@
+location /archive {
+        rewrite /archive/(.*) /$1 break;
+        proxy_pass http://127.0.0.1:1570;
+        proxy_redirect off;
+}
diff --git a/local/soroban-rpc/etc/stellar-captive-core.cfg b/local/soroban-rpc/etc/stellar-captive-core.cfg
@@ -11,9 +11,6 @@ ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
 ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
-EXPERIMENTAL_BUCKETLIST_DB=true
-EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12
-
 UNSAFE_QUORUM=true
 FAILURE_SAFETY=0
 

diff --git a/pubnet/soroban-rpc/etc/stellar-captive-core.cfg b/pubnet/soroban-rpc/etc/stellar-captive-core.cfg
@@ -10,9 +10,6 @@ DATABASE="__DATABASE__"
 ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
-EXPERIMENTAL_BUCKETLIST_DB=true
-EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12
-
 # TODO: Connect only to the local node after
 # https://github.com/stellar/go/pull/5053 is available.
 # PREFERRED_PEERS=["127.0.0.1:11625"]

diff --git a/testnet/soroban-rpc/etc/stellar-captive-core.cfg b/testnet/soroban-rpc/etc/stellar-captive-core.cfg
@@ -10,9 +10,6 @@ DATABASE="__DATABASE__"
 ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
-EXPERIMENTAL_BUCKETLIST_DB=true
-EXPERIMENTAL_BUCKETLIST_DB_INDEX_PAGE_SIZE_EXPONENT=12
-
 # TODO: Connect only to the local node after
 # https://github.com/stellar/go/pull/5053 is available.
 # PREFERRED_PEERS=["127.0.0.1:11625"]