fix: add new ens url

optimism-java · Mar 13, 2024 · 9d11f56 · 9d11f56
1 parent 27d2a69
commit 9d11f56
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 29 deletions.
diff --git a/hildr-node/src/main/java/io/optimism/l1/BeaconBlobFetcher.java b/hildr-node/src/main/java/io/optimism/l1/BeaconBlobFetcher.java
@@ -28,7 +28,7 @@
  * @since 0.2.7
  */
 public class BeaconBlobFetcher {
-    // https://beacon-nd-182-746-446.p2pify.com/ae65ad4cb1ef42d6a520ac0516776939
+
     private static final Logger LOGGER = LoggerFactory.getLogger(BeaconBlobFetcher.class);
 
     private static final String GENESIS_METHOD_FORMAT = "%s/eth/v1/beacon/genesis";
@@ -127,7 +127,7 @@ public List<BlobSidecar> getBlobSidecards(String blockId, final List<BigInteger>
                 : Map.of("indices", indices.stream().map(BigInteger::toString).collect(Collectors.joining(",")));
         var postfix = "%s%s".formatted(blockId, prepareQueryParams(params));
         var res = getBlobSidecars("%s/%s".formatted(this.sidecarsMethod, postfix));
-        if (res.getData() != null && res.getData().isEmpty()) {
+        if (res.getData() != null && !res.getData().isEmpty()) {
             return res.getData();
         }
         if (this.archiverSidecarsMethod != null) {

diff --git a/hildr-node/src/main/java/io/optimism/network/OpStackNetwork.java b/hildr-node/src/main/java/io/optimism/network/OpStackNetwork.java
@@ -44,22 +44,29 @@ public class OpStackNetwork {
 
     private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(OpStackNetwork.class);
     private static final List<String> BOOTNODES = List.of(
-            "enr:-J64QBbwPjPLZ6IOOToOLsSjtFUjjzN66qmBZdUexpO32Klrc"
-                    + "458Q24kbty2PdRaLacHM5z-cZQr8mjeQu3pik6jPS"
-                    + "OGAYYFIqBfgmlkgnY0gmlwhDaRWFWHb3BzdGFja4SzlAUAi"
-                    + "XNlY3AyNTZrMaECmeSnJh7zjKrDSPoNMGXoopeDF4"
-                    + "hhpj5I0OsQUUt4u8uDdGNwgiQGg3VkcIIkBg",
-            "enr:-J64QAlTCDa188Hl1OGv5_2Kj2nWCsvxMVc_rEnLtw7RPFbOf"
-                    + "qUOV6khXT_PH6cC603I2ynY31rSQ8sI9gLeJbfFGa"
-                    + "WGAYYFIrpdgmlkgnY0gmlwhANWgzCHb3BzdGFja4SzlAUAi"
-                    + "XNlY3AyNTZrMaECkySjcg-2v0uWAsFsZZu43qNHpp"
-                    + "Gr2D5F913Qqs5jDCGDdGNwgiQGg3VkcIIkBg",
-            "enr:-J24QGEzN4mJgLWNTUNwj7riVJ2ZjRLenOFccl2dbRFxHHOC"
-                    + "CZx8SXWzgf-sLzrGs6QgqSFCvGXVgGPBkRkfOWlT1-"
-                    + "iGAYe6Cu93gmlkgnY0gmlwhCJBEUSHb3BzdGFja4OkAwC"
-                    + "Jc2VjcDI1NmsxoQLuYIwaYOHg3CUQhCkS-RsSHmUd1b"
-                    + "_x93-9yQ5ItS6udIN0Y3CCIyuDdWRwgiMr");
-
+            "enr:-J64QBbwPjPLZ6IOOToOLsSjtFUjjzN66qmBZdUexpO32Klrc458Q24kbty2PdRaLacHM5z-cZQr8mjeQu3pik6jPSOGAYYFIqBfgmlkgnY0gmlwhDaRWFWHb3BzdGFja4SzlAUAiXNlY3AyNTZrMaECmeSnJh7zjKrDSPoNMGXoopeDF4hhpj5I0OsQUUt4u8uDdGNwgiQGg3VkcIIkBg",
+            "enr:-J64QAlTCDa188Hl1OGv5_2Kj2nWCsvxMVc_rEnLtw7RPFbOfqUOV6khXT_PH6cC603I2ynY31rSQ8sI9gLeJbfFGaWGAYYFIrpdgmlkgnY0gmlwhANWgzCHb3BzdGFja4SzlAUAiXNlY3AyNTZrMaECkySjcg-2v0uWAsFsZZu43qNHppGr2D5F913Qqs5jDCGDdGNwgiQGg3VkcIIkBg",
+            "enr:-J24QGEzN4mJgLWNTUNwj7riVJ2ZjRLenOFccl2dbRFxHHOCCZx8SXWzgf-sLzrGs6QgqSFCvGXVgGPBkRkfOWlT1-iGAYe6Cu93gmlkgnY0gmlwhCJBEUSHb3BzdGFja4OkAwCJc2VjcDI1NmsxoQLuYIwaYOHg3CUQhCkS-RsSHmUd1b_x93-9yQ5ItS6udIN0Y3CCIyuDdWRwgiMr",
+            "enr:-Ku4QHqVeJ8PPICcWk1vSn_XcSkjOkNiTg6Fmii5j6vUQgvzMc9L1goFnLKgXqBJspJjIsB91LTOleFmyWWrFVATGngBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhAMRHkWJc2VjcDI1NmsxoQKLVXFOhp2uX6jeT0DvvDpPcU8FWMjQdR4wMuORMhpX24N1ZHCCIyg",
+            "enr:-Ku4QG-2_Md3sZIAUebGYT6g0SMskIml77l6yR-M_JXc-UdNHCmHQeOiMLbylPejyJsdAPsTHJyjJB2sYGDLe0dn8uYBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhBLY-NyJc2VjcDI1NmsxoQORcM6e19T1T9gi7jxEZjk_sjVLGFscUNqAY9obgZaxbIN1ZHCCIyg",
+            "enr:-Ku4QPn5eVhcoF1opaFEvg1b6JNFD2rqVkHQ8HApOKK61OIcIXD127bKWgAtbwI7pnxx6cDyk_nI88TrZKQaGMZj0q0Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhDayLMaJc2VjcDI1NmsxoQK2sBOLGcUb4AwuYzFuAVCaNHA-dy24UuEKkeFNgCVCsIN1ZHCCIyg",
+            "enr:-Ku4QEWzdnVtXc2Q0ZVigfCGggOVB2Vc1ZCPEc6j21NIFLODSJbvNaef1g4PxhPwl_3kax86YPheFUSLXPRs98vvYsoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhDZBrP2Jc2VjcDI1NmsxoQM6jr8Rb1ktLEsVcKAPa08wCsKUmvoQ8khiOl_SLozf9IN1ZHCCIyg",
+            // Teku team (Consensys)
+            "enr:-KG4QOtcP9X1FbIMOe17QNMKqDxCpm14jcX5tiOE4_TyMrFqbmhPZHK_ZPG2Gxb1GE2xdtodOfx9-cgvNtxnRyHEmC0ghGV0aDKQ9aX9QgAAAAD__________4JpZIJ2NIJpcIQDE8KdiXNlY3AyNTZrMaEDhpehBDbZjM_L9ek699Y7vhUJ-eAdMyQW_Fil522Y0fODdGNwgiMog3VkcIIjKA",
+            "enr:-KG4QDyytgmE4f7AnvW-ZaUOIi9i79qX4JwjRAiXBZCU65wOfBu-3Nb5I7b_Rmg3KCOcZM_C3y5pg7EBU5XGrcLTduQEhGV0aDKQ9aX9QgAAAAD__________4JpZIJ2NIJpcIQ2_DUbiXNlY3AyNTZrMaEDKnz_-ps3UUOfHWVYaskI5kWYO_vtYMGYCQRAR3gHDouDdGNwgiMog3VkcIIjKA",
+            // PegaSys Teku
+            "enr:-KG4QJRlj4pHagfNIm-Fsx9EVjW4rviuZYzle3tyddm2KAWMJBDGAhxfM2g-pDaaiwE8q19uvLSH4jyvWjypLMr3TIcEhGV0aDKQ9aX9QgAAAAD__________4JpZIJ2NIJpcIQDE8KdiXNlY3AyNTZrMaEDhpehBDbZjM_L9ek699Y7vhUJ-eAdMyQW_Fil522Y0fODdGNwgiMog3VkcIIjKA",
+            "enr:-KG4QL-eqFoHy0cI31THvtZjpYUu_Jdw_MO7skQRJxY1g5HTN1A0epPCU6vi0gLGUgrzpU-ygeMSS8ewVxDpKfYmxMMGhGV0aDKQtTA_KgAAAAD__________4JpZIJ2NIJpcIQ2_DUbiXNlY3AyNTZrMaED8GJ2vzUqgL6-KD1xalo1CsmY4X1HaDnyl6Y_WayCo9GDdGNwgiMog3VkcIIjKA",
+            // Prysmatic Labs
+            "enr:-Ku4QImhMc1z8yCiNJ1TyUxdcfNucje3BGwEHzodEZUan8PherEo4sF7pPHPSIB1NNuSg5fZy7qFsjmUKs2ea1Whi0EBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQOVphkDqal4QzPMksc5wnpuC3gvSC8AfbFOnZY_On34wIN1ZHCCIyg",
+            "enr:-Ku4QP2xDnEtUXIjzJ_DhlCRN9SN99RYQPJL92TMlSv7U5C1YnYLjwOQHgZIUXw6c-BvRg2Yc2QsZxxoS_pPRVe0yK8Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQMeFF5GrS7UZpAH2Ly84aLK-TyvH-dRo0JM1i8yygH50YN1ZHCCJxA",
+            "enr:-Ku4QPp9z1W4tAO8Ber_NQierYaOStqhDqQdOPY3bB3jDgkjcbk6YrEnVYIiCBbTxuar3CzS528d2iE7TdJsrL-dEKoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQMw5fqqkw2hHC4F5HZZDPsNmPdB1Gi8JPQK7pRc9XHh-oN1ZHCCKvg",
+            // Sigp Lighthouse
+            "enr:-Jq4QItoFUuug_n_qbYbU0OY04-np2wT8rUCauOOXNi0H3BWbDj-zbfZb7otA7jZ6flbBpx1LNZK2TDebZ9dEKx84LYBhGV0aDKQtTA_KgEAAAD__________4JpZIJ2NIJpcISsaa0ZiXNlY3AyNTZrMaEDHAD2JKYevx89W0CcFJFiskdcEzkH_Wdv9iW42qLK79ODdWRwgiMo",
+            "enr:-Jq4QN_YBsUOqQsty1OGvYv48PMaiEt1AzGD1NkYQHaxZoTyVGqMYXg0K9c0LPNWC9pkXmggApp8nygYLsQwScwAgfgBhGV0aDKQtTA_KgEAAAD__________4JpZIJ2NIJpcISLosQxiXNlY3AyNTZrMaEDBJj7_dLFACaxBfaI8KZTh_SSJUjhyAyfshimvSqo22WDdWRwgiMo",
+            // Nimbus
+            "enr:-LK4QA8FfhaAjlb_BXsXxSfiysR7R52Nhi9JBt4F8SPssu8hdE1BXQQEtVDC3qStCW60LSO7hEsVHv5zm8_6Vnjhcn0Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhAN4aBKJc2VjcDI1NmsxoQJerDhsJ-KxZ8sHySMOCmTO6sHM3iCFQ6VMvLTe948MyYN0Y3CCI4yDdWRwgiOM",
+            "enr:-LK4QKWrXTpV9T78hNG6s8AM6IO4XH9kFT91uZtFg1GcsJ6dKovDOr1jtAAFPnS2lvNltkOGA9k29BUN7lFh_sjuc9QBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhANAdd-Jc2VjcDI1NmsxoQLQa6ai7y9PMN5hpLe5HmiJSlYzMuzP7ZhwRiwHvqNXdoN0Y3CCI4yDdWRwgiOM");
     private final P2PNetwork<?> p2pNetwork;
 
     private final List<TopicHandler> topicHandlers;

diff --git a/hildr-node/src/test/java/io/optimism/TestConstants.java b/hildr-node/src/test/java/io/optimism/TestConstants.java
@@ -18,6 +18,7 @@ private TestConstants() {}
 
     private static final String ETH_API_ENV = "ETH_API_KEY";
     private static final String OPT_API_ENV = "OPT_API_KEY";
+    private static final String BEACON_ARCHIVER_ENV = "BEACON_ARCHIVE_API_URL";
 
     /** The L 1 rpc url format. */
     static String l1RpcUrlFormat = "https://eth-sepolia.g.alchemy.com/v2/%s";
@@ -42,10 +43,20 @@ public static Config createConfig() {
         }
         var l1RpcUrl = l1RpcUrlFormat.formatted(envs.get(ETH_API_ENV));
         var l1WsRpcUrl = l1RpcWsUrlFormat.formatted(envs.get(ETH_API_ENV));
-        var l1BeaconRpcUrl = l1RpcBeaconUrlFormat.formatted(envs.get(ETH_API_ENV));
+        var l1BeaconRpcUrl = "https://ethereum-sepolia-beacon-api.publicnode.com";
+        var l1BeaconArchiverRpcUrl = envs.get(BEACON_ARCHIVER_ENV);
         var l2RpcUrl = l2RpcUrlFormat.formatted(envs.get(OPT_API_ENV));
         Config.CliConfig cliConfig = new Config.CliConfig(
-                l1RpcUrl, l1WsRpcUrl, l1BeaconRpcUrl, l1BeaconRpcUrl, l2RpcUrl, null, "testjwt", null, null, false);
+                l1RpcUrl,
+                l1WsRpcUrl,
+                l1BeaconRpcUrl,
+                l1BeaconArchiverRpcUrl,
+                l2RpcUrl,
+                null,
+                "testjwt",
+                null,
+                null,
+                false);
         return Config.create(null, cliConfig, Config.ChainConfig.optimismGoerli());
     }
 }
diff --git a/hildr-node/src/test/java/io/optimism/l1/BeaconBlobFetcherTest.java b/hildr-node/src/test/java/io/optimism/l1/BeaconBlobFetcherTest.java
@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import io.optimism.TestConstants;
+import io.optimism.config.Config;
 import io.optimism.type.BlobSidecar;
 import io.optimism.type.SpecConfig;
 import java.math.BigInteger;
@@ -15,31 +17,45 @@
  */
 class BeaconBlobFetcherTest {
 
-    private static String beaconUrl =
-            "https://few-sleek-sound.ethereum-sepolia.quiknode.pro/8e8c3ae8c9ddf50628ad22d3d8cdaf36230d52e1";
     private static BeaconBlobFetcher fetcher;
 
+    private static Config config;
+
     @BeforeAll
     static void setUp() {
-        fetcher = new BeaconBlobFetcher(beaconUrl);
+        if (!TestConstants.isConfiguredApiKeyEnv) {
+            return;
+        }
+        config = TestConstants.createConfig();
+        fetcher = new BeaconBlobFetcher(config.l1BeaconUrl());
     }
 
     @Test
     void getSpecConfig() {
+        if (!TestConstants.isConfiguredApiKeyEnv) {
+            return;
+        }
         SpecConfig specConfig = fetcher.getSpecConfig();
-        System.out.println(specConfig);
+        assertEquals(BigInteger.valueOf(12L), specConfig.getSecondsPerSlot());
     }
 
     @Test
     void getSlotFromTime() {
+        if (!TestConstants.isConfiguredApiKeyEnv) {
+            return;
+        }
         BigInteger slotFromTime = fetcher.getSlotFromTime(BigInteger.valueOf(1708659300L));
-        System.out.println(slotFromTime);
+        assertEquals(BigInteger.valueOf(4410475), slotFromTime);
     }
 
     @Test
-    void getBlobSidecards() {
-        BigInteger slotFromTime = fetcher.getSlotFromTime(BigInteger.valueOf(1708659300L));
-        List<BlobSidecar> blobSidecards = fetcher.getBlobSidecards(slotFromTime.toString(), null);
-        System.out.println(blobSidecards);
+    void getBlobSidecardsAlreadyPrune() {
+        if (!TestConstants.isConfiguredApiKeyEnv) {
+            return;
+        }
+        var blobFetcher = new BeaconBlobFetcher(config.l1BeaconUrl(), config.l1BeaconArchiverUrl());
+        BigInteger slotFromTime = blobFetcher.getSlotFromTime(BigInteger.valueOf(1708659300L));
+        List<BlobSidecar> blobSidecards = blobFetcher.getBlobSidecards(slotFromTime.toString(), null);
+        assertTrue(blobSidecards != null && blobSidecards.size() > 0);
     }
 }