initialize incoming confirmed transfers account/subaddress index;

first part of getTransfers() test passing
This commit is contained in:
woodser
2019-06-09 13:59:23 -04:00
parent a6901d4366
commit a4dd14b2f2
+8 -3
View File
@@ -596,6 +596,8 @@ namespace monero {
//throw runtime_error("isPool not implemented");
}
// TODO: apply filtering
return transfers;
}
@@ -711,19 +713,22 @@ namespace monero {
if (*block->height >= chainHeight || (*block->height == 0 && !tx->inTxPool)) tx->numConfirmations = 0;
else tx->numConfirmations = chainHeight - *block->height;
// construct transfer
MoneroIncomingTransfer incomingTransfer;
incomingTransfer.tx = tx;
incomingTransfer.amount = pd.m_amount;
incomingTransfer.accountIndex = boost::none;
//incomingTransfer.subaddressIndex = pd.m_subaddr_index; // TODO: this is {major, minor} me thinks
incomingTransfer.accountIndex = pd.m_subaddr_index.major;
incomingTransfer.subaddressIndex = pd.m_subaddr_index.minor;
incomingTransfer.address = wallet2->get_subaddress_as_str(pd.m_subaddr_index);
tx->incomingTransfers.push_back(incomingTransfer);
// compute numSuggestedConfirmations TODO monero core: this logic is based on wallet_rpc_server.cpp:87 but it should be encapsulated in wallet2
uint64_t blockReward = wallet2->get_last_block_reward();
if (blockReward == 0) incomingTransfer.numSuggestedConfirmations = 0;
else incomingTransfer.numSuggestedConfirmations = (*incomingTransfer.amount + blockReward - 1) / blockReward;
// add transfer to tx
tx->incomingTransfers.push_back(incomingTransfer);
return incomingTransfer;
}
}