Merge pull request #459 from KomodoPlatform/dev

sync beta
KomodoPlatform · Jun 13, 2021 · 4f7f0b9 · 4f7f0b9
2 parents cefc54e + e27c6f9
commit 4f7f0b9
Show file tree

Hide file tree

Showing 27 changed files with 263 additions and 132 deletions.
diff --git 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
@@ -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)"

diff --git a/src/ac/gleec 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
diff --git a/src/ac/stbl b/src/ac/stbl
diff --git a/src/ac/wlc21 b/src/ac/wlc21
diff --git a/src/ac/zilla 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
@@ -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
@@ -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
@@ -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
diff --git a/src/fiat/pgt b/src/fiat/pgt
diff --git a/src/fiat/rfox b/src/fiat/rfox
diff --git a/src/fiat/stbl b/src/fiat/stbl
diff --git a/src/fiat/verus b/src/fiat/verus
diff --git a/src/fiat/verus.bat b/src/fiat/verus.bat
diff --git a/src/fiat/vrsc b/src/fiat/vrsc
diff --git a/src/fiat/wlc21 b/src/fiat/wlc21
diff --git a/src/hush-cli b/src/hush-cli
diff --git a/src/hushd b/src/hushd
diff --git 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 )

diff --git 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<CNetAddr, LocalServiceInfo> 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();

diff --git a/zcutil/VerusCoin.xml b/zcutil/VerusCoin.xml
@@ -252,7 +252,7 @@
                     <filename>${windows_folder_appdata}/ZcashParams/sprout-proving.key</filename>
                     <progressText>Zcash Params file: sprout-proving.key</progressText>
                     <showMessageOnError>0</showMessageOnError>
-                    <url>https://z.cash/downloads/sprout-proving.key</url>
+                    <url>https://z.cash/downloads/sprout-proving.key.deprecated-sworn-elves</url>
                 </httpGet>
             </actionList>
             <ruleList>

diff --git a/zcutil/fetch-params-alt.bat b/zcutil/fetch-params-alt.bat
@@ -0,0 +1,32 @@
+@echo off
+call :GET_CURRENT_DIR
+cd %THIS_DIR%
+IF NOT EXIST "%APPDATA%"\ZcashParams (
+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://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://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://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://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://komodoplatform.com/downloads/sprout-groth16.params -O "%APPDATA%"\ZcashParams\sprout-groth16.params
+)
+goto :EOF
+:GET_CURRENT_DIR
+pushd %~dp0
+set THIS_DIR=%CD%
+popd
+goto :EOF
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		./komodo-cli -ac_name=GLEEC $1 $2 $3 $4 $5 $6
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		./komodo-cli -ac_name=ZILLA $1 $2 $3 $4 $5 $6