diff --git a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java index 86f016040c4..8f5388aad29 100644 --- a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java +++ b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/NetworkUpgrade.java @@ -25,7 +25,7 @@ public enum NetworkUpgrade { ORCHID("orchid"), ORCHID_060("orchid060"), WASABI_100("wasabi100"), - WASABI_PLUS_ONE("wasabiPlusOne"), + PAPYRUS_200("papyrus200"), TWOTOTHREE("twoToThree"); private String name; diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf index 9e71db9dd89..9c441a65571 100644 --- a/rskj-core/src/main/resources/reference.conf +++ b/rskj-core/src/main/resources/reference.conf @@ -1,5 +1,5 @@ # disable wasabi+1 consensus rules by default for every network -blockchain.config.hardforkActivationHeights.wasabiPlusOne = -1 +blockchain.config.hardforkActivationHeights.papyrus200 = -1 blockchain = { config = { @@ -25,15 +25,15 @@ blockchain = { rskip125 = wasabi100, rskip126 = wasabi100, rskip132 = wasabi100, - rskip134 = wasabiPlusOne, + rskip134 = papyrus200, rskip136 = bahamas, - rskip137 = wasabiPlusOne, - rskip140 = wasabiPlusOne, - rskip146 = wasabiPlusOne, + rskip137 = papyrus200, + rskip140 = papyrus200, + rskip146 = papyrus200, rskip150 = twoToThree, - rskip151 = wasabiPlusOne, - rskip152 = wasabiPlusOne - rskip156 = wasabiPlusOne + rskip151 = papyrus200, + rskip152 = papyrus200 + rskip156 = papyrus200 } } gc = { diff --git a/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java index 5149b60e18e..12fe69fd738 100644 --- a/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java +++ b/rskj-core/src/test/java/org/ethereum/config/blockchain/upgrades/ActivationConfigTest.java @@ -35,7 +35,7 @@ public class ActivationConfigTest { " orchid: 0,", " orchid060: 0,", " wasabi100: 0", - " wasabiPlusOne: 0", + " papyrus200: 0", " twoToThree: 0", "},", "consensusRules: {", @@ -60,15 +60,15 @@ public class ActivationConfigTest { " rskip125: wasabi100", " rskip126: wasabi100", " rskip132: wasabi100", - " rskip134: wasabiPlusOne", + " rskip134: papyrus200", " rskip136: bahamas", - " rskip137: wasabiPlusOne", - " rskip140: wasabiPlusOne,", - " rskip146: wasabiPlusOne", + " rskip137: papyrus200", + " rskip140: papyrus200,", + " rskip146: papyrus200", " rskip150: twoToThree", - " rskip151: wasabiPlusOne", - " rskip152: wasabiPlusOne", - " rskip156: wasabiPlusOne", + " rskip151: papyrus200", + " rskip152: papyrus200", + " rskip156: papyrus200", "}" ));