Skip to content

Commit 0177b98

Browse files
committed
Make eos-vm-oc-whitelist option multitoken to match other whitelist options. Also add info level log of the configured eos-vm-oc-whitelist accounts on startup.
1 parent c375450 commit 0177b98

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

plugins/chain_plugin/chain_plugin.cpp

+10-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
363363
"'auto' - EOS VM OC tier-up is enabled for eosio.* accounts, read-only trxs, and except on producers applying blocks.\n"
364364
"'all' - EOS VM OC tier-up is enabled for all contract execution.\n"
365365
"'none' - EOS VM OC tier-up is completely disabled.\n")
366-
("eos-vm-oc-whitelist", bpo::value<vector<string>>()->composing()->default_value(std::vector<string>{{"xsat"}}),
366+
("eos-vm-oc-whitelist", bpo::value<vector<string>>()->composing()->multitoken()->default_value(std::vector<string>{{"xsat"}}),
367367
"EOS VM OC tier-up whitelist account suffixes for tier-up runtime 'auto'.")
368368
#endif
369369
("enable-account-queries", bpo::value<bool>()->default_value(false), "enable queries to find accounts by various metadata.")
@@ -533,6 +533,15 @@ void chain_plugin_impl::plugin_initialize(const variables_map& options) {
533533

534534
LOAD_VALUE_SET( options, "trusted-producer", chain_config->trusted_producers );
535535

536+
if (!chain_config->eos_vm_oc_whitelist_suffixes.empty()) {
537+
const auto& wl = chain_config->eos_vm_oc_whitelist_suffixes;
538+
std::string s = std::accumulate(std::next(wl.begin()), wl.end(),
539+
wl.begin()->to_string(),
540+
[](std::string a, account_name b) -> std::string {
541+
return std::move(a) + ", " + b.to_string();
542+
});
543+
ilog("eos-vm-oc-whitelist accounts: ${a}", ("a", s));
544+
}
536545
if( options.count( "action-blacklist" )) {
537546
const std::vector<std::string>& acts = options["action-blacklist"].as<std::vector<std::string>>();
538547
auto& list = chain_config->action_blacklist;

0 commit comments

Comments
 (0)