Merge pull request #143 from fioprotocol/release/2.3.x

Release/2.3.x -> Master ( v2.3.5 Release )
fioprotocol · May 27, 2021 · 0295e80 · 0295e80
2 parents c248ed8 + 83b0c3c
commit 0295e80
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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<int64_t >(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<int64_t >(trxstatus::cancelled);
-                fr.obt_time = currentTime;
+                fr.obt_time = present_time;
             });
         }
         // USED FOR MIGRATION