Resolve merge conflicts with main branch

Author: Copilot

.github/workflows/build-future.yml

@@ -12,16 +12,15 @@ on:
         required: false
     inputs:
       sha:
-        description: 'Sha to build'
-        type: 'string'
+        description: "Sha to build"
+        type: "string"
         required: true
       tag-prefix:
-        description: 'Prefix for the tag name'
-        type: 'string'
-        default: ''
+        description: "Prefix for the tag name"
+        type: "string"
+        default: ""
 
 jobs:
-
   amd64:
     uses: ./.github/workflows/build.yml
     secrets:
@@ -31,12 +30,12 @@ jobs:
       sha: ${{ inputs.sha }}
       arch: amd64
       tag: ${{ inputs.tag-prefix }}future-amd64
-      protocol_version_default: 22
-      xdr_ref: v22.0.0
-      core_ref: v22.3.0
-      horizon_ref: horizon-v22.0.2
-      stellar_rpc_ref: v22.1.2
-      friendbot_ref: horizon-v22.0.2
+      protocol_version_default: 23
+      xdr_ref: v23.0.0
+      core_ref: v23.0.0
+      horizon_ref: horizon-v23.0.0
+      stellar_rpc_ref: v23.0.0
+      friendbot_ref: horizon-v23.0.0
       lab_ref: main
       test_matrix: |
         {
@@ -56,12 +55,12 @@ jobs:
       sha: ${{ inputs.sha }}
       arch: arm64
       tag: ${{ inputs.tag-prefix }}future-arm64
-      protocol_version_default: 22
-      xdr_ref: v22.0.0
-      core_ref: v22.3.0
-      horizon_ref: horizon-v22.0.2
-      stellar_rpc_ref: v22.1.2
-      friendbot_ref: horizon-v22.0.2
+      protocol_version_default: 23
+      xdr_ref: v23.0.0
+      core_ref: v23.0.0
+      horizon_ref: horizon-v23.0.0
+      stellar_rpc_ref: v23.0.0
+      friendbot_ref: horizon-v23.0.0
       lab_ref: main
       test_matrix: |
         {

.github/workflows/build-latest.yml

@@ -33,7 +33,7 @@ jobs:
       arch: amd64
       tag: ${{ inputs.tag-prefix }}latest-amd64
       protocol_version_default: 22
-      xdr_ref: v22.0.0
+      xdr_ref: v23.0.0
       core_ref: v22.3.0
       horizon_ref: horizon-v22.0.2
       stellar_rpc_ref: v22.1.2
@@ -58,7 +58,7 @@ jobs:
       arch: arm64
       tag: ${{ inputs.tag-prefix }}latest-arm64
       protocol_version_default: 22
-      xdr_ref: v22.0.0
+      xdr_ref: v23.0.0
       core_ref: v22.3.0
       horizon_ref: horizon-v22.0.2
       stellar_rpc_ref: v22.1.2

.github/workflows/build-testing.yml

@@ -33,15 +33,15 @@ jobs:
       sha: ${{ inputs.sha }}
       arch: amd64
       tag: ${{ inputs.tag-prefix }}testing-amd64
-      protocol_version_default: 22
-      xdr_ref: v22.0.0
-      core_ref: v22.3.0
-      horizon_ref: horizon-v22.0.2
-      stellar_rpc_ref: v22.1.2
-      friendbot_ref: horizon-v22.0.2
+      protocol_version_default: 23
+      xdr_ref: v23.0.0
+      core_ref: v23.0.0
+      horizon_ref: horizon-v23.0.0
+      stellar_rpc_ref: v23.0.0
+      friendbot_ref: horizon-v23.0.0
       lab_ref: main
       test_matrix: |
-        {
+        {j
           "network": ["testnet", "pubnet", "local"],
           "core": ["core", null],
           "horizon": ["horizon", null],
@@ -58,12 +58,12 @@ jobs:
       sha: ${{ inputs.sha }}
       arch: arm64
       tag: ${{ inputs.tag-prefix }}testing-arm64
-      protocol_version_default: 22
-      xdr_ref: v22.0.0
-      core_ref: v22.3.0
-      horizon_ref: horizon-v22.0.2
-      stellar_rpc_ref: v22.1.2
-      friendbot_ref: horizon-v22.0.2
+      protocol_version_default: 23
+      xdr_ref: v23.0.0
+      core_ref: v23.0.0
+      horizon_ref: horizon-v23.0.0
+      stellar_rpc_ref: v23.0.0
+      friendbot_ref: horizon-v23.0.0
       lab_ref: main
       test_matrix: |
         {

.github/workflows/build.yml

@@ -438,12 +438,10 @@ jobs:
       run: >
         docker run
         --platform linux/${{ inputs.arch }}
-        --rm
         -d
         -p
         "8000:8000"
         -p "11626:11626"
-        -v "$PWD/logs":/var/log/supervisor
         --name stellar
         $IMAGE
         --${{ matrix.network }}
@@ -505,7 +503,7 @@ jobs:
         go run tests/test_stellar_rpc_healthy.go
     - name: Prepare Test Logs
       if: always()
-      run: sudo chmod -R a+r logs
+      run: docker cp stellar:/var/log logs
     - name: Upload Test Logs
       if: always()
       uses: actions/upload-artifact@v4

Dockerfile

@@ -44,6 +44,9 @@ RUN adduser --system --group --quiet --home /var/lib/stellar --disabled-password
 RUN ["mkdir", "-p", "/opt/stellar"]
 RUN ["touch", "/opt/stellar/.docker-ephemeral"]
 
+RUN ["rm", "-fr", "/etc/supervisor"]
+RUN ["ln", "-sT", "/opt/stellar/supervisor/etc", "/etc/supervisor"]
+
 RUN ["ln", "-s", "/opt/stellar", "/stellar"]
 RUN ["ln", "-s", "/opt/stellar/core/etc/stellar-core.cfg", "/stellar-core.cfg"]
 RUN ["ln", "-s", "/opt/stellar/horizon/etc/horizon.env", "/horizon.env"]

Dockerfile.lab

@@ -9,6 +9,7 @@ RUN git fetch origin ${NEXT_PUBLIC_COMMIT_HASH}
 RUN git checkout ${NEXT_PUBLIC_COMMIT_HASH}
 RUN rm -rf .git
 RUN yarn install --frozen-lockfile
+ENV NEXT_PUBLIC_ENABLE_STANDALONE_OUTPUT=true
 ENV NEXT_PUBLIC_ENABLE_EXPLORER=true
 ENV NEXT_PUBLIC_DEFAULT_NETWORK=custom
 ENV NEXT_BASE_PATH=/lab

Makefile

@@ -25,29 +25,29 @@ console:
 build-latest:
 	$(MAKE) build TAG=latest \
 		PROTOCOL_VERSION_DEFAULT=22 \
-		XDR_REF=v22.0.0 \
+		XDR_REF=v23.0.0 \
 		CORE_REF=v22.3.0 \
 		HORIZON_REF=horizon-v22.0.3 \
 		STELLAR_RPC_REF=v22.1.2 \
 		FRIENDBOT_REF=horizon-v22.0.3
 
 build-testing:
 	$(MAKE) build TAG=testing \
-	    PROTOCOL_VERSION_DEFAULT=22 \
-		XDR_REF=v22.0.0 \
-		CORE_REF=v22.3.0 \
-		HORIZON_REF=horizon-v22.0.3 \
-		STELLAR_RPC_REF=v22.1.2 \
-		FRIENDBOT_REF=horizon-v22.0.3
+		PROTOCOL_VERSION_DEFAULT=23 \
+		XDR_REF=v23.0.0 \
+		CORE_REF=v23.0.0 \
+		HORIZON_REF=horizon-v23.0.0 \
+		STELLAR_RPC_REF=v23.0.0 \
+		FRIENDBOT_REF=horizon-v23.0.0
 
 build-future:
 	$(MAKE) build TAG=future \
-		PROTOCOL_VERSION_DEFAULT=22 \
-		XDR_REF=v22.0.0 \
-		CORE_REF=v22.3.0 \
-		HORIZON_REF=horizon-v22.0.3 \
-		STELLAR_RPC_REF=v22.1.2 \
-		FRIENDBOT_REF=horizon-v22.0.3
+		PROTOCOL_VERSION_DEFAULT=23 \
+		XDR_REF=v23.0.0 \
+		CORE_REF=v23.0.0 \
+		HORIZON_REF=horizon-v23.0.0 \
+		STELLAR_RPC_REF=v23.0.0 \
+		FRIENDBOT_REF=horizon-v23.0.0
 
 build:
 	$(MAKE) -j 4 build-deps