Checkpoints, transaction pool and general improvements

ducknote · Sep 4, 2014 · e9dcc98 · e9dcc98 · ducknote · Sep 4, 2014
1 parent 1e46aa2
commit e9dcc98
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/crypto/tree-hash.c b/src/crypto/tree-hash.c
@@ -19,7 +19,7 @@ void tree_hash(const char (*hashes)[HASH_SIZE], size_t count, char *root_hash) {
     size_t i, j;
     size_t cnt = count - 1;
     char (*ints)[HASH_SIZE];
-    for (i = 1; i < sizeof(size_t); i <<= 1) {
+    for (i = 1; i < 8 * sizeof(size_t); i <<= 1) {
       cnt |= cnt >> i;
     }
     cnt &= ~(cnt >> 1);

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
@@ -42,8 +42,8 @@
 #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_MEMPOOL_TX_LIVETIME                  (60*60*24) //seconds, one day
-#define CRYPTONOTE_MEMPOOL_TX_FROM_ALT_BLOCK_LIVETIME   (60*60*24*7) //seconds, one week
+#define CRYPTONOTE_MEMPOOL_TX_LIVETIME                  (60*60*14) //seconds, 14 hours
+#define CRYPTONOTE_MEMPOOL_TX_FROM_ALT_BLOCK_LIVETIME   (60*60*24) //seconds, one day
 
 #define DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN             DIFFICULTY_TARGET //just alias
 

diff --git a/src/cryptonote_core/checkpoints_create.h b/src/cryptonote_core/checkpoints_create.h
@@ -15,7 +15,8 @@ namespace cryptonote {
     ADD_CHECKPOINT(1100,  "990a83b3e77ba5def86311da34793e09fa3b0a2875571bd59449173fddf4e129");
     ADD_CHECKPOINT(4200,  "76af92fc41eadf9c99df91efc08011d0fce6f3f55b131da2449c187f432f91f7");
     ADD_CHECKPOINT(11000, "970c15459e4d484166c36e303fcf35886e14633b40b1fe4e3f250eb03eaca1f8");
-
+    ADD_CHECKPOINT(22000, "ae9ab36c4ff2cf215d49ffa4358d108dd777b8897c2d873a064dc103fea2b5ab");
+    ADD_CHECKPOINT(33000, "3fac95a900e65391d693e2cb331a26c757595baac133b9fa24936dd50fc7465f");
     return true;
   }
 }
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
@@ -534,6 +534,7 @@ namespace cryptonote
 
     m_store_blockchain_interval.do_call(boost::bind(&blockchain_storage::store_blockchain, &m_blockchain_storage));
     m_miner.on_idle();
+    m_mempool.on_idle();
     return true;
   }
   //-----------------------------------------------------------------------------------------------