github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-18 23:58:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

MoneroCheck fields are optional;

Browse Source 
make error messages consistent with rpc
This commit is contained in:
woodser
2019-07-02 20:29:22 -04:00
parent bb82e5f3d2
commit a00c4a9ee5
3 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+32 -12
View File
@@ -1291,7 +1291,7 @@ namespace monero {
cout << "MoneroWallet::getTxNote" << endl;
cryptonote::blobdata txBlob;
if (!epee::string_tools::parse_hexstr_to_binbuff(txId, txBlob) || txBlob.size() != sizeof(crypto::hash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
crypto::hash txHash = *reinterpret_cast<const crypto::hash*>(txBlob.data());
return wallet2->get_tx_note(txHash);
@@ -1301,7 +1301,7 @@ namespace monero {
cout << "MoneroWallet::setTxNote" << endl;
cryptonote::blobdata txBlob;
if (!epee::string_tools::parse_hexstr_to_binbuff(txId, txBlob) || txBlob.size() != sizeof(crypto::hash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
crypto::hash txHash = *reinterpret_cast<const crypto::hash*>(txBlob.data());
wallet2->set_tx_note(txHash, note);
@@ -1357,7 +1357,7 @@ namespace monero {
// validate and parse tx id hash
crypto::hash txHash;
if (!epee::string_tools::hex_to_pod(txId, txHash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
// get tx key and additional keys
@@ -1382,7 +1382,7 @@ namespace monero {
// validate and parse tx id
crypto::hash txHash;
if (!epee::string_tools::hex_to_pod(txId, txHash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
// validate and parse tx key
@@ -1414,9 +1414,15 @@ namespace monero {
}
// initialize and return tx check using wallet2
uint64_t receivedAmount;
bool inTxPool;
uint64_t numConfirmations;
wallet2->check_tx_key(txHash, tx_key, additionalTxKeys, info.address, receivedAmount, inTxPool, numConfirmations);
shared_ptr<MoneroCheckTx> checkTx = shared_ptr<MoneroCheckTx>(new MoneroCheckTx());
wallet2->check_tx_key(txHash, tx_key, additionalTxKeys, info.address, checkTx->receivedAmount, checkTx->inTxPool, checkTx->numConfirmations);
checkTx->isGood = true; // check is good if we get this far
checkTx->receivedAmount = receivedAmount;
checkTx->inTxPool = inTxPool;
checkTx->numConfirmations = numConfirmations;
return checkTx;
}
@@ -1425,7 +1431,7 @@ namespace monero {
// validate and parse tx id hash
crypto::hash txHash;
if (!epee::string_tools::hex_to_pod(txId, txHash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
// validate and parse address
@@ -1444,7 +1450,7 @@ namespace monero {
// validate and parse tx id
crypto::hash txHash;
if (!epee::string_tools::hex_to_pod(txId, txHash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
// validate and parse address
@@ -1455,7 +1461,15 @@ namespace monero {
// initialize and return tx check using wallet2
shared_ptr<MoneroCheckTx> checkTx = shared_ptr<MoneroCheckTx>(new MoneroCheckTx());
checkTx->isGood = wallet2->check_tx_proof(txHash, info.address, info.is_subaddress, message, signature, checkTx->receivedAmount, checkTx->inTxPool, checkTx->numConfirmations);
uint64_t receivedAmount;
bool inTxPool;
uint64_t numConfirmations;
checkTx->isGood = wallet2->check_tx_proof(txHash, info.address, info.is_subaddress, message, signature, receivedAmount, inTxPool, numConfirmations);
if (checkTx->isGood) {
checkTx->receivedAmount = receivedAmount;
checkTx->inTxPool = inTxPool;
checkTx->numConfirmations = numConfirmations;
}
return checkTx;
}
@@ -1465,7 +1479,7 @@ namespace monero {
// validate and parse tx id
crypto::hash txHash;
if (!epee::string_tools::hex_to_pod(txId, txHash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
// return spend proof signature
@@ -1478,11 +1492,11 @@ namespace monero {
// validate and parse tx id
crypto::hash txHash;
if (!epee::string_tools::hex_to_pod(txId, txHash)) {
throw runtime_error("Tx id has invalid format");
throw runtime_error("TX ID has invalid format");
}
// check spend proof
wallet2->check_spend_proof(txHash, message, signature);
return wallet2->check_spend_proof(txHash, message, signature);
}
string MoneroWallet::getReserveProofWallet(const string& message) const {
@@ -1509,7 +1523,13 @@ namespace monero {
// initialize check reserve using wallet2
shared_ptr<MoneroCheckReserve> checkReserve = shared_ptr<MoneroCheckReserve>(new MoneroCheckReserve());
checkReserve->isGood = wallet2->check_reserve_proof(info.address, message, signature, checkReserve->totalAmount, checkReserve->unconfirmedSpentAmount);
uint64_t totalAmount;
uint64_t unconfirmedSpentAmount;
checkReserve->isGood = wallet2->check_reserve_proof(info.address, message, signature, totalAmount, unconfirmedSpentAmount);
if (checkReserve->isGood) {
checkReserve->totalAmount = totalAmount;
checkReserve->unconfirmedSpentAmount = unconfirmedSpentAmount;
}
return checkReserve;
}
src/wallet/MoneroWalletModel.cpp
+5 -5
View File
@@ -421,9 +421,9 @@ namespace monero {
boost::property_tree::ptree MoneroCheckTx::toPropertyTree() const {
boost::property_tree::ptree node = MoneroCheck::toPropertyTree();;
node.put("inTxPool", inTxPool);
node.put("numConfirmations", numConfirmations);
node.put("receivedAmount", receivedAmount);
if (inTxPool != boost::none) node.put("inTxPool", *inTxPool);
if (numConfirmations != boost::none) node.put("numConfirmations", *numConfirmations);
if (receivedAmount != boost::none) node.put("receivedAmount", *receivedAmount);
return node;
}
@@ -431,8 +431,8 @@ namespace monero {
boost::property_tree::ptree MoneroCheckReserve::toPropertyTree() const {
boost::property_tree::ptree node = MoneroCheck::toPropertyTree();
node.put("totalAmount", totalAmount);
node.put("unconfirmedSpentAmount", unconfirmedSpentAmount);
if (totalAmount != boost::none) node.put("totalAmount", *totalAmount);
if (unconfirmedSpentAmount != boost::none) node.put("unconfirmedSpentAmount", *unconfirmedSpentAmount);
return node;
}
}
src/wallet/MoneroWalletModel.h
+5 -5
View File
@@ -279,9 +279,9 @@ namespace monero {
* Results from checking a transaction key.
*/
struct MoneroCheckTx : public MoneroCheck {
bool inTxPool;
uint64_t numConfirmations;
uint64_t receivedAmount;
boost::optional<bool> inTxPool;
boost::optional<uint64_t> numConfirmations;
boost::optional<uint64_t> receivedAmount;
boost::property_tree::ptree toPropertyTree() const;
};
@@ -290,8 +290,8 @@ namespace monero {
* Results from checking a reserve proof.
*/
struct MoneroCheckReserve : public MoneroCheck {
uint64_t totalAmount;
uint64_t unconfirmedSpentAmount;
boost::optional<uint64_t> totalAmount;
boost::optional<uint64_t> unconfirmedSpentAmount;
boost::property_tree::ptree toPropertyTree() const;
};