diff --git a/config.env b/config.env index 71dc4f2..db98469 100644 --- a/config.env +++ b/config.env @@ -72,7 +72,7 @@ export EXPLORER_INSTALL=on # Soroban configuration export SOROBAN_INSTALL=on -SOROBAN_ANNOUNCE_CONFIG=$(yq e '.soroban-announce.enabled' /root/start9/config.yaml) +SOROBAN_ANNOUNCE_CONFIG=$(yq e '.soroban-announce.enabled // "disabled"' /root/start9/config.yaml) if [ "$SOROBAN_ANNOUNCE_CONFIG" = "enabled" ]; then export SOROBAN_ANNOUNCE=on else @@ -80,7 +80,7 @@ else fi # PandoTx Process is only available when Soroban announce is enabled -S9_PANDOTX_PROCESS=$(yq e '.soroban-announce.pandotx-process' /root/start9/config.yaml) +S9_PANDOTX_PROCESS=$(yq e '.soroban-announce.pandotx-process // false' /root/start9/config.yaml) if [ "$SOROBAN_ANNOUNCE_CONFIG" = "enabled" ] && [ "$S9_PANDOTX_PROCESS" = "true" ]; then export NODE_PANDOTX_PROCESS=on else @@ -120,4 +120,4 @@ export SOROBAN_ONION_FILE=/var/lib/tor/hsv3soroban/hostname export NODE_PANDOTX_FALLBACK_MODE=$(yq e '.pandotx-fallback-mode' /root/start9/config.yaml) # Max number of retries in case of a failed push -export NODE_PANDOTX_NB_RETRIES=$(yq e '.pandotx-retries' /root/start9/config.yaml) \ No newline at end of file +export NODE_PANDOTX_NB_RETRIES=$(yq e '.pandotx-retries' /root/start9/config.yaml) diff --git a/manifest.yaml b/manifest.yaml index ef5f9a0..270fad8 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -105,7 +105,7 @@ interfaces: - http dependencies: bitcoind: - version: '>=0.21.1.2 <31.0.0' + version: '>=0.21.1.2' requirement: type: 'opt-out' how: Use the Bitcoin Core (default) @@ -117,7 +117,7 @@ dependencies: type: script requires-runtime-config: true bitcoind-testnet: - version: '>=0.21.1.2 <31.0.0' + version: '>=0.21.1.2' requirement: type: 'opt-in' how: Use the Bitcoin Core Testnet4 @@ -129,7 +129,7 @@ dependencies: type: script requires-runtime-config: true fulcrum: - version: '>=1.11.0' + version: '>=2.0.0' requirement: type: 'opt-in' how: Set Indexer to Fulcrum in the config diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts index c084bf7..f8d96d4 100644 --- a/scripts/procedures/migrations.ts +++ b/scripts/procedures/migrations.ts @@ -1,4 +1,34 @@ -import { compat, types as T } from "../deps.ts"; +import { compat, types as T } from '../deps.ts' -export const migration: T.ExpectedExports.migration = compat.migrations - .fromMapping({}, "1.27.0.0" ); +export const migration: T.ExpectedExports.migration = compat.migrations.fromMapping( + { + '1.28.0.0': { + up: compat.migrations.updateConfig( + (config: any) => { + // Add default soroban and pandotx config for users upgrading from versions before 1.28.0 + config['soroban-announce'] = { + 'enabled': 'disabled' + } + config['pandotx-push'] = true + config['pandotx-retries'] = 2 + config['pandotx-fallback-mode'] = 'convenient' + return config + }, + true, + { version: '1.28.0.0', type: 'up' }, + ), + down: compat.migrations.updateConfig( + (config: any) => { + delete config['soroban-announce'] + delete config['pandotx-push'] + delete config['pandotx-retries'] + delete config['pandotx-fallback-mode'] + return config + }, + true, + { version: '1.28.0.0', type: 'down' }, + ), + }, + }, + '1.28.0.0', +) \ No newline at end of file