Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1618

This commit is contained in:
luigi1111 2017-01-27 11:33:26 -06:00
parent ad91ffe7e5 e92c4fff1a
commit 4629ead8c5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/api/wallet.h
View File

@ -94,6 +94,7 @@ public:
void setRecoveringFromSeed(bool recoveringFromSeed); void setRecoveringFromSeed(bool recoveringFromSeed);
bool watchOnly() const; bool watchOnly() const;
bool rescanSpent(); bool rescanSpent();
bool testnet() const {return m_wallet->testnet();}
PendingTransaction * createTransaction(const std::string &dst_addr, const std::string &payment_id, PendingTransaction * createTransaction(const std::string &dst_addr, const std::string &payment_id,

1
src/wallet/wallet2_api.h
View File

@ -295,6 +295,7 @@ struct Wallet
virtual bool setPassword(const std::string &password) = 0; virtual bool setPassword(const std::string &password) = 0;
virtual std::string address() const = 0; virtual std::string address() const = 0;
virtual std::string path() const = 0; virtual std::string path() const = 0;
virtual bool testnet() const = 0;
/*! /*!
* \brief integratedAddress - returns integrated address for current wallet address and given payment_id. * \brief integratedAddress - returns integrated address for current wallet address and given payment_id.