Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8dbeae7
runtime/vstaging: unapplied_slashes runtime API
ordian Feb 1, 2023
d3273d7
runtime/vstaging: key_ownership_proof runtime API
ordian Feb 2, 2023
8394592
runtime/ParachainHost: submit_report_dispute_lost
ordian Feb 2, 2023
d31edbb
fix key_ownership_proof API
ordian Feb 2, 2023
5808d0b
runtime: submit_report_dispute_lost runtime API
ordian Feb 3, 2023
78d9da0
nits
ordian Feb 3, 2023
7caf651
Update node/subsystem-types/src/messages.rs
ordian Feb 5, 2023
ab08d67
merge master and resolve ExecutorParams conflicts
ordian Feb 27, 2023
62e3831
revert unrelated fmt changes
ordian Feb 27, 2023
f2119e4
Merge branch 'master' into ao-past-session-slashing-runtime
ordian Mar 7, 2023
35d76d3
merge master, resolve conflicts, bump to v5
ordian Mar 16, 2023
a150569
Merge branch 'master' into ao-past-session-slashing-runtime
ordian Mar 21, 2023
fbc0e9d
Merge branch 'master' into ao-past-session-slashing-runtime
ordian Mar 23, 2023
2ba635b
Merge branch 'master' into ao-past-session-slashing-runtime
ordian Mar 29, 2023
ef78e51
post merge fixes
ordian Mar 29, 2023
4f660d1
Merge branch 'master' into ao-past-session-slashing-runtime
ordian Apr 12, 2023
a58b144
Merge branch 'master' into ao-past-session-slashing-runtime
ordian Apr 26, 2023
bce0379
fix compilation
ordian Apr 24, 2023
f45594d
Merge branch 'master' into ao-past-session-slashing-runtime
ordian May 23, 2023
9cb0723
Merge branch 'master' into ao-past-session-slashing-runtime
ordian May 24, 2023
1ae22c5
Merge branch 'master' into ao-past-session-slashing-runtime
ordian May 24, 2023
f2bcd9b
Merge branch 'master' into ao-past-session-slashing-runtime
ordian May 25, 2023
f621e4a
Merge branch 'master' into ao-past-session-slashing-runtime
ordian May 25, 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
Prev Previous commit
Next Next commit
Merge branch 'master' into ao-past-session-slashing-runtime
* master:
  kusama: enable dispute slashes (#5974)
  Introduce OpenGov into Polkadot (#6701)
  introduce new well known key (#6915)
  [CI] Add bootnode checking CI jobs (#6889)
  Bump parity-db (#6921)
  Handling timers for repeat dispute participation requests (#6901)
  [Companion #13634] keystore overhaul (iter2) (#6913)
  tweak some pattern matches to address a new clippy warning
  Bump ci-linux image for rust 1.68
  Revert "Update orchestra to the recent version (#6854)" (#6916)
  Deprecate Currency: Companion for #12951 (#6780)
  changelog: template fixup (#6907)
  [Companion #13615] Keystore overhaul (#6892)
  update weights (#6897)
  Fix approval voting test (#6898)
  parachains-runtime: Less cloning! (#6896)
  Testing Reversion Speed on Dispute Concluded Against (#6880)
  remove duplicated arm and fix version index (#6884)
  • Loading branch information
ordian committed Mar 21, 2023
commit a15056926587c06bc90516f720ea8decfef4aea4

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.