From 487196590cc4d94e60600f6f16f6a380cf6db7c5 Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 14:51:42 +0100 Subject: [PATCH 1/8] update github actions remove php from worker --- .github/workflows/komodod_ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/komodod_ci.yml b/.github/workflows/komodod_ci.yml index 4206ab3bed3..bdbfc0a9a3b 100644 --- a/.github/workflows/komodod_ci.yml +++ b/.github/workflows/komodod_ci.yml @@ -9,6 +9,7 @@ jobs: strategy: matrix: + php-version: ['7.1', '7.2', '7.3'] os: [macOS-latest, ubuntu-18.04] steps: @@ -17,7 +18,7 @@ jobs: - name: Install deps (Linux) if: runner.os == 'Linux' run: | - sudo apt-get remove php7.1-fpm + sudo apt-get remove php${{ matrix.php-version }}-fpm 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 @@ -74,7 +75,7 @@ jobs: DEBIAN_FRONTEND: noninteractive if: runner.os == 'Linux' run: | - sudo apt-get remove php7.1-fpm + sudo apt-get remove php${{ matrix.php-version }}-fpm 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 From 38fb5a4fa56bd17310b147a6f8499854dbb9a21b Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 17:09:29 +0100 Subject: [PATCH 2/8] update github actions --- .github/workflows/komodod_ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/komodod_ci.yml b/.github/workflows/komodod_ci.yml index bdbfc0a9a3b..962e9cca7d3 100644 --- a/.github/workflows/komodod_ci.yml +++ b/.github/workflows/komodod_ci.yml @@ -18,7 +18,6 @@ jobs: - name: Install deps (Linux) if: runner.os == 'Linux' run: | - sudo apt-get remove php${{ matrix.php-version }}-fpm 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 @@ -75,7 +74,6 @@ jobs: DEBIAN_FRONTEND: noninteractive if: runner.os == 'Linux' run: | - sudo apt-get remove php${{ matrix.php-version }}-fpm 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 From 5263f6d9f808ff78c29c8a02e95a01ce76de577a Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 17:22:29 +0100 Subject: [PATCH 3/8] update github actions --- .github/workflows/komodod_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/komodod_ci.yml b/.github/workflows/komodod_ci.yml index 962e9cca7d3..45d2c2624c5 100644 --- a/.github/workflows/komodod_ci.yml +++ b/.github/workflows/komodod_ci.yml @@ -18,6 +18,7 @@ jobs: - name: Install deps (Linux) if: runner.os == 'Linux' run: | + sudo apt-get remove php7.1-fpm php7.2-fpm php7.3-fpm 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 @@ -74,6 +75,7 @@ jobs: DEBIAN_FRONTEND: noninteractive if: runner.os == 'Linux' run: | + sudo apt-get remove php7.1-fpm php7.2-fpm php7.3-fpm 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 From 79dea8dfa975fd894b4ffd37455e01ebaa28f967 Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 17:48:43 +0100 Subject: [PATCH 4/8] fix invalid typecast --- src/main.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index b2f7dfdf1dd..d7b55c1f602 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5155,6 +5155,21 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C if ( ASSETCHAINS_STAKED == 0 && komodo_checkPOW(0,1,(CBlock *)&block,height) < 0 ) // checks Equihash return state.DoS(100, error("CheckBlock: failed slow_checkPOW"),REJECT_INVALID, "failed-slow_checkPOW"); } + if ( height > nDecemberHardforkHeight && ASSETCHAINS_SYMBOL[0] == 0 ) // December 2019 hardfork + { + int32_t notaryid; + int32_t special = komodo_chosennotary(¬aryid,height,pubkey33,tiptime); + if (notaryid > 0) { + CScript merkleroot = CScript(); + CBlock blockcopy = block; // block shouldn't be changed below, so let's make it's copy + CBlock *pblockcopy = (CBlock *)&blockcopy; + if (!komodo_checkopret(pblockcopy, merkleroot)) { + fprintf(stderr, "failed or missing merkleroot expected.%s != merkleroot.%s\n", komodo_makeopret(pblockcopy, false).ToString().c_str(), merkleroot.ToString().c_str()); + return state.DoS(100, error("CheckBlock: failed or missing merkleroot opret in easy-mined"),REJECT_INVALID, "failed-merkle-opret-in-easy-mined"); + } + } + } + // Check the merkle root. if (fCheckMerkleRoot) { bool mutated; From b97a4a84e9b06350106a3fea5bd98ca98b1fc0a9 Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 17:52:06 +0100 Subject: [PATCH 5/8] fix invalid typecast --- src/pow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pow.cpp b/src/pow.cpp index 736eee1b459..35fb040dfe3 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -857,6 +857,7 @@ bool CheckProofOfWork(const CBlockHeader &blkHeader, uint8_t *pubkey33, int32_t if ( (flag != 0 || special2 > 0) && special2 != -2 ) { bnTarget.SetCompact(KOMODO_MINDIFF_NBITS,&fNegative,&fOverflow); + /* const void* pblock = &blkHeader; CScript merkleroot = CScript(); if ( height > nDecemberHardforkHeight && !komodo_checkopret((CBlock*)pblock, merkleroot) ) // December 2019 hardfork @@ -864,6 +865,7 @@ bool CheckProofOfWork(const CBlockHeader &blkHeader, uint8_t *pubkey33, int32_t fprintf(stderr, "failed or missing expected.%s != %s\n", komodo_makeopret((CBlock*)pblock, false).ToString().c_str(), merkleroot.ToString().c_str()); return false; } + */ } } } From 76a0701db783faed3a8be7db5f1646a357153a7f Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 17:52:41 +0100 Subject: [PATCH 6/8] bump version --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9b280a33c81..d216247b896 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) -define(_CLIENT_VERSION_MAJOR, 2) +define(_CLIENT_VERSION_MAJOR, 3) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 15) -define(_CLIENT_VERSION_BUILD, 26) +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))) define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1))) define(_CLIENT_VERSION_IS_RELEASE, true) From fd29315e315414c23ec66668c1e4dfd04d5a5935 Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 18:50:24 +0100 Subject: [PATCH 7/8] update github actions --- .github/workflows/komodod_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/komodod_ci.yml b/.github/workflows/komodod_ci.yml index 45d2c2624c5..482fda4feab 100644 --- a/.github/workflows/komodod_ci.yml +++ b/.github/workflows/komodod_ci.yml @@ -75,7 +75,7 @@ jobs: DEBIAN_FRONTEND: noninteractive if: runner.os == 'Linux' run: | - sudo apt-get remove php7.1-fpm php7.2-fpm php7.3-fpm + sudo apt-get remove php5.6-fpm php7.0-fpm php7.1-fpm php7.2-fpm php7.3-fpm 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 From df12de10c1493ca691dad7d52b1c945919ea98b8 Mon Sep 17 00:00:00 2001 From: ca333 Date: Thu, 28 Nov 2019 19:12:10 +0100 Subject: [PATCH 8/8] rm matrix array --- .github/workflows/komodod_ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/komodod_ci.yml b/.github/workflows/komodod_ci.yml index 482fda4feab..a08865a3552 100644 --- a/.github/workflows/komodod_ci.yml +++ b/.github/workflows/komodod_ci.yml @@ -9,7 +9,6 @@ jobs: strategy: matrix: - php-version: ['7.1', '7.2', '7.3'] os: [macOS-latest, ubuntu-18.04] steps: