Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions retesteth/configs/Options.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class genIstanbulCfg { public: genIstanbulCfg(); };
class genBerlinCfg { public: genBerlinCfg(); };
class genLondonCfg { public: genLondonCfg(); };
class genArrowGlacierCfg { public: genArrowGlacierCfg(); };
class genGrayGlacierCfg { public: genGrayGlacierCfg(); };
class genMergeCfg { public: genMergeCfg(); };
class genArrowGlacierToMergeAtDiffC0000Cfg { public: genArrowGlacierToMergeAtDiffC0000Cfg(); };

Expand Down Expand Up @@ -62,6 +63,7 @@ class OptionsInit
genBerlinCfg genBerlin;
genLondonCfg genLondon;
genArrowGlacierCfg genArrowGlacier;
genGrayGlacierCfg genGrayGlacier;
genMergeCfg genMerge;

// Transition genesis configs
Expand Down
3 changes: 2 additions & 1 deletion retesteth/configs/clientconfigs/besu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ string const besu_config = R"({
"HomesteadToDaoAt5",
"ByzantiumToConstantinopleFixAt5",
"BerlinToLondonAt5",
"ArrowGlacier"
"ArrowGlacier",
"GrayGlacier"
],
"exceptions" : {
"ExtraDataTooBig" : "extra-data too long",
Expand Down
3 changes: 2 additions & 1 deletion retesteth/configs/clientconfigs/t8ntool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ string const t8ntool_config = R"({
"ByzantiumToConstantinopleFixAt5",
"BerlinToLondonAt5",
"ArrowGlacier",
"ArrowGlacierToMergeAtDiffC0000"
"ArrowGlacierToMergeAtDiffC0000",
"GrayGlacier"
],
"exceptions" : {
"AddressTooShort" : "input string too short for common.Address",
Expand Down
47 changes: 47 additions & 0 deletions retesteth/configs/genesis/default/GrayGlacier.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#include <retesteth/configs/Options.h>
#include <string>
using namespace std;
using namespace dataobject;

const string default_GrayGlacier_config = R"({
"params" : {
"homesteadForkBlock" : "0x00",
"EIP150ForkBlock" : "0x00",
"EIP158ForkBlock" : "0x00",
"byzantiumForkBlock" : "0x00",
"constantinopleForkBlock" : "0x00",
"constantinopleFixForkBlock" : "0x00",
"istanbulForkBlock" : "0x00",
"berlinForkBlock" : "0x00",
"londonForkBlock" : "0x00",
"arrowGlacierForkBlock" : "0x00",
"grayGlacierForkBlock" : "0x00",
"chainID" : "0x01"
},
"accounts" : {
}
})";

const string t8ntool_GrayGlacier_config = R"({
"params" : {
"fork" : "GrayGlacier",
"constantinopleForkBlock" : "0x00",
"byzantiumForkBlock" : "0x00",
"homesteadForkBlock" : "0x00"
},
"accounts" : {
}
})";

genGrayGlacierCfg::genGrayGlacierCfg()
{
spDataObject obj(new DataObject());
(*obj)["path"] = "besu/genesis/GrayGlacier.json";
(*obj)["content"] = default_GrayGlacier_config;
map_configs.addArrayObject(obj);

spDataObject obj2(new DataObject());
(*obj2)["path"] = "default/genesis/GrayGlacier.json";
(*obj2)["content"] = t8ntool_GrayGlacier_config;
map_configs.addArrayObject(obj2);
}
4 changes: 3 additions & 1 deletion retesteth/configs/genesis/default/correctMiningReward.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const string default_correctMiningReward_config = R"({
"Istanbul": "2000000000000000000",
"Berlin" : "2000000000000000000",
"London" : "2000000000000000000",
"ArrowGlacier" : "2000000000000000000"
"ArrowGlacier" : "2000000000000000000",
"GrayGlacier" : "2000000000000000000"
})";

const string t8ntool_correctMiningReward_config = R"({
Expand All @@ -31,6 +32,7 @@ const string t8ntool_correctMiningReward_config = R"({
"Berlin" : "2000000000000000000",
"London" : "2000000000000000000",
"ArrowGlacier" : "2000000000000000000",
"GrayGlacier" : "2000000000000000000",

"//comment" : "Retesteth calculate rewards on behalf of the tool when filling state tests",
"YOLOv1" : "2000000000000000000",
Expand Down
1 change: 1 addition & 0 deletions retesteth/testSuites/DifficultyTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ BOOST_AUTO_TEST_CASE(dfConstantinople) {}
BOOST_AUTO_TEST_CASE(dfEIP2384) {}
BOOST_AUTO_TEST_CASE(dfExample) {}
BOOST_AUTO_TEST_CASE(dfFrontier) {}
BOOST_AUTO_TEST_CASE(dfGrayGlacier) {}
BOOST_AUTO_TEST_CASE(dfHomestead) {}

BOOST_AUTO_TEST_SUITE_END()