json rpc for wallet and bugfix

1 files changed, 16 insertions, 16 deletions

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
index 55efb1508..35dfcb3bb 100644
--- a/src/cryptonote_config.h
+++ b/src/cryptonote_config.h
@@ -4,30 +4,30 @@
 
 #pragma once
 
-#define CRYPTONOTE_MAX_BLOCK_NUMBER                       500000000
-#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           6 // addresses start with "2"
-#define CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW              10
+#define CRYPTONOTE_MAX_BLOCK_NUMBER                     500000000
+#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         6 // addresses start with "2"
+#define CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW            10
 #define CURRENT_TRANSACTION_VERSION                     1
 #define CURRENT_BLOCK_MAJOR_VERSION                     1
 #define CURRENT_BLOCK_MINOR_VERSION                     0
-#define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT                60*60*2
+#define CRYPTONOTE_BLOCK_FUTURE_TIME_LIMIT              60*60*2
 
 #define BLOCKCHAIN_TIMESTAMP_CHECK_WINDOW               60
 
 // MONEY_SUPPLY - total number coins to be generated
 #define MONEY_SUPPLY                                    ((uint64_t)(-1))
+
+#define CRYPTONOTE_REWARD_BLOCKS_WINDOW                 100
+#define CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE       10000 //size of block (bytes) after which reward for block calculated using block size
+#define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE          600
+#define CRYPTONOTE_DISPLAY_DECIMAL_POINT                8
 // COIN - number of smallest units in one coin
-#define COIN                                            ((uint64_t)1000000000000) // pow(10, 12)
+#define COIN                                            ((uint64_t)100000000) // pow(10, 8)
 #define DEFAULT_FEE                                     ((uint64_t)1000000) // pow(10, 6)
 
-#define CRYPTONOTE_REWARD_BLOCKS_WINDOW                   100
-#define CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE            10000 //size of block (bytes) after which reward for block calculated using block size
-#define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE            600
-#define CRYPTONOTE_DISPLAY_DECIMAL_POINT                  8
-
 
 #define ORPHANED_BLOCKS_MAX_COUNT                       100
 
@@ -39,8 +39,8 @@
 #define DIFFICULTY_BLOCKS_COUNT                         DIFFICULTY_WINDOW + DIFFICULTY_LAG
 
 
-#define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS        DIFFICULTY_TARGET * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS
-#define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS         1
+#define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS      DIFFICULTY_TARGET * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS
+#define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS       1
 
 
 #define DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN             DIFFICULTY_TARGET //just alias
@@ -48,7 +48,7 @@
 
 #define BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT          10000  //by default, blocks ids count in synchronizing
 #define BLOCKS_SYNCHRONIZING_DEFAULT_COUNT              200    //by default, blocks count in blocks downloading
-#define CRYPTONOTE_PROTOCOL_HOP_RELAX_COUNT               3      //value of hop, after which we use only announce of new block
+#define CRYPTONOTE_PROTOCOL_HOP_RELAX_COUNT             3      //value of hop, after which we use only announce of new block
 
 
 #define P2P_DEFAULT_PORT                                8080