fix debug build

adshares · Apr 4, 2019 · 85b3454 · 85b3454
1 parent 845ff46
commit 85b3454
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/default_ads.h.in b/src/default_ads.h.in
@@ -21,6 +21,7 @@
 #define VALIDATORS 8 /* number of validator threads */
 #define CLIENT_POOL 16	/* do not offer more threads that are used for network message validation */
 #define USER_MIN_AGE     (BLOCKSEC*2)
+#define OFFICE_USER_MIN_AGE   (BLOCKSEC*2)
 #define BANK_MIN_MTIME   (BLOCKSEC*2) /* AND if no transaction in this period bank can be taken over */
 #define BLOCKS_COMPRESSED_SHIFT 128 /* shift from current block to archive old blocks */
 #define SHARED_PROFIT_NODES     10         /* Limit profit sharing to the first N nodes (+vips) */
@@ -38,6 +39,7 @@
 #define VALIDATORS 8 /* number of validator threads */
 #define CLIENT_POOL 16	/* do not offer more threads that are used for network message validation */
 #define USER_MIN_AGE     (BLOCKSEC*10000L) /* wait at least 10000 blocks before deleting an account */
+#define OFFICE_USER_MIN_AGE  ((USER_MIN_AGE) * 8) /* do not select to overwrite account before 80000 blocks */
 #define BANK_MIN_MTIME   (BLOCKSEC*1000L) /* AND if no transaction in this period bank can be taken over */
 #define BLOCKS_COMPRESSED_SHIFT 4096 /* shift from current block to archive old blocks */
 #define SHARED_PROFIT_NODES     100         /* Limit profit sharing to the first N nodes (+vips) */

diff --git a/src/escd/office.cpp b/src/escd/office.cpp
@@ -678,7 +678,7 @@ uint32_t office::add_user(uint16_t abank,uint8_t* pk,uint32_t when) { // will cr
         deleted_users.pop_front();
         lseek(offifd_,nuser*sizeof(user_t),SEEK_SET);
         read(offifd_,&nu,sizeof(user_t));
-        if((nu.weight<=TXS_DIV_FEE) && (nu.stat&USER_STAT_DELETED) && (when-USER_MIN_AGE*8>nu.lpath)) {
+        if((nu.weight<=TXS_DIV_FEE) && (nu.stat&USER_STAT_DELETED) && (when-OFFICE_USER_MIN_AGE>nu.lpath)) {
             DLOG("WARNING, overwriting empty account %08X [weight:%016lX]\n",nuser,nu.weight);
             //FIXME !!!  wrong time !!! must use time from txs
             srv_.last_srvs_.init_user(nu,svid,nuser,(abank==svid?USER_MIN_MASS:0),pk,when);