Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
add duplicate check for set code/abi/contract, fix 5748
Browse files Browse the repository at this point in the history
  • Loading branch information
@taokayan
taokayan committed Sep 20, 2018
1 parent 0f6695c commit ef8819b
Showing 1 changed file with 60 additions and 14 deletions.
74 changes: 60 additions & 14 deletions programs/cleos/main.cpp
View file
Expand Up @@ -2303,15 +2303,18 @@ int main( int argc, char** argv ) {
string abiPath;
bool shouldSend = true;
bool contract_clear = false;
bool suppress_duplicate_check = false;
auto codeSubcommand = setSubcommand->add_subcommand("code", localized("Create or update the code on an account"));
codeSubcommand->add_option("account", account, localized("The account to set code for"))->required();
codeSubcommand->add_option("code-file", wasmPath, localized("The fullpath containing the contract WASM"));//->required();
codeSubcommand->add_flag( "-c,--clear", contract_clear, localized("Remove code on an account"));
codeSubcommand->add_flag( "--suppress-duplicate-check", suppress_duplicate_check, localized("Don't check for duplicate"));

auto abiSubcommand = setSubcommand->add_subcommand("abi", localized("Create or update the abi on an account"));
abiSubcommand->add_option("account", account, localized("The account to set the ABI for"))->required();
abiSubcommand->add_option("abi-file", abiPath, localized("The fullpath containing the contract ABI"));//->required();
abiSubcommand->add_flag( "-c,--clear", contract_clear, localized("Remove abi on an account"));
abiSubcommand->add_flag( "--suppress-duplicate-check", suppress_duplicate_check, localized("Don't check for duplicate"));

auto contractSubcommand = setSubcommand->add_subcommand("contract", localized("Create or update the contract on an account"));
contractSubcommand->add_option("account", account, localized("The account to publish a contract for"))
Expand All @@ -2323,9 +2326,22 @@ int main( int argc, char** argv ) {
auto abi = contractSubcommand->add_option("abi-file,-a,--abi", abiPath, localized("The ABI for the contract relative to contract-dir"));
// ->check(CLI::ExistingFile);
contractSubcommand->add_flag( "-c,--clear", contract_clear, localized("Rmove contract on an account"));
contractSubcommand->add_flag( "--suppress-duplicate-check", suppress_duplicate_check, localized("Don't check for duplicate"));

std::vector<chain::action> actions;
auto set_code_callback = [&]() {

std::vector<char> old_wasm;
bool duplicate = false;
if (!suppress_duplicate_check) {
try {
const auto result = call(get_raw_code_and_abi_func, fc::mutable_variant_object("account_name", account));
old_wasm = result["wasm"].as_blob().data;
} catch (...) {
std::cout << "Failed to get old contract, continue without duplicate check..." << std::endl;
}
}

bytes code_bytes;
if(!contract_clear){
std::string wasm;
Expand All @@ -2347,19 +2363,41 @@ int main( int argc, char** argv ) {
std::cerr << localized("WARNING: ") << wasmPath << localized(" doesn't look like a binary WASM file. Is it something else, like WAST? Trying anyways...") << std::endl;
code_bytes = bytes(wasm.begin(), wasm.end());

if (code_bytes.size() > 0 && code_bytes.size() == old_wasm.size()) {
duplicate = (memcmp(&(code_bytes[0]), &(old_wasm[0]), code_bytes.size()) == 0);
}
} else {
code_bytes = bytes();
}


actions.emplace_back( create_setcode(account, code_bytes ) );
if ( shouldSend ) {
std::cerr << localized("Setting Code...") << std::endl;
send_actions(std::move(actions), 10000, packed_transaction::zlib);
if (!duplicate) {
actions.emplace_back( create_setcode(account, code_bytes ) );
if ( shouldSend ) {
std::cerr << localized("Setting Code...") << std::endl;
send_actions(std::move(actions), 10000, packed_transaction::zlib);
}
} else {
std::cout << "Skipping set code because the new code is the same as the existing code" << std::endl;
}
};

auto set_abi_callback = [&]() {

bytes old_abi;
bool duplicate = false;
if (!suppress_duplicate_check) {
try {
const auto result = call(get_raw_code_and_abi_func, fc::mutable_variant_object("account_name", account));
const std::vector<char> abi_v = result["abi"].as_blob().data;
abi_def abi_d;
if (abi_serializer::to_abi(abi_v, abi_d)) {
old_abi = fc::raw::pack(abi_d);
}
} catch (...) {
std::cout << "Failed to get old contract, continue without duplicate check..." << std::endl;
}
}

bytes abi_bytes;
if(!contract_clear){
fc::path cpath(contractPath);
Expand All @@ -2374,17 +2412,23 @@ int main( int argc, char** argv ) {
EOS_ASSERT( fc::exists( abiPath ), abi_file_not_found, "no abi file found ${f}", ("f", abiPath) );

abi_bytes = fc::raw::pack(fc::json::from_file(abiPath).as<abi_def>());

if (abi_bytes.size() > 0 && abi_bytes.size() == old_abi.size()) {
duplicate = (memcmp(&(abi_bytes[0]), &(old_abi[0]), abi_bytes.size()) == 0);
}
} else {
abi_bytes = bytes();
}

try {
actions.emplace_back( create_setabi(account, abi_bytes) );
} EOS_RETHROW_EXCEPTIONS(abi_type_exception, "Fail to parse ABI JSON")
if ( shouldSend ) {
std::cerr << localized("Setting ABI...") << std::endl;
send_actions(std::move(actions), 10000, packed_transaction::zlib);
if (!duplicate) {
try {
actions.emplace_back( create_setabi(account, abi_bytes) );
} EOS_RETHROW_EXCEPTIONS(abi_type_exception, "Fail to parse ABI JSON")
if ( shouldSend ) {
std::cerr << localized("Setting ABI...") << std::endl;
send_actions(std::move(actions), 10000, packed_transaction::zlib);
}
} else {
std::cout << "Skipping set abi because the new abi is the same as the existing abi" << std::endl;
}
};

Expand All @@ -2396,8 +2440,10 @@ int main( int argc, char** argv ) {
shouldSend = false;
set_code_callback();
set_abi_callback();
std::cerr << localized("Publishing contract...") << std::endl;
send_actions(std::move(actions), 10000, packed_transaction::zlib);
if (actions.size()) {
std::cerr << localized("Publishing contract...") << std::endl;
send_actions(std::move(actions), 10000, packed_transaction::zlib);
}
});
codeSubcommand->set_callback(set_code_callback);
abiSubcommand->set_callback(set_abi_callback);
Expand Down

0 comments on commit ef8819b

Please sign in to comment.