v0.5.3: ConsensusJ 0.7.0-beta2, OmniJ 0.7.0-beta1, bitcoinj 0.17.1, JDK 25, other dependency updates

.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

.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

.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') }}

.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

.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') }}

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}"
 

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

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

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

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<TokenRichList<N, ID>> richList(ID id, int i) {
     }
 
     @Override
-    public Flowable<TokenRichList<N, ID>> richListUpdates(ID id, int i) {
+    public Publisher<TokenRichList<N, ID>> richListUpdates(ID id, int i) {
         throw new UnsupportedOperationException("this service is incubating and this method isn't available yet.");
     }
 

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"));