Skip to content

Commit

Permalink
Merge #2921 #2931
Browse files Browse the repository at this point in the history
2921: feat: reduce cellbase maturity on staging spec r=quake,doitian a=keroro520



2931: chore: add pr template r=quake,zhangsoledad a=doitian

Copy from https://github.com/tikv/tikv/blob/master/.github/pull_request_template.md

<!--
Thank you for contributing to nervosnetwork/ckb!

If you haven't already, please read [CONTRIBUTING](https://github.com/nervosnetwork/ckb/blob/develop/CONTRIBUTING.md) document.

If you're unsure about anything, just ask; somebody should be along to answer within a day or two.

PR Title Format:
1. module [, module2, module3]: what's changed
2. *: what's changed
-->

### What is changed and how it works?

What's Changed: Add a template for new pull request.

### Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

- No code

Side effects

- N/A


Co-authored-by: keroro <keroroxx520@gmail.com>
Co-authored-by: ian <ian@nervos.org>
  • Loading branch information
3 people authored Aug 11, 2021
3 parents 39c5853 + c9e06d5 + 11dbbf2 commit 532128e
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 2 deletions.
49 changes: 49 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!--
Thank you for contributing to nervosnetwork/ckb!
If you haven't already, please read [CONTRIBUTING](https://github.com/nervosnetwork/ckb/blob/develop/CONTRIBUTING.md) document.
If you're unsure about anything, just ask; somebody should be along to answer within a day or two.
PR Title Format:
1. module [, module2, module3]: what's changed
2. *: what's changed
-->

### What problem does this PR solve?

Issue Number: close #xxx <!-- REMOVE this line if no issue to close -->

Problem Summary:

### What is changed and how it works?

Proposal: [xxx](url) <!-- REMOVE this line if not applicable -->

What's Changed:

### Related changes

- PR to update `owner/repo`:
- Need to cherry-pick to the release branch

### Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

- Unit test
- Integration test
- Manual test (add detailed scripts or steps below)
- No code (skip ci)

Side effects

- Performance regression
- Breaking backward compatibility

### Release note <!-- bugfixes or new feature need a release note -->

```release-note
Please add a release note.
If you don't think this PR needs a release note then fill it with None.
```
2 changes: 1 addition & 1 deletion docs/hashes.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ index = 1

# Spec: ckb_staging
[ckb_staging]
spec_hash = "0x2d96bd61335be33418befa47f1c5ead53a0546b57a6d79719f0f999fa954dde4"
spec_hash = "0x42710b7a9387d72ebf918042f497b6c29ce02da9037b5349f3a05c070864611e"
genesis = "0xbc081e6b2e31149c1dc39007f161ed0a0b63d5d30b3b771acc6a3b622133fcc0"
cellbase = "0x7295631c414e50a8d9bb73d9845231ac212d10404045c96de7f149ec874ac6b7"

Expand Down
2 changes: 1 addition & 1 deletion resource/specs/staging.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ lock.hash_type = "type"
initial_primary_epoch_reward = 1_917_808_21917808
secondary_epoch_reward = 613_698_63013698
max_block_cycles = 10_000_000_000
cellbase_maturity = 10
cellbase_maturity = 1
primary_epoch_reward_halving_interval = 8760
epoch_duration_target = 14400
genesis_epoch_length = 1000
Expand Down

0 comments on commit 532128e

Please sign in to comment.