Skip to content

Commit 3fb7f60

Browse files
twoethstwoeths
authored
fix: revert yamux (#6990)
* Revert "feat: add yamux stream muxer (#5886)" This reverts commit acbedaf. * chore: update yarn.lock
1 parent 42af692 commit 3fb7f60

File tree

3 files changed

+35
-101
lines changed

3 files changed

+35
-101
lines changed

‎packages/beacon-node/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
"@chainsafe/libp2p-gossipsub": "^13.0.0",
102102
"@chainsafe/libp2p-identify": "^1.0.0",
103103
"@chainsafe/libp2p-noise": "^15.0.0",
104-
"@chainsafe/libp2p-yamux": "^6.0.2",
105104
"@chainsafe/persistent-merkle-tree": "^0.7.1",
106105
"@chainsafe/prometheus-gc-stats": "^1.0.0",
107106
"@chainsafe/ssz": "^0.15.1",

‎packages/beacon-node/src/network/libp2p/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {mplex} from "@libp2p/mplex";
1010
import {prometheusMetrics} from "@libp2p/prometheus-metrics";
1111
import {tcp} from "@libp2p/tcp";
1212
import {noise} from "@chainsafe/libp2p-noise";
13-
import {yamux} from "@chainsafe/libp2p-yamux";
1413
import {defaultNetworkOptions, NetworkOptions} from "../options.js";
1514
import {Eth2PeerDataStore} from "../peers/datastore.js";
1615
import {Libp2p, LodestarComponents} from "../interface.js";
@@ -86,7 +85,7 @@ export async function createNodeJsLibp2p(
8685
},
8786
}),
8887
],
89-
streamMuxers: [yamux({maxInboundStreams: 256}), mplex({maxInboundStreams: 256})],
88+
streamMuxers: [mplex({maxInboundStreams: 256})],
9089
peerDiscovery,
9190
metrics: nodeJsLibp2pOpts.metrics
9291
? prometheusMetrics({

‎yarn.lock

Lines changed: 34 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -484,19 +484,6 @@
484484
uint8arrays "^5.0.0"
485485
wherearewe "^2.0.1"
486486

487-
"@chainsafe/libp2p-yamux@^6.0.2":
488-
version "6.0.2"
489-
resolved "https://registry.yarnpkg.com/@chainsafe/libp2p-yamux/-/libp2p-yamux-6.0.2.tgz#ba94c38ebfe2761d20b0986ff8d832fc05c2ce15"
490-
integrity sha512-S5OkLHqYhEVMQQ4BTgnRANEIbGTQhaC23glCgBwGdeoTRtMpIozwDiPfljFLCm0RYWdCRJw9oFztO95KUHjptA==
491-
dependencies:
492-
"@libp2p/interface" "^1.1.3"
493-
"@libp2p/utils" "^5.2.5"
494-
get-iterator "^2.0.1"
495-
it-foreach "^2.0.6"
496-
it-pipe "^3.0.1"
497-
it-pushable "^3.2.3"
498-
uint8arraylist "^2.4.8"
499-
500487
"@chainsafe/netmask@^2.0.0":
501488
version "2.0.0"
502489
resolved "https://registry.yarnpkg.com/@chainsafe/netmask/-/netmask-2.0.0.tgz#0d4a75f47919f65011da4327a3845c9661f1038a"
@@ -1591,41 +1578,6 @@
15911578
progress-events "^1.0.0"
15921579
uint8arraylist "^2.4.8"
15931580

1594-
"@libp2p/interface@^1.1.3":
1595-
version "1.2.0"
1596-
resolved "https://registry.yarnpkg.com/@libp2p/interface/-/interface-1.2.0.tgz#3b5fdc5d96cffe17a8c88cc29ed78c70516b0a7f"
1597-
integrity sha512-ImnGNl3El/AukgaojACT8i9SNW1FOsrThcQU/qA3w5tEBR5p84Uwgzl/nxa4X5vGinItUJ9jLEJmtkQJENoiGQ==
1598-
dependencies:
1599-
"@multiformats/multiaddr" "^12.2.1"
1600-
it-pushable "^3.2.3"
1601-
it-stream-types "^2.0.1"
1602-
multiformats "^13.1.0"
1603-
progress-events "^1.0.0"
1604-
uint8arraylist "^2.4.8"
1605-
1606-
"@libp2p/interface@^1.2.0", "@libp2p/interface@^1.6.1":
1607-
version "1.6.1"
1608-
resolved "https://registry.yarnpkg.com/@libp2p/interface/-/interface-1.6.1.tgz#dc8f1a49da7ee81cd068e872bde3445c3b631d45"
1609-
integrity sha512-bpkIYTvZhGGc/ajITKvgFpaP8UtPWoSj+xHVrj6zyAN8U/cAqN0IQQt4a7daJr5VZa8B86i4d1iccdG42/mz+g==
1610-
dependencies:
1611-
"@multiformats/multiaddr" "^12.2.3"
1612-
it-pushable "^3.2.3"
1613-
it-stream-types "^2.0.1"
1614-
multiformats "^13.1.0"
1615-
progress-events "^1.0.0"
1616-
uint8arraylist "^2.4.8"
1617-
1618-
"@libp2p/logger@^4.0.10":
1619-
version "4.0.17"
1620-
resolved "https://registry.yarnpkg.com/@libp2p/logger/-/logger-4.0.17.tgz#1ae663bb2dec3c7e6b29d2195756f64e5e77d939"
1621-
integrity sha512-NPGN27uOXFGuKkxnX39InMvxS0lMenq6/aFqQHN1N0f0S3LaG9RuTcz/VE3qyO1Ik1aAockR6qqCwbfFxJuO0g==
1622-
dependencies:
1623-
"@libp2p/interface" "^1.6.1"
1624-
"@multiformats/multiaddr" "^12.2.3"
1625-
debug "^4.3.4"
1626-
interface-datastore "^8.2.11"
1627-
multiformats "^13.1.0"
1628-
16291581
"@libp2p/logger@^4.0.11", "@libp2p/logger@^4.0.6":
16301582
version "4.0.11"
16311583
resolved "https://registry.yarnpkg.com/@libp2p/logger/-/logger-4.0.11.tgz#671692a0cceee73a0c0bf9b5f05ea14fde05f5e5"
@@ -1784,27 +1736,6 @@
17841736
"@types/sinon" "^17.0.3"
17851737
stream-to-it "^1.0.0"
17861738

1787-
"@libp2p/utils@^5.2.5":
1788-
version "5.3.1"
1789-
resolved "https://registry.yarnpkg.com/@libp2p/utils/-/utils-5.3.1.tgz#1d3ff7e494f78503f33e1c8df4ad4a13209d594b"
1790-
integrity sha512-FdGzRU50PJLYSEOmVXqqtq27yjUVXkU4QNRZzMVuXF9L/sKgSC2oXwj0Satc9fHx5tG3MCX1ZOSAmYEIl2fu+w==
1791-
dependencies:
1792-
"@chainsafe/is-ip" "^2.0.2"
1793-
"@libp2p/interface" "^1.2.0"
1794-
"@libp2p/logger" "^4.0.10"
1795-
"@multiformats/multiaddr" "^12.2.1"
1796-
"@multiformats/multiaddr-matcher" "^1.2.0"
1797-
delay "^6.0.0"
1798-
get-iterator "^2.0.1"
1799-
is-loopback-addr "^2.0.2"
1800-
it-pushable "^3.2.3"
1801-
it-stream-types "^2.0.1"
1802-
netmask "^2.0.2"
1803-
p-defer "^4.0.1"
1804-
race-event "^1.2.0"
1805-
race-signal "^1.0.2"
1806-
uint8arraylist "^2.4.8"
1807-
18081739
"@libp2p/utils@^5.3.2":
18091740
version "5.3.2"
18101741
resolved "https://registry.yarnpkg.com/@libp2p/utils/-/utils-5.3.2.tgz#044881910350fb22ed0f9db35e6f68f7e8948801"
@@ -1916,19 +1847,6 @@
19161847
uint8-varint "^2.0.1"
19171848
uint8arrays "^5.0.0"
19181849

1919-
"@multiformats/multiaddr@^12.2.3":
1920-
version "12.3.0"
1921-
resolved "https://registry.yarnpkg.com/@multiformats/multiaddr/-/multiaddr-12.3.0.tgz#b1422813446e5cdec4b0f6cba51f93239f390884"
1922-
integrity sha512-JQ8Gc/jgucqqvEaDTFN/AvxlYDHEE7lgEWLMYW7hKZkWggER+GvG/tVxUgUxIP8M0vFpvEHKKHE0lKzyMsgi8Q==
1923-
dependencies:
1924-
"@chainsafe/is-ip" "^2.0.1"
1925-
"@chainsafe/netmask" "^2.0.0"
1926-
"@libp2p/interface" "^1.0.0"
1927-
"@multiformats/dns" "^1.0.3"
1928-
multiformats "^13.0.0"
1929-
uint8-varint "^2.0.1"
1930-
uint8arrays "^5.0.0"
1931-
19321850
"@napi-rs/[email protected]":
19331851
version "7.2.2"
19341852
resolved "https://registry.yarnpkg.com/@napi-rs/snappy-android-arm-eabi/-/snappy-android-arm-eabi-7.2.2.tgz#85fee3ba198dad4b444b5f12bceebcf72db0d65e"
@@ -7545,18 +7463,18 @@ https-proxy-agent@^7.0.2:
75457463
agent-base "^7.0.2"
75467464
debug "4"
75477465

7548-
https-proxy-agent@^7.0.3, https-proxy-agent@^7.0.5:
7549-
version "7.0.5"
7550-
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
7551-
integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
7466+
https-proxy-agent@^7.0.3, https-proxy-agent@^7.0.4:
7467+
version "7.0.4"
7468+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
7469+
integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
75527470
dependencies:
75537471
agent-base "^7.0.2"
75547472
debug "4"
75557473

7556-
https-proxy-agent@^7.0.4:
7557-
version "7.0.4"
7558-
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
7559-
integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
7474+
https-proxy-agent@^7.0.5:
7475+
version "7.0.5"
7476+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
7477+
integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
75607478
dependencies:
75617479
agent-base "^7.0.2"
75627480
debug "4"
@@ -10360,18 +10278,18 @@ [email protected]:
1036010278
p-reduce "^2.0.0"
1036110279

1036210280
pac-proxy-agent@^7.0.1:
10363-
version "7.0.2"
10364-
resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz#0fb02496bd9fb8ae7eb11cfd98386daaac442f58"
10365-
integrity sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==
10281+
version "7.0.1"
10282+
resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz#6b9ddc002ec3ff0ba5fdf4a8a21d363bcc612d75"
10283+
integrity sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==
1036610284
dependencies:
1036710285
"@tootallnate/quickjs-emscripten" "^0.23.0"
1036810286
agent-base "^7.0.2"
1036910287
debug "^4.3.4"
1037010288
get-uri "^6.0.1"
1037110289
http-proxy-agent "^7.0.0"
10372-
https-proxy-agent "^7.0.5"
10373-
pac-resolver "^7.0.1"
10374-
socks-proxy-agent "^8.0.4"
10290+
https-proxy-agent "^7.0.2"
10291+
pac-resolver "^7.0.0"
10292+
socks-proxy-agent "^8.0.2"
1037510293

1037610294
pac-resolver@^7.0.1:
1037710295
version "7.0.1"
@@ -11963,7 +11881,16 @@ string-argv@~0.3.1:
1196311881
resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
1196411882
integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
1196511883

11966-
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
11884+
"string-width-cjs@npm:string-width@^4.2.0":
11885+
version "4.2.3"
11886+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
11887+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
11888+
dependencies:
11889+
emoji-regex "^8.0.0"
11890+
is-fullwidth-code-point "^3.0.0"
11891+
strip-ansi "^6.0.1"
11892+
11893+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
1196711894
version "4.2.3"
1196811895
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
1196911896
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -13598,7 +13525,16 @@ [email protected]:
1359813525
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
1359913526
integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
1360013527

13601-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
13528+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
13529+
version "7.0.0"
13530+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
13531+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
13532+
dependencies:
13533+
ansi-styles "^4.0.0"
13534+
string-width "^4.1.0"
13535+
strip-ansi "^6.0.0"
13536+
13537+
wrap-ansi@^7.0.0:
1360213538
version "7.0.0"
1360313539
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
1360413540
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)