aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-11-22 15:37:31 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-11-22 15:53:40 +0000
commitd7cf8727674bbb8a366e4ad400707671694e4036 (patch)
tree32d828634d7255c7538584ceb0fc6d019fbfcca1
parentMerge pull request #6097 (diff)
downloadmonero-d7cf8727674bbb8a366e4ad400707671694e4036.tar.xz
rpc: add received_timestamp for pool txes in gettransactions
-rw-r--r--src/rpc/core_rpc_server.cpp3
-rw-r--r--src/rpc/core_rpc_server_commands_defs.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 9117b5b3a..ed65dcf1e 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -953,18 +953,21 @@ namespace cryptonote
{
e.double_spend_seen = it->second.double_spend_seen;
e.relayed = it->second.relayed;
+ e.received_timestamp = it->second.receive_time;
}
else
{
MERROR("Failed to determine pool info for " << tx_hash);
e.double_spend_seen = false;
e.relayed = false;
+ e.received_timestamp = 0;
}
}
else
{
e.block_height = m_core.get_blockchain_storage().get_db().get_tx_block_height(tx_hash);
e.block_timestamp = m_core.get_blockchain_storage().get_db().get_block_timestamp(e.block_height);
+ e.received_timestamp = 0;
e.double_spend_seen = false;
e.relayed = false;
}
diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index 855ea854c..c76880ab9 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 0
+#define CORE_RPC_VERSION_MINOR 1
#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)
@@ -351,6 +351,7 @@ namespace cryptonote
bool double_spend_seen;
uint64_t block_height;
uint64_t block_timestamp;
+ uint64_t received_timestamp;
std::vector<uint64_t> output_indices;
bool relayed;
@@ -372,6 +373,7 @@ namespace cryptonote
else
{
KV_SERIALIZE(relayed)
+ KV_SERIALIZE(received_timestamp)
}
END_KV_SERIALIZE_MAP()
};