Skip to content

Commit b387bba

Browse files
committed
Set RSKIP529 as part of Vetiver
1 parent a2e4571 commit b387bba

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ public enum ConsensusRule {
107107
RSKIP454("rskip454"),
108108
RSKIP459("rskip459"),
109109
RSKIP460("rskip460"),
110-
RSKIP502("rskip502"), // Union bridge integration
111-
RSKIP516("rskip516"), // Addition of precompiled contracts for add and mul operations on the secp256k1 curve
112-
RSKIP529("rskip529"), // super events
110+
RSKIP502("rskip502"), // PowPeg and Union Bridge integration
111+
RSKIP516("rskip516"), // Addition of precompiled contracts for add and mul operations on the secp256k1 curve
112+
RSKIP529("rskip529"), // New storage cells in Bridge native contract for base and super events info
113113
;
114114

115115
private final String configKey;

rskj-core/src/main/resources/expected.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ blockchain = {
4848
rskip137 = <hardforkName>
4949
rskip140 = <hardforkName>
5050
rskip143 = <hardforkName>
51+
rskip144 = <hardforkName>
5152
rskip146 = <hardforkName>
5253
rskip150 = <hardforkName>
5354
rskip151 = <hardforkName>
@@ -82,9 +83,8 @@ blockchain = {
8283
rskip294 = <hardforkName>
8384
rskip297 = <hardforkName>
8485
rskip305 = <hardforkName>
85-
rskip351 = <hardforkName>
86-
rskip144 = <hardforkName>
8786
rskip326 = <hardforkName>
87+
rskip351 = <hardforkName>
8888
rskip353 = <hardforkName>
8989
rskip357 = <hardforkName>
9090
rskip374 = <hardforkName>

rskj-core/src/main/resources/reference.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ blockchain = {
9595
rskip460 = lovell700
9696
rskip502 = vetiver900
9797
rskip516 = reed800
98-
rskip529 = -1
98+
rskip529 = vetiver900
9999
}
100100
}
101101
gc = {

rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class ActivationConfigTest {
138138
" rskip460: lovell700",
139139
" rskip502: vetiver900",
140140
" rskip516: reed800",
141-
" rskip529: reed800",
141+
" rskip529: vetiver900",
142142
"}"
143143
));
144144

0 commit comments

Comments
 (0)