Sync with upstream repo

.github/dependabot.yml

@@ -0,0 +1,79 @@
+# Dependabot configuration
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+version: 2
+
+updates:
+  # Gradle — main module
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "gradle"
+    groups:
+      gradle-minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  # Gradle — foundation module
+  - package-ecosystem: "gradle"
+    directory: "/foundation"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "gradle"
+    groups:
+      gradle-minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  # Gradle — buildSrc (build logic / plugins)
+  - package-ecosystem: "gradle"
+    directory: "/buildSrc"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "gradle"
+    groups:
+      gradle-minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+
+  # Docker — base image in Dockerfile
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "docker"
+
+  # GitHub Actions — workflow action versions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"
+    open-pull-requests-limit: 5
+    labels:
+      - "dependencies"
+      - "github-actions"
+    groups:
+      actions-minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"

.github/workflows/publish.yaml

@@ -8,17 +8,17 @@ jobs:
   publish-docker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.ref }}
           submodules: recursive
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
       - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
       - name: Upload to Docker
         run: make jib
         env:
@@ -28,22 +28,22 @@ jobs:
   publish-github:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.ref }}
           submodules: recursive
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
       - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
       - name: Build zip
         run: make distZip
       - name: Upload Release
         id: upload-release-asset
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref }}

.github/workflows/static.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: asciidoctor-ghpages
         uses: manoelcampos/asciidoctor-ghpages-action@v2
         env:

.github/workflows/test.yaml

@@ -23,22 +23,24 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           submodules: recursive
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 21
 
       - name: Install System Libs
         run: sudo apt-get install -y openssl libapr1
+
       - name: Setup gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Check
         run: make test
         env:

.gitignore

@@ -20,9 +20,17 @@ env
 /test*
 /test/
 Test*.kt
+*_test.sh
 
 # http-client config
 http-client.env.json
 
 .DS_Store
-mise.toml
+mise.toml
+.claude/
+
+# demo sandbox (local-only, regenerate with demo/response-signing/generate-keys.sh + protoc)
+/demo/response-signing/
+
+# superpowers scratch: specs and plans live locally only for now
+/docs/superpowers/

.sdkmanrc

@@ -0,0 +1,2 @@
+gradle=9.2.0
+java=21.0.11.fx-librca

Dockerfile

@@ -1,3 +1,3 @@
-FROM eclipse-temurin:21
+FROM eclipse-temurin:25
 
 RUN apt-get update -y && apt-get install -y libcurl4-openssl-dev libcjson-dev

Makefile

@@ -2,6 +2,9 @@ all: build-foundation build-main
 build-foundation:
 	cd foundation && ../gradlew build publishToMavenLocal
 
+run-main:
+	./gradlew run
+
 build-main:
 	./gradlew build
 

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.1'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.10.0'
     }
 }
 
@@ -71,20 +71,18 @@ dependencies {
     implementation(libs.reactor.grpc.stub)
     implementation(libs.grpc.proto.util)
 
+    implementation libs.prom.exporter.server
     implementation libs.micrometer.registry.prometheus
+    implementation libs.micrometer.ctx.prop
     implementation libs.lettuce.core
 
-    implementation(libs.spring.cloud.starter.sleuth) {
-        exclude module: 'spring-security-rsa'
-    }
     implementation libs.brave.instrumentation.grpc
+    implementation libs.brave.ctx.slf4j
 
     implementation libs.logstash.encoder
 
     implementation libs.janino
 
-    implementation libs.spring.cloud.sleuth.zipkin
-
     implementation libs.bitcoinj
 
     implementation libs.snake.yaml
@@ -97,6 +95,7 @@ dependencies {
     implementation libs.javax.annotations
 
     implementation libs.auth0.jwt
+    implementation libs.semver4j
 
     testImplementation libs.cglib.nodep
     testImplementation libs.spockframework.core
@@ -184,7 +183,7 @@ jib {
     }
     container {
         creationTime = 'USE_CURRENT_TIMESTAMP'
-        jvmFlags = ['-XX:+UseG1GC', '-XX:+ExitOnOutOfMemoryError', '-Xms1024M', '-XX:NativeMemoryTracking=summary', '-XX:+UnlockDiagnosticVMOptions', '-XX:GCLockerRetryAllocationCount=10', '--enable-preview']
+        jvmFlags = ['-XX:+UseG1GC', '-XX:+ExitOnOutOfMemoryError', '-Xms1024M', '-XX:NativeMemoryTracking=summary', '-XX:+UnlockDiagnosticVMOptions', '--enable-preview']
         mainClass = 'io.emeraldpay.dshackle.StarterKt'
         args = []
         ports = ['2448', '2449', '8545']

buildSrc/build.gradle.kts

@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.yaml:snakeyaml:1.24")
+    implementation("org.yaml:snakeyaml:2.6")
     implementation("dshackle:foundation:1.0.0")
-    implementation("com.squareup:kotlinpoet:1.14.2")
+    implementation("com.squareup:kotlinpoet:2.3.0")
 }

buildSrc/src/main/kotlin/chainsconfig.codegen.gradle.kts

@@ -128,6 +128,7 @@ open class CodeGen(private val config: ChainsConfig) {
 
     private fun type(type: String): String {
         return when(type) {
+            "aztec" -> "BlockchainType.AZTEC"
             "eth" -> "BlockchainType.ETHEREUM"
             "bitcoin" -> "BlockchainType.BITCOIN"
             "starknet" -> "BlockchainType.STARKNET"
@@ -139,6 +140,9 @@ open class CodeGen(private val config: ChainsConfig) {
             "cosmos" -> "BlockchainType.COSMOS"
             "ripple" -> "BlockchainType.RIPPLE"
             "kadena" -> "BlockchainType.KADENA"
+            "avm" -> "BlockchainType.AVM"
+            "app" -> "BlockchainType.ETHEREUM"
+            "aptos" -> "BlockchainType.ETHEREUM"
             else -> throw IllegalArgumentException("unknown blockchain type $type")
         }
     }

docs/04-upstream-config.adoc

@@ -174,6 +174,41 @@ In case of rpc and ws connection we can specify different modes of works togethe
 
 You can specify this modes through `connector-mode` parameter in connection config.
 
+=== Custom Headers
+
+Dshackle allows you to add custom HTTP headers to all requests sent to an upstream.
+This is useful when connecting to providers that require API keys, authentication tokens, or other custom headers.
+
+Custom headers are configured at the upstream level and will be added to:
+
+- All HTTP JSON RPC requests
+- WebSocket connection handshakes (initial HTTP upgrade request)
+
+NOTE: Custom headers are supported for all connection types except gRPC connections.
+
+==== Configuration
+
+Custom headers are specified using the `custom-headers` parameter in your upstream configuration:
+
+[source,yaml]
+----
+version: v1
+
+upstreams:
+  - id: my-ethereum-node
+    chain: ethereum
+    custom-headers:
+      X-API-Key: "your-api-key-here"
+      X-Custom-Header: "custom-value"
+      Authorization: "Bearer your-token"
+    connection:
+      generic:
+        rpc:
+          url: "https://api.example.com/rpc"
+        ws:
+          url: "wss://api.example.com/ws"
+----
+
 === Bitcoin Methods
 
 .By default an ethereum upstream allows call to the following JSON RPC methods: