diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 8e029ac..83ffc96 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -15,10 +15,10 @@ jobs: preset: [default] include: - toolchain: gcc - docker: 1.234.1 + docker: 1.237.0 compiler: gcc - toolchain: clang - docker: 1.234.1 + docker: 1.237.0 compiler: clang steps: - name: Checkout opentxs diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 1ed8208..1660092 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false env: - docker: '1.234.1' + docker: '1.237.0' steps: - name: Checkout opentxs uses: actions/checkout@v3 diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml index 0666c61..b2f6968 100644 --- a/.github/workflows/iwyu.yml +++ b/.github/workflows/iwyu.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false env: - docker: '1.234.1' + docker: '1.237.0' steps: - name: Checkout opentxs uses: actions/checkout@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 204dac9..7f61806 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ otcommon_print_build_details(METIER_SERVER_PEDANTIC_BUILD "") otcommon_find_system_libraries() find_package( opentxs - 1.234 + 1.237 CONFIG REQUIRED ) diff --git a/src/metier_server/main.cpp b/src/metier_server/main.cpp index f655cbf..5422544 100644 --- a/src/metier_server/main.cpp +++ b/src/metier_server/main.cpp @@ -25,7 +25,7 @@ using namespace std::literals; #pragma GCC diagnostic pop using Type = opentxs::blockchain::Type; -using Enabled = opentxs::Map; +using Enabled = opentxs::Set; using Disabled = opentxs::Set; constexpr auto all_{"all"}; @@ -49,6 +49,7 @@ auto lower(opentxs::UnallocatedString& str) noexcept auto parse( opentxs::UnallocatedString const& input, Type const type, + opentxs::api::Options& args, Enabled& enabled, Disabled& disabled) noexcept -> void; auto process_arguments(Options& opts, int argc, char** argv) noexcept -> void; @@ -95,8 +96,8 @@ auto main(int argc, char* argv[]) -> int opentxs::blockchain::Type, opentxs::NaturalCaseCompare>{}; - for (auto const& [chain, seed] : opts.enabled_chains_) { - if (client.Network().Blockchain().Enable(chain, seed)) { + for (auto const& chain : opts.enabled_chains_) { + if (client.Network().Blockchain().Enable(chain)) { out.try_emplace(opentxs::blockchain::print(chain), chain); } else { @@ -261,6 +262,7 @@ auto options() noexcept -> boost::program_options::options_description const& auto parse( opentxs::UnallocatedString const& input, Type const type, + opentxs::api::Options& args, Enabled& enabled, Disabled& disabled) noexcept -> void { @@ -270,7 +272,8 @@ auto parse( disabled.emplace(type); enabled.erase(type); } else if (0u == disabled.count(type)) { - enabled[type] = input; + enabled.emplace(type); + args.AddBlockchainNativePeer(type, input); } } @@ -321,7 +324,7 @@ auto process_arguments(Options& opts, int argc, char** argv) noexcept -> void } else if (name == all_) { for (auto const chain : allChains) { if (0u == disabled.count(chain)) { - opts.enabled_chains_[chain]; + opts.enabled_chains_.emplace(chain); } } } else if (name == home_) { @@ -348,6 +351,7 @@ auto process_arguments(Options& opts, int argc, char** argv) noexcept -> void parse( value.as(), chain, + otargs, enabled, disabled); } catch (...) {