simplewallet: add set_tx_key for importing tx keys from 3rd party wallets #4188
Conversation
src/wallet/wallet2.cpp
Outdated
| @@ -8583,6 +8583,52 @@ bool wallet2::get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key, s | |||
| return true; | |||
| } | |||
| //---------------------------------------------------------------------------------------------------- | |||
| bool wallet2::set_tx_key(const crypto::hash &txid, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys) | |||
| { | |||
| THROW_WALLET_EXCEPTION_IF(m_tx_keys.find(txid) != m_tx_keys.end(), error::wallet_internal_error, "Tx key for is already stored in the cache"); | |||
There was a problem hiding this comment.
That means if you make a mistake, you can't correct it.
src/wallet/wallet2.cpp
Outdated
| std::vector<tx_extra_field> tx_extra_fields; | ||
| THROW_WALLET_EXCEPTION_IF(!parse_tx_extra(tx.extra, tx_extra_fields), error::wallet_internal_error, "Transaction extra has unsupported format"); | ||
| tx_extra_pub_key pub_key_field; | ||
| for (size_t i = 0; i < 2; ++i) |
There was a problem hiding this comment.
That seems wrong. Either assume only one, or check all of them. Besides, it looks like it'll never get to try the second since it breaks if it succeeds on the first one.
src/simplewallet/simplewallet.cpp
Outdated
| } | ||
|
|
||
| crypto::secret_key tx_key; | ||
| if (!epee::string_tools::hex_to_pod(local_args[1].substr(0, 64), tx_key)) |
There was a problem hiding this comment.
That throws if the string is less than 64: need to catch.
There was a problem hiding this comment.
I don't see hex_to_pod throwing; it just returns false when the string size is wrong:
https://github.com/monero-project/monero/blob/master/contrib/epee/include/string_tools.h#L343
template<class t_pod_type>
bool hex_to_pod(const std::string& hex_str, t_pod_type& s)
{
...
if(sizeof(s)*2 != hex_str.size())
return false;
...
}There was a problem hiding this comment.
It doesn't. substr does.
src/simplewallet/simplewallet.cpp
Outdated
| if (local_args[1].empty()) | ||
| break; | ||
| additional_tx_keys.resize(additional_tx_keys.size() + 1); | ||
| if (!epee::string_tools::hex_to_pod(local_args[1].substr(0, 64), additional_tx_keys.back())) |
There was a problem hiding this comment.
That also throws.
src/wallet/wallet2.cpp
Outdated
| m_tx_keys.insert(std::make_pair(txid, tx_key)); | ||
| m_additional_tx_keys.insert(std::make_pair(txid, additional_tx_keys)); | ||
| return true; | ||
| } |
There was a problem hiding this comment.
Maybe remove the bool since all the errors are exceptions, and the caller doesn't check the return value, makes it less likely a future chance will return false on error.
a3fe1c5 simplewallet: add set_tx_key for importing tx keys from 3rd party wallets (stoffu)
Motivated by this discussion: https://www.reddit.com/r/Monero/comments/92ekxo/i_sent_monero_to_binance_from_mymonero_but_havent/
This patch allows users to import tx secret keys after restoring a wallet that was originally created using 3rd party wallet services, like MyMonero, so that tx proofs can then be generated.