Merge pull request sigp#3491 from divagant-martian/networking-version…

…-upgrades Upgrade libp2p to v0.47.0
divagant-martian · Sep 7, 2022 · d1a9635 · d1a9635
2 parents 166a3cd + 1e5694f
commit d1a9635
Show file tree

Hide file tree

Showing 26 changed files with 1,401 additions and 1,498 deletions.
diff --git a/.github/workflows/local-testnet.yml b/.github/workflows/local-testnet.yml
@@ -20,7 +20,8 @@ jobs:
 
       - name: Get latest version of stable Rust
         run: rustup update stable
-
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
       - name: Install ganache
         run: npm install ganache@latest --global
 

diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -50,6 +50,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Install ganache
       run: sudo npm install -g ganache
     - name: Run tests in release
@@ -68,7 +70,7 @@ jobs:
         node-version: '14'
     - name: Install windows build tools
       run: |
-        choco install python visualstudio2019-workload-vctools -y
+        choco install python protoc visualstudio2019-workload-vctools -y
         npm config set msvs_version 2019
     - name: Install ganache
       run: npm install -g ganache --loglevel verbose
@@ -90,6 +92,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Run beacon_chain tests for all known forks
       run: make test-beacon-chain
   op-pool-tests:
@@ -100,6 +104,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Run operation_pool tests for all known forks
       run: make test-op-pool
   slasher-tests:
@@ -120,6 +126,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Install ganache
       run: sudo npm install -g ganache
     - name: Run tests in debug
@@ -132,6 +140,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Run state_transition_vectors in release.
       run: make run-state-transition-tests
   ef-tests-ubuntu:
@@ -142,6 +152,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Run consensus-spec-tests with blst, milagro and fake_crypto
       run: make test-ef
   dockerfile-ubuntu:
@@ -164,6 +176,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Install ganache
       run: sudo npm install -g ganache
     - name: Run the beacon chain sim that starts from an eth1 contract
@@ -176,6 +190,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Install ganache
       run: sudo npm install -g ganache
     - name: Run the beacon chain sim and go through the merge transition
@@ -188,6 +204,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Install ganache
       run: sudo npm install -g ganache
     - name: Run the beacon chain sim without an eth1 connection
@@ -197,35 +215,39 @@ jobs:
     runs-on: ubuntu-latest
     needs: cargo-fmt
     steps:
-      - uses: actions/checkout@v1
-      - name: Get latest version of stable Rust
-        run: rustup update stable
-      - name: Install ganache
-        run: sudo npm install -g ganache
-      - name: Run the syncing simulator
-        run: cargo run --release --bin simulator syncing-sim
+    - uses: actions/checkout@v1
+    - name: Get latest version of stable Rust
+      run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+    - name: Install ganache
+      run: sudo npm install -g ganache
+    - name: Run the syncing simulator
+      run: cargo run --release --bin simulator syncing-sim
   doppelganger-protection-test:
-      name: doppelganger-protection-test
-      runs-on: ubuntu-latest
-      needs: cargo-fmt
-      steps:
-          - uses: actions/checkout@v1
-          - name: Get latest version of stable Rust
-            run: rustup update stable
-          - name: Install ganache
-            run: sudo npm install -g ganache
-          - name: Install lighthouse and lcli
-            run: |
-                make
-                make install-lcli
-          - name: Run the doppelganger protection success test script
-            run: |
-                cd scripts/tests
-                ./doppelganger_protection.sh success
-          - name: Run the doppelganger protection failure test script
-            run: |
-                cd scripts/tests
-                ./doppelganger_protection.sh failure
+    name: doppelganger-protection-test
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Get latest version of stable Rust
+      run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
+    - name: Install ganache
+      run: sudo npm install -g ganache
+    - name: Install lighthouse and lcli
+      run: |
+          make
+          make install-lcli
+    - name: Run the doppelganger protection success test script
+      run: |
+          cd scripts/tests
+          ./doppelganger_protection.sh success
+    - name: Run the doppelganger protection failure test script
+      run: |
+          cd scripts/tests
+          ./doppelganger_protection.sh failure
   execution-engine-integration-ubuntu:
     name: execution-engine-integration-ubuntu
     runs-on: ubuntu-latest
@@ -240,6 +262,8 @@ jobs:
         dotnet-version: '6.0.201'
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Run exec engine integration tests in release
       run: make test-exec-engine
   check-benchmarks:
@@ -250,6 +274,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Typecheck benchmark code without running it
       run: make check-benches
   check-consensus:
@@ -270,6 +296,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Get latest version of stable Rust
       run: rustup update stable
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Lint code for quality and style with Clippy
       run: make lint
     - name: Certify Cargo.lock freshness
@@ -289,6 +317,8 @@ jobs:
         git checkout 31a49666ccfcd7963b63345d6ce757c373f22c2a
         cargo build --release --bin cargo-clippy --bin clippy-driver
         cargo build --release --bin cargo-clippy --bin clippy-driver -Zunstable-options --out-dir $(rustc --print=sysroot)/bin
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Run Clippy with the disallowed-from-async lint
       run: make nightly-lint
   check-msrv:
@@ -299,6 +329,8 @@ jobs:
     - uses: actions/checkout@v1
     - 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@v1
     - name: Run cargo check
       run: cargo check --workspace
   arbitrary-check:
@@ -339,6 +371,8 @@ jobs:
       run: rustup toolchain install $PINNED_NIGHTLY
     # NOTE: cargo-udeps version is pinned until this issue is resolved:
     # https://github.com/est31/cargo-udeps/issues/135
+    - name: Install Protoc
+      uses: arduino/setup-protoc@v1
     - name: Install cargo-udeps
       run: cargo install cargo-udeps --locked --force --version 0.1.30
     - name: Create Cargo config dir