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.

Sign up for GitHub

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

Added RSKIP459 activation code #2899

Open
wants to merge 1 commit into
base: invalid-pegin-as-processed-integration
Choose a base branch
from
+6 −1
Open

Added RSKIP459 activation code #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public enum ConsensusRule {
RSKIP434("rskip434"),
RSKIP438("rskip438"),
RSKIP454("rskip454"),
RSKIP459("rskip459"),
;

private final String configKey;
Expand Down
1 change: 1 addition & 0 deletions rskj-core/src/main/resources/expected.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ blockchain = {
rskip434 = <hardforkName>
rskip438 = <hardforkName>
rskip454 = <hardforkName>
rskip459 = <hardforkName>
}
}
gc = {
Expand Down
1 change: 1 addition & 0 deletions rskj-core/src/main/resources/reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ blockchain = {
rskip434 = arrowhead631
rskip438 = lovell700
rskip454 = lovell700
rskip459 = lovell700
}
}
gc = {
Expand Down
1 change: 1 addition & 0 deletions rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class ActivationConfigTest {
" rskip434: arrowhead631",
" rskip438: lovell700",
" rskip454: lovell700",
" rskip459: lovell700",
"}"
));

Expand Down
3 changes: 2 additions & 1 deletion ...-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigsForTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ private static List<ConsensusRule> getLovell700Rskips() {
ConsensusRule.RSKIP427,
ConsensusRule.RSKIP428,
ConsensusRule.RSKIP438,
ConsensusRule.RSKIP454
ConsensusRule.RSKIP454,
ConsensusRule.RSKIP459
));
}

Expand Down
Loading