diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/cryptonote_basic/cryptonote_basic.h | 6 | ||||
-rw-r--r-- | src/cryptonote_core/cryptonote_tx_utils.cpp | 2 | ||||
-rw-r--r-- | src/device/device_default.cpp | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/cryptonote_basic/cryptonote_basic.h b/src/cryptonote_basic/cryptonote_basic.h index 12124ebf5..d4558ef7b 100644 --- a/src/cryptonote_basic/cryptonote_basic.h +++ b/src/cryptonote_basic/cryptonote_basic.h @@ -429,12 +429,6 @@ namespace cryptonote crypto::public_key pub; crypto::secret_key sec; - static inline keypair generate() - { - keypair k; - generate_keys(k.pub, k.sec); - return k; - } static inline keypair generate(hw::device &hwdev) { keypair k; diff --git a/src/cryptonote_core/cryptonote_tx_utils.cpp b/src/cryptonote_core/cryptonote_tx_utils.cpp index cbacc7893..db4ab9e11 100644 --- a/src/cryptonote_core/cryptonote_tx_utils.cpp +++ b/src/cryptonote_core/cryptonote_tx_utils.cpp @@ -78,7 +78,7 @@ namespace cryptonote tx.vout.clear(); tx.extra.clear(); - keypair txkey = keypair::generate(); + keypair txkey = keypair::generate(hw::get_device("default")); add_tx_pub_key_to_extra(tx, txkey.pub); if(!extra_nonce.empty()) if(!add_extra_nonce_to_tx_extra(tx.extra, extra_nonce)) diff --git a/src/device/device_default.cpp b/src/device/device_default.cpp index 6d60c8cc1..d63dafe9e 100644 --- a/src/device/device_default.cpp +++ b/src/device/device_default.cpp @@ -251,7 +251,7 @@ namespace hw { /* ======================================================================= */ bool device_default::open_tx(crypto::secret_key &tx_key) { - cryptonote::keypair txkey = cryptonote::keypair::generate(); + cryptonote::keypair txkey = cryptonote::keypair::generate(*this); tx_key = txkey.sec; return true; } |