diff --git a/.github/workflows/build-docker-jit.yml b/.github/workflows/build-docker-jit.yml index 32af87e..0416f12 100644 --- a/.github/workflows/build-docker-jit.yml +++ b/.github/workflows/build-docker-jit.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - uses: actions/cache@v3 with: path: | @@ -18,10 +18,10 @@ jobs: key: ${{ runner.os }}-gradle-test-${{ hashFiles('**/*.gradle') }} restore-keys: | ${{ runner.os }}-gradle-test- - - name: Set up JDK 17 - uses: actions/setup-java@v3 + - name: Set up JDK 25 + uses: actions/setup-java@v5 with: - java-version: 17 + java-version: 25 distribution: 'temurin' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/build-docker-native.yml b/.github/workflows/build-docker-native.yml index 1b45165..d2678ca 100755 --- a/.github/workflows/build-docker-native.yml +++ b/.github/workflows/build-docker-native.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - uses: actions/cache@v3 with: path: | @@ -18,10 +18,10 @@ jobs: key: ${{ runner.os }}-gradle-test-${{ hashFiles('**/*.gradle') }} restore-keys: | ${{ runner.os }}-gradle-test- - - name: Set up JDK 17 - uses: actions/setup-java@v3 + - name: Set up JDK 25 + uses: actions/setup-java@v5 with: - java-version: 17 + java-version: 25 distribution: 'temurin' - name: Set up QEMU uses: docker/setup-qemu-action@v2 diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml index 8ca5e16..ab68664 100644 --- a/.github/workflows/graalvm.yml +++ b/.github/workflows/graalvm.yml @@ -8,22 +8,21 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - java-version: [ '17' ] + java-version: [ '25' ] distribution: [ 'graalvm-community' ] fail-fast: false name: ${{ matrix.os }} JDK ${{ matrix.java-version }}.${{ matrix.distribution }} steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set up GraalVM uses: graalvm/setup-graalvm@v1 with: java-version: ${{ matrix.java-version }} distribution: ${{ matrix.distribution }} - components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v5 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 889aa3c..27828d5 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -6,5 +6,5 @@ jobs: name: "Validate Gradle Wrapper" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v6 + - uses: gradle/actions/wrapper-validation@v5 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9b4f489..d156fc5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -8,20 +8,20 @@ jobs: strategy: matrix: os: [ubuntu-latest, macOS-latest] - java: ['17'] + java: ['25'] distribution: ['temurin'] fail-fast: false name: ${{ matrix.os }} JDK ${{ matrix.java }} steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} - name: Cache Gradle packages - uses: actions/cache@v3 + uses: actions/cache@v5 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} diff --git a/build.gradle b/build.gradle index aa909c3..709f2f4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id("groovy") - id 'org.asciidoctor.jvm.convert' version '3.3.2' - id 'org.asciidoctor.jvm.pdf' version '3.3.2' - id 'org.ajoberstar.git-publish' version '4.2.0' + id 'org.asciidoctor.jvm.convert' version '4.0.5' + id 'org.asciidoctor.jvm.pdf' version '4.0.5' + id 'org.ajoberstar.git-publish' version '6.0.0' id("com.bmuschko.docker-remote-api") version "9.3.2" apply false id("io.micronaut.application") version "${micronautAppGradlePluginVersion}" } @@ -34,7 +34,7 @@ micronaut { testRuntime("spock2") processing { incremental(true) - annotations("org.consensusj.bitcoin.proxyd.*") + annotations("org.consensusj.bitcoin.proxyd.*,org.consensusj.bitcoin.proxy.jsonrpc.*,foundation.omni.proxy.analysis.*") } } @@ -44,7 +44,7 @@ graalvmNative { imageName = 'btcproxyd' buildArgs.add('--initialize-at-run-time=io.netty.handler.ssl.OpenSslAsyncPrivateKeyMethod,io.netty.handler.ssl.OpenSsl,io.netty.handler.ssl.OpenSslPrivateKeyMethod,io.netty.internal.tcnative.CertificateVerifier,io.netty.internal.tcnative.SSL,io.netty.internal.tcnative.SSLPrivateKeyMethod') javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(25) vendor = JvmVendorSpec.matching("GraalVM Community") } } @@ -63,8 +63,6 @@ dependencies { runtimeOnly "org.yaml:snakeyaml" runtimeOnly("ch.qos.logback:logback-classic") - implementation 'org.bouncycastle:bcprov-jdk15to18:1.76' - implementation "com.msgilligan:cj-btc-jsonrpc:${consensusjVersion}" implementation "com.msgilligan:cj-btc-rx-jsonrpc:${consensusjVersion}" diff --git a/config/proxy-omni-regtest.yml b/config/proxy-omni-regtest.yml index 6a6c5be..57fed98 100644 --- a/config/proxy-omni-regtest.yml +++ b/config/proxy-omni-regtest.yml @@ -39,14 +39,6 @@ btcproxyd: - omni_getproperty - omni_getallbalancesforaddress - omni_getallbalancesforid - - btcproxy.help - - btcproxy.proxyinfo - - omniproxy.help - - omniproxy.getbalance - - omniproxy.getbalances - - omniproxy.getrichlist - - omniproxy.listproperties - - omniproxy.getproperty - generate - generatetoaddress - btcproxy.help diff --git a/gradle.properties b/gradle.properties index 4e01a0c..ee464c8 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -btcProxyVersion = 0.5.2 +btcProxyVersion = 0.5.3 useMavenLocal = false -consensusjVersion = 0.7.0-alpha2 -omnijVersion = 0.7.0-alpha2 +consensusjVersion = 0.7.0-beta2 +omnijVersion = 0.7.0-beta1 -micronautVersion= 4.1.0 -micronautAppGradlePluginVersion = 4.0.3 +micronautVersion= 4.10.11 +micronautAppGradlePluginVersion = 4.6.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d997cfc 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 864d6c4..8e61ef1 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..739907d 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -145,7 +146,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -170,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -202,16 +202,15 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 6689b85..e509b2d 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/foundation/omni/proxy/analysis/CachedRichListService.java b/src/main/java/foundation/omni/proxy/analysis/CachedRichListService.java index 6fc2370..4408c46 100644 --- a/src/main/java/foundation/omni/proxy/analysis/CachedRichListService.java +++ b/src/main/java/foundation/omni/proxy/analysis/CachedRichListService.java @@ -7,6 +7,7 @@ import org.consensusj.analytics.service.RichListService; import org.consensusj.analytics.service.TokenRichList; import org.consensusj.bitcoin.json.pojo.ChainTip; +import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,7 @@ public Single> richList(ID id, int i) { } @Override - public Flowable> richListUpdates(ID id, int i) { + public Publisher> richListUpdates(ID id, int i) { throw new UnsupportedOperationException("this service is incubating and this method isn't available yet."); } diff --git a/src/main/java/foundation/omni/proxy/analysis/OmniPropertyListService.java b/src/main/java/foundation/omni/proxy/analysis/OmniPropertyListService.java index d3e32ff..49dcc11 100644 --- a/src/main/java/foundation/omni/proxy/analysis/OmniPropertyListService.java +++ b/src/main/java/foundation/omni/proxy/analysis/OmniPropertyListService.java @@ -11,6 +11,7 @@ import io.reactivex.rxjava3.disposables.Disposable; import org.bitcoinj.base.BitcoinNetwork; import org.consensusj.bitcoin.json.pojo.ChainTip; +import org.consensusj.bitcoin.rx.ChainTipPublisher; import org.consensusj.bitcoin.rx.jsonrpc.service.TxOutSetService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,11 +45,11 @@ public class OmniPropertyListService implements Closeable { private Disposable intervalSubscription; private Disposable outSetSubscription; - OmniPropertyListService(OmniClient omniClient) { + OmniPropertyListService(OmniClient omniClient, ChainTipPublisher chainTipPublisher) { rxJsonClient = omniClient; cache = new OmniPropertyListCache((BitcoinNetwork) rxJsonClient.getNetwork()); activeProperties = rxJsonClient.getNetwork().equals(BitcoinNetwork.MAINNET) ? List.of(OMNI, TOMNI, USDT) : List.of(OMNI, TOMNI); - txOutSetService = new TxOutSetService(omniClient); + txOutSetService = new TxOutSetService(omniClient, chainTipPublisher); timerInterval = Flowable.interval(3,1, TimeUnit.SECONDS); } @@ -63,7 +64,7 @@ public synchronized void start() { } // Subscribe to a TxOutSetInfo stream (happens once per block, but delayed because the calculation takes some time) if (outSetSubscription == null) { - outSetSubscription = txOutSetService.getTxOutSetPublisher() + outSetSubscription = Flowable.fromPublisher(txOutSetService.getTxOutSetPublisher()) .subscribe(cache::cachePutBitcoin, t -> log.error("TxOutSetService", t), () -> log.error("TxOutSetService completed")); diff --git a/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/CachedRpcService.java b/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/CachedRpcService.java index af44535..50c4d62 100644 --- a/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/CachedRpcService.java +++ b/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/CachedRpcService.java @@ -4,6 +4,7 @@ import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.disposables.Disposable; import org.consensusj.bitcoin.json.pojo.ChainTip; +import org.consensusj.bitcoin.rx.ChainTipPublisher; import org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient; import org.consensusj.jsonrpc.JsonRpcRequest; import org.consensusj.jsonrpc.JsonRpcResponse; @@ -12,9 +13,11 @@ import jakarta.annotation.PostConstruct; import jakarta.inject.Singleton; + import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +// TODO: Refactor to remover usage of RxJava, except ChainTipPublisher which will migrate to Flow.Publisher /** * This prototype caching service implementation works best for RPC methods that: *
    @@ -31,17 +34,20 @@ public class CachedRpcService { private final Set cached = Set.of("getchaintips", "getblockcount", "getblockchaininfo", "getbestblockhash", "gettxoutsetinfo"); private final ConcurrentHashMap> cache = new ConcurrentHashMap<>(); private final RxBitcoinClient rxBitcoinClient; + private final ChainTipPublisher chainTipPublisher; private Disposable chainTipSubscription; - public CachedRpcService( RxBitcoinClient rxBitcoinClient) { + // TODO: Change constructor to take a regular BitcoinClient + public CachedRpcService(RxBitcoinClient rxBitcoinClient, ChainTipPublisher chainTipPublisher) { this.rxBitcoinClient = rxBitcoinClient; + this.chainTipPublisher = chainTipPublisher; } @PostConstruct public synchronized void start() { if (chainTipSubscription == null) { log.info("starting"); - chainTipSubscription = Flowable.fromPublisher(rxBitcoinClient.chainTipPublisher()) + chainTipSubscription = Flowable.fromPublisher(chainTipPublisher) .subscribe(this::onNewBlock, this::onError); } } @@ -50,6 +56,7 @@ public boolean isCached(JsonRpcRequest request) { return cached.contains(request.getMethod()); } + // TODO: Change to return CompletableFuture public Single> callCached(JsonRpcRequest request) { return fetch(request.getMethod()) .map(result -> responseFromResult(request, result)); diff --git a/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/ExtraRpcMethods.java b/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/ExtraRpcMethods.java index 6163071..fec9be9 100644 --- a/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/ExtraRpcMethods.java +++ b/src/main/java/org/consensusj/bitcoin/proxy/jsonrpc/ExtraRpcMethods.java @@ -2,6 +2,7 @@ import io.micronaut.context.annotation.Context; import io.micronaut.context.annotation.Property; +import io.micronaut.core.annotation.ReflectiveAccess; import io.reactivex.rxjava3.core.Single; import jakarta.inject.Singleton; @@ -15,11 +16,11 @@ public class ExtraRpcMethods { private final ExtraRpcRegistry rpcRegistry; - @Property(name = "micronaut.application.name") - private String appName; + private final String appName; - public ExtraRpcMethods(ExtraRpcRegistry rpcRegistry) { + public ExtraRpcMethods(ExtraRpcRegistry rpcRegistry, @Property(name = "micronaut.application.name") String appName) { this.rpcRegistry = rpcRegistry; + this.appName = appName; rpcRegistry.register("btcproxy.help", "", params -> params.size() >= 1 ? this.rpcRegistry.help(parmToString(params.get(0))) : this.rpcRegistry.help()); @@ -32,5 +33,6 @@ public Single proxyInfo() { return Single.just(new BtcProxyInfo(appName, "unknown")); } + @ReflectiveAccess public record BtcProxyInfo(String name, String version){} } diff --git a/src/main/java/org/consensusj/bitcoin/proxyd/Application.java b/src/main/java/org/consensusj/bitcoin/proxyd/Application.java index f80d835..a5e1f08 100755 --- a/src/main/java/org/consensusj/bitcoin/proxyd/Application.java +++ b/src/main/java/org/consensusj/bitcoin/proxyd/Application.java @@ -6,6 +6,7 @@ import io.micronaut.runtime.Micronaut; import org.consensusj.bitcoin.json.conversion.RpcServerModule; import org.consensusj.bitcoin.proxy.jsonrpc.JsonRpcProxyConfiguration; +import org.consensusj.bitcoin.rx.ChainTipPublisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,4 +39,9 @@ public OmniClient bitcoinClient(JsonRpcProxyConfiguration configuration) { //client.start(); return client; } + + @Singleton + ChainTipPublisher chainTipPublisher(OmniClient omniClient) { + return omniClient.chainTipPublisher(); + } } diff --git a/src/test/groovy/org/consensusj/bitcoin/proxyd/ApplicationSpec.groovy b/src/test/groovy/org/consensusj/bitcoin/proxyd/ApplicationSpec.groovy index b739726..d35e1de 100755 --- a/src/test/groovy/org/consensusj/bitcoin/proxyd/ApplicationSpec.groovy +++ b/src/test/groovy/org/consensusj/bitcoin/proxyd/ApplicationSpec.groovy @@ -1,7 +1,12 @@ package org.consensusj.bitcoin.proxyd +import io.micronaut.context.annotation.Replaces import io.micronaut.runtime.server.EmbeddedServer import io.micronaut.test.extensions.spock.annotation.MicronautTest +import jakarta.inject.Singleton + +import org.consensusj.bitcoin.rx.ChainTipPublisher +import org.consensusj.bitcoin.rx.jsonrpc.test.TestChainTipPublishers import org.consensusj.jsonrpc.JsonRpcStatusException import org.consensusj.jsonrpc.groovy.DynamicRpcClient import spock.lang.Shared @@ -57,4 +62,10 @@ class ApplicationSpec extends Specification { e.jsonRpcCode == -32601 // TODO e.httpCode == ?? } + + @Replaces(ChainTipPublisher) + @Singleton + ChainTipPublisher chainTipService() { + return TestChainTipPublishers.never(); + } }