Skip to content

Commit

Permalink
Merge pull request #326 from doitian/ckb2021-rfcs-revision
Browse files Browse the repository at this point in the history
ckb2021 rfcs revision
  • Loading branch information
janx authored Apr 11, 2022
2 parents 3a376af + e163453 commit ca26788
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0029"
Category: Consensus (Hard Fork)
Status: Draft
Category: Standards Track
Status: Proposal
Author: Ian Yang
Organization: Nervos Foundation
Created: 2021-02-03
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0030"
Category: Consensus (Soft Fork)
Status: Draft
Category: Standards Track
Status: Proposal
Author: Ian Yang
Organization: Nervos Foundation
Created: 2021-02-04
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0031"
Category: Consensus (Hard Fork)
Status: Draft
Category: Standards Track
Status: Proposal
Author: Ian Yang
Organization: Nervos Foundation
Created: 2021-02-07
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0032"
Category: Consensus (Hard Fork)
Status: Draft
Category: Standards Track
Status: Proposal
Author: Ian Yang
Organization: Nervos Foundation
Created: 2021-04-26
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0035"
Category: P2P Protocol
Status: Draft
Category: Standards Track
Status: Proposal
Author: Chao Luo, Ian Yang
Organization: Nervos Foundation
Created: 2021-07-01
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0035"
Category: P2P Protocol
Status: Draft
Category: Standards Track
Status: Proposal
Author: Chao Luo, Ian Yang
Organization: Nervos Foundation
Created: 2021-07-01
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Number: "0036"
Category: Consensus (Hard Fork)
Status: Draft
Category: Standards Track
Status: Proposal
Author: Ian Yang
Organization: Nervos Foundation
Created: 2021-02-07
Expand Down
2 changes: 1 addition & 1 deletion rfcs/0037-ckb2021/0037-ckb2021.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The mainnet upgrade is divided into three phases.

* **Stage 2 - Testnet Activation**: With the release of CKB 0.101.0, CKB2021 is set to activate on Aggron testnet on October 24th, 2021. Pudge is the successor guardian of the testnet after activation. Thank you Aggron, Ogre Magi! Look who's coming for dinner, Pudge!

* **Stage 3 - Mainnet Activation**: With the release of CKB 0.102.0, CKB2021 will be set to activate on Lina mainnet. The exact mainnet activation time will be determined after Stage 2 passed successfully. Mirana will be the successor guardian of CKB mainnet after activation. Thank you Lina, our flame burns brighter. The moon lights our way, Mirana!
* **Stage 3 - Mainnet Activation**: With the release of CKB 0.103.0, CKB2021 will be set to activate on Lina mainnet. The exact mainnet activation time will be determined after Stage 2 passed successfully. Mirana will be the successor guardian of CKB mainnet after activation. Thank you Lina, our flame burns brighter. The moon lights our way, Mirana!

## Upgrade Strategies

Expand Down

0 comments on commit ca26788

Please sign in to comment.