diff --git a/CMakeLists.txt b/CMakeLists.txt index 117efd99..7addb486 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(fio.contracts) set(VERSION_MAJOR 2) set(VERSION_MINOR 3) -set(VERSION_PATCH 4) +set(VERSION_PATCH 5) #set(VERSION_SUFFIX rc3) if (VERSION_SUFFIX) diff --git a/README.md b/README.md index fdb18121..cf91d3d3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # fio.contracts -## Version : 2.3.4 +## Version : 2.3.5 Smart contracts that provide some of the basic functions of the FIO blockchain diff --git a/contracts/fio.common/fio.common.hpp b/contracts/fio.common/fio.common.hpp index ae79c516..673fabe9 100644 --- a/contracts/fio.common/fio.common.hpp +++ b/contracts/fio.common/fio.common.hpp @@ -27,7 +27,7 @@ #define SECONDS30DAYS 2592000 #define SECONDSPERDAY 86400 #define DOMAINWAITFORBURNDAYS 90 * SECONDSPERDAY -#define ADDRESSWAITFORBURNDAYS 90 * SECONDSPERDAY +#define ADDRESSWAITFORBURNDAYS 365 * SECONDSPERDAY #define MAXBOUNTYTOKENSTOMINT 125000000000000000 //#define MINVOTEDFIO 10'000'000'000000000 //TESTNET ONLY #define MINVOTEDFIO 65'000'000'000000000 diff --git a/contracts/fio.request.obt/fio.request.obt.cpp b/contracts/fio.request.obt/fio.request.obt.cpp index b5a1c0e1..1ab1ad7e 100644 --- a/contracts/fio.request.obt/fio.request.obt.cpp +++ b/contracts/fio.request.obt/fio.request.obt.cpp @@ -770,7 +770,7 @@ namespace fioio { if(fioreqctx2_iter != trxtByRequestId.end()){ trxtByRequestId.modify(fioreqctx2_iter, _self, [&](struct fiotrxt_info &fr) { fr.fio_data_type = static_cast(trxstatus::rejected); - fr.obt_time = currentTime; + fr.obt_time = present_time; }); } // USED FOR MIGRATION @@ -935,7 +935,7 @@ namespace fioio { if(fioreqctx2_iter != trxtByRequestId.end()){ trxtByRequestId.modify(fioreqctx2_iter, _self, [&](struct fiotrxt_info &fr) { fr.fio_data_type = static_cast(trxstatus::cancelled); - fr.obt_time = currentTime; + fr.obt_time = present_time; }); } // USED FOR MIGRATION