Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

added expiration median to COMMAND_RPC_GET_TX_POOL

Browse source
This commit is contained in:
cryptozoidberg 2020-03-08 20:30:16 +01:00
parent c6c3d2264d
commit 39ecd43321
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/core_rpc_server.cpp
View file

@ -386,6 +386,9 @@ namespace currency
return true;
}
res.tx_expiration_ts_median = m_core.get_blockchain_storage().get_tx_expiration_median();
for(auto& tx: txs)
{
res.txs.push_back(t_serializable_object_to_blob(tx));
@ -393,6 +396,7 @@ namespace currency
res.status = CORE_RPC_STATUS_OK;
return true;
}
//------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::on_scan_pos(const COMMAND_RPC_SCAN_POS::request& req, COMMAND_RPC_SCAN_POS::response& res, connection_context& cntx)
{
CHECK_CORE_READY();

2
src/rpc/core_rpc_server_commands_defs.h
View file

@ -181,10 +181,12 @@ namespace currency
struct response
{
std::list<blobdata> txs; //transactions blobs
uint64_t tx_expiration_ts_median;
std::string status;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(txs)
KV_SERIALIZE(tx_expiration_ts_median)
KV_SERIALIZE(status)
END_KV_SERIALIZE_MAP()
};

2
src/wallet/wallet2.cpp
View file

@ -1356,7 +1356,7 @@ void wallet2::scan_tx_pool(bool& has_related_alias_in_unconfirmed)
std::unordered_map<crypto::hash, std::pair<currency::transaction, money_transfer2_details>> unconfirmed_multisig_transfers_from_tx_pool;
has_related_alias_in_unconfirmed = false;
uint64_t tx_expiration_ts_median = get_tx_expiration_median();
uint64_t tx_expiration_ts_median = res.tx_expiration_ts_median; //get_tx_expiration_median();
for (const auto &tx_blob : res.txs)
{
currency::transaction tx;