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 #4422 

6e270fbd wallet2_api: fix for latest code changes (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-25 12:13:33 +02:00
parent 0d206dccda 6e270fbd29
commit e67789d075
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/api/wallet.cpp
View File

@ -1385,7 +1385,7 @@ PendingTransaction *WalletImpl::createTransaction(const string &dst_addr, const
for (uint32_t index = 0; index < m_wallet->get_num_subaddresses(subaddr_account); ++index) for (uint32_t index = 0; index < m_wallet->get_num_subaddresses(subaddr_account); ++index)
subaddr_indices.insert(index); subaddr_indices.insert(index);
} }
transaction->m_pending_tx = m_wallet->create_transactions_all(0, info.address, info.is_subaddress, fake_outs_count, 0 /* unlock_time */, transaction->m_pending_tx = m_wallet->create_transactions_all(0, info.address, info.is_subaddress, 1, fake_outs_count, 0 /* unlock_time */,
adjusted_priority, adjusted_priority,
extra, subaddr_account, subaddr_indices); extra, subaddr_account, subaddr_indices);
} }

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

@ -79,7 +79,7 @@ public:
bool recoverFromDevice(const std::string &path, bool recoverFromDevice(const std::string &path,
const std::string &password, const std::string &password,
const std::string &device_name); const std::string &device_name);
Device getDeviceType() const; Device getDeviceType() const override;
bool close(bool store = true); bool close(bool store = true);
std::string seed() const override; std::string seed() const override;
std::string getSeedLanguage() const override; std::string getSeedLanguage() const override;

2
src/wallet/api/wallet_manager.h
View File

@ -76,7 +76,7 @@ public:
virtual bool closeWallet(Wallet *wallet, bool store = true) override; virtual bool closeWallet(Wallet *wallet, bool store = true) override;
bool walletExists(const std::string &path) override; bool walletExists(const std::string &path) override;
bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const override; bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const override;
bool queryWalletDevice(Wallet::Device& device_type, const std::string &keys_file_name, const std::string &password, uint64_t kdf_rounds = 1) const; bool queryWalletDevice(Wallet::Device& device_type, const std::string &keys_file_name, const std::string &password, uint64_t kdf_rounds = 1) const override;
std::vector<std::string> findWallets(const std::string &path) override; std::vector<std::string> findWallets(const std::string &path) override;
std::string errorString() const override; std::string errorString() const override;
void setDaemonAddress(const std::string &address) override; void setDaemonAddress(const std::string &address) override;