From 6e992aee12fcff386cab33273e8d69a849f630a9 Mon Sep 17 00:00:00 2001 From: Casey Gardiner <44983607+fiocasey@users.noreply.github.com> Date: Mon, 24 May 2021 13:32:23 -0600 Subject: [PATCH 1/4] FIP-28 --- contracts/fio.common/fio.common.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 12f436a86d9b38d7c20f48c6a331a9e72af52ff5 Mon Sep 17 00:00:00 2001 From: Casey Gardiner Date: Mon, 24 May 2021 13:36:36 -0600 Subject: [PATCH 2/4] time fixes that could cause issues on mainnet --- contracts/fio.request.obt/fio.request.obt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From d7966af390e0d70209ab8aca5ee235ceb3e48453 Mon Sep 17 00:00:00 2001 From: Casey Gardiner <44983607+fiocasey@users.noreply.github.com> Date: Mon, 24 May 2021 13:37:37 -0600 Subject: [PATCH 3/4] versioning changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb2ffaff..c57f0c70 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 From 7037176a57075858999c8ea050958028e0c49aa5 Mon Sep 17 00:00:00 2001 From: Casey Gardiner <44983607+fiocasey@users.noreply.github.com> Date: Mon, 24 May 2021 13:37:54 -0600 Subject: [PATCH 4/4] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)