Merge pull request #7986
5770265
wallet2: keep around transaction prefix for confirmed transfers (tobtoht)
This commit is contained in:
commit
d912444a4a
|
@ -494,6 +494,7 @@ private:
|
||||||
|
|
||||||
struct confirmed_transfer_details
|
struct confirmed_transfer_details
|
||||||
{
|
{
|
||||||
|
cryptonote::transaction_prefix m_tx;
|
||||||
uint64_t m_amount_in;
|
uint64_t m_amount_in;
|
||||||
uint64_t m_amount_out;
|
uint64_t m_amount_out;
|
||||||
uint64_t m_change;
|
uint64_t m_change;
|
||||||
|
@ -508,10 +509,12 @@ private:
|
||||||
|
|
||||||
confirmed_transfer_details(): m_amount_in(0), m_amount_out(0), m_change((uint64_t)-1), m_block_height(0), m_payment_id(crypto::null_hash), m_timestamp(0), m_unlock_time(0), m_subaddr_account((uint32_t)-1) {}
|
confirmed_transfer_details(): m_amount_in(0), m_amount_out(0), m_change((uint64_t)-1), m_block_height(0), m_payment_id(crypto::null_hash), m_timestamp(0), m_unlock_time(0), m_subaddr_account((uint32_t)-1) {}
|
||||||
confirmed_transfer_details(const unconfirmed_transfer_details &utd, uint64_t height):
|
confirmed_transfer_details(const unconfirmed_transfer_details &utd, uint64_t height):
|
||||||
m_amount_in(utd.m_amount_in), m_amount_out(utd.m_amount_out), m_change(utd.m_change), m_block_height(height), m_dests(utd.m_dests), m_payment_id(utd.m_payment_id), m_timestamp(utd.m_timestamp), m_unlock_time(utd.m_tx.unlock_time), m_subaddr_account(utd.m_subaddr_account), m_subaddr_indices(utd.m_subaddr_indices), m_rings(utd.m_rings) {}
|
m_tx(utd.m_tx), m_amount_in(utd.m_amount_in), m_amount_out(utd.m_amount_out), m_change(utd.m_change), m_block_height(height), m_dests(utd.m_dests), m_payment_id(utd.m_payment_id), m_timestamp(utd.m_timestamp), m_unlock_time(utd.m_tx.unlock_time), m_subaddr_account(utd.m_subaddr_account), m_subaddr_indices(utd.m_subaddr_indices), m_rings(utd.m_rings) {}
|
||||||
|
|
||||||
BEGIN_SERIALIZE_OBJECT()
|
BEGIN_SERIALIZE_OBJECT()
|
||||||
VERSION_FIELD(0)
|
VERSION_FIELD(1)
|
||||||
|
if (version >= 1)
|
||||||
|
FIELD(m_tx)
|
||||||
VARINT_FIELD(m_amount_in)
|
VARINT_FIELD(m_amount_in)
|
||||||
VARINT_FIELD(m_amount_out)
|
VARINT_FIELD(m_amount_out)
|
||||||
VARINT_FIELD(m_change)
|
VARINT_FIELD(m_change)
|
||||||
|
|
Loading…
Reference in New Issue