diff options
author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-12 12:33:05 +0000 |
---|---|---|
committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-03-16 12:07:42 +0000 |
commit | 798535149d85d2a1db9f6c21584fd43368cd3fe1 (patch) | |
tree | 56261a21c7ca6a446835c4bed84d3b52febef643 /src/wallet/api | |
parent | wallet2_api: add ring api (diff) | |
download | monero-798535149d85d2a1db9f6c21584fd43368cd3fe1.tar.xz |
wallet2_api: add key reuse mitigations API
Diffstat (limited to '')
-rw-r--r-- | src/wallet/api/wallet.cpp | 15 | ||||
-rw-r--r-- | src/wallet/api/wallet.h | 3 | ||||
-rw-r--r-- | src/wallet/api/wallet2_api.h | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index be3ca9853..4838395cd 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -1990,6 +1990,21 @@ bool WalletImpl::setRing(const std::string &key_image, const std::vector<uint64_ return true; } +void WalletImpl::segregatePreForkOutputs(bool segregate) +{ + m_wallet->segregate_pre_fork_outputs(segregate); +} + +void WalletImpl::segregationHeight(uint64_t height) +{ + m_wallet->segregation_height(height); +} + +void WalletImpl::keyReuseMitigation2(bool mitigation) +{ + m_wallet->key_reuse_mitigation2(mitigation); +} + } // namespace namespace Bitmonero = Monero; diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 9d40008d1..4bde20959 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -167,6 +167,9 @@ public: virtual bool unblackballOutput(const std::string &pubkey); virtual bool getRing(const std::string &key_image, std::vector<uint64_t> &ring) const; virtual bool setRing(const std::string &key_image, const std::vector<uint64_t> &ring, bool relative); + virtual void segregatePreForkOutputs(bool segregate); + virtual void segregationHeight(uint64_t height); + virtual void keyReuseMitigation2(bool mitigation); private: void clearStatus() const; diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h index b67e13ac5..c77e495a2 100644 --- a/src/wallet/api/wallet2_api.h +++ b/src/wallet/api/wallet2_api.h @@ -769,6 +769,15 @@ struct Wallet //! sets the ring used for a key image virtual bool setRing(const std::string &key_image, const std::vector<uint64_t> &ring, bool relative) = 0; + //! sets whether pre-fork outs are to be segregated + virtual void segregatePreForkOutputs(bool segregate) = 0; + + //! sets the height where segregation should occur + virtual void segregationHeight(uint64_t height) = 0; + + //! secondary key reuse mitigation + virtual void keyReuseMitigation2(bool mitigation) = 0; + //! Light wallet authenticate and login virtual bool lightWalletLogin(bool &isNewWallet) const = 0; |