|
|
@ -1283,6 +1283,11 @@ public:
|
|
|
|
// if mine output has RingCT, i.e., tx version is 2
|
|
|
|
// if mine output has RingCT, i.e., tx version is 2
|
|
|
|
if (mine_output && tx.version == 2)
|
|
|
|
if (mine_output && tx.version == 2)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// cointbase txs have amounts in plain sight.
|
|
|
|
|
|
|
|
// so use amount from ringct, only for non-coinbase txs
|
|
|
|
|
|
|
|
if (!is_coinbase(tx))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
// initialize with regular amount
|
|
|
|
// initialize with regular amount
|
|
|
|
uint64_t rct_amount = money_transfered[output_idx];
|
|
|
|
uint64_t rct_amount = money_transfered[output_idx];
|
|
|
|
|
|
|
|
|
|
|
@ -1300,10 +1305,6 @@ public:
|
|
|
|
cerr << "\nshow_my_outputs: Cant decode ringCT! " << endl;
|
|
|
|
cerr << "\nshow_my_outputs: Cant decode ringCT! " << endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// cointbase txs have amounts in plain sight.
|
|
|
|
|
|
|
|
// so use amount from ringct, only for non-coinbase txs
|
|
|
|
|
|
|
|
if (!is_coinbase(tx))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
outp.second = rct_amount;
|
|
|
|
outp.second = rct_amount;
|
|
|
|
money_transfered[output_idx] = rct_amount;
|
|
|
|
money_transfered[output_idx] = rct_amount;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1513,6 +1514,10 @@ public:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (mine_output && mixin_tx.version == 2)
|
|
|
|
if (mine_output && mixin_tx.version == 2)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// cointbase txs have amounts in plain sight.
|
|
|
|
|
|
|
|
// so use amount from ringct, only for non-coinbase txs
|
|
|
|
|
|
|
|
if (!is_coinbase(mixin_tx))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// initialize with regular amount
|
|
|
|
// initialize with regular amount
|
|
|
|
uint64_t rct_amount = amount;
|
|
|
|
uint64_t rct_amount = amount;
|
|
|
@ -1531,12 +1536,9 @@ public:
|
|
|
|
cerr << "show_my_outputs: key images: Cant decode ringCT!" << endl;
|
|
|
|
cerr << "show_my_outputs: key images: Cant decode ringCT!" << endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// cointbase txs have amounts in plain sight.
|
|
|
|
|
|
|
|
// so use amount from ringct, only for non-coinbase txs
|
|
|
|
|
|
|
|
if (!is_coinbase(mixin_tx))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
amount = rct_amount;
|
|
|
|
amount = rct_amount;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} // if (mine_output && mixin_tx.version == 2)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|