From a8784f98068647715f770acbc000c3a984f1bd67 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Sun, 16 May 2021 22:27:38 +0300 Subject: [PATCH 1/6] bump openssl (1.1.1k) and libcurl (7.76.1) versions --- depends/packages/libcurl.mk | 4 ++-- depends/packages/openssl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/packages/libcurl.mk b/depends/packages/libcurl.mk index fd82dc4e0b..2a70a51b35 100644 --- a/depends/packages/libcurl.mk +++ b/depends/packages/libcurl.mk @@ -1,9 +1,9 @@ package=libcurl -$(package)_version=7.67.0 +$(package)_version=7.76.1 $(package)_dependencies=openssl $(package)_download_path=https://curl.haxx.se/download $(package)_file_name=curl-$($(package)_version).tar.gz -$(package)_sha256_hash=52af3361cf806330b88b4fe6f483b6844209d47ae196ac46da4de59bb361ab02 +$(package)_sha256_hash=5f85c4d891ccb14d6c3c701da3010c91c6570c3419391d485d95235253d837d7 $(package)_config_opts_linux=--disable-shared --enable-static --prefix=$(host_prefix) --host=x86_64-unknown-linux-gnu $(package)_config_opts_mingw32=--enable-mingw --disable-shared --enable-static --prefix=$(host_prefix) --host=x86_64-w64-mingw32 $(package)_config_opts_darwin=--disable-shared --enable-static --prefix=$(host_prefix) diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk index 296a553894..ddc5acd70d 100644 --- a/depends/packages/openssl.mk +++ b/depends/packages/openssl.mk @@ -1,8 +1,8 @@ package=openssl -$(package)_version=1.1.1f +$(package)_version=1.1.1k $(package)_download_path=https://www.openssl.org/source $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 +$(package)_sha256_hash=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" From f584c27606fa002125ecf8ba234feb99c6bc5ff7 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Mon, 17 May 2021 19:24:54 +0300 Subject: [PATCH 2/6] fix nLocalServices NODE_NSPV conditional init thx @dimxy for point out --- src/net.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/net.cpp b/src/net.cpp index 1b982d2444..5fe1660254 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -83,7 +83,7 @@ extern char ASSETCHAINS_SYMBOL[65]; bool fDiscover = true; bool fListen = true; -uint64_t nLocalServices = GetBoolArg("-nspv_msg", DEFAULT_NSPV_PROCESSING) ? NODE_NETWORK | NODE_NSPV : NODE_NETWORK; +uint64_t nLocalServices = NODE_NETWORK; CCriticalSection cs_mapLocalHost; map mapLocalHost; static bool vfLimited[NET_MAX] = {}; @@ -1792,6 +1792,12 @@ void static Discover(boost::thread_group& threadGroup) void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler) { + + if (GetBoolArg("-nspv_msg", DEFAULT_NSPV_PROCESSING)) { + nLocalServices |= NODE_NSPV; + LogPrintf("NSPV messages processing enabled\n"); + } + uiInterface.InitMessage(_("Loading addresses...")); // Load addresses for peers.dat int64_t nStart = GetTimeMillis(); From df7ee6b2a3f8710656e2ef5dc6dccda59eb4c641 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Tue, 25 May 2021 03:59:57 +0300 Subject: [PATCH 3/6] fix cJSON* pointer compare with int this also will fix build on OS with default compiler - gcc 11.1.x such as archlinux 5.2.16 and others. (c) https://github.com/DeckerSU/KomodoOcean/commit/f4ed74c66beb6abf329c7e9fb3af3b3fb6199c8f --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index ec9f7cd850..137e0b16b3 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -529,7 +529,7 @@ int32_t komodo_verifynotarization(char *symbol,char *dest,int32_t height,int32_t { if ( (json= cJSON_Parse(jsonstr)) != 0 ) { - if ( (txjson= jobj(json,(char *)"result")) != 0 && (vouts= jarray(&n,txjson,(char *)"vout")) > 0 ) + if ( (txjson= jobj(json,(char *)"result")) != 0 && (vouts= jarray(&n,txjson,(char *)"vout")) != 0 ) { vout = jitem(vouts,n-1); if ( 0 && ASSETCHAINS_SYMBOL[0] != 0 ) From 601a9077783f8e77d9dc4524c9a2c5c63f85ee02 Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Wed, 26 May 2021 21:29:25 +0300 Subject: [PATCH 4/6] change zcash params files location to self-hosted as zcash seems delete sprout related files (sprout-proving.key, sprout-verifying.key) from their hosting (z.cash), we need to switch on our one hosting to download these files, as komodo still needed them. --- zcutil/VerusCoin.xml | 4 ++-- zcutil/fetch-params.bat | 10 +++++----- zcutil/fetch-params.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zcutil/VerusCoin.xml b/zcutil/VerusCoin.xml index 914e2f14b2..610533787a 100644 --- a/zcutil/VerusCoin.xml +++ b/zcutil/VerusCoin.xml @@ -252,7 +252,7 @@ ${windows_folder_appdata}/ZcashParams/sprout-proving.key Zcash Params file: sprout-proving.key 0 - https://z.cash/downloads/sprout-proving.key + https://komodoplatform.com/downloads/sprout-proving.key @@ -274,7 +274,7 @@ ${windows_folder_appdata}/ZcashParams/sprout-verifying.key Zcash Params file: sprout-verifying.key 0 - https://z.cash/downloads/sprout-verifying.key + https://komodoplatform.com/downloads/sprout-verifying.key diff --git a/zcutil/fetch-params.bat b/zcutil/fetch-params.bat index f9e70d4812..46124d9523 100644 --- a/zcutil/fetch-params.bat +++ b/zcutil/fetch-params.bat @@ -6,23 +6,23 @@ MKDIR "%APPDATA%"\ZcashParams ) IF NOT EXIST "%APPDATA%"\ZcashParams\sprout-proving.key ( ECHO Downloading Zcash trusted setup sprout-proving.key, this may take a while ... - .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-proving.key -O "%APPDATA%"\ZcashParams\sprout-proving.key + .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://komodoplatform.com/downloads/sprout-proving.key -O "%APPDATA%"\ZcashParams\sprout-proving.key ) IF NOT EXIST "%APPDATA%"\ZcashParams\sprout-verifying.key ( ECHO Downloading Zcash trusted setup sprout-verifying.key, this may take a while ... - .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-verifying.key -O "%APPDATA%"\ZcashParams\sprout-verifying.key + .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://komodoplatform.com/downloads/sprout-verifying.key -O "%APPDATA%"\ZcashParams\sprout-verifying.key ) IF NOT EXIST "%APPDATA%"\ZcashParams\sapling-spend.params ( ECHO Downloading Zcash trusted setup sprout-proving.key, this may take a while ... - .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sapling-spend.params -O "%APPDATA%"\ZcashParams\sapling-spend.params + .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://komodoplatform.com/downloads/sapling-spend.params -O "%APPDATA%"\ZcashParams\sapling-spend.params ) IF NOT EXIST "%APPDATA%"\ZcashParams\sapling-output.params ( ECHO Downloading Zcash trusted setup sprout-verifying.key, this may take a while ... - .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sapling-output.params -O "%APPDATA%"\ZcashParams\sapling-output.params + .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://komodoplatform.com/downloads/sapling-output.params -O "%APPDATA%"\ZcashParams\sapling-output.params ) IF NOT EXIST "%APPDATA%"\ZcashParams\sprout-groth16.params ( ECHO Downloading Zcash trusted setup sprout-verifying.key, this may take a while ... - .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://z.cash/downloads/sprout-groth16.params -O "%APPDATA%"\ZcashParams\sprout-groth16.params + .\wget64.exe --progress=dot:giga --continue --retry-connrefused --waitretry=3 --timeout=30 https://komodoplatform.com/downloads/sprout-groth16.params -O "%APPDATA%"\ZcashParams\sprout-groth16.params ) goto :EOF :GET_CURRENT_DIR diff --git a/zcutil/fetch-params.sh b/zcutil/fetch-params.sh index 522de80991..7e9154eec3 100755 --- a/zcutil/fetch-params.sh +++ b/zcutil/fetch-params.sh @@ -13,7 +13,7 @@ SPROUT_VKEY_NAME='sprout-verifying.key' SAPLING_SPEND_NAME='sapling-spend.params' SAPLING_OUTPUT_NAME='sapling-output.params' SAPLING_SPROUT_GROTH16_NAME='sprout-groth16.params' -SPROUT_URL="https://z.cash/downloads" +SPROUT_URL="https://komodoplatform.com/downloads" SPROUT_IPFS="/ipfs/QmZKKx7Xup7LiAtFRhYsE1M7waXcv9ir9eCECyXAFGxhEo" SHA256CMD="$(command -v sha256sum || echo shasum)" From 7e0e2d68b5ce438655652f8a5299f2135b2f6457 Mon Sep 17 00:00:00 2001 From: SHossain Date: Thu, 27 May 2021 14:13:57 +0100 Subject: [PATCH 5/6] Remove VOTE2021 & WLC21 and bit cleanup of old files --- src/ac/gleec | 2 ++ src/ac/pgt | 2 -- src/ac/stbl | 2 -- src/ac/wlc21 | 2 -- src/ac/zilla | 2 ++ src/assetchains.json | 14 -------------- src/assetchains.old | 2 -- src/fiat/gleec | 2 ++ src/fiat/hush | 7 ------- src/fiat/pgt | 2 -- src/fiat/rfox | 2 -- src/fiat/stbl | 2 -- src/fiat/verus | 7 ------- src/fiat/verus.bat | 14 -------------- src/fiat/vrsc | 2 -- src/fiat/wlc21 | 2 -- 16 files changed, 6 insertions(+), 60 deletions(-) create mode 100755 src/ac/gleec delete mode 100755 src/ac/pgt delete mode 100755 src/ac/stbl delete mode 100755 src/ac/wlc21 create mode 100755 src/ac/zilla create mode 100755 src/fiat/gleec delete mode 100755 src/fiat/hush delete mode 100755 src/fiat/pgt delete mode 100755 src/fiat/rfox delete mode 100755 src/fiat/stbl delete mode 100755 src/fiat/verus delete mode 100644 src/fiat/verus.bat delete mode 100755 src/fiat/vrsc delete mode 100755 src/fiat/wlc21 diff --git a/src/ac/gleec b/src/ac/gleec new file mode 100755 index 0000000000..61cb54b34c --- /dev/null +++ b/src/ac/gleec @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=GLEEC $1 $2 $3 $4 $5 $6 diff --git a/src/ac/pgt b/src/ac/pgt deleted file mode 100755 index 8e124bbd10..0000000000 --- a/src/ac/pgt +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=PGT $1 $2 $3 $4 $5 $6 diff --git a/src/ac/stbl b/src/ac/stbl deleted file mode 100755 index a6703513d2..0000000000 --- a/src/ac/stbl +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=STBL $1 $2 $3 $4 $5 $6 diff --git a/src/ac/wlc21 b/src/ac/wlc21 deleted file mode 100755 index 829d7e90c4..0000000000 --- a/src/ac/wlc21 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=WLC21 $1 $2 $3 $4 $5 $6 diff --git a/src/ac/zilla b/src/ac/zilla new file mode 100755 index 0000000000..d8c7133691 --- /dev/null +++ b/src/ac/zilla @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=ZILLA $1 $2 $3 $4 $5 $6 diff --git a/src/assetchains.json b/src/assetchains.json index 090d772784..68486cfbe2 100644 --- a/src/assetchains.json +++ b/src/assetchains.json @@ -145,24 +145,10 @@ "earlytxid": "7e4a76259e99c9379551389e9f757fc5f46c33ae922a8644dc2b187af2a6adc1", "addnode": ["157.230.45.184", "165.22.52.123"] }, - { - "ac_name": "WLC21", - "ac_supply": "21000000", - "ac_reward": "190258751", - "ac_staked": "90", - "ac_public": "1", - "addnode": ["37.187.225.231", "51.38.38.134"] - }, { "ac_name": "ZILLA", "ac_supply": "11000000", "ac_sapling": "5000000", "addnode": ["51.68.215.104"] - }, - { - "ac_name": "VOTE2021", - "ac_supply": "129848152", - "ac_public": "1", - "addnode": ["77.74.197.115"] } ] diff --git a/src/assetchains.old b/src/assetchains.old index 0a96575614..2681554554 100755 --- a/src/assetchains.old +++ b/src/assetchains.old @@ -29,6 +29,4 @@ echo $pubkey ./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=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 & -./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 & diff --git a/src/fiat/gleec b/src/fiat/gleec new file mode 100755 index 0000000000..61cb54b34c --- /dev/null +++ b/src/fiat/gleec @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=GLEEC $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/hush b/src/fiat/hush deleted file mode 100755 index 3d7a3425d3..0000000000 --- a/src/fiat/hush +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#set working directory to the location of this script -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $DIR - -../komodo-cli -ac_name=HUSH3 "$@" diff --git a/src/fiat/pgt b/src/fiat/pgt deleted file mode 100755 index 8e124bbd10..0000000000 --- a/src/fiat/pgt +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=PGT $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/rfox b/src/fiat/rfox deleted file mode 100755 index e082505d0f..0000000000 --- a/src/fiat/rfox +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=RFOX $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/stbl b/src/fiat/stbl deleted file mode 100755 index a6703513d2..0000000000 --- a/src/fiat/stbl +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=STBL $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/verus b/src/fiat/verus deleted file mode 100755 index 956ac71c4d..0000000000 --- a/src/fiat/verus +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#set working directory to the location of this script -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $DIR - -../komodo-cli -ac_name=VRSC "$@" diff --git a/src/fiat/verus.bat b/src/fiat/verus.bat deleted file mode 100644 index 0bf87d33be..0000000000 --- a/src/fiat/verus.bat +++ /dev/null @@ -1,14 +0,0 @@ -@call :GET_CURRENT_DIR -@cd %THIS_DIR% -komodo-cli.exe -ac_name=VRSC %1 %2 %3 %4 %5 %6 %7 %8 %9 -@goto :EOF - -:GET_CURRENT_DIR -@pushd %~dp0 -@set THIS_DIR=%CD% -@popd -@goto :EOF - - - - diff --git a/src/fiat/vrsc b/src/fiat/vrsc deleted file mode 100755 index 6cd4dd1fb4..0000000000 --- a/src/fiat/vrsc +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=VRSC $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/wlc21 b/src/fiat/wlc21 deleted file mode 100755 index 829d7e90c4..0000000000 --- a/src/fiat/wlc21 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./komodo-cli -ac_name=WLC21 $1 $2 $3 $4 $5 $6 From 475eff78c562302c07c28f19489837997701f28b Mon Sep 17 00:00:00 2001 From: SHossain Date: Thu, 27 May 2021 16:00:32 +0100 Subject: [PATCH 6/6] clean rubbish --- src/hush-cli | 11 ----------- src/hushd | 52 ---------------------------------------------------- 2 files changed, 63 deletions(-) delete mode 100755 src/hush-cli delete mode 100755 src/hushd diff --git a/src/hush-cli b/src/hush-cli deleted file mode 100755 index efa1840a6f..0000000000 --- a/src/hush-cli +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Copyright (c) 2019 Hush developers - -# set working directory to the location of this script -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd $DIR - -NAME=HUSH3 - -CLI=${KOMODOCLI:-./komodo-cli} -$CLI -ac_name=$NAME "$@" diff --git a/src/hushd b/src/hushd deleted file mode 100755 index 949779a90c..0000000000 --- a/src/hushd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -# Copyright (c) 2019 Hush developers - -# set working directory to the location of this script -DIR="$( cd "$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" )" && pwd )" -cd $DIR - -NAME=HUSH3 -# this corresponds to FR address RHushEyeDm7XwtaTWtyCbjGQumYyV8vMjn -SCRIPT=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac - -# Chain parameters -ERAS=3 -BLOCKTIME=150 -# 6250000 - (sprout pool at block 500,000) -SUPPLY=6178674 -FOUNDERS=1 -REWARD=0,1125000000,562500000 -PERC=11111111 -HALVING=129,340000,840000 -# NOTE: keep in sync with komodo_bitcoind.h -END=128,340000,5422111 -CLIENTNAME=GoldenSandtrout -SEEDNODE1=188.165.212.101 -SEEDNODE2=136.243.227.142 -SEEDNODE3=5.9.224.250 -CCLIB=hush3 - -# CryptoConditions/Custom Consensus params -FAUCET=228 -HEIR=234 -CHANNEL=235 -ORACLE=236 -GATEWAY=241 -CCENABLE=$FAUCET,$HEIR,$CHANNEL,$ORACLE,$GATEWAY - -KMD=${KOMODOD:-./komodod} -$KMD -ac_name=$NAME -ac_sapling=1 \ - -ac_reward=$REWARD \ - -ac_halving=$HALVING \ - -ac_end=$END \ - -ac_eras=$ERAS \ - -ac_blocktime=$BLOCKTIME \ - -ac_cc=2 -ac_ccenable=$CCENABLE \ - -ac_founders=$FOUNDERS -ac_supply=$SUPPLY \ - -ac_perc=$PERC \ - -clientname=$CLIENTNAME \ - -addnode=$SEEDNODE1 \ - -addnode=$SEEDNODE2 \ - -addnode=$SEEDNODE3 \ - -ac_cclib=$CCLIB \ - -ac_script=$SCRIPT "$@"