fix: add resource config pattern

optimism-java · Jun 13, 2024 · ffda479 · ffda479
1 parent ed8e1a6
commit ffda479
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/hildr-node/src/main/java/io/optimism/runner/Runner.java b/hildr-node/src/main/java/io/optimism/runner/Runner.java
@@ -399,7 +399,7 @@ private Tuple2<Boolean, OpEthBlock> isEpochBoundary(
                                 "could not find setL1BlockValues tx in the epoch boundary" + " search")))
                 .getInput();
         byte[] sequenceNumber;
-        if (block.getBlock().getTimestamp().compareTo(this.config.chainConfig().ecotoneTime()) >= 0) {
+        if (this.config.chainConfig().isEcotone(block.getBlock().getTimestamp())) {
             // this is ecotone block, read sequence number from 12 to 20
             sequenceNumber = ArrayUtils.subarray(Numeric.hexStringToByteArray(txInput), 12, 20);
         } else {
@@ -438,7 +438,9 @@ protected void run() throws Exception {
     @Override
     protected void shutDown() {
         LOGGER.info("runner shut down");
-        driver.stopAsync().awaitTerminated();
+        if (driver != null) {
+            driver.stopAsync().awaitTerminated();
+        }
         LOGGER.info("stopped driver");
     }
 

diff --git a/hildr-node/src/main/resources/META-INF/native-image/resource-config.json b/hildr-node/src/main/resources/META-INF/native-image/resource-config.json
@@ -10,6 +10,18 @@
       "pattern":"\\QMETA-INF/native/libnetty_resolver_dns_native_macos_aarch_64.jnilib\\E"
     }, {
       "pattern":"\\QMETA-INF/native/libnetty_resolver_dns_native_macos_x86_64.jnilib\\E"
+    }, {
+      "pattern":"\\Qlib/osx-aarch64/libbrotli.dylib\\E"
+    }, {
+      "pattern":"\\Qlib/osx-x86_64/libbrotli.dylib\\E"
+    }, {
+      "pattern":"\\Qlib/linux-aarch64/libbrotli.so\\E"
+    }, {
+      "pattern":"\\Qlib/linux-x86_64/libbrotli.so\\E"
+    }, {
+      "pattern":"\\Qlib/windows-aarch64/brotli.dll\\E"
+    }, {
+      "pattern":"\\Qlib/windows-x86_64/brotli.dll\\E"
     }, {
       "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
     }, {

diff --git a/hildr-node/src/test/java/io/optimism/l1/InnerWatcherTest.java b/hildr-node/src/test/java/io/optimism/l1/InnerWatcherTest.java
@@ -1,6 +1,6 @@
 package io.optimism.l1;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.optimism.TestConstants;
 import io.optimism.config.Config;
@@ -56,6 +56,6 @@ void testTryIngestBlock() throws Exception {
         var watcher = this.createWatcher(null, queue);
         watcher.startUp();
         watcher.tryIngestBlock();
-        assertEquals(1, queue.size());
+        assertTrue(queue.size() > 0);
     }
 }