feat:canyou upgrade fix

Signed-off-by: Chen Kai <281165273grape@gmail.com>
optimism-java · Dec 15, 2023 · 6ea75a4 · 6ea75a4
1 parent 1aa3e2d
commit 6ea75a4
Show file tree

Hide file tree

Showing 22 changed files with 10,615 additions and 7,906 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 20
+          java-version: 21
           distribution: 'temurin'
 
       - name: Setup Gradle

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 20
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 20
+          java-version: 21
           distribution: 'temurin'
 
       - name: Setup Gradle

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ '21.0.1' ]
+        version: [ '22.3.2' ]
         java-version: [ '21' ]
         os: [ macos-latest ]
 
@@ -58,16 +58,18 @@ jobs:
       - name: 🏗️ Native Image Build & Test
         id: native-build
         run: |
-          ./gradlew nativeCompile
-          mv hildr-node/build/native/nativeCompile/hildr-node hildr-node/build/native/nativeCompile/hildr-node-osx
-          ls -ltrh hildr-node/build/native/nativeCompile/hildr-node-osx
+          echo $JAVA_HOME
+          echo $GRAALVM_HOME
+          ./gradlew buildBinary
+          mv hildr-node/build/binary/hildr-node hildr-node/build/binary/hildr-node-osx
+          ls -ltrh hildr-node/build/binary/hildr-node-osx
 
       - name: 📤 Upload ${{ matrix.os }} native image
         uses: actions/upload-artifact@v3
         with:
           name: hildr-node-osx
           path: |
-            hildr-node/build/native/nativeCompile/hildr-node-osx
+            hildr-node/build/binary/hildr-node-osx
           if-no-files-found: error
 
   native-build-windows:
@@ -76,7 +78,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ '21.0.1' ]
+        version: [ '22.3.2' ]
         java-version: [ '21' ]
         os: [ windows-latest ]
 
@@ -103,15 +105,15 @@ jobs:
       - name: 🏗️ Native Image Build & Test
         id: native-build
         run: |
-          ./gradlew nativeCompile
-          ls -ltrh hildr-node/build/native/nativeCompile/hildr-node.exe
+          ./gradlew buildBinary
+          ls -ltrh hildr-node/build/binary/hildr-node.exe
 
       - name: 📤 Upload ${{ matrix.os }} native image
         uses: actions/upload-artifact@v3
         with:
           name: hildr-node-windows
           path: |
-            hildr-node/build/native/nativeCompile/hildr-node.exe
+            hildr-node/build/binary/hildr-node.exe
           if-no-files-found: error
 
   native-build-linux:
@@ -120,7 +122,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ '21.0.1' ]
+        version: [ '22.3.2' ]
         java-version: [ '21' ]
         os: [ ubuntu-latest ]
 
@@ -172,14 +174,14 @@ jobs:
       - name: ☕ Setup GraalVM Build
         uses: graalvm/setup-graalvm@v1
         with:
-          version: '21.0.1'
+          version: '22.3.2'
           java-version: '21'
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache: 'gradle'
           native-image-musl: 'true'
-          set-java-home: 'true'
           native-image-job-reports: 'true'
+          set-java-home: 'true'
 
       - name: 🏗️ Build static image with musl libc
         id: native-build
@@ -199,31 +201,42 @@ jobs:
   push_image_to_github:
     name: Push Docker image to Github
     runs-on: ubuntu-latest
+    permissions: write-all
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
       - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/jvm.dock
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
+      - name: Build and push graalvm native Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-native
+          labels: ${{ steps.meta.outputs.labels }}-native
+
+
   release:
     name: 🚰 Release new version.
     needs: [ native-build-osx, native-build-musl, native-build-linux, native-build-windows, push_image_to_github ]

diff --git a/docker/README.md b/docker/README.md
@@ -6,7 +6,7 @@ This contains a simple docker setup for running hildr and op-geth.
 
 Begin by copying `.env.default` to `.env`. You can set the network to sync to by changing the `NETWORK` value (supported options are optimism-goerli and base-goerli). Make sure to set the `L1_RPC_URL` value to a valid RPC URL for the L1 being used by the given network. If you are running in production, you may also want to set a secure `JWT_SECRET` value. You can create a new secret by running `openssl rand -hex 32`.
 
-To run both hildr and op-geth together, run `docker compose up`. To run just op-geth without hildr for local development, run `COMPOSE_PROFILES=op-geth,metrics docker compose up`
+To run both hildr and op-geth together, run `docker compose up`. To run just op-geth without hildr for local development, run `COMPOSE_PROFILES=hildr-node,op-geth,metrics docker compose up -d`
 
 ## Troubleshooting
 If you are getting `permission denied` errors when attempting to run `docker-compose`, try `sudo docker compose` instead. This is often required when running docker depending on how it was installed.
diff --git a/hildr-node/build.gradle b/hildr-node/build.gradle
@@ -12,7 +12,7 @@ plugins {
 	id 'application'
 //	id "checkstyle"
 	id "jacoco"
-	id "com.diffplug.spotless" version "6.22.0"
+	id "com.diffplug.spotless" version "6.23.3"
 	id "net.ltgt.errorprone" version "3.1.0"
 	id 'org.graalvm.buildtools.native' version '0.9.28'
 	id 'com.github.johnrengelman.shadow' version '8.1.1'
@@ -23,7 +23,7 @@ plugins {
 }
 
 group 'me.grapebaba'
-version '0.2.1'
+version '0.2.2'
 
 repositories {
 	// Use Maven Central for resolving dependencies.
@@ -74,7 +74,7 @@ dependencies {
 	implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
 	implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2")
 
-	implementation('org.web3j:core:4.9.8') {
+	implementation('org.web3j:core:4.10.3') {
 		exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
 		exclude group: 'com.squareup.okhttp3', module: 'okhttp'
 		exclude group: 'com.squareup.okhttp3', module: 'logging-interceptor'