Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.2] Backport of the cleos validate signatures #500

Merged
merged 2 commits into from
Jun 23, 2022
Merged

[3.2] Backport of the cleos validate signatures #500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdab1c9
add cleos validate signatures
arhag May 8, 2020
d9a511f
fixed conflicts
ndcgundlach Jun 22, 2022
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
42 changes: 41 additions & 1 deletion programs/cleos/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ chain::action generate_nonce_action() {
return chain::action( {}, config::null_account_name, name("nonce"), fc::raw::pack(fc::time_point::now().time_since_epoch().count()));
}

auto abi_serializer_resolver_empty = [](const name& account) -> std::optional<abi_serializer> {
return std::optional<abi_serializer>();
};

void prompt_for_wallet_password(string& pw, const string& name) {
if(pw.size() == 0 && name != "SecureEnclave") {
std::cout << localized("password: ");
Expand Down Expand Up @@ -2660,6 +2664,42 @@ int main( int argc, char** argv ) {
std::cout << fc::json::to_pretty_string(unpacked_action_data_json) << std::endl;
});

// validate subcommand
auto validate = app.add_subcommand("validate", localized("Validate transactions"));
validate->require_subcommand();

// validate signatures
string trx_json_to_validate;
string str_chain_id;
auto validate_signatures = validate->add_subcommand("signatures", localized("Validate signatures and recover public keys"));
validate_signatures->add_option("transaction", trx_json_to_validate,
localized("The JSON string or filename defining the transaction to validate"), true)->required();
validate_signatures->add_option("-c,--chain-id", str_chain_id, localized("The chain id that will be used in signature verification"));

validate_signatures->callback([&] {
fc::variant trx_var = json_from_file_or_string(trx_json_to_validate);
signed_transaction trx;
try {
abi_serializer::from_variant( trx_var, trx, abi_serializer_resolver_empty, abi_serializer::create_yield_function( abi_serializer_max_time ) );
} EOS_RETHROW_EXCEPTIONS(transaction_type_exception, "Invalid transaction format: '${data}'",
("data", fc::json::to_string(trx_var, fc::time_point::maximum())))

std::optional<chain_id_type> chain_id;

if( str_chain_id.size() == 0 ) {
ilog( "grabbing chain_id from ${n}", ("n", node_executable_name) );
auto info = get_info();
chain_id = info.chain_id;
} else {
chain_id = chain_id_type(str_chain_id);
}

flat_set<public_key_type> recovered_pub_keys;
trx.get_signature_keys( *chain_id, fc::time_point::maximum(), recovered_pub_keys, false );

std::cout << fc::json::to_pretty_string(recovered_pub_keys) << std::endl;
});

// Get subcommand
auto get = app.add_subcommand("get", localized("Retrieve various items and information from the blockchain"));
get->require_subcommand();
Expand Down Expand Up @@ -3461,7 +3501,7 @@ int main( int argc, char** argv ) {
// sign subcommand
string trx_json_to_sign;
string str_private_key;
string str_chain_id;
str_chain_id = {};
string str_private_key_file;
string str_public_key;
bool push_trx = false;
Expand Down