github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-17 15:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

shared_ptr<MoneroTx> cnTxToTx(const cryptonote::transaction& cnTx, bool

Browse Source 
initAsTxWallet = false);
This commit is contained in:
woodser
2019-07-31 21:07:40 -04:00
parent 9963b71caa
commit a8eed01cc6
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/MoneroUtils.cpp
+3 -3
View File
@@ -479,15 +479,15 @@ shared_ptr<MoneroBlock> MoneroUtils::cnBlockToBlock(const cryptonote::block& cnB
block->timestamp = cnBlock.timestamp;
block->prevId = epee::string_tools::pod_to_hex(cnBlock.prev_id);
block->nonce = cnBlock.nonce;
block->coinbaseTx = MoneroUtils::cnTransactionToTx(cnBlock.miner_tx);
block->coinbaseTx = MoneroUtils::cnTxToTx(cnBlock.miner_tx);
for (const crypto::hash& txHash : cnBlock.tx_hashes) {
block->txIds.push_back(epee::string_tools::pod_to_hex(txHash));
}
return block;
}
shared_ptr<MoneroTx> MoneroUtils::cnTransactionToTx(const cryptonote::transaction& cnTx) {
shared_ptr<MoneroTx> tx = make_shared<MoneroTx>();
shared_ptr<MoneroTx> MoneroUtils::cnTxToTx(const cryptonote::transaction& cnTx, bool initAsTxWallet) {
shared_ptr<MoneroTx> tx = initAsTxWallet ? make_shared<MoneroTxWallet>() : make_shared<MoneroTx>();
//tx->version = cnTx.version;
tx->unlockTime = cnTx.unlock_time;
tx->id = epee::string_tools::pod_to_hex(cnTx.hash);
src/utils/MoneroUtils.h
+6 -4
View File
@@ -92,13 +92,15 @@ namespace MoneroUtils
*/
shared_ptr<MoneroBlock> cnBlockToBlock(const cryptonote::block& cnBlock);
/**
* Convert a Monero Core cryptonote::transaction to a transaction in this library's native model.
* Convert a Monero Core crpytonote::transaction to a transaction in this library's
* native model.
*
* @param cnTransaction is the Core transaction to convert
* @return a transaction in this library's native model
* @param cnTx is the Core transaction to convert
* @param initAsTxWallet specifies if a MoneroTx xor MoneroTxWallet should be initialized
*/
shared_ptr<MoneroTx> cnTransactionToTx(const cryptonote::transaction& cnTransaction);
shared_ptr<MoneroTx> cnTxToTx(const cryptonote::transaction& cnTx, bool initAsTxWallet = false);
/**
* Modified from core_rpc_server.cpp to return a string.
src/wallet/MoneroWallet.cpp
+4 -1
View File
@@ -719,14 +719,17 @@ namespace monero {
// TODO **: fill this out
shared_ptr<MoneroBlock> block = make_shared<MoneroBlock>();
block->height = height;
shared_ptr<MoneroTxWallet> tx = make_shared<MoneroTxWallet>();
shared_ptr<MoneroTxWallet> tx = static_pointer_cast<MoneroTxWallet>(MoneroUtils::cnTxToTx(cnTx, true));
block->txs.push_back(tx);
tx->block = block;
tx->id = epee::string_tools::pod_to_hex(txid);
tx->unlockTime = unlock_time;
shared_ptr<MoneroIncomingTransfer> transfer = make_shared<MoneroIncomingTransfer>();
tx->incomingTransfers.push_back(transfer);
transfer->tx = tx;
transfer->amount = amount;
transfer->accountIndex = subaddr_index.major;
transfer->subaddressIndex = subaddr_index.minor;
// notify listener of transfer
listener->onIncomingTransfer(*transfer);