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

Drew.merge upstream #9

Merged
merged 112 commits into from
Jun 23, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
f2c8b88
Fix typo: eror -> error (#6293)
subsocialdev Jun 8, 2020
cc5b3a6
Fix typo: PRORITY -> PRIORITY (#6291)
subsocialdev Jun 8, 2020
e287915
Intent to release rc3 (#6290)
gnunicorn Jun 8, 2020
85cd556
Fix transaction pool & network issues (#6288)
NikVolf Jun 8, 2020
863611e
Use `sign_with` for signing grandpa's outgoing message (#6178)
rakanalh Jun 9, 2020
a8bf260
Revalidation tweak & logging for transaction pool (#6258)
NikVolf Jun 9, 2020
feb334d
Update README.md
gavofyork Jun 9, 2020
1853b9a
Allow adding a prefix to the informant (#6174)
cecton Jun 9, 2020
65fe00b
Transaction pool added missed comment (#6308)
bkchr Jun 9, 2020
a3a5160
Add a test for lots of nodes connecting at the same time (#6247)
tomaka Jun 9, 2020
4b1d862
Introduce frozen indices. (#6307)
gavofyork Jun 9, 2020
6c01b10
new crate sc-light (#6235)
seunlanlege Jun 9, 2020
9c39e2c
Fix ui tests for latest rust stable (#6310)
bkchr Jun 9, 2020
b1038c8
Expose light client. (#6313)
dvc94ch Jun 10, 2020
571cfc1
Fix nits in rpc error display. (#6302)
seerscode Jun 10, 2020
e2a6c3e
"OR gate" for EnsureOrigin (#6237)
shaunxw Jun 10, 2020
69034ef
New CI image (#6223)
TriplEight Jun 10, 2020
a684e83
Add a feature to create automatically a random temporary directory fo…
cecton Jun 10, 2020
f06d5f0
Add a [prefix]_process_start_time_seconds metric (#6315)
tomaka Jun 10, 2020
8aeda51
Make NumberOrHex a common primitive. (#6321)
pepyakin Jun 10, 2020
70cfeff
Avoid self-lookups in Authority Discovery (#6317)
romanb Jun 10, 2020
606c56d
Fix quadratic iterations in transaction pool ready set (#6256)
NikVolf Jun 10, 2020
164fb3b
Find the alive incoming entry on disconnect. (#6320)
romanb Jun 11, 2020
99708c0
Impl Debug and Display for Ss58AddressFormat when compiled with std (…
cecton Jun 11, 2020
0a169d4
transaction-pool: expose blocking api for tx submission (#6325)
andresilva Jun 11, 2020
f893506
Pruned and resubmitted metrics in transaction pool (#6322)
NikVolf Jun 11, 2020
4bd0785
Enable wasmtime on node-template (#6336)
shawntabrizi Jun 11, 2020
75113aa
Adds support for storage parameter types (#6296)
bkchr Jun 11, 2020
883c89a
Basic documentation for Scheduler pallet (#6338)
danforbes Jun 12, 2020
6b45e24
Fix check-line-width CI script (#6326)
athei Jun 12, 2020
0dc6634
client: use appropriate ExecutionContext for initial sync / regular i…
andresilva Jun 12, 2020
384be7e
Fix transaction pool event sending (#6341)
bkchr Jun 12, 2020
afdf5ef
Deprecate FunctionOf and remove its users (#6340)
athei Jun 12, 2020
d735e4d
Add events for balance reserve and unreserve functions (#6330)
joepetrowski Jun 12, 2020
1a31f43
Update contributing guide with new label policy (#6333)
apopiak Jun 13, 2020
7401153
adding a ss58 format for Stafi Network (#6347)
Tore19 Jun 14, 2020
f837c39
add extend_lock for StorageLock (#6323)
wangjj9219 Jun 15, 2020
0db70ea
Introduce in-origin filtering (#6318)
gui1117 Jun 15, 2020
4368fc6
pallet-evm add get(fn) to AccountStorages (#6279)
tgmichel Jun 15, 2020
6907018
Add IPC support (#6348)
Demi-Marie Jun 16, 2020
9e999b2
expose constants of pallet_recovery trait (#6363)
wangjj9219 Jun 16, 2020
b29e467
Impl integrity test for runtime (#6356)
gui1117 Jun 16, 2020
1095920
historical slashing w ocw w adhoc tree creation (#6220)
drahnr Jun 16, 2020
1f536e9
[CI] Auto-label new PRs according to draft status (#6361)
s3krit Jun 16, 2020
6199d86
Split the service initialisation up into seperate functions (#6332)
expenses Jun 16, 2020
54d1c5c
[CI] Add label enforcement (#6365)
s3krit Jun 16, 2020
24cbfc4
vesting: Force Vested Transfer (#6368)
gavofyork Jun 16, 2020
288ead0
client/authority-discovery: Don't add own address to priority group (…
mxinden Jun 16, 2020
74efab4
.gitlab-ci.yml: Run promtool on Prometheus alerting rules (#6344)
mxinden Jun 16, 2020
1823782
Use /dns/ instead of /dns4/ (#6369)
tomaka Jun 16, 2020
02e77d2
add system_dryRun (#6300)
xlc Jun 16, 2020
db8916a
fix BlockAttributes encoding (#6281)
svyatonik Jun 16, 2020
bdae39f
Allow Sudo to do anything (#6375)
gavofyork Jun 17, 2020
17be6fd
Stored call in multisig (#6319)
gavofyork Jun 17, 2020
0c42ced
Fix the broken weight multiplier update function (#6334)
kianenigma Jun 17, 2020
8e1f753
Restrict remove_proxies (#6383)
gavofyork Jun 18, 2020
a2653e8
Remove penalty on duplicate Status message (#6377)
tomaka Jun 18, 2020
d6d688c
`decl_module!` print better error on duplicate reserved keyword (#6384)
bkchr Jun 18, 2020
f8afa52
FixedPointNumber: zero is not positive. (#6385)
shaunxw Jun 18, 2020
b02101e
Allow empty values in the storage (#6364)
arkpar Jun 18, 2020
bd72cb6
Pallet: Atomic Swap (#6349)
sorpaas Jun 18, 2020
81ba3e2
Runtime interface to add support for tracing from wasm (#6381)
mattrutherford Jun 18, 2020
9a5892e
Block packet size limit
arkpar Jun 18, 2020
0bb3001
Revert "Block packet size limit"
arkpar Jun 18, 2020
9402334
Update s3 artifact url (#6399)
ddorgan Jun 18, 2020
44978b9
Increase network buffer sizes even more (#6080)
tomaka Jun 18, 2020
cb83391
Remove pallet-balances from non-dev-deps (#6407)
gnunicorn Jun 18, 2020
9b08492
Babe VRF Signing in keystore (#6225)
rakanalh Jun 18, 2020
caf9fbe
Update `libp2p-ping`. (#6412)
twittner Jun 18, 2020
7a4bd76
Remove --legacy-network-protocol CLI flag (#6411)
tomaka Jun 18, 2020
4f0b601
Scale and increase validator count (#6417)
gavofyork Jun 19, 2020
369f9fc
Expose constants from Proxy Pallet (#6420)
shawntabrizi Jun 19, 2020
31c3e06
.maintain/monitoring: Add alerting rule tests (#6343)
mxinden Jun 19, 2020
31af203
[CI] Label PRs if polkadot companion build fails (#6410)
s3krit Jun 19, 2020
3ca1d91
Print bad mandatory error (#6416)
bkchr Jun 19, 2020
9758376
Track last blocks in informant display (#6429)
bkchr Jun 19, 2020
2bb79cb
Simple Docs for Atomic Swap Pallet (#6434)
danforbes Jun 19, 2020
a2c493d
More descriptive error message when invalid slot duration is used (#6…
cecton Jun 19, 2020
d343bfc
Root origin use no filter by default. Scheduler and Democracy dispatc…
gui1117 Jun 19, 2020
111b628
llow decl-module to have a where clause with trailing comma (#6431)
gui1117 Jun 19, 2020
18707b3
.gitlab-ci.yml: Use promtool from paritytech/tools:latest image (#6425)
mxinden Jun 19, 2020
26aec42
Update sync chain info on own block import (#6424)
bkchr Jun 19, 2020
4c67aee
client/authority-discovery: Compare PeerIds and not Multihashes (#6414)
mxinden Jun 19, 2020
c8c16d1
add network propagated metrics (#6438)
NikVolf Jun 19, 2020
f9d4d30
change (ci): add interruptible to kubernetes jobs (#6441)
TriplEight Jun 19, 2020
9cbda1e
Avoid multisig reentrancy (#6445)
gavofyork Jun 19, 2020
d0ab405
Validate encoding of extrinsics passed to runtime (#6442)
arkpar Jun 19, 2020
8032321
Fix Babe secondary plain slots claiming (#6451)
bkchr Jun 19, 2020
1fae45f
sp-npos-elections should not depend on itself (#6444)
bkchr Jun 20, 2020
6c16d15
Don't autolabel insubstantial PRs 'pleasereview' (#6447)
s3krit Jun 20, 2020
ef2a6c1
change everything to transaction (#6440)
NikVolf Jun 21, 2020
41970e7
node: spawn block authoring and grandpa voter as blocking tasks (#6446)
andresilva Jun 21, 2020
a5bcfed
pallet-atomic-swap: generialized swap action (#6421)
sorpaas Jun 21, 2020
6f86bdd
Fix issues with `Operational` transactions validity and prioritizatio…
tomusdrw Jun 21, 2020
3bf25c2
`pallet-staking`: Expose missing consts (#6456)
bkchr Jun 22, 2020
8329dbd
update collective events docs to be consistent with changes (#6463)
apopiak Jun 22, 2020
94b3812
[CI] Don't tag PRs on companion job cancels (#6470)
s3krit Jun 22, 2020
50eb257
network: remove unused variable (#6460)
andresilva Jun 22, 2020
19826b9
Avoid panic on dropping a `sc_network::service::out_events::Receiver`…
romanb Jun 23, 2020
5a102f7
Implement nested storage transactions (#6269)
athei Jun 23, 2020
fed834c
Optimize offchain worker api by re-using http-client (#6454)
pscott Jun 23, 2020
cf7432a
Remove lingering runtime upgrades (#6476)
shawntabrizi Jun 23, 2020
6221146
impl Debug for sc_service::Configuration (#6400)
cecton Jun 23, 2020
c771821
Fix `sp-api` handling of multiple arguments (#6484)
bkchr Jun 23, 2020
ad7b5ef
Fix the browser node and ensure it doesn't colour the informant outpu…
expenses Jun 23, 2020
8baaa18
bound some missing bound for elevated trait (#6487)
gui1117 Jun 23, 2020
034055a
`pallet-scheduler`: Check that `when` is not in the past (#6480)
bkchr Jun 23, 2020
4c03656
client/network/service: Add primary dimension to connection metrics (…
mxinden Jun 23, 2020
d59281f
Ensure the listen addresses are consistent with the transport (#6436)
cecton Jun 23, 2020
9a9b248
pallet-contracts: migrate to nested storage transaction mechanism (#6…
pepyakin Jun 23, 2020
b1ba3a4
Update lock
drewstone Jun 23, 2020
11682ef
Another upstream merge
drewstone Jun 23, 2020
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
Update contributing guide with new label policy (paritytech#6333)
* mention C and M labels in contributing guide

* update PR template with more specific instructions

* update PR template with updated label rules and contributing guide link

* update contibuting guide
  • Loading branch information
apopiak authored Jun 13, 2020
commit 1a31f4319ef4938dc121e7b7e4e9ca73bd875249
35 changes: 28 additions & 7 deletions docs/CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,30 @@ There are a few basic ground-rules for contributors (including the maintainer(s)

== Merge Process

Merging pull requests once CI is successful:
*In General*

. A PR needs to be reviewed and approved by project maintainers unless:
- it does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged https://github.com/paritytech/substrate/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3AA2-insubstantial[`insubstantial`] and merged by its author once CI is complete.
- it is an urgent fix with no large change to logic, then it may be merged after a non-author contributor has approved the review once CI is complete.
A PR needs to be reviewed and approved by project maintainers unless:

- it does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged https://github.com/paritytech/substrate/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+label%3AA2-insubstantial[`insubstantial`] and merged by its author once CI is complete.
- it is an urgent fix with no large change to logic, then it may be merged after a non-author contributor has approved the review once CI is complete.

*Labels TLDR:*

- `A-*` Pull request status. ONE REQUIRED.
- `B-*` Changelog and/or Runtime-upgrade post composition markers. ONE REQUIRED. (used by automation)
- `C-*` Release notes release-priority markers. EXACTLY ONE REQUIRED. (used by automation)
- `D-*` More general tags on the PR denoting various implications and requirements.

*Process:*

. Please tag each PR with exactly one `A`, `B` and `C` label at the minimum.
. Once a PR is ready for review please add the https://github.com/paritytech/substrate/pulls?q=is%3Apr+is%3Aopen+label%3AA0-pleasereview[`A0-pleasereview`] label. Generally PRs should sit with this label for 48 hours in order to garner feedback. It may be merged before if all relevant parties had a look at it.
. If the first review is not an approval, swap `A0-pleasereview` to any label `[A3, A7]` to indicate that the PR has received some feedback, but needs further work. For example. https://github.com/paritytech/substrate/labels/A3-inprogress[`A3-inprogress`] is a general indicator that the PR is work in progress and https://github.com/paritytech/substrate/labels/A4-gotissues[`A4-gotissues`] means that it has significant problems that need fixing. Once the work is done, change the label back to `A0-pleasereview`. You might end up swapping a few times back and forth to climb up the A label group. Once a PR is https://github.com/paritytech/substrate/labels/A8-mergeoncegreen[`A8-mergeoncegreen`], it is ready to merge.
. PRs must be tagged with respect to _release notes_ with https://github.com/paritytech/substrate/labels/B0-silent[`B0-silent`] and `B1-..`. The former indicates that no changes should be mentioned in any release notes. The latter indicates that the changes should be reported in the corresponding release note
. PRs that break the external API must be tagged with https://github.com/paritytech/substrate/labels/B2-breaksapi[`B2-breaksapi`], when it changes the FRAME or consensus of running system with https://github.com/paritytech/substrate/labels/B3-breaksconsensus[`B3-breaksconsensus`]
. No PR should be merged until all reviews' comments are addressed.
. PRs that break the external API must be tagged with https://github.com/paritytech/substrate/labels/B2-breaksapi[`B2-breaksapi`], when it changes the FRAME or consensus of running system with https://github.com/paritytech/substrate/labels/B3-breaksconsensus[`B3-breaksconsensus`].
. PRs should be labeled with their release importance via the `C1-C9`.
. PRs should be categorized into projects.
. No PR should be merged until all reviews' comments are addressed and CI is successful.

*Reviewing pull requests*:

Expand All @@ -49,7 +62,7 @@ When reviewing a pull request, the end-goal is to suggest useful changes to the

=== Updating Polkadot as well

**All pull requests will be checked agains either Polkadot master, or your provided Polkadot companion PR**. That is, If your PR changes the external APIs or interfaces used by Polkadot. If you tagged the PR with `breaksapi` or `breaksconsensus` this is most certainly the case, in all other cases check for it by running step 1 below.
**All pull requests will be checked against either Polkadot master, or your provided Polkadot companion PR**. That is, If your PR changes the external APIs or interfaces used by Polkadot. If you tagged the PR with `breaksapi` or `breaksconsensus` this is most certainly the case, in all other cases check for it by running step 1 below.

To create a Polkadot companion PR:

Expand All @@ -69,6 +82,14 @@ As there might be multiple pending PRs that might conflict with one another, a)

We use https://github.com/paritytech/substrate/labels[labels] to manage PRs and issues and communicate state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in https://github.com/paritytech/substrate/milestones[milestones]. Best way to get started is to a pick a ticket from the current milestone tagged https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AQ2-easy[`easy`] or https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AQ3-medium[`medium`] and get going or https://github.com/paritytech/substrate/issues?q=is%3Aissue+is%3Aopen+label%3AX1-mentor[`mentor`] and get in contact with the mentor offering their support on that larger task.

== Issues
Please label issues with the following labels:

. `I-*` Issue severity and type. EXACTLY ONE REQUIRED.
. `P-*` Issue priority. AT MOST ONE ALLOWED.
. `Q-*` Issue difficulty. AT MOST ONE ALLOWED.
. `Z-*` More general tags on the issue, denoting context and resolution.

== Releases

Declaring formal releases remains the prerogative of the project maintainer(s).
Expand Down
13 changes: 10 additions & 3 deletions docs/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,24 @@ Before you submitting, please check that:
- What does it do?
- What important points reviewers should know?
- Is there something left for follow-up PRs?
- [ ] You labeled the PR with appropriate labels if you have permissions to do so.
- [ ] You labeled the PR appropriately if you have permissions to do so:
- [ ] `A*` for PR status (**one required**)
- [ ] `B*` for changelog (**one required**)
- [ ] `C*` for release notes (**exactly one required**)
- [ ] `D*` for various implications/requirements
- [ ] Github's project assignment
- [ ] You mentioned a related issue if this PR related to it, e.g. `Fixes #228` or `Related #1337`.
- [ ] You asked any particular reviewers to review. If you aren't sure, start with GH suggestions.
- [ ] Your PR adheres [the style guide](https://wiki.parity.io/Substrate-Style-Guide)
- In particular, mind the maximal line length.
- [ ] Your PR adheres to [the style guide](https://wiki.parity.io/Substrate-Style-Guide)
- In particular, mind the maximal line length of 100 (120 in exceptional circumstances).
- There is no commented code checked in unless necessary.
- Any panickers have a proof or removed.
- [ ] You bumped the runtime version if there are breaking changes in the **runtime**.
- [ ] You updated any rustdocs which may have changed
- [ ] Has the PR altered the external API or interfaces used by Polkadot? Do you have the corresponding Polkadot PR ready?

Refer to [the contributing guide](https://github.com/paritytech/substrate/blob/master/docs/CONTRIBUTING.adoc) for details.

After you've read this notice feel free to remove it.
Thank you!

Expand Down