diff options
author | paybee <dev@payb.ee> | 2014-05-29 17:53:49 +0200 |
---|---|---|
committer | paybee <dev@payb.ee> | 2014-05-29 17:53:49 +0200 |
commit | 0e5223321258d8fa6bbb7190ecb2b230a801aac2 (patch) | |
tree | acbd51dac3256b47bab6c1b98d21a3434b7158b7 /src/cryptonote_config.h | |
parent | Added incoming_transfers RPC API method (diff) | |
parent | Merge branch '0.8.8update' (diff) | |
download | monero-0e5223321258d8fa6bbb7190ecb2b230a801aac2.tar.xz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cryptonote_config.h')
-rw-r--r-- | src/cryptonote_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 34d053aa8..a992a9db0 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -8,7 +8,7 @@ #define CRYPTONOTE_MAX_BLOCK_SIZE 500000000 // block header blob limit, never used! #define CRYPTONOTE_MAX_TX_SIZE 1000000000 #define CRYPTONOTE_PUBLIC_ADDRESS_TEXTBLOB_VER 0 -#define CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX 18 // addresses start with "2" +#define CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX 18 // addresses start with "4" #define CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW 60 #define CURRENT_TRANSACTION_VERSION 1 #define CURRENT_BLOCK_MAJOR_VERSION 1 @@ -26,8 +26,8 @@ #define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE 600 #define CRYPTONOTE_DISPLAY_DECIMAL_POINT 12 // COIN - number of smallest units in one coin -#define COIN ((uint64_t)100000000) // pow(10, 8) -#define DEFAULT_FEE ((uint64_t)1000000) // pow(10, 6) +#define COIN ((uint64_t)1000000000000) // pow(10, 12) +#define DEFAULT_FEE ((uint64_t)5000000000) // 5 * pow(10, 9) #define ORPHANED_BLOCKS_MAX_COUNT 100 |