diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-03-12 16:14:07 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-03-12 16:14:07 +0200 |
| commit | bb7b31d5eda71e2df4faf676f12d87de5223993e (patch) | |
| tree | 2bc555d25803de37a95b9e612f0e3c655893db49 /src/wallet/wallet2.h | |
| parent | Merge pull request #714 (diff) | |
| parent | wallet: use minimum mixin when RPC asks for too low mixin (diff) | |
| download | monero-bb7b31d5eda71e2df4faf676f12d87de5223993e.tar.xz | |
Merge pull request #715
8bc1bd6 wallet: use minimum mixin when RPC asks for too low mixin (moneromooo-monero)
31d2e0f wallet_rpc_server: make use_fork_rules public (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index c79da2e15..6c689d4ba 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -348,6 +348,8 @@ namespace tools bool get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key) const; + bool use_fork_rules(uint8_t version); + private: /*! * \brief Stores wallet information to wallet file. @@ -384,7 +386,6 @@ namespace tools crypto::hash get_payment_id(const pending_tx &ptx) const; void check_acc_out(const cryptonote::account_keys &acc, const cryptonote::tx_out &o, const crypto::public_key &tx_pub_key, size_t i, uint64_t &money_transfered, bool &error) const; void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const; - bool use_fork_rules(uint8_t version); uint64_t get_upper_tranaction_size_limit(); void check_pending_txes(); |