chore: update libp2p dependencies

ChainSafe · Jan 11, 2024 · 74b539d · 74b539d
1 parent acb4792
commit 74b539d
Show file tree

Hide file tree

Showing 11 changed files with 1,208 additions and 1,381 deletions.
diff --git a/packages/discv5/package.json b/packages/discv5/package.json
@@ -65,12 +65,12 @@
   },
   "homepage": "https://github.com/ChainSafe/discv5#readme",
   "devDependencies": {
-    "@libp2p/peer-id-factory": "^3.0.9"
+    "@libp2p/peer-id-factory": "^4.0.3"
   },
   "dependencies": {
     "@chainsafe/enr": "^2.0.1",
-    "@libp2p/crypto": "^3.0.0",
-    "@libp2p/interface": "^1.0.0",
+    "@libp2p/crypto": "^3.0.4",
+    "@libp2p/interface": "^1.1.1",
     "@multiformats/multiaddr": "^12.1.10",
     "bcrypto": "^5.4.0",
     "bigint-buffer": "^1.1.5",

diff --git a/packages/discv5/src/keypair/index.ts b/packages/discv5/src/keypair/index.ts
@@ -1,4 +1,4 @@
-import { KeyType } from "@libp2p/interface/keys";
+import { KeyType } from "@libp2p/interface";
 
 import { IKeypair } from "./types.js";
 import { ERR_TYPE_NOT_IMPLEMENTED } from "./constants.js";

diff --git a/packages/discv5/src/keypair/secp256k1.ts b/packages/discv5/src/keypair/secp256k1.ts
@@ -1,5 +1,5 @@
 import secp256k1 from "bcrypto/lib/secp256k1.js";
-import { KeyType } from "@libp2p/interface/keys";
+import { KeyType } from "@libp2p/interface";
 import { AbstractKeypair, IKeypair, IKeypairClass } from "./types.js";
 import { ERR_INVALID_KEYPAIR_TYPE } from "./constants.js";
 

diff --git a/packages/discv5/src/keypair/types.ts b/packages/discv5/src/keypair/types.ts
@@ -1,4 +1,4 @@
-import { KeyType } from "@libp2p/interface/keys";
+import { KeyType } from "@libp2p/interface";
 
 export interface IKeypair {
   type: KeyType;

diff --git a/packages/discv5/src/libp2p/discv5.ts b/packages/discv5/src/libp2p/discv5.ts
@@ -1,7 +1,12 @@
-import { PeerId } from "@libp2p/interface/peer-id";
-import { PeerDiscovery, PeerDiscoveryEvents, peerDiscoverySymbol } from "@libp2p/interface/peer-discovery";
-import { PeerInfo } from "@libp2p/interface/peer-info";
-import { CustomEvent, TypedEventEmitter } from "@libp2p/interface/events";
+import {
+  CustomEvent,
+  PeerDiscovery,
+  PeerDiscoveryEvents,
+  peerDiscoverySymbol,
+  PeerId,
+  PeerInfo,
+  TypedEventEmitter,
+} from "@libp2p/interface";
 import { Multiaddr, multiaddr } from "@multiformats/multiaddr";
 import { ENR } from "@chainsafe/enr";
 

diff --git a/packages/discv5/src/service/service.ts b/packages/discv5/src/service/service.ts
@@ -2,7 +2,7 @@ import { EventEmitter } from "events";
 import debug from "debug";
 import { randomBytes } from "@libp2p/crypto";
 import { Multiaddr } from "@multiformats/multiaddr";
-import { PeerId } from "@libp2p/interface/peer-id";
+import { PeerId } from "@libp2p/interface";
 import {
   createPeerIdFromPublicKey,
   createPrivateKeyFromPeerId,

diff --git a/packages/discv5/test/e2e/connect.test.ts b/packages/discv5/test/e2e/connect.test.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 import { expect } from "chai";
 import { multiaddr } from "@multiformats/multiaddr";
-import { PeerId } from "@libp2p/interface/peer-id";
+import { PeerId } from "@libp2p/interface";
 import { createFromPrivKey } from "@libp2p/peer-id-factory";
 import { unmarshalPrivateKey } from "@libp2p/crypto/keys";
 import { SignableENR } from "@chainsafe/enr";

diff --git a/packages/enr/package.json b/packages/enr/package.json
@@ -49,13 +49,13 @@
   },
   "homepage": "https://github.com/ChainSafe/discv5#readme",
   "devDependencies": {
-    "@libp2p/peer-id-factory": "^3.0.1",
+    "@libp2p/peer-id-factory": "^4.0.3",
     "@types/bn.js": "^4.11.5"
   },
   "dependencies": {
-    "@libp2p/crypto": "^3.0.0",
-    "@libp2p/interface": "^1.0.0",
-    "@libp2p/peer-id": "^4.0.0",
+    "@libp2p/crypto": "^3.0.4",
+    "@libp2p/interface": "^1.1.1",
+    "@libp2p/peer-id": "^4.0.4",
     "@multiformats/multiaddr": "^12.1.10",
     "base64url": "^3.0.1",
     "bcrypto": "^5.4.0",

diff --git a/packages/enr/src/enr.ts b/packages/enr/src/enr.ts
@@ -2,8 +2,7 @@ import { Multiaddr, multiaddr, protocols } from "@multiformats/multiaddr";
 import base64url from "base64url";
 import { toBigIntBE } from "bigint-buffer";
 import * as RLP from "rlp";
-import { KeyType } from "@libp2p/interface/keys";
-import { PeerId } from "@libp2p/interface/peer-id";
+import { KeyType, PeerId } from "@libp2p/interface";
 import { convertToString, convertToBytes } from "@multiformats/multiaddr/convert";
 import { encode as varintEncode } from "uint8-varint";
 

diff --git a/packages/enr/src/peerId.ts b/packages/enr/src/peerId.ts
@@ -1,7 +1,6 @@
-import { PeerId } from "@libp2p/interface/peer-id";
+import { KeyType, PeerId } from "@libp2p/interface";
 import { peerIdFromKeys } from "@libp2p/peer-id";
 import { keysPBM, supportedKeys } from "@libp2p/crypto/keys";
-import { KeyType } from "@libp2p/interface/keys";
 
 export const ERR_TYPE_NOT_IMPLEMENTED = "Keypair type not implemented";