@chainsafe/lodestar 1.49.0-dev.09a1892a85 → 1.49.0-dev.0a27fd270f

package/src/options/beaconNodeOptions/sync.ts

@@ -5,7 +5,6 @@ export type SyncArgs = {
   "sync.isSingleNode"?: boolean;
   "sync.disableProcessAsChainSegment"?: boolean;
   "sync.disableRangeSync"?: boolean;
-  "sync.backfillBatchSize"?: number;
   "sync.slotImportTolerance"?: number;
 };
 
@@ -13,7 +12,6 @@ export function parseArgs(args: SyncArgs): IBeaconNodeOptions["sync"] {
   return {
     isSingleNode: args["sync.isSingleNode"],
     disableProcessAsChainSegment: args["sync.disableProcessAsChainSegment"],
-    backfillBatchSize: args["sync.backfillBatchSize"] ?? defaultOptions.sync.backfillBatchSize,
     disableRangeSync: args["sync.disableRangeSync"],
     slotImportTolerance: args["sync.slotImportTolerance"] ?? defaultOptions.sync.slotImportTolerance,
   };
@@ -54,12 +52,4 @@ Use only for local networks with a single node, can be dangerous in regular netw
     defaultDescription: String(defaultOptions.sync.disableProcessAsChainSegment),
     group: "sync",
   },
-
-  "sync.backfillBatchSize": {
-    hidden: true,
-    type: "number",
-    description: "Batch size for backfill sync to sync/process blocks, set non zero to enable backfill sync",
-    defaultDescription: String(defaultOptions.sync.backfillBatchSize),
-    group: "sync",
-  },
 };

package/src/util/proposerConfig.ts

@@ -3,7 +3,7 @@ import path from "node:path";
 import {routes} from "@lodestar/api";
 import {BuilderEntryConfig, builderConfigDataFromJson} from "@lodestar/api/keymanager";
 import {MAX_BUILDER_AUTH_DATA_SIZE, MAX_BUILDER_ENTRIES, MAX_BUILDER_URL_SIZE} from "@lodestar/params";
-import {fromHex, isValidAsciiHttpUrl, toHex} from "@lodestar/utils";
+import {fromHex, isValidAsciiHttpUrl, toAsciiHttpUrl, toHex} from "@lodestar/utils";
 import {ValidatorProposerConfig} from "@lodestar/validator";
 import {parseFeeRecipient} from "./feeRecipient.js";
 import {readFile} from "./file.js";
@@ -226,7 +226,8 @@ export function parseBuilderEntries(builders?: unknown): BuilderEntryConfig[] |
     if (!isValidAsciiHttpUrl(entry.url)) {
       throw Error(`Invalid builder url: ${entry.url}`);
     }
-    const authData = entry.authData !== undefined ? toHex(fromHex(entry.authData)) : toHex(Buffer.from(entry.url));
+    const authData =
+      entry.authData !== undefined ? toHex(fromHex(entry.authData)) : toHex(Buffer.from(new URL(entry.url).hostname));
     const entryKey = `${entry.url}|${authData}`;
     if (seenEntries.has(entryKey)) {
       throw Error(`Duplicate builder entry url=${entry.url}`);
@@ -239,7 +240,7 @@ export function parseBuilderEntries(builders?: unknown): BuilderEntryConfig[] |
 /**
  * Parse builder urls into builder entries. Auth data agreed with a builder out of band may be
  * appended as a hex fragment (`https://builder.example.com#0x0123`), it is stripped from the url
- * and never sent on the wire. Without a fragment the auth data derives from the url.
+ * and never sent on the wire. Without a fragment the auth data derives from the url hostname.
  */
 export function parseBuilderUrls(urls?: string[]): BuilderEntryConfig[] | undefined {
   if (urls === undefined) return undefined;
@@ -251,7 +252,8 @@ export function parseBuilderUrls(urls?: string[]): BuilderEntryConfig[] | undefi
     const url = fragmentIndex === -1 ? value : value.slice(0, fragmentIndex);
     const authData = fragmentIndex === -1 ? undefined : value.slice(fragmentIndex + 1);
     if (!isValidAsciiHttpUrl(url)) {
-      throw Error(`Invalid builder url: ${url}`);
+      const asciiUrl = toAsciiHttpUrl(url);
+      throw Error(`Invalid builder url: ${url}` + (asciiUrl !== null ? `, use ${asciiUrl} instead` : ""));
     }
     if (Buffer.byteLength(url, "utf8") > MAX_BUILDER_URL_SIZE) {
       throw Error(`Invalid builder url, must not exceed ${MAX_BUILDER_URL_SIZE} bytes: ${url}`);
@@ -261,7 +263,7 @@ export function parseBuilderUrls(urls?: string[]): BuilderEntryConfig[] | undefi
         `Invalid builder url auth data, must be a 0x-prefixed hex string of 1 to ${MAX_BUILDER_AUTH_DATA_SIZE} bytes: ${url}`
       );
     }
-    const entryKey = `${url}|${authData !== undefined ? toHex(fromHex(authData)) : toHex(Buffer.from(url))}`;
+    const entryKey = `${url}|${authData !== undefined ? toHex(fromHex(authData)) : toHex(Buffer.from(new URL(url).hostname))}`;
     if (seenEntries.has(entryKey)) {
       throw Error(`Duplicate builder url: ${url}`);
     }