ARCHIVE/hpcore
1
0
Fork 0
mirror of https://github.com/EvernodeXRPL/hpcore.git synced 2026-04-29 15:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:EvernodeXRPL/hpcore into hpsh

Browse Source
This commit is contained in:
Dulana Peiris
2023-12-19 12:50:19 +05:30
parent 78d534fa2a c3bacabff6
commit 88be187928
25 changed files with 355 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf.cpp
View File

@@ -1006,10 +1006,14 @@ namespace conf
jdoc.insert_or_assign("max_input_ledger_offset", contract.max_input_ledger_offset);
jsoncons::ojson consensus;
jsoncons::ojson fallback;
fallback.insert_or_assign("execute", contract.consensus.fallback.execute);
consensus.insert_or_assign("mode", contract.consensus.mode == MODE::PUBLIC ? MODE_PUBLIC : MODE_PRIVATE);
consensus.insert_or_assign("roundtime", contract.consensus.roundtime.load());
consensus.insert_or_assign("stage_slice", contract.consensus.stage_slice.load());
consensus.insert_or_assign("threshold", contract.consensus.threshold);
consensus.insert_or_assign("fallback", fallback);
jdoc.insert_or_assign("consensus", consensus);
jsoncons::ojson npl;
@@ -1149,6 +1153,9 @@ namespace conf
}
contract.consensus.mode = jdoc["consensus"]["mode"].as<std::string>() == MODE_PUBLIC ? MODE::PUBLIC : MODE::PRIVATE;
jpath = "contract.consensus.fallback";
contract.consensus.fallback.execute = jdoc["consensus"]["fallback"]["execute"].as<bool>();
jpath = "contract.npl";
if (jdoc["npl"]["mode"].as<std::string>() != MODE_PUBLIC && jdoc["npl"]["mode"].as<std::string>() != MODE_PRIVATE)
{