mirror of
https://github.com/monero-project/monero.git
synced 2025-02-26 04:50:25 +00:00
remove overlap with offline signing PR
This commit is contained in:
parent
ffcea8b03a
commit
b169bb1ce2
3 changed files with 1 additions and 35 deletions
src/wallet/api
|
@ -3138,24 +3138,6 @@ bool WalletImpl::saveMultisigTx(const PendingTransaction &multisig_ptx, const st
|
|||
return false;
|
||||
}
|
||||
//-------------------------------------------------------------------------------------------------------------------
|
||||
std::string WalletImpl::convertTxToStr(const PendingTransaction &ptxs) const
|
||||
{
|
||||
clearStatus();
|
||||
|
||||
const PendingTransactionImpl *ptx_impl = dynamic_cast<const PendingTransactionImpl*>(&ptxs);
|
||||
std::string tx_dump = m_wallet->dump_tx_to_str(ptx_impl->m_pending_tx);
|
||||
if (tx_dump.empty())
|
||||
setStatusError(tr("Failed to convert pending tx to string"));
|
||||
|
||||
return tx_dump;
|
||||
}
|
||||
//-------------------------------------------------------------------------------------------------------------------
|
||||
bool WalletImpl::parseUnsignedTxFromStr(const std::string &unsigned_tx_str, UnsignedTransaction &exported_txs) const
|
||||
{
|
||||
UnsignedTransactionImpl *utx_impl = dynamic_cast<UnsignedTransactionImpl*>(&exported_txs);
|
||||
return m_wallet->parse_unsigned_tx_from_str(unsigned_tx_str, utx_impl->m_unsigned_tx_set);
|
||||
}
|
||||
//-------------------------------------------------------------------------------------------------------------------
|
||||
bool WalletImpl::parseTxFromStr(const std::string &signed_tx_str, PendingTransaction &ptx) const
|
||||
{
|
||||
PendingTransactionImpl *ptx_impl = dynamic_cast<PendingTransactionImpl*>(&ptx);
|
||||
|
@ -3386,7 +3368,7 @@ std::size_t WalletImpl::importEnotesFromStr(const std::string &enotes_str)
|
|||
}
|
||||
catch (const std::exception &e)
|
||||
{
|
||||
setStatusError(string(tr("Failed to import enotes to string: ")) + e.what());
|
||||
setStatusError(string(tr("Failed to import enotes from string: ")) + e.what());
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -248,8 +248,6 @@ public:
|
|||
void getEnoteDetails(std::vector<std::unique_ptr<EnoteDetails>> &enote_details) const override;
|
||||
std::string convertMultisigTxToStr(const PendingTransaction &multisig_ptx) const override;
|
||||
bool saveMultisigTx(const PendingTransaction &multisig_ptx, const std::string &filename) const override;
|
||||
std::string convertTxToStr(const PendingTransaction &ptxs) const override;
|
||||
bool parseUnsignedTxFromStr(const std::string &unsigned_tx_str, UnsignedTransaction &exported_txs) const override;
|
||||
bool parseTxFromStr(const std::string &signed_tx_str, PendingTransaction &ptx) const override;
|
||||
void insertColdKeyImages(PendingTransaction &ptx) override;
|
||||
bool parseMultisigTxFromStr(const std::string &multisig_tx_str, PendingTransaction &exported_txs) const override;
|
||||
|
|
|
@ -1300,20 +1300,6 @@ struct Wallet
|
|||
*/
|
||||
virtual bool saveMultisigTx(const PendingTransaction &multisig_ptx, const std::string &filename) const = 0;
|
||||
/**
|
||||
* brief: convertTxToStr - get the encrypted data from a vector of pending transactions as hex string
|
||||
* param: ptxs -
|
||||
* return: unsigned tx data as encrypted hex string if succeeded, else empty string
|
||||
* note: sets status error on fail
|
||||
*/
|
||||
virtual std::string convertTxToStr(const PendingTransaction &ptxs) const = 0;
|
||||
/**
|
||||
* brief: parseUnsignedTxFromStr - get an unsigned transaction set from encrypted unsigned transaction as hex string
|
||||
* param: unsigned_tx_str - encrypted hex string
|
||||
* outparam: exported_txs -
|
||||
* return: true if succeeded
|
||||
*/
|
||||
virtual bool parseUnsignedTxFromStr(const std::string &unsigned_tx_str, UnsignedTransaction &exported_txs) const = 0;
|
||||
/**
|
||||
* brief: parseTxFromStr - get transactions from encrypted signed transaction as hex string
|
||||
* param: signed_tx_str -
|
||||
* outparam: ptx -
|
||||
|
|
Loading…
Reference in a new issue