diff options
| author | thankful_for_today <my email> | 2014-04-30 14:36:31 +0400 |
|---|---|---|
| committer | thankful_for_today <my email> | 2014-04-30 14:36:31 +0400 |
| commit | 132c364301b25e3e9e05f601681623cfe1be084d (patch) | |
| tree | 03aa4de37cf45deaca8010fc195aede07e43ddaf | |
| parent | 2nd seed node added (diff) | |
| parent | Merge pull request #1 from HenryHartshorne/master (diff) | |
| download | monero-132c364301b25e3e9e05f601681623cfe1be084d.tar.xz | |
Merge branch 'master' of https://github.com/bitmonero-project/bitmonero
voting commit merged
| -rw-r--r-- | src/cryptonote_config.h | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_format_utils.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index b7c0170e3..22b5ad693 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -12,7 +12,7 @@ #define CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW 60 #define CURRENT_TRANSACTION_VERSION 1 #define CURRENT_BLOCK_MAJOR_VERSION 1 -#define CURRENT_BLOCK_MINOR_VERSION 0 +#define CURRENT_BLOCK_MINOR_VERSION 1 #define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT 60*60*2 #define BLOCKCHAIN_TIMESTAMP_CHECK_WINDOW 60 diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index 2dd79abdc..a231f9c75 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -607,8 +607,8 @@ namespace cryptonote string_tools::parse_hexstr_to_binbuff(genesis_coinbase_tx_hex, tx_bl); bool r = parse_and_validate_tx_from_blob(tx_bl, bl.miner_tx); CHECK_AND_ASSERT_MES(r, false, "failed to parse coinbase tx from hard coded blob"); - bl.major_version = CURRENT_BLOCK_MAJOR_VERSION; - bl.minor_version = CURRENT_BLOCK_MINOR_VERSION; + bl.major_version = 1; + bl.minor_version = 0; bl.timestamp = 0; bl.nonce = 10000; miner::find_nonce_for_given_block(bl, 1, 0); |