Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

[Substrate companion] update libp2p to 0.52.0 #7472

Merged
merged 23 commits into from
Jul 25, 2023
Merged

[Substrate companion] update libp2p to 0.52.0 #7472

merged 23 commits into from
Jul 25, 2023

Conversation

melekes
Copy link
Contributor

@melekes melekes commented Jul 6, 2023 •
edited by ordian
Loading

@melekes melekes mentioned this pull request Jul 6, 2023
Merged
@melekes melekes mentioned this pull request Jul 6, 2023
Merged
@melekes melekes requested a review from a team July 6, 2023 12:19
@melekes melekes added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Jul 6, 2023
@melekes
Copy link
Contributor Author

melekes commented Jul 10, 2023

bot rebase

@paritytech-processbot
Copy link

Rebased

@melekes
Copy link
Contributor Author

melekes commented Jul 17, 2023

bot rebase

@paritytech-processbot
Copy link

Rebased

@melekes
Copy link
Contributor Author

melekes commented Jul 18, 2023

bot rebase

@paritytech-processbot
Copy link

Rebased

@melekes
Copy link
Contributor Author

melekes commented Jul 19, 2023 •
edited
Loading 

[2023-07-19 06:52:13] error: failed to select a version for `sha2`.
[2023-07-19 06:52:13]     ... required by package `sp-core-hashing v9.0.0 (/builds/parity/mirrors/substrate/primitives/core/hashing)`
[2023-07-19 06:52:13]     ... which satisfies path dependency `sp-core-hashing` of package `sp-core v21.0.0 (/builds/parity/mirrors/substrate/primitives/core)`
[2023-07-19 06:52:13]     ... which satisfies path dependency `sp-core` of package `frame-benchmarking v4.0.0-dev (/builds/parity/mirrors/substrate/frame/benchmarking)`
[2023-07-19 06:52:13]     ... which satisfies path dependency `frame-benchmarking` of package `frame-benchmarking-cli v4.0.0-dev (/builds/parity/mirrors/substrate/utils/frame/benchmarking-cli)`
[2023-07-19 06:52:13]     ... which satisfies git dependency `frame-benchmarking-cli` (locked to 4.0.0-dev) of package `polkadot-cli v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot/cli)`
[2023-07-19 06:52:13]     ... which satisfies path dependency `polkadot-cli` (locked to 0.9.43) of package `polkadot v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot)`
[2023-07-19 06:52:13] versions that meet the requirements `^0.10.7` are: 0.10.7
[2023-07-19 06:52:13] 
[2023-07-19 06:52:13] all possible versions conflict with previously selected packages.
[2023-07-19 06:52:13] 
[2023-07-19 06:52:13]   previously selected package `sha2 v0.10.6`
[2023-07-19 06:52:13]     ... which satisfies dependency `sha2 = "^0.10.2"` (locked to 0.10.6) of package `tiny-bip39 v1.0.0`
[2023-07-19 06:52:13]     ... which satisfies dependency `tiny-bip39 = "^1.0.0"` (locked to 1.0.0) of package `sc-cli v0.10.0-dev (/builds/parity/mirrors/substrate/client/cli)`
[2023-07-19 06:52:13]     ... which satisfies path dependency `sc-cli` of package `frame-benchmarking-cli v4.0.0-dev (/builds/parity/mirrors/substrate/utils/frame/benchmarking-cli)`
[2023-07-19 06:52:13]     ... which satisfies git dependency `frame-benchmarking-cli` (locked to 4.0.0-dev) of package `polkadot-cli v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot/cli)`
[2023-07-19 06:52:13]     ... which satisfies path dependency `polkadot-cli` (locked to 0.9.43) of package `polkadot v0.9.43 (/builds/parity/mirrors/substrate/companions/polkadot)`

don't understand why cargo refuses to update sha2 to 0.10.7 😐

@melekes
update lru
4f11c42 
in attempt to compile polkadot
@altonen
Copy link
Contributor

altonen commented Jul 19, 2023

I get similar error but for smallvec

@dmitry-markin dmitry-markin requested a review from a team July 20, 2023 07:49
@melekes melekes added the D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. label Jul 20, 2023
@melekes
Copy link
Contributor Author

melekes commented Jul 25, 2023

bot rebase

@paritytech-processbot
Copy link

Rebased

@melekes
Copy link
Contributor Author

melekes commented Jul 25, 2023

bot rebase

@paritytech-processbot
Copy link

Rebased

@paritytech-cicd-pr
Copy link

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable
Logs: https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/3253611

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Head SHA changed from 44298df to f03120d

@melekes
Copy link
Contributor Author

melekes commented Jul 25, 2023

bot rebase

@paritytech-processbot
Copy link

Branch is already up-to-date

@ordian
Copy link
Member

ordian commented Jul 25, 2023

bot merge

@paritytech-processbot
Copy link

Error: Statuses failed for 44298df

@ordian
Copy link
Member

ordian commented Jul 25, 2023

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot paritytech-processbot bot merged commit 01fd49a into master Jul 25, 2023
4 checks passed
@paritytech-processbot paritytech-processbot bot deleted the anton/libp2p-0.52.0 branch July 25, 2023 14:25
vstakhov added a commit that referenced this pull request Aug 2, 2023
@vstakhov
Revert "[Substrate companion] update libp2p to 0.52.0 (#7472)"
c1a7d3f 
This reverts commit 01fd49a.
altonen added a commit that referenced this pull request Aug 6, 2023
@altonen
Revert "[Substrate companion] update libp2p to 0.52.0 (#7472)"
9ccf1ae 
This reverts commit 01fd49a.
paritytech-processbot bot pushed a commit that referenced this pull request Aug 16, 2023
@altonen
Revert "[Substrate companion] update libp2p to 0.52.0 (#7472)" (#7583)
39397a5 
* Revert "[Substrate companion] update libp2p to 0.52.0 (#7472)"

This reverts commit 01fd49a.

* Update dependencies

* update lockfile for {"substrate"}

---------

Co-authored-by: parity-processbot <>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@altonen altonen altonen approved these changes

@dmitry-markin dmitry-markin dmitry-markin approved these changes

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@melekes @altonen @paritytech-cicd-pr @ordian @dmitry-markin