@lodestar/beacon-node 1.23.0-dev.d69d809e7a → 1.23.0-dev.e01142b1f8

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.23.0-dev.d69d809e7a",
+  "version": "1.23.0-dev.e01142b1f8",
   "type": "module",
   "exports": {
     ".": {
@@ -75,8 +75,8 @@
     "build:release": "yarn clean && yarn run build",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
     "check-types": "tsc",
-    "lint": "eslint --color --ext .ts src/ test/",
-    "lint:fix": "yarn run lint --fix",
+    "lint": "biome check src/ test/",
+    "lint:fix": "yarn run lint --write",
     "test": "yarn test:unit && yarn test:e2e",
     "test:unit:minimal": "LODESTAR_PRESET=minimal vitest --run --dir test/unit/",
     "test:unit:mainnet": "LODESTAR_PRESET=mainnet vitest --run --dir test/unit-mainnet",
@@ -96,52 +96,52 @@
   "dependencies": {
     "@chainsafe/as-sha256": "^0.5.0",
     "@chainsafe/blst": "^2.0.3",
-    "@chainsafe/discv5": "^9.0.0",
-    "@chainsafe/enr": "^3.0.0",
-    "@chainsafe/libp2p-gossipsub": "^13.0.0",
-    "@chainsafe/libp2p-identify": "^1.0.0",
-    "@chainsafe/libp2p-noise": "^15.0.0",
+    "@chainsafe/discv5": "^10.0.1",
+    "@chainsafe/enr": "^4.0.1",
+    "@chainsafe/libp2p-gossipsub": "^14.1.0",
+    "@chainsafe/libp2p-noise": "^16.0.0",
     "@chainsafe/persistent-merkle-tree": "^0.8.0",
     "@chainsafe/prometheus-gc-stats": "^1.0.0",
-    "@chainsafe/ssz": "^0.17.1",
+    "@chainsafe/pubkey-index-map": "2.0.0",
+    "@chainsafe/ssz": "^0.18.0",
     "@chainsafe/threads": "^1.11.1",
     "@ethersproject/abi": "^5.7.0",
     "@fastify/bearer-auth": "^10.0.1",
     "@fastify/cors": "^10.0.1",
     "@fastify/swagger": "^9.0.0",
     "@fastify/swagger-ui": "^5.0.1",
-    "@libp2p/bootstrap": "^10.0.21",
-    "@libp2p/identify": "^1.0.20",
-    "@libp2p/interface": "^1.3.0",
-    "@libp2p/mdns": "^10.0.21",
-    "@libp2p/mplex": "^10.0.21",
-    "@libp2p/peer-id": "^4.1.0",
-    "@libp2p/peer-id-factory": "^4.1.0",
-    "@libp2p/prometheus-metrics": "^3.0.21",
-    "@libp2p/tcp": "9.0.23",
-    "@lodestar/api": "1.23.0-dev.d69d809e7a",
-    "@lodestar/config": "1.23.0-dev.d69d809e7a",
-    "@lodestar/db": "1.23.0-dev.d69d809e7a",
-    "@lodestar/fork-choice": "1.23.0-dev.d69d809e7a",
-    "@lodestar/light-client": "1.23.0-dev.d69d809e7a",
-    "@lodestar/logger": "1.23.0-dev.d69d809e7a",
-    "@lodestar/params": "1.23.0-dev.d69d809e7a",
-    "@lodestar/reqresp": "1.23.0-dev.d69d809e7a",
-    "@lodestar/state-transition": "1.23.0-dev.d69d809e7a",
-    "@lodestar/types": "1.23.0-dev.d69d809e7a",
-    "@lodestar/utils": "1.23.0-dev.d69d809e7a",
-    "@lodestar/validator": "1.23.0-dev.d69d809e7a",
+    "@libp2p/bootstrap": "^11.0.4",
+    "@libp2p/crypto": "^5.0.4",
+    "@libp2p/identify": "^3.0.4",
+    "@libp2p/interface": "^2.1.2",
+    "@libp2p/mdns": "^11.0.4",
+    "@libp2p/mplex": "^11.0.4",
+    "@libp2p/peer-id": "^5.0.4",
+    "@libp2p/prometheus-metrics": "^4.1.2",
+    "@libp2p/tcp": "10.0.4",
+    "@lodestar/api": "1.23.0-dev.e01142b1f8",
+    "@lodestar/config": "1.23.0-dev.e01142b1f8",
+    "@lodestar/db": "1.23.0-dev.e01142b1f8",
+    "@lodestar/fork-choice": "1.23.0-dev.e01142b1f8",
+    "@lodestar/light-client": "1.23.0-dev.e01142b1f8",
+    "@lodestar/logger": "1.23.0-dev.e01142b1f8",
+    "@lodestar/params": "1.23.0-dev.e01142b1f8",
+    "@lodestar/reqresp": "1.23.0-dev.e01142b1f8",
+    "@lodestar/state-transition": "1.23.0-dev.e01142b1f8",
+    "@lodestar/types": "1.23.0-dev.e01142b1f8",
+    "@lodestar/utils": "1.23.0-dev.e01142b1f8",
+    "@lodestar/validator": "1.23.0-dev.e01142b1f8",
     "@multiformats/multiaddr": "^12.1.3",
     "c-kzg": "^2.1.2",
-    "datastore-core": "^9.1.1",
-    "datastore-level": "^10.1.1",
+    "datastore-core": "^10.0.0",
+    "datastore-level": "^11.0.0",
     "deepmerge": "^4.3.1",
     "fastify": "^5.0.0",
-    "interface-datastore": "^8.2.7",
+    "interface-datastore": "^8.3.0",
     "it-all": "^3.0.4",
     "it-pipe": "^3.0.1",
     "jwt-simple": "0.5.6",
-    "libp2p": "1.4.3",
+    "libp2p": "2.1.7",
     "multiformats": "^11.0.1",
     "prom-client": "^15.1.0",
     "qs": "^6.11.1",
@@ -167,5 +167,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "266c057e7d69ff854d851a49e4f60daf696a0d34"
+  "gitHead": "c9816562f541146dbe9f8d00e4209239693d98f1"
 }

package/lib/chain/archiver/archiveStates.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"archiveStates.js","sourceRoot":"","sources":["../../../src/chain/archiver/archiveStates.ts"],"names":[],"mappings":"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"}

package/lib/network/processor/gossipQueues/indexedAvgTime.d.ts

@@ -1,31 +0,0 @@
-import { GossipQueue, IndexedGossipQueueOpts } from "./types.js";
-/**
- * An implementation of GossipQueue that tries to run the batch with highest score first.
- * TODO: add unit tests
- * - index items by indexFn using a map
- * - compute avgRecvTimestampMs for each key every time we add new item
- * - on next, pick the key with the highest score (check the score function above)
- */
-export declare class IndexedGossipQueueAvgTime<T extends {
-    indexed?: string;
-}> implements GossipQueue<T> {
-    private readonly opts;
-    private _length;
-    private indexedItems;
-    constructor(opts: IndexedGossipQueueOpts<T>);
-    get length(): number;
-    get keySize(): number;
-    clear(): void;
-    getDataAgeMs(): number[];
-    /**
-     * Add item to gossip queue. If queue is full, drop first item of first key.
-     * Return number of items dropped
-     */
-    add(item: T): number;
-    /**
-     * Try to get list of items of the same key with highest score
-     */
-    next(): T[] | null;
-    getAll(): T[];
-}
-//# sourceMappingURL=indexedAvgTime.d.ts.map

package/lib/network/processor/gossipQueues/indexedAvgTime.js

@@ -1,115 +0,0 @@
-function listScore(list) {
-    return list.items.length / Math.max(1000, Date.now() - list.avgRecvTimestampMs);
-}
-/**
- * An implementation of GossipQueue that tries to run the batch with highest score first.
- * TODO: add unit tests
- * - index items by indexFn using a map
- * - compute avgRecvTimestampMs for each key every time we add new item
- * - on next, pick the key with the highest score (check the score function above)
- */
-export class IndexedGossipQueueAvgTime {
-    constructor(opts) {
-        this.opts = opts;
-        this._length = 0;
-        this.indexedItems = new Map();
-    }
-    get length() {
-        return this._length;
-    }
-    get keySize() {
-        return this.indexedItems.size;
-    }
-    clear() {
-        this.indexedItems = new Map();
-        this._length = 0;
-    }
-    // not implemented for this gossip queue
-    getDataAgeMs() {
-        return [];
-    }
-    /**
-     * Add item to gossip queue. If queue is full, drop first item of first key.
-     * Return number of items dropped
-     */
-    add(item) {
-        const key = this.opts.indexFn(item);
-        if (key == null) {
-            // this comes from getAttDataBase64FromAttestationSerialized() return type
-            // should not happen
-            return 0;
-        }
-        item.indexed = key;
-        let list = this.indexedItems.get(key);
-        if (list == null) {
-            list = {
-                items: [],
-                avgRecvTimestampMs: Date.now(),
-            };
-            this.indexedItems.set(key, list);
-        }
-        else {
-            list.avgRecvTimestampMs = (list.avgRecvTimestampMs * list.items.length + Date.now()) / (list.items.length + 1);
-            list.items.push(item);
-        }
-        this._length++;
-        if (this._length <= this.opts.maxLength) {
-            return 0;
-        }
-        // overload, need to drop more items
-        const firstKey = this.indexedItems.keys().next().value;
-        // there should be at least 1 key
-        if (firstKey == null) {
-            return 0;
-        }
-        const firstList = this.indexedItems.get(firstKey);
-        // should not happen
-        if (firstList == null) {
-            return 0;
-        }
-        const deletedItem = firstList.items.shift();
-        if (deletedItem != null) {
-            this._length--;
-            if (firstList.items.length === 0) {
-                this.indexedItems.delete(firstKey);
-            }
-            return 1;
-        }
-        else {
-            return 0;
-        }
-    }
-    /**
-     * Try to get list of items of the same key with highest score
-     */
-    next() {
-        let maxScore = 0;
-        let maxScoreKey;
-        for (const [key, list] of this.indexedItems) {
-            const score = listScore(list);
-            if (score > maxScore) {
-                maxScore = score;
-                maxScoreKey = key;
-            }
-        }
-        if (maxScoreKey == null) {
-            return null;
-        }
-        const items = this.indexedItems.get(maxScoreKey)?.items;
-        if (items == null) {
-            // should not happen
-            return null;
-        }
-        this.indexedItems.delete(maxScoreKey);
-        this._length = Math.max(0, this._length - items.length);
-        return items;
-    }
-    getAll() {
-        const items = [];
-        for (const list of this.indexedItems.values()) {
-            items.push(...list.items);
-        }
-        return items;
-    }
-}
-//# sourceMappingURL=indexedAvgTime.js.map

package/lib/network/processor/gossipQueues/indexedAvgTime.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"indexedAvgTime.js","sourceRoot":"","sources":["../../../../src/network/processor/gossipQueues/indexedAvgTime.ts"],"names":[],"mappings":"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"}