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

companion for #12212 #6162

Merged
merged 7 commits into from
Oct 18, 2022
Merged

companion for #12212 #6162

merged 7 commits into from
Oct 18, 2022

Conversation

niklasad1
Copy link
Member

@github-actions github-actions bot added the A0-please_review Pull request needs code review. label Oct 18, 2022
@niklasad1 niklasad1 mentioned this pull request Oct 18, 2022
Merged
@niklasad1 niklasad1 added B0-silent Changes should not be mentioned in any release notes A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. C1-low PR touches the given topic and has a low impact on builders. labels Oct 18, 2022
ruseinov
ruseinov approved these changes Oct 18, 2022
View reviewed changes
Copy link
Contributor

@ruseinov ruseinov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, signatures a bit long now

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Command 'Command { std: "cargo" "update" "-v" "-p" "pallet-bags-list:4.0.0-dev" "-p" "pallet-authorship:4.0.0-dev" "-p" "sp-mmr-primitives:4.0.0-dev" "-p" "pallet-preimage:4.0.0-dev" "-p" "sc-cli:0.10.0-dev" "-p" "sp-database:4.0.0-dev" "-p" "sc-network-bitswap:0.10.0-dev" "-p" "pallet-membership:4.0.0-dev" "-p" "frame-benchmarking-cli:4.0.0-dev" "-p" "sc-sync-state-rpc:0.10.0-dev" "-p" "pallet-balances:4.0.0-dev" "-p" "beefy-merkle-tree:4.0.0-dev" "-p" "substrate-prometheus-endpoint:0.10.0-dev" "-p" "sp-version-proc-macro:4.0.0-dev" "-p" "pallet-authority-discovery:4.0.0-dev" "-p" "pallet-bags-list-remote-tests:4.0.0-dev" "-p" "pallet-utility:4.0.0-dev" "-p" "sc-executor-wasmtime:0.10.0-dev" "-p" "sc-consensus-epochs:0.10.0-dev" "-p" "frame-benchmarking:4.0.0-dev" "-p" "sc-tracing-proc-macro:4.0.0-dev" "-p" "sp-std:4.0.0" "-p" "frame-support-procedural-tools-derive:3.0.0" "-p" "pallet-recovery:4.0.0-dev" "-p" "sp-runtime-interface-proc-macro:5.0.0" "-p" "sc-network-light:0.10.0-dev" "-p" "sc-executor-wasmi:0.10.0-dev" "-p" "frame-system:4.0.0-dev" "-p" "sp-core:6.0.0" "-p" "pallet-whitelist:4.0.0-dev" "-p" "pallet-offences:4.0.0-dev" "-p" "pallet-im-online:4.0.0-dev" "-p" "sc-executor:0.10.0-dev" "-p" "sc-executor-common:0.10.0-dev" "-p" "sc-finality-grandpa-rpc:0.10.0-dev" "-p" "sp-rpc:6.0.0" "-p" "sp-storage:6.0.0" "-p" "sp-offchain:4.0.0-dev" "-p" "substrate-test-utils:4.0.0-dev" "-p" "pallet-mmr-rpc:3.0.0" "-p" "sp-authorship:4.0.0-dev" "-p" "pallet-vesting:4.0.0-dev" "-p" "sp-inherents:4.0.0-dev" "-p" "frame-election-provider-support:4.0.0-dev" "-p" "pallet-session-benchmarking:4.0.0-dev" "-p" "sp-debug-derive:4.0.0" "-p" "sp-io:6.0.0" "-p" "sp-staking:4.0.0-dev" "-p" "sc-offchain:4.0.0-dev" "-p" "sp-session:4.0.0-dev" "-p" "substrate-build-script-utils:3.0.0" "-p" "pallet-election-provider-multi-phase:4.0.0-dev" "-p" "frame-support-test:3.0.0" "-p" "sc-client-api:4.0.0-dev" "-p" "substrate-test-utils-derive:0.10.0-dev" "-p" "sp-runtime:6.0.0" "-p" "substrate-state-trie-migration-rpc:4.0.0-dev" "-p" "sc-chain-spec:4.0.0-dev" "-p" "sc-authority-discovery:0.10.0-dev" "-p" "sp-panic-handler:4.0.0" "-p" "substrate-frame-rpc-system:4.0.0-dev" "-p" "frame-support-procedural:4.0.0-dev" "-p" "pallet-grandpa:4.0.0-dev" "-p" "sc-allocator:4.1.0-dev" "-p" "pallet-multisig:4.0.0-dev" "-p" "pallet-beefy-mmr:4.0.0-dev" "-p" "sc-network-gossip:0.10.0-dev" "-p" "substrate-rpc-client:0.10.0-dev" "-p" "fork-tree:3.0.0" "-p" "pallet-proxy:4.0.0-dev" "-p" "sc-tracing:4.0.0-dev" "-p" "pallet-staking-reward-curve:4.0.0-dev" "-p" "pallet-tips:4.0.0-dev" "-p" "sc-proposer-metrics:0.10.0-dev" "-p" "pallet-offences-benchmarking:4.0.0-dev" "-p" "sp-consensus-babe:0.10.0-dev" "-p" "frame-election-provider-solution-type:4.0.0-dev" "-p" "sc-rpc:4.0.0-dev" "-p" "sp-consensus-slots:0.10.0-dev" "-p" "sp-tasks:4.0.0-dev" "-p" "remote-externalities:0.10.0-dev" "-p" "sc-basic-authorship:0.10.0-dev" "-p" "sp-maybe-compressed-blob:4.1.0-dev" "-p" "sp-api:4.0.0-dev" "-p" "sc-sysinfo:6.0.0-dev" "-p" "frame-support-test-pallet:4.0.0-dev" "-p" "sc-network-sync:0.10.0-dev" "-p" "sp-sandbox:0.10.0-dev" "-p" "sp-keystore:0.12.0" "-p" "sc-consensus-slots:0.10.0-dev" "-p" "sp-application-crypto:6.0.0" "-p" "sp-version:5.0.0" "-p" "beefy-primitives:4.0.0-dev" "-p" "pallet-referenda:4.0.0-dev" "-p" "pallet-session:4.0.0-dev" "-p" "sp-finality-grandpa:4.0.0-dev" "-p" "pallet-timestamp:4.0.0-dev" "-p" "sp-trie:6.0.0" "-p" "sc-state-db:0.10.0-dev" "-p" "beefy-gadget-rpc:4.0.0-dev" "-p" "pallet-collective:4.0.0-dev" "-p" "frame-system-rpc-runtime-api:4.0.0-dev" "-p" "pallet-democracy:4.0.0-dev" "-p" "pallet-gilt:4.0.0-dev" "-p" "pallet-transaction-payment:4.0.0-dev" "-p" "sc-client-db:0.10.0-dev" "-p" "sc-keystore:4.0.0-dev" "-p" "sc-transaction-pool:4.0.0-dev" "-p" "sp-timestamp:4.0.0-dev" "-p" "sc-peerset:4.0.0-dev" "-p" "sc-rpc-server:4.0.0-dev" "-p" "pallet-elections-phragmen:5.0.0-dev" "-p" "pallet-transaction-payment-rpc:4.0.0-dev" "-p" "sc-network-common:0.10.0-dev" "-p" "pallet-fast-unstake:4.0.0-dev" "-p" "sc-network-transactions:0.10.0-dev" "-p" "sp-tracing:5.0.0" "-p" "sc-utils:4.0.0-dev" "-p" "pallet-conviction-voting:4.0.0-dev" "-p" "pallet-staking-reward-fn:4.0.0-dev" "-p" "sp-block-builder:4.0.0-dev" "-p" "sp-npos-elections:4.0.0-dev" "-p" "pallet-indices:4.0.0-dev" "-p" "sc-network:0.10.0-dev" "-p" "sc-transaction-pool-api:4.0.0-dev" "-p" "substrate-wasm-builder:5.0.0-dev" "-p" "sp-consensus:0.10.0-dev" "-p" "sp-transaction-storage-proof:4.0.0-dev" "-p" "pallet-beefy:4.0.0-dev" "-p" "sc-rpc-api:0.10.0-dev" "-p" "sc-chain-spec-derive:4.0.0-dev" "-p" "sp-arithmetic:5.0.0" "-p" "sp-state-machine:0.12.0" "-p" "pallet-treasury:4.0.0-dev" "-p" "pallet-assets:4.0.0-dev" "-p" "sc-consensus:0.10.0-dev" "-p" "pallet-nomination-pools-runtime-api:1.0.0-dev" "-p" "pallet-staking:4.0.0-dev" "-p" "pallet-nomination-pools-benchmarking:1.0.0" "-p" "pallet-transaction-payment-rpc-runtime-api:4.0.0-dev" "-p" "frame-system-benchmarking:4.0.0-dev" "-p" "beefy-gadget:4.0.0-dev" "-p" "substrate-test-client:2.0.1" "-p" "sc-rpc-spec-v2:0.10.0-dev" "-p" "pallet-nomination-pools:1.0.0" "-p" "frame-executive:4.0.0-dev" "-p" "pallet-sudo:4.0.0-dev" "-p" "try-runtime-cli:0.10.0-dev" "-p" "pallet-scheduler:4.0.0-dev" "-p" "sp-api-proc-macro:4.0.0-dev" "-p" "sc-consensus-babe-rpc:0.10.0-dev" "-p" "sp-blockchain:4.0.0-dev" "-p" "frame-support:4.0.0-dev" "-p" "frame-try-runtime:0.10.0-dev" "-p" "sc-block-builder:0.10.0-dev" "-p" "sc-finality-grandpa:0.10.0-dev" "-p" "sp-authority-discovery:4.0.0-dev" "-p" "sp-externalities:0.12.0" "-p" "sc-consensus-babe:0.10.0-dev" "-p" "frame-support-procedural-tools:4.0.0-dev" "-p" "pallet-child-bounties:4.0.0-dev" "-p" "generate-bags:4.0.0-dev" "-p" "sc-service:0.10.0-dev" "-p" "pallet-ranked-collective:4.0.0-dev" "-p" "sp-keyring:6.0.0" "-p" "pallet-identity:4.0.0-dev" "-p" "pallet-society:4.0.0-dev" "-p" "sc-informant:0.10.0-dev" "-p" "sp-consensus-vrf:0.10.0-dev" "-p" "pallet-bounties:4.0.0-dev" "-p" "sp-runtime-interface:6.0.0" "-p" "sp-transaction-pool:4.0.0-dev" "-p" "sp-wasm-interface:6.0.0" "-p" "pallet-babe:4.0.0-dev" "-p" "pallet-mmr:4.0.0-dev" "-p" "sc-telemetry:4.0.0-dev" "-p" "sp-core-hashing:4.0.0" "-p" "sp-core-hashing-proc-macro:5.0.0" "-p" "pallet-election-provider-support-benchmarking:4.0.0-dev" "-p" "sp-weights:4.0.0", kill_on_drop: false }' failed with status Some(101); output: error: There are multiple sp-database packages in your project, and the specification sp-database:4.0.0-dev is ambiguous.
Please re-run this command with -p <spec> where <spec> is one of the following:
https://github.com/paritytech/substrate#sp-database:4.0.0-dev
https://github.com/paritytech/substrate#sp-database:4.0.0-dev

@niklasad1
Copy link
Member Author

niklasad1 commented Oct 18, 2022 •
edited
Loading

bot merge

@niklasad1 niklasad1 merged commit f1e36fe into master Oct 18, 2022
@niklasad1 niklasad1 deleted the na-comp-substrate-rpc-client branch October 18, 2022 18:09
ordian added a commit that referenced this pull request Oct 21, 2022
@ordian
Merge branch 'master' into giles-common-version
ecd7b49 
* master: (21 commits)
  try and fix build (#6170)
  Companion for EPM duplicate submissions (#6115)
  Bump docker/setup-buildx-action from 2.0.0 to 2.1.0 (#6141)
  companion for #12212 (#6162)
  Bump substrate (#6164)
  BlockId removal: refactor: StorageProvider (#6160)
  availability-recovery: use `IfDisconnected::TryConnect` for chunks (#6081)
  Update clap to version 4 (#6128)
  Add `force_open_hrmp_channel` Call (#6155)
  Fix fuzzing builds xcm-fuzz and erasure-coding fuzzer (#6153)
  BlockId removal refactor: Backend::state_at (#6149)
  First round of implementers guide fixes (#6146)
  bump zombienet version (#6142)
  lingua.dic is not managed by CI team (#6148)
  pallet-mmr: RPC and Runtime APIs work with block numbers (#6072)
  Separate preparation timeouts for PVF prechecking and execution (#6139)
  Malus: add disputed block percentage (#6100)
  refactor grid topology to expose more info to subsystems (#6140)
  Manual Para Lock (#5451)
  Expose node subcommands in Malus CLI (#6135)
  ...
@Polkadot-Forum
Copy link

This pull request has been mentioned on Polkadot Forum. There might be relevant details there:

https://forum.polkadot.network/t/polkadot-release-analysis/1026/2

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ruseinov ruseinov ruseinov approved these changes

@kianenigma kianenigma kianenigma approved these changes

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@niklasad1 @Polkadot-Forum @ruseinov @kianenigma