diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:47:05 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-25 19:47:05 +0200 |
| commit | d80a3e5c38fe1775d73ac98b668ebb2d44953c4f (patch) | |
| tree | 0ae9d4474bd411871c315a0d43bcdbd0e80b517d /src/cryptonote_core | |
| parent | 5eb825b87626d21ff981b1a5afdc7d436c2a2ee8 (diff) | |
| parent | 9739da1e840b2fac30fd60c63717ea16a7a43007 (diff) | |
| download | monzero-core-d80a3e5c38fe1775d73ac98b668ebb2d44953c4f.tar.gz monzero-core-d80a3e5c38fe1775d73ac98b668ebb2d44953c4f.tar.xz monzero-core-d80a3e5c38fe1775d73ac98b668ebb2d44953c4f.zip | |
Merge pull request #2788
9739da1e wallet_rpc_server: new relay_tx command (moneromooo-monero)
01dc8297 wallet: transfer RPC can now return tx metadata (pending_tx) (moneromooo-monero)
83fa9047 serialization: add std::set and std::unordered_set serialization (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/cryptonote_tx_utils.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_tx_utils.h b/src/cryptonote_core/cryptonote_tx_utils.h index 9a3b2484d..8d9a1e332 100644 --- a/src/cryptonote_core/cryptonote_tx_utils.h +++ b/src/cryptonote_core/cryptonote_tx_utils.h @@ -53,6 +53,20 @@ namespace cryptonote rct::key mask; //ringct amount mask void push_output(uint64_t idx, const crypto::public_key &k, uint64_t amount) { outputs.push_back(std::make_pair(idx, rct::ctkey({rct::pk2rct(k), rct::zeroCommit(amount)}))); } + + BEGIN_SERIALIZE_OBJECT() + FIELD(outputs) + FIELD(real_output) + FIELD(real_out_tx_key) + FIELD(real_out_additional_tx_keys) + FIELD(real_output_in_tx_index) + FIELD(amount) + FIELD(rct) + FIELD(mask) + + if (real_output >= outputs.size()) + return false; + END_SERIALIZE() }; struct tx_destination_entry |