From 6bf55f9d40fc520797f81fdbbaade46fa53d9722 Mon Sep 17 00:00:00 2001
From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com>
Date: Wed, 6 Mar 2024 00:54:05 +1000
Subject: [PATCH] Enable ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION on rpc when
 --enable-soroban-diagnostic-events is in use (#580)

---
 .github/workflows/build-start.yml             | 27 ++++++++++++-------
 .../horizon/etc/stellar-captive-core.cfg      |  3 ++-
 .../soroban-rpc/etc/stellar-captive-core.cfg  |  4 ++-
 local/horizon/etc/stellar-captive-core.cfg    |  3 ++-
 .../soroban-rpc/etc/stellar-captive-core.cfg  |  4 ++-
 pubnet/horizon/etc/stellar-captive-core.cfg   |  1 +
 .../soroban-rpc/etc/stellar-captive-core.cfg  |  4 ++-
 start                                         |  4 +--
 testnet/horizon/etc/stellar-captive-core.cfg  |  2 +-
 .../soroban-rpc/etc/stellar-captive-core.cfg  |  4 ++-
 10 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-start.yml b/.github/workflows/build-start.yml
index 4c22b08a..f938f49c 100644
--- a/.github/workflows/build-start.yml
+++ b/.github/workflows/build-start.yml
@@ -18,7 +18,10 @@ jobs:
 
   complete:
     if: always()
-    needs: [latest, testing, future]
+    needs:
+    - latest
+    - testing
+    # - future
     runs-on: ubuntu-latest
     steps:
     - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
@@ -58,12 +61,16 @@ jobs:
       sha: ${{ github.event.pull_request.head.sha || github.sha }}
       tag-prefix: ${{ needs.setup.outputs.tag-prefix }}
 
-  future:
-    needs: [setup]
-    uses: ./.github/workflows/build-future.yml
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-    with:
-      sha: ${{ github.event.pull_request.head.sha || github.sha }}
-      tag-prefix: ${{ needs.setup.outputs.tag-prefix }}
+  # TODO: Reenable the future build when the version of soroban-rpc used in the
+  # future build supports the stellar-core ENABLE_DIAGNOSTICS_FOR_TX_SUBMISSION
+  # config, and the time has come for a new preview release.
+  #
+  # future:
+  #   needs: [setup]
+  #   uses: ./.github/workflows/build-future.yml
+  #   secrets:
+  #     DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+  #     DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+  #   with:
+  #     sha: ${{ github.event.pull_request.head.sha || github.sha }}
+  #     tag-prefix: ${{ needs.setup.outputs.tag-prefix }}
diff --git a/futurenet/horizon/etc/stellar-captive-core.cfg b/futurenet/horizon/etc/stellar-captive-core.cfg
index b1da9f71..54b1ce41 100644
--- a/futurenet/horizon/etc/stellar-captive-core.cfg
+++ b/futurenet/horizon/etc/stellar-captive-core.cfg
@@ -6,7 +6,8 @@ PUBLIC_HTTP_PORT=false
 # To avoid conflicts with the core instance
 PEER_PORT=11725
 DATABASE="__DATABASE__"
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
+
+ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 FAILURE_SAFETY=0
 UNSAFE_QUORUM=true
diff --git a/futurenet/soroban-rpc/etc/stellar-captive-core.cfg b/futurenet/soroban-rpc/etc/stellar-captive-core.cfg
index 952989d5..90cc16bf 100644
--- a/futurenet/soroban-rpc/etc/stellar-captive-core.cfg
+++ b/futurenet/soroban-rpc/etc/stellar-captive-core.cfg
@@ -7,9 +7,11 @@ PUBLIC_HTTP_PORT=false
 PEER_PORT=11825
 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
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 FAILURE_SAFETY=0
 UNSAFE_QUORUM=true
diff --git a/local/horizon/etc/stellar-captive-core.cfg b/local/horizon/etc/stellar-captive-core.cfg
index 0ebaae41..3cc81832 100644
--- a/local/horizon/etc/stellar-captive-core.cfg
+++ b/local/horizon/etc/stellar-captive-core.cfg
@@ -7,7 +7,8 @@ PUBLIC_HTTP_PORT=false
 PEER_PORT=11725
 DATABASE="__DATABASE__"
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
+
+ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 UNSAFE_QUORUM=true
 FAILURE_SAFETY=0
diff --git a/local/soroban-rpc/etc/stellar-captive-core.cfg b/local/soroban-rpc/etc/stellar-captive-core.cfg
index ce81e010..0ff0616d 100644
--- a/local/soroban-rpc/etc/stellar-captive-core.cfg
+++ b/local/soroban-rpc/etc/stellar-captive-core.cfg
@@ -7,7 +7,9 @@ PUBLIC_HTTP_PORT=false
 PEER_PORT=11825
 DATABASE="__DATABASE__"
 ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
+
+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
diff --git a/pubnet/horizon/etc/stellar-captive-core.cfg b/pubnet/horizon/etc/stellar-captive-core.cfg
index bc05a942..49b5092e 100644
--- a/pubnet/horizon/etc/stellar-captive-core.cfg
+++ b/pubnet/horizon/etc/stellar-captive-core.cfg
@@ -7,6 +7,7 @@ PUBLIC_HTTP_PORT=false
 PEER_PORT=11725
 DATABASE="__DATABASE__"
 
+ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 [[HOME_DOMAINS]]
 HOME_DOMAIN="stellar.org"
diff --git a/pubnet/soroban-rpc/etc/stellar-captive-core.cfg b/pubnet/soroban-rpc/etc/stellar-captive-core.cfg
index 8ec2b358..18ec9afc 100644
--- a/pubnet/soroban-rpc/etc/stellar-captive-core.cfg
+++ b/pubnet/soroban-rpc/etc/stellar-captive-core.cfg
@@ -7,9 +7,11 @@ PUBLIC_HTTP_PORT=false
 PEER_PORT=11825
 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
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 # TODO: Connect only to the local node after
 # https://github.com/stellar/go/pull/5053 is available.
diff --git a/start b/start
index d85a7622..94a27910 100644
--- a/start
+++ b/start
@@ -449,7 +449,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
-  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
+  run_silent "finalize-horizon-captivecore-config-enable-soroban-diagnostic-events" perl -pi -e "s/__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
@@ -486,7 +486,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
-  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
+  run_silent "finalize-soroban-rpc-captivecore-config-enable-soroban-diagnostic-events" perl -pi -e "s/__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
diff --git a/testnet/horizon/etc/stellar-captive-core.cfg b/testnet/horizon/etc/stellar-captive-core.cfg
index 07f72d62..a52a9ea6 100644
--- a/testnet/horizon/etc/stellar-captive-core.cfg
+++ b/testnet/horizon/etc/stellar-captive-core.cfg
@@ -6,8 +6,8 @@ PUBLIC_HTTP_PORT=false
 # To avoid conflicts with the core instance
 PEER_PORT=11725
 DATABASE="__DATABASE__"
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
+ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 UNSAFE_QUORUM=true
 FAILURE_SAFETY=1
diff --git a/testnet/soroban-rpc/etc/stellar-captive-core.cfg b/testnet/soroban-rpc/etc/stellar-captive-core.cfg
index 42242f37..beec37db 100644
--- a/testnet/soroban-rpc/etc/stellar-captive-core.cfg
+++ b/testnet/soroban-rpc/etc/stellar-captive-core.cfg
@@ -7,9 +7,11 @@ PUBLIC_HTTP_PORT=false
 PEER_PORT=11825
 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
-__ENABLE_SOROBAN_DIAGNOSTIC_EVENTS__
 
 # TODO: Connect only to the local node after
 # https://github.com/stellar/go/pull/5053 is available.