Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - upgrade to libp2p 0.52 #4431

Closed
wants to merge 118 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
7dd0ea0
update libp2p to v0.51.1
divagant-martian Mar 14, 2023
f3693c2
Revert "Ensure protoc is installed for release CI (#3621)"
divagant-martian Mar 14, 2023
b700771
Revert "Merge pull request #3546 from divagant-martian/cross-update"
divagant-martian Mar 14, 2023
28e02c4
remove protobuf installation ops and instructions
divagant-martian Mar 14, 2023
672807b
update path for ConnectionId
divagant-martian Mar 14, 2023
2cbd05a
update deprecated type aliases
divagant-martian Mar 15, 2023
77681d2
use new identity top level crate
divagant-martian Mar 15, 2023
d273f1b
fix bandwidth logging code
divagant-martian Mar 15, 2023
d203526
update most of the handler required changes
divagant-martian Mar 15, 2023
0e87da9
update behaviour function names in the rpc
divagant-martian Mar 15, 2023
d213b6a
weird change needed for the NetworkBehaviour macro to work
divagant-martian Mar 15, 2023
07b711b
update prometheus client
divagant-martian Mar 15, 2023
ec8fc7d
fix updates to the rpc handler
divagant-martian Mar 15, 2023
26d24ff
partially update the peer manager's network behaviour code
divagant-martian Mar 15, 2023
d004913
fix generics over NetworkBehaviourAction
divagant-martian Mar 15, 2023
51445b5
fix rpc network behaviour
divagant-martian Mar 15, 2023
a596d54
fix connection event buffer limits
divagant-martian Mar 15, 2023
a5c2e72
fix discovery and rpc network behaviour impls
divagant-martian Mar 15, 2023
05ea5e6
use utf encoding in prometheus to align with open metrics format
divagant-martian Mar 15, 2023
d425cb5
remove unnecesary code
divagant-martian Mar 16, 2023
b76e3b6
update libp2p-identity to latest release
divagant-martian Mar 20, 2023
823828a
fix warnings where the fix does not bring an unnecesary clone
divagant-martian Mar 20, 2023
c7798b3
partially address ConnectionLimits deprecation in favor of connection…
divagant-martian Apr 13, 2023
b524150
allow necessary deprecated variant
divagant-martian Apr 14, 2023
9d3e0a2
Merge branch 'unstable' into libp2p-0.51.3
divagant-martian Jun 5, 2023
1245fde
fix import in tests
divagant-martian Jun 5, 2023
f67bfbc
Merge branch 'unstable' into libp2p-0.51.1
divagant-martian Jun 10, 2023
283982e
prepare for 0.52 upgrade
divagant-martian Jun 10, 2023
c413c5a
replace NetworkBehaviourAction with ToSwarm
divagant-martian Jun 10, 2023
894cb77
deprecation warns
divagant-martian Jun 10, 2023
40aa0d9
annoying stuff
divagant-martian Jun 14, 2023
a0b2cc2
wip
divagant-martian Jun 15, 2023
2fa23a0
need to stop coding tired
divagant-martian Jun 16, 2023
b933fa3
Merge branch 'unstable' into libp2p-0.51.1
divagant-martian Jun 19, 2023
e5570fd
Merge branch 'unstable' into libp2p-0.51.1
divagant-martian Jun 19, 2023
51c2148
Merge branch 'unstable' into libp2p-0.51.1
divagant-martian Jun 23, 2023
40d0db1
address deprecation warning
divagant-martian Jun 23, 2023
d121bc9
address deprecation warning
divagant-martian Jun 23, 2023
d66835d
temp fix errors, see warns
divagant-martian Jun 23, 2023
e84095b
move libp2p a bit up to deal with deprecation warnings that had no wa…
divagant-martian Jun 23, 2023
9a4dde9
use Into to get public key
divagant-martian Jun 23, 2023
288bfdb
keypair clones everywhere
divagant-martian Jun 23, 2023
bb360ee
use new function names
divagant-martian Jun 23, 2023
96afe89
more deprecation warns
divagant-martian Jun 23, 2023
b433d7f
more deprecation warns
divagant-martian Jun 23, 2023
9ae2f55
follow suggested code style
divagant-martian Jun 23, 2023
007e6db
follow suggested code style
divagant-martian Jun 23, 2023
9e47c60
Merge remote-tracking branch 'origin/libp2p-0.51.1' into libp2p-0.51.1
divagant-martian Jun 23, 2023
c97c5ff
follow suggested code style
divagant-martian Jun 23, 2023
e01e17c
incrementally addressing deprecations
divagant-martian Jun 23, 2023
9949dfa
use gossipsub types from the root
divagant-martian Jun 23, 2023
fcbae56
remove ProtocolName
divagant-martian Jun 23, 2023
0ce49bd
no deprecations checkpoint
divagant-martian Jun 23, 2023
06b9da1
remove handling of error that was dead code in libp2p
divagant-martian Jun 23, 2023
0f9f012
remove deprecated ban reports
divagant-martian Jun 23, 2023
3a09b5d
placeholders everywhere
divagant-martian Jun 23, 2023
ce2c34b
address change to StreamUpgradeError
divagant-martian Jun 24, 2023
0102ee7
address change to StreamUpgradeError
divagant-martian Jun 24, 2023
4ab0ef4
Merge remote-tracking branch 'origin/libp2p-0.51.1' into libp2p-0.51.1
divagant-martian Jun 24, 2023
d537025
change to Stream
divagant-martian Jun 24, 2023
1a2fe18
so many renamings omg
divagant-martian Jun 24, 2023
0e509e5
rename `Custom` variant to `NotifyBehaviour`
divagant-martian Jun 24, 2023
9c4b429
use new event field
divagant-martian Jun 24, 2023
c95c5c5
add new events reporting addresses
divagant-martian Jun 24, 2023
165f2d2
checkpoint
divagant-martian Jun 24, 2023
73947b5
change identity path
divagant-martian Jun 24, 2023
4fa7762
multiaddr can no longer produce invalid peer ids
divagant-martian Jun 24, 2023
1dd0420
checkpoint
divagant-martian Jun 24, 2023
eeb9232
v0.52. Finally
divagant-martian Jun 24, 2023
e62db42
cargo update
divagant-martian Jun 24, 2023
44e4e90
Merge branch 'unstable' into libp2p-0.51.1
divagant-martian Jun 24, 2023
63a0cf0
update identity
divagant-martian Jun 28, 2023
245eece
Merge branch 'unstable' into libp2p-0.52
divagant-martian Jun 28, 2023
e7e6efa
Merge branch 'unstable' into libp2p-0.52
divagant-martian Jun 30, 2023
4167cf5
ignore pending inbound connection accept/reject in discovery
divagant-martian Jun 30, 2023
3733032
fix workflows
divagant-martian Jun 30, 2023
eeda936
more workflow fixes
divagant-martian Jun 30, 2023
2c68cb4
partially address discovery todos
divagant-martian Jun 30, 2023
b97af5e
address todos in rpc; improving logging in the handler
divagant-martian Jun 30, 2023
9f1afc6
one todo! out, three in :sigh:
divagant-martian Jun 30, 2023
8a9697b
more todos
divagant-martian Jun 30, 2023
a0cc5d6
Merge branch 'unstable' into libp2p-0.52
divagant-martian Jul 3, 2023
afee9a7
remove unnecesary clones
divagant-martian Jul 3, 2023
49965a7
remove more unnecesary clones
divagant-martian Jul 3, 2023
63b93f3
fix style
divagant-martian Jul 3, 2023
53cd497
prepare handover
divagant-martian Jul 3, 2023
bf1c706
Merge branch 'unstable' into libp2p-0.52
divagant-martian Jul 8, 2023
b97cfee
reduce diff, avoid new features for now
divagant-martian Jul 9, 2023
3e06b8b
restore PM behaviour
divagant-martian Jul 9, 2023
c437a4b
cleanup pm's network behaviour
divagant-martian Jul 9, 2023
64fc9dc
cleanup discovery
divagant-martian Jul 9, 2023
ec36293
cleanup service
divagant-martian Jul 9, 2023
c736daf
cleanup rpc/mod
divagant-martian Jul 9, 2023
a950d5c
Merge branch 'unstable' into libp2p-0.52
divagant-martian Jul 19, 2023
5d277a2
one todo less
divagant-martian Jul 19, 2023
e806b18
fix test
divagant-martian Jul 19, 2023
52354c9
fmt
divagant-martian Jul 20, 2023
006d0e1
Age version
AgeManning Jul 20, 2023
ad9b96e
Mergin branches
AgeManning Jul 20, 2023
9543a0a
@AgeManning says my version is better :shrug: so..
divagant-martian Jul 20, 2023
d46b1aa
fmt
divagant-martian Jul 20, 2023
63a14ab
Handler modifications
AgeManning Jul 20, 2023
a1f1286
add banner peers behaviour
divagant-martian Jul 20, 2023
72ae2b5
fmt
divagant-martian Jul 20, 2023
50356e4
upgrade discv5 to get rid of protoc
divagant-martian Jul 20, 2023
7d85736
make clippy happy
divagant-martian Jul 20, 2023
8dff926
fix key conversion
divagant-martian Jul 20, 2023
952eff5
Merge branch 'unstable' into libp2p-0.52
divagant-martian Jul 21, 2023
b512852
fix workflow double install
divagant-martian Jul 24, 2023
ae658c4
point to fork with better error msgs
divagant-martian Jul 24, 2023
8ea0432
Cargo update
AgeManning Jul 24, 2023
63d85ed
fix point to workspace
divagant-martian Jul 24, 2023
1232e6e
aggressively printing errors
divagant-martian Jul 25, 2023
28e4ecf
fmt
divagant-martian Jul 25, 2023
edb0f1e
Fix libp2p
AgeManning Jul 25, 2023
ebf3536
Remove protobuf-compiler installation for Pi
ackintosh Jul 26, 2023
6d7fd04
restore libp2p version to published crates + cargo update for bug fixes
divagant-martian Jul 26, 2023
28b07c7
Merge latest unstable
AgeManning Aug 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/local-testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:

- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install geth (ubuntu)
if: matrix.os == 'ubuntu-22.04'
run: |
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,6 @@ jobs:
if: startsWith(matrix.arch, 'x86_64-windows')
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV

# ==============================
# Windows & Mac dependencies
# ==============================
- name: Install Protoc
if: contains(matrix.arch, 'darwin') || contains(matrix.arch, 'windows')
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

# ==============================
# Builds
# ==============================
Expand Down
68 changes: 2 additions & 66 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ jobs:
- name: Get latest version of stable Rust
if: env.SELF_HOSTED_RUNNERS == false
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install Foundry (anvil)
uses: foundry-rs/foundry-toolchain@v1
- name: Run tests in release
Expand All @@ -83,7 +79,7 @@ jobs:
node-version: '14'
- name: Install windows build tools
run: |
choco install python protoc visualstudio2019-workload-vctools -y
choco install python visualstudio2019-workload-vctools -y
npm config set msvs_version 2019
- name: Install Foundry (anvil)
uses: foundry-rs/foundry-toolchain@v1
Expand All @@ -108,10 +104,6 @@ jobs:
- name: Get latest version of stable Rust
if: env.SELF_HOSTED_RUNNERS == false
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run beacon_chain tests for all known forks
run: make test-beacon-chain
op-pool-tests:
Expand All @@ -122,10 +114,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run operation_pool tests for all known forks
run: make test-op-pool
slasher-tests:
Expand All @@ -148,10 +136,6 @@ jobs:
- name: Get latest version of stable Rust
if: env.SELF_HOSTED_RUNNERS == false
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install Foundry (anvil)
uses: foundry-rs/foundry-toolchain@v1
- name: Run tests in debug
Expand All @@ -164,10 +148,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run state_transition_vectors in release.
run: make run-state-transition-tests
ef-tests-ubuntu:
Expand All @@ -180,10 +160,6 @@ jobs:
- name: Get latest version of stable Rust
if: env.SELF_HOSTED_RUNNERS == false
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run consensus-spec-tests with blst, milagro and fake_crypto
run: make test-ef
dockerfile-ubuntu:
Expand All @@ -206,10 +182,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install Foundry (anvil)
uses: foundry-rs/foundry-toolchain@v1
- name: Run the beacon chain sim that starts from an eth1 contract
Expand All @@ -222,10 +194,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install Foundry (anvil)
uses: foundry-rs/foundry-toolchain@v1
- name: Run the beacon chain sim and go through the merge transition
Expand All @@ -238,10 +206,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run the beacon chain sim without an eth1 connection
run: cargo run --release --bin simulator no-eth1-sim
syncing-simulator-ubuntu:
Expand All @@ -252,10 +216,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install Foundry (anvil)
uses: foundry-rs/foundry-toolchain@v1
- name: Run the syncing simulator
Expand All @@ -268,10 +228,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install geth
run: |
sudo add-apt-repository -y ppa:ethereum/ethereum
Expand Down Expand Up @@ -303,10 +259,6 @@ jobs:
dotnet-version: '6.0.201'
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run exec engine integration tests in release
run: make test-exec-engine
check-benchmarks:
Expand All @@ -317,10 +269,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Typecheck benchmark code without running it
run: make check-benches
clippy:
Expand All @@ -331,10 +279,6 @@ jobs:
- uses: actions/checkout@v3
- name: Get latest version of stable Rust
run: rustup update stable
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Lint code for quality and style with Clippy
run: make lint
- name: Certify Cargo.lock freshness
Expand All @@ -347,10 +291,6 @@ jobs:
- uses: actions/checkout@v3
- name: Install Rust @ MSRV (${{ needs.extract-msrv.outputs.MSRV }})
run: rustup override set ${{ needs.extract-msrv.outputs.MSRV }}
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Run cargo check
run: cargo check --workspace
arbitrary-check:
Expand Down Expand Up @@ -389,10 +329,6 @@ jobs:
- uses: actions/checkout@v3
- name: Install Rust (${{ env.PINNED_NIGHTLY }})
run: rustup toolchain install $PINNED_NIGHTLY
- name: Install Protoc
uses: arduino/setup-protoc@e52d9eb8f7b63115df1ac544a1376fdbf5a39612
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install cargo-udeps
run: cargo install cargo-udeps --locked --force
- name: Create Cargo config dir
Expand All @@ -410,7 +346,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt install -y git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang protobuf-compiler
run: sudo apt install -y git gcc g++ make cmake pkg-config llvm-dev libclang-dev clang
- name: Use Rust beta
run: rustup override set beta
- name: Run make
Expand Down
Loading
Loading