Skip to content

Commit

Permalink
Merge pull request jl777#436 from KomodoPlatform/beta
Browse files Browse the repository at this point in the history
0.7.0
  • Loading branch information
ca333 authored May 17, 2021
2 parents 03ec324 + cefc54e commit 272c59d
Show file tree
Hide file tree
Showing 29 changed files with 313 additions and 94 deletions.
21 changes: 13 additions & 8 deletions .github/workflows/komodo_linux_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive
run: |
sudo apt-get update # prevents repo404 errors on apt-remove below
sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17 mysql-server*
sudo apt-get remove php* msodbcsql17 mysql* powershell dotn*
sudo apt-get update
sudo ACCEPT_EULA=Y apt-get upgrade -y
sudo apt-get install -q \
Expand All @@ -33,8 +33,8 @@ jobs:
libcurl4-openssl-dev \
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
./zcutil/fetch-params.sh
python3 -m pip install pytest wget jsonschema
python3 -m pip install -Iv https://github.com/KomodoPlatform/slick-bitcoinrpc/archive/refs/tags/0.1.4.tar.gz
- name: Build (Linux)
run: |
# flag for some CC tests transactions - so DO NOT USE THIS CI ARTIFACTS IN PRODUCTION!!!
Expand Down Expand Up @@ -67,7 +67,8 @@ jobs:
libcurl4-openssl-dev \
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
python3 -m pip install pytest wget jsonschema
python3 -m pip install -Iv https://github.com/KomodoPlatform/slick-bitcoinrpc/archive/refs/tags/0.1.4.tar.gz
- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -102,7 +103,8 @@ jobs:
libcurl4-openssl-dev \
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
python3 -m pip install pytest wget jsonschema
python3 -m pip install -Iv https://github.com/KomodoPlatform/slick-bitcoinrpc/archive/refs/tags/0.1.4.tar.gz
- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -137,7 +139,8 @@ jobs:
libcurl4-openssl-dev \
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
python3 -m pip install pytest wget jsonschema
python3 -m pip install -Iv https://github.com/KomodoPlatform/slick-bitcoinrpc/archive/refs/tags/0.1.4.tar.gz
- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -172,7 +175,8 @@ jobs:
libcurl4-openssl-dev \
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
python3 -m pip install pytest wget jsonschema
python3 -m pip install -Iv https://github.com/KomodoPlatform/slick-bitcoinrpc/archive/refs/tags/0.1.4.tar.gz
- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand Down Expand Up @@ -207,7 +211,8 @@ jobs:
libcurl4-openssl-dev \
libssl-dev -y
python3 -m pip install setuptools wheel
python3 -m pip install slick-bitcoinrpc pytest wget jsonschema
python3 -m pip install pytest wget jsonschema
python3 -m pip install -Iv https://github.com/KomodoPlatform/slick-bitcoinrpc/archive/refs/tags/0.1.4.tar.gz
- name: Download komodo-linux.tar.gz
uses: actions/download-artifact@v1
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/komodo_mac_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ jobs:
brew install coreutils
brew install wget
brew install python3
pip3 install setuptools wheel slick-bitcoinrpc pytest wget
./zcutil/fetch-params.sh
brew install gmp
- name: Build (macOS)
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/komodo_win_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive
run: |
sudo apt-get update # prevents repo404 errors on apt-remove below
sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17
sudo apt-get remove php* msodbcsql17 mysql* powershell containernetworking-* containers* dotn*
sudo ACCEPT_EULA=Y apt-get upgrade -y
sudo apt-get update
sudo apt-get install build-essential \
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
cmake \
clang \
libsodium-dev \
python-zmq \
python3-zmq \
mingw-w64 -y
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/komodod_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install deps (Linux)
run: |
sudo apt-get update # prevents repo404 errors on apt-remove below
sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm msodbcsql17 mysql-server*
sudo apt-get remove php* msodbcsql17 mysql* powershell dotn*
sudo apt-get update
sudo ACCEPT_EULA=Y apt-get upgrade -y
sudo apt-get install -q \
Expand All @@ -56,7 +56,7 @@ jobs:
with:
name: komodo-linux
path: ./komodo-linux.zip

- name: Login to docker hub
uses: actions-hub/docker/login@master
env:
Expand Down Expand Up @@ -88,6 +88,7 @@ jobs:
brew install coreutils
brew install wget
brew install python3
brew install gmp
- name: Build (macOS)
run: |
./zcutil/build-mac.sh -j4
Expand All @@ -109,11 +110,14 @@ jobs:
DEBIAN_FRONTEND: noninteractive
run: |
sudo apt-get update # prevents repo404 errors on apt-remove below
sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm php7.3-common php7.4-fpm
sudo apt-get remove php* msodbcsql17 mysql* powershell containernetworking-* containers* dotn*
sudo apt-get update
sudo apt-get upgrade -y
sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool libncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang libsodium-dev -y
sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl4-gnutls-dev bsdmainutils automake curl cmake mingw-w64
sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool \
libncurses-dev unzip wget bsdmainutils automake libboost-all-dev libssl-dev \
libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev ntp ntpdate nano \
software-properties-common curl libevent-dev libcurl4-gnutls-dev cmake clang \
libsodium-dev ncurses-dev git python3 python3-zmq zlib1g-dev mingw-w64 -y
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
rustup target add x86_64-pc-windows-gnu
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 3)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 7)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
Expand Down Expand Up @@ -743,7 +743,7 @@ fi
# platforms, so we use older autoconf detection mechanisms:
if test x$TARGET_OS = xdarwin; then
AC_CHECK_HEADER([gmp.h],,AC_MSG_ERROR(libgmp headers missing))
AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])
#AC_CHECK_LIB([gmp],[[__gmpn_sub_n]],GMP_LIBS=-lgmp, [AC_MSG_ERROR(libgmp missing)])

AC_CHECK_HEADER([gmpxx.h],,AC_MSG_ERROR(libgmpxx headers missing))
AC_CHECK_LIB([gmpxx],[main],GMPXX_LIBS=-lgmpxx, [AC_MSG_ERROR(libgmpxx missing)])
Expand Down
32 changes: 13 additions & 19 deletions src/assetchains.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@
"ac_name": "DEX",
"ac_supply": "999999"
},
{
"ac_name": "GLEEC",
"ac_supply": "210000000",
"ac_public": "1",
"ac_staked": "100",
"addnode":["95.217.161.126"]
},
{
"ac_name": "HODL",
"ac_supply": "9999999"
Expand Down Expand Up @@ -90,35 +97,25 @@
{
"ac_name": "OOT",
"ac_supply": "216000000",
"ac_sapling": "5000000"
"ac_sapling": "5000000",
"addnode": ["88.99.212.81"]
},
{
"ac_name": "PANGEA",
"ac_supply": "999999"
},
{
"ac_name": "PGT",
"ac_supply": "10000000",
"ac_end": "1",
"addnode": ["190.114.254.104"]
},
{
"ac_name": "PIRATE",
"ac_supply": "0",
"ac_reward": "25600000000",
"ac_halving": "77777",
"ac_private": "1",
"addnode": ["136.243.102.225"]
"addnode": ["88.99.212.81"]
},
{
"ac_name": "REVS",
"ac_supply": "1300000"
},
{
"ac_name": "RFOX",
"ac_supply": "1000000000",
"ac_reward": "100000000"
},
{
"ac_name": "RICK",
"ac_supply": "90000000000",
Expand Down Expand Up @@ -163,12 +160,9 @@
"addnode": ["51.68.215.104"]
},
{
"ac_name": "STBL",
"ac_supply": "50000000",
"ac_cc": "1",
"ac_name": "VOTE2021",
"ac_supply": "129848152",
"ac_public": "1",
"ac_adaptivepow": "1",
"ac_end": "1",
"addnode": ["142.93.173.53", "68.183.74.250"]
"addnode": ["77.74.197.115"]
}
]
11 changes: 4 additions & 7 deletions src/assetchains.old
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ echo $pubkey
./komodod -pubkey=$pubkey -ac_name=COQUICASH -ac_supply=72000000 -ac_reward=7200000000 -ac_staked=50 -ac_halving=420000 -ac_cc=2 -ac_ccenable=227,235,236,241 -addnode=78.47.108.168 $1 &
./komodod -pubkey=$pubkey -ac_name=CRYPTO -ac_supply=999999 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=DEX -ac_supply=999999 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=GLEEC -ac_supply=210000000 -ac_public=1 -ac_staked=100 -addnode=95.217.161.126 $1 &
./komodod -pubkey=$pubkey -ac_name=HODL -ac_supply=9999999 -addnode=95.213.238.98 $1 &
#~/hush3/src/komodod -pubkey=$pubkey -ac_name=HUSH3 -ac_sapling=1 -ac_reward=0,1125000000,562500000 -ac_halving=129,340000,840000 -ac_end=128,340000,5422111 -ac_eras=3 -ac_blocktime=150 -ac_cc=2 -ac_ccenable=228,234,235,236,241 -ac_founders=1 -ac_supply=6178674 -ac_perc=11111111 -clientname=GoldenSandtrout -addnode=188.165.212.101 -addnode=136.243.227.142 -addnode=5.9.224.250 -ac_cclib=hush3 -ac_script=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac $1 &
./komodod -pubkey=$pubkey -ac_name=ILN -ac_supply=10000000000 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=51.75.122.83 $1 &
./komodod -pubkey=$pubkey -ac_name=JUMBLR -ac_supply=999999 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=KOIN -ac_supply=125000000 -addnode=3.0.32.10 $1 &
Expand All @@ -22,16 +22,13 @@ echo $pubkey
./komodod -pubkey=$pubkey -ac_name=MORTY -ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -ac_staked=10 -addnode=95.217.44.58 -addnode=138.201.136.145 $1 &
./komodod -pubkey=$pubkey -ac_name=MSHARK -ac_supply=1400000 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=OOT -ac_supply=216000000 -ac_sapling=5000000 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=OOT -ac_supply=216000000 -ac_sapling=5000000 -addnode=88.99.212.81 $1 &
./komodod -pubkey=$pubkey -ac_name=PANGEA -ac_supply=999999 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=PGT -ac_supply=10000000 -ac_end=1 -addnode=190.114.254.104 $1 &
./komodod -pubkey=$pubkey -ac_name=PIRATE -ac_supply=0 -ac_reward=25600000000 -ac_halving=77777 -ac_private=1 -addnode=178.63.77.56 $1 &
./komodod -pubkey=$pubkey -ac_name=PIRATE -ac_supply=0 -ac_reward=25600000000 -ac_halving=77777 -ac_private=1 -addnode=88.99.212.81 $1 &
./komodod -pubkey=$pubkey -ac_name=REVS -ac_supply=1300000 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=RFOX -ac_supply=1000000000 -ac_reward=100000000 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=RICK -ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -ac_staked=10 -addnode=95.217.44.58 -addnode=138.201.136.145 $1 &
./komodod -pubkey=$pubkey -ac_name=STBL -ac_supply=50000000 -ac_cc=1 -ac_public=1 -ac_adaptivepow=1 -ac_end=1 -addnode=142.93.173.53 -addnode=68.183.74.250 $1 &
./komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=95.213.238.98 $1 &
./komodod -pubkey=$pubkey -ac_name=THC -ac_supply=251253103 -ac_reward=360000000,300000000,240000000,180000000,150000000,90000000,0 -ac_staked=100 -ac_eras=7 -ac_end=500001,1000001,1500001,2000001,2500001,4500001,0 -ac_perc=233333333 -ac_cc=2 -ac_ccenable=229,236,240 -ac_script=2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401ccb8 -ac_founders=150 -ac_cbmaturity=1 -ac_sapling=1 -addnode=157.230.45.184 -addnode=165.22.52.123 -earlytxid=7e4a76259e99c9379551389e9f757fc5f46c33ae922a8644dc2b187af2a6adc1 $1 &
#~/VerusCoin/src/verusd -pubkey=$pubkey $1 &
./komodod -pubkey=$pubkey -ac_public=1 -ac_name=VOTE2021 -ac_supply=129848152 -addnode=77.74.197.115 $1 &
./komodod -pubkey=$pubkey -ac_name=WLC21 -ac_supply=21000000 -ac_reward=190258751 -ac_staked=90 -ac_public=1 -addnode=37.187.225.231 -addnode=51.38.38.134 $1 &
./komodod -pubkey=$pubkey -ac_name=ZILLA -ac_supply=11000000 -ac_sapling=5000000 -addnode=51.68.215.104 $1 &
21 changes: 18 additions & 3 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -691,9 +691,24 @@ void *chainparams_commandline()
( 1500000, uint256S("0x0791f892210ce3c513ab607d689cd1e8907a27f3dfeb58dec21ae299b7981cb7"))
( 1550000, uint256S("0x08fcbaffb7164b161a25efc6dd5c70b679498ee637d663fe201a55c7decc37a3"))
( 1600000, uint256S("0x0e577dcd49319a67fe2acbb39ae6d46afccd3009d3ba9d1bcf6c624708e12bac"))
( 1615921, uint256S("0x049140623cc54a4a3d5868f720611e180ba0cafa21eab1edd0bc9ec2e6b7c374")),
1573604104, // * UNIX timestamp of last checkpoint block
7371665, // * total number of transactions between genesis and last checkpoint
( 1650000, uint256S("0x091ac57a0f786a9526b2224a10b62f1f464b9ffc0afc2240d86264439e6ad3d0"))
( 1700000, uint256S("0x0d0be6ab4a5083ce9d2a7ea2549b03cfc9770427b7d51c0bf0c603399a60d037"))
( 1750000, uint256S("0x0a019d830157db596eeb678787279908093fd273a4e022b5e052f3a9f95714ca"))
( 1800000, uint256S("0x0390779f6c615620391f9dd7df7f3f4947523bd6350b26625c0315571c616076"))
( 1850000, uint256S("0x000000007ca2de1bd9cb7b52fe0accca4874143822521d955e58c73e304279e0"))
( 1900000, uint256S("0x04c6589d5703f8237bf215c4e3e881c1c77063ef079cea5dc132a0e7f7a0cbd9"))
( 1950000, uint256S("0x00000000386795b9fa21f14782ee1b9176763d6a544d7e0511d1860c62d540aa"))
( 2000000, uint256S("0x0b0403fbe3c5742bbd0e3fc643049534e50c4a49bbc4a3b284fc0ecedf15c044"))
( 2050000, uint256S("0x0c7923957469864d49a0be56b5ffbee7f21c1b6d00acc7374f60f1c1c7b87e14"))
( 2100000, uint256S("0x05725ed166ae796529096ac2a42e85a3bdd0d69dbb2f69e620c08219fda1130a"))
( 2150000, uint256S("0x0edb94f5a5501fc8dd72a455cdaccf0af0215b914dd3d8d4ae5d644e27ef562c"))
( 2200000, uint256S("0x08b92203aa4a3b09001a75e8eebe8e64434259ae7ed7a31384203924d1ab03b8"))
( 2250000, uint256S("0x0127d1ed5cd6f261631423275b6b17728c392583177e1151a6e638a4b0dea985"))
( 2300000, uint256S("0x07df8af646bc30c71d068b146d9ea2c8b25b27a180e9537d5aef859efcfc41f7"))
( 2350000, uint256S("0x0b8028dbfcd92fe34496953872cba2d256923e3e52b4abbdcbe9911071e929e5"))
( 2395555, uint256S("0x0a09f16d886ed8152aaa2e2fcdf6ab4bb142ff8ce5abac131c5eda385a5d712f")),
1621188001, // * UNIX timestamp of last checkpoint block
13903562, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
2777 // * estimated number of transactions per day after checkpoint
// total number of tx / (checkpoint block height / (24 * 24))
Expand Down
8 changes: 4 additions & 4 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
*/

//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 7
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0

//! Set to true for release, false for prerelease or test build
Expand All @@ -42,7 +42,7 @@
* Copyright year (2009-this)
* Todo: update this when changing our copyright comments in the source
*/
#define COPYRIGHT_YEAR 2019
#define COPYRIGHT_YEAR 2021

#endif //HAVE_CONFIG_H

Expand Down
1 change: 1 addition & 0 deletions src/crypto/equihash.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "komodo_nk.h"

#include <cstring>
#include <stdexcept>
#include <exception>
#include <functional>
#include <memory>
Expand Down
1 change: 0 additions & 1 deletion src/cryptoconditions/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ LT_INIT

# Checks for programs.
AC_PROG_CC
AC_PROG_CC_STDC

# Checks for libraries.

Expand Down
8 changes: 4 additions & 4 deletions src/cryptoconditions/src/include/secp256k1/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ fi

AM_PROG_CC_C_O

AC_PROG_CC_C89
if test x"$ac_cv_prog_cc_c89" = x"no"; then
AC_MSG_ERROR([c89 compiler support required])
AC_PROG_CC
if test x"$ac_cv_prog_cc_c11" = x"no"; then
AC_MSG_ERROR([c2011 compiler support required])
fi
AM_PROG_AS

Expand Down Expand Up @@ -65,7 +65,7 @@ esac

CFLAGS="$CFLAGS -W"

warn_CFLAGS="-std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings"
warn_CFLAGS="-pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings"
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $warn_CFLAGS"
AC_MSG_CHECKING([if ${CC} supports ${warn_CFLAGS}])
Expand Down
2 changes: 1 addition & 1 deletion src/deprecation.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// * Shut down WEEKS_UNTIL_DEPRECATION weeks' worth of blocks after the estimated release block height.
// * A warning is shown during the DEPRECATION_WARN_LIMIT worth of blocks prior to shut down.
static const int WEEKS_UNTIL_DEPRECATION = 52;
static const int DEPRECATION_HEIGHT = 2900000; //TODO: use [last_season_array_item - 1] + 650.000 for automagic update
static const int DEPRECATION_HEIGHT = 3600000; //TODO: use [last_season_array_item - 1] + 650.000 for automagic update
static const int APPROX_RELEASE_HEIGHT = DEPRECATION_HEIGHT - (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60);

// Number of blocks before deprecation to warn users
Expand Down
6 changes: 6 additions & 0 deletions src/komodo-tx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ int32_t komodo_nextheight()
return(100000000);
}

// function stub to allow build komodo-tx
bool komodo_is_vSolutionsFixActive()
{
return true;
}


// Set default values of new CMutableTransaction based on consensus rules at given height.
CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Params& consensusParams, int nHeight)
Expand Down
Loading

0 comments on commit 272c59d

Please sign in to comment.