Skip to content

Commit 59116ae

Browse files
committed
Fix inconsistent naming in RFCs and update the status of some RFCs
1 parent bd5d3ff commit 59116ae

File tree

20 files changed

+86
-76
lines changed

20 files changed

+86
-76
lines changed

README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,28 @@ The maintainers of RFCs and the community will review the PR, and you should upd
7979
| [24](rfcs/0024-ckb-genesis-script-list) | [CKB Genesis Script List](rfcs/0024-ckb-genesis-script-list/0024-ckb-genesis-script-list.md) | Dylan Duan | Informational | Final
8080
| [25](rfcs/0025-simple-udt) | [Simple UDT](rfcs/0025-simple-udt/0025-simple-udt.md) | Xuejie Xiao | Standards Track | Proposal
8181
| [26](rfcs/0026-anyone-can-pay) | [Anyone-Can-Pay Lock](rfcs/0026-anyone-can-pay/0026-anyone-can-pay.md) | Xuejie Xiao | Standards Track | Proposal
82-
| [27](rfcs/0027-block-structure) | [CKB Block Structure](rfcs/0027-block-structure/0027-block-structure.md) | Ian Yang | Informational | Draft
83-
| [37](rfcs/0037-ckb2021) | [CKB Consensus Change (Edition CKB2021)](rfcs/0037-ckb2021/0037-ckb2021.md) | Ian Yang | Informational | Draft
82+
| [27](rfcs/0027-block-structure) | [CKB Block Structure](rfcs/0027-block-structure/0027-block-structure.md) | Ian Yang | Informational | Final
83+
| [28](rfcs/0028-change-since-relative-timestamp) | [Change Since Relative Timestamp](rfcs/0028-change-since-relative-timestamp/0028-change-since-relative-timestamp.md) | Ian Yang | Standards Track | Active
84+
| [29](rfcs/0029-allow-script-multiple-matches-on-identical-code) | [Allow Multiple Cell Dep Matches](rfcs/0029-allow-script-multiple-matches-on-identical-code/0029-allow-script-multiple-matches-on-identical-code.md) | Ian Yang | Standards Track | Active
85+
| [30](rfcs/0030-ensure-index-less-than-length-in-since) | [Ensure That Index Is Less Than Length In the Input Since Field](rfcs/0030-ensure-index-less-than-length-in-since/0030-ensure-index-less-than-length-in-since.md) | Ian Yang | Standards Track | Active
86+
| [31](rfcs/0031-variable-length-header-field) | [Add a variable length field in the block](rfcs/0031-variable-length-header-field/0031-variable-length-header-field.md) | Ian Yang | Standards Track | Active
87+
| [32](rfcs/0032-ckb-vm-version-selection) | [CKB VM Version Selection](rfcs/0032-ckb-vm-version-selection/0032-ckb-vm-version-selection.md) | Ian Yang | Standards Track | Active
88+
| [33](rfcs/0033-ckb-vm-version-1) | [CKB VM version1](rfcs/0033-ckb-vm-version-1/0033-ckb-vm-version-1.md) | Wanbiao Ye| Standards Track | Active
89+
| [34](rfcs/0034-vm-syscalls-2) | [CKB Block Structure](rfcs/0034-vm-syscalls-2/0034-vm-syscalls-2.md) | Wanbiao Ye | Standards Track | Active
90+
| [35](rfcs/0035-ckb-p2p-protocol-upgrade) | [CKB P2P protocol upgrade](rfcs/0035-ckb-p2p-protocol-upgrade/0035-ckb-p2p-protocol-upgrade.md) | Chao Luo, Ian Yang | Standards Track | Active
91+
| [36](rfcs/0036-remove-header-deps-immature-rule) | [Remove Header Deps Immature Rule](rfcs/0036-remove-header-deps-immature-rule/0036-remove-header-deps-immature-rule.md) | Ian Yang | Standards Track | Active
92+
| [37](rfcs/ckb-mirana-2021) | [CKB Consensus Change (CKB Edition Mirana)](rfcs/0037-ckb-mirana-2021/0037-ckb-mirana-2021.md) | Ian Yang | Informational | Draft
8493
| [39](rfcs/0039-cheque) | [Cheque Lock](rfcs/0039-cheque/0039-cheque.md) | Dylan Duan | Standards Track | Proposal |
8594
| [42](rfcs/0042-omnilock) | [Omnilock](rfcs/0042-omnilock/0042-omnilock.md) | Xu Jiandong | Standards Track | Proposal
8695
| [43](rfcs/0043-ckb-softfork-activation) | [CKB Softfork Activation](rfcs/0043-ckb-softfork-activation/0043-ckb-softfork-activation.md) | Dingwei Zhang | Standards Track | Proposal
8796
| [44](rfcs/0044-ckb-light-client) | [CKB Light Client Protocol](rfcs/0044-ckb-light-client/0044-ckb-light-client.md) | Boyu Yang | Standards Track | Proposal
8897
| [45](rfcs/0045-client-block-filter) | [CKB Client Side Block Filter Protocol](rfcs/0045-client-block-filter/0045-client-block-filter.md) | Quake Wang | Standards Track | Proposal
8998
| [46](rfcs/0046-syscalls-summary) | [CKB VM Syscalls Summary](rfcs/0046-syscalls-summary/0046-syscalls-summary.md) | Shan | Informational | Draft
99+
| [48](rfcs/0048-remove-block-header-version-reservation-rule) | [Remove Block Header Version Reservation Rule](rfcs/0048-remove-block-header-version-reservation-rule/0048-remove-block-header-version-reservation-rule.md) | Dingwei Zhang | Standards Track | Proposal
100+
| [49](rfcs/0049-ckb-vm-version-2) | [CKB VM version2](rfcs/0049-ckb-vm-version-2/0049-ckb-vm-version-2.md) | Wanbiao Ye | Standards Track | Proposal
101+
| [50](rfcs/0050-vm-syscalls-3) | [VM Syscalls 3](rfcs/0050-vm-syscalls-3/0050-vm-syscalls-3.md) | Xuejie Xiao , Jiandong Xu, Wanbiao Ye, Dingwei Zhang | Standards Track | Proposal
102+
| [51](rfcs/0051-ckb-meepo-2024) | [CKB Edition Meepo (2024)](rfcs/0051-ckb-meepo-2024/0051-ckb-meepo-2024.md) | Dingwei Zhang | Standards Track | Proposal
103+
| [52](rfcs/0052-extensible-udt) | [Extensible UDT](rfcs/0052-extensible-udt/0052-extensible-udt.md) | Xuejie Xiao, Xu Jiandong | Standards Track | Proposal
90104
## License
91105

92106
This repository is being licensed under terms of [MIT license](LICENSE).

rfcs/0009-vm-syscalls/0009-vm-syscalls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Created: 2018-12-14
1010

1111
## Abstract
1212

13-
This document describes all the RISC-V VM syscalls implemented in CKB Lina. Note that 3 new syscalls have been added to ckb2021 [2].
13+
This document describes all the RISC-V VM syscalls implemented in CKB Lina. Note that 3 new syscalls have been added to CKB Edition Mirana [2].
1414

1515
## Introduction
1616

@@ -446,7 +446,7 @@ In case of errors, `addr` and `index` will not contain meaningful data to use.
446446

447447
Attention that all the blocks referenced in header deps must be 4 epochs ago, otherwise the header is immature and the transaction must wait. For example, if the block is the first block in epoch 4, a transaction with its header as a header dep can only be included in the first block of epoch 8 and later blocks.
448448

449-
This rule will be removed since ckb2021 as proposed in [RFC36].
449+
This rule will be removed since CKB Edition Mirana as proposed in [RFC36].
450450

451451
[RFC36]: ../0036-remove-header-deps-immature-rule/0036-remove-header-deps-immature-rule.md
452452

rfcs/0021-ckb-address-format/0021-ckb-address-format.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ payload = 0x02/0x04 | code_hash | args
8888

8989
The first byte identifies the lock script's hash_type, 0x02 for "Data", 0x04 for "Type".
9090

91-
Two reasons have caused this address format to be deprecated. First, a [flaw](https://github.com/sipa/bech32/issues/51) of Bech32 enables attackers to generate valid but unexpected addresses by deleting or inserting characters into certain full addresses. Last, the hard fork of [ckb2021](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0037-ckb2021/0037-ckb2021.md) requires a new field to indicate the CKB VM version for each script group.
91+
Two reasons have caused this address format to be deprecated. First, a [flaw](https://github.com/sipa/bech32/issues/51) of Bech32 enables attackers to generate valid but unexpected addresses by deleting or inserting characters into certain full addresses. Last, the hard fork of [CKB Edition Mirana](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0037-ckb-mirana-2021/0037-ckb-mirana-2021.md) requires a new field to indicate the CKB VM version for each script group.
9292

9393
## Wrap to Address
9494

rfcs/0027-block-structure/0027-block-structure.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0027"
33
Category: Informational
4-
Status: Draft
4+
Status: Final
55
Author: Ian Yang <@doitian>
66
Created: 2020-04-30
77
---
@@ -72,7 +72,7 @@ The header contains commitments on the body fields to ensure data integrity. CKB
7272

7373
## Header
7474

75-
To ease PoW computation, the header is split into `raw` and `nonce`.
75+
To ease PoW computation, the header is split into `raw` and `nonce`.
7676

7777
```
7878
struct Header {
@@ -130,11 +130,11 @@ The header `compact_target` is the encoded form of the target threshold as it ap
130130

131131
It is similar to `nBits` in bitcoin, the original `nBits` implementation inherits properties from a signed data class, allowing the target threshold to be negative if the high bit of the significant is set. This is useless—the header hash is treated as an unsigned number, so it can never be equal to or lower than a negative target threshold.
132132

133-
In CKB, the "compact" format is a representation of a whole number N using an unsigned 32bit number similar to a floating-point format.
133+
In CKB, the "compact" format is a representation of a whole number N using an unsigned 32bit number similar to a floating-point format.
134134

135135
* The most significant 8 bits are the unsigned exponent of base 256.
136-
* This exponent can be thought of as "number of bytes of N" in which the first 3 bytes are the mantissa.
137-
* The lower 24 bits are the mantissa.
136+
* This exponent can be thought of as "number of bytes of N" in which the first 3 bytes are the mantissa.
137+
* The lower 24 bits are the mantissa.
138138

139139
```
140140
N = mantissa * 256^(exponent-3)
@@ -388,7 +388,7 @@ if __name__ == '__main__':
388388
unittest.main()
389389
```
390390

391-
## CKB Merkle Tree
391+
## CKB Merkle Tree
392392

393393
CKB Merkle Tree is a [CBMT](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0006-merkle-tree/0006-merkle-tree.md) using following merge function:
394394

rfcs/0028-change-since-relative-timestamp/0028-change-since-relative-timestamp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0028"
33
Category: Standards Track
4-
Status: Draft
4+
Status: Active
55
Author: Ian Yang <@doitian>
66
Created: 2021-02-03
77
---

rfcs/0029-allow-script-multiple-matches-on-identical-code/0029-allow-script-multiple-matches-on-identical-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0029"
33
Category: Standards Track
4-
Status: Proposal
4+
Status: Active
55
Author: Ian Yang <@doitian>
66
Created: 2021-02-03
77
---

rfcs/0030-ensure-index-less-than-length-in-since/0030-ensure-index-less-than-length-in-since.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0030"
33
Category: Standards Track
4-
Status: Proposal
4+
Status: Active
55
Author: Ian Yang <@doitian>
66
Created: 2021-02-04
77
---

rfcs/0031-variable-length-header-field/0031-variable-length-header-field.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0031"
33
Category: Standards Track
4-
Status: Proposal
4+
Status: Active
55
Author: Ian Yang <@doitian>
66
Created: 2021-02-07
77
---
@@ -47,7 +47,7 @@ The `extra_hash` is defined as:
4747
* When `extension` is empty, `extra_hash` is the same as the `uncles_hash`.
4848
* Otherwise `extra_hash = ckbhash(uncles_hash || ckbhash(extension))`
4949

50-
Since epoch B, consensus will define the schema of `extension` and verify the content. This is a soft fork if the `extension` is at most 96 bytes, because nodes deployed since epoch A do not verify the content of `extension`.
50+
Since epoch B, consensus will define the schema of `extension` and verify the content. This is a soft fork if the `extension` is at most 96 bytes, because nodes deployed since epoch A do not verify the content of `extension`.
5151

5252
### P2P Protocols Changes
5353

rfcs/0032-ckb-vm-version-selection/0032-ckb-vm-version-selection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0032"
33
Category: Standards Track
4-
Status: Proposal
4+
Status: Active
55
Author: Ian Yang <@doitian>
66
Created: 2021-04-26
77
---
@@ -76,7 +76,7 @@ In [nervosnetwork/ckb](https://github.com/nervosnetwork/ckb), the `hash_type` is
7676

7777
This RFC depends on [rfc33], [rfc34], and [rfc35]. The 4 RFCs must be activated together at the same epoch.
7878

79-
[rfc35]: ../0035-ckb2021-p2p-protocol-upgrade/0035-ckb2021-p2p-protocol-upgrade.md
79+
[rfc35]: ../0035-ckb-p2p-protocol-upgrade/0035-ckb-p2p-protocol-upgrade.md
8080

8181
The first two RFCs, [rfc33] and [rfc34] are the specification of VM version 1. The [rfc35] proposes to run two versions of transaction relay protocols during the fork, because the VM selection algorithm depends on which epoch the transaction belongs to, thus it is not deterministic for transactions still in the memory pool.
8282

rfcs/0033-ckb-vm-version-1/0033-ckb-vm-version-1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
Number: "0033"
3-
Category: Informational
4-
Status: Draft
3+
Category: Standards Track
4+
Status: Active
55
Author: Wanbiao Ye <mohanson@outlook.com>
66
Created: 2021-05-25
77
---

0 commit comments

Comments
 (0)