diff options
| author | Zachary Michaels <mikezackles@gmail.com> | 2014-09-08 15:09:59 -0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-15 15:53:50 +0200 |
| commit | 96eed84aad89e6e2799a9db91e2dd2e9fe0889f9 (patch) | |
| tree | 81ae5c4709effb79c5cbc031c452a71ac07ac9f6 /src/wallet | |
| parent | Separate network id for testnet (diff) | |
| download | monero-96eed84aad89e6e2799a9db91e2dd2e9fe0889f9.tar.xz | |
Pass tx and nonce to genesis block constructor
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index b8b728425..78fac0e87 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -35,6 +35,7 @@ #include "include_base_utils.h" using namespace epee; +#include "cryptonote_config.h" #include "wallet2.h" #include "cryptonote_core/cryptonote_format_utils.h" #include "rpc/core_rpc_server_commands_defs.h" @@ -939,10 +940,13 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions(std::vector<crypto //---------------------------------------------------------------------------------------------------- void wallet2::generate_genesis(cryptonote::block& b) { - if (m_testnet) { - cryptonote::generate_testnet_genesis_block(b); - } else { - cryptonote::generate_genesis_block(b); + if (m_testnet) + { + cryptonote::generate_genesis_block(b, config::testnet::GENESIS_TX, config::testnet::GENESIS_NONCE); + } + else + { + cryptonote::generate_genesis_block(b, config::GENESIS_TX, config::GENESIS_NONCE); } } } |