diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-08-17 10:18:12 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-08-17 10:18:12 -0500 |
| commit | 894adef29588f20951a675fc25139ebb777493eb (patch) | |
| tree | 5c94911d0318160c8b11d7fc6e4783af07196285 /src | |
| parent | Merge pull request #8800 (diff) | |
| parent | core_rpc_server: return ID of submitted block (diff) | |
| download | monero-894adef29588f20951a675fc25139ebb777493eb.tar.xz | |
Merge pull request #8891
842478c core_rpc_server: return ID of submitted block (jeffro256)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server_commands_defs.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 981a207a7..826cb63fa 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -2178,7 +2178,8 @@ namespace cryptonote // Fixing of high orphan issue for most pools // Thanks Boolberry! block b; - if(!parse_and_validate_block_from_blob(blockblob, b)) + crypto::hash blk_id; + if(!parse_and_validate_block_from_blob(blockblob, b, blk_id)) { error_resp.code = CORE_RPC_ERROR_CODE_WRONG_BLOCKBLOB; error_resp.message = "Wrong block blob"; @@ -2201,6 +2202,7 @@ namespace cryptonote error_resp.message = "Block not accepted"; return false; } + res.block_id = epee::string_tools::pod_to_hex(blk_id); res.status = CORE_RPC_STATUS_OK; return true; } diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 63f74108d..9b3d0f001 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -88,7 +88,7 @@ namespace cryptonote // advance which version they will stop working with // Don't go over 32767 for any of these #define CORE_RPC_VERSION_MAJOR 3 -#define CORE_RPC_VERSION_MINOR 12 +#define CORE_RPC_VERSION_MINOR 13 #define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor)) #define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR) @@ -1115,8 +1115,11 @@ namespace cryptonote struct response_t: public rpc_response_base { + std::string block_id; + BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE_PARENT(rpc_response_base) + KV_SERIALIZE(block_id) END_KV_SERIALIZE_MAP() }; typedef epee::misc_utils::struct_init<response_t> response; |