From 39a8d075de32661757c4a023ac24937728e7035c Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 5 May 2018 15:50:42 -0700 Subject: [PATCH 01/29] Add some build details. --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 65f34d3d4..ee1c29922 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,26 @@ Dependencies 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 libcurl3-gnutls-dev bsdmainutils automake ``` +Building +-------- + +First time you'll need to get assorted startup values downloaded. This takes a moderate amount of time once but then does niot need to be repeated unless you bring a new system up. The command is: +``` +./zcutil/fetch-params.sh +``` +Building for Ubunutu/Mint: +``` +./zcutil/build.sh +``` +Building for Mac OS/X: +``` +./zcutil/build-mac.sh +``` +Building for Windows: +``` +./zcutil/build-win.sh +``` + Komodo ------ We have a release process that goes through several stages before it reaches master. This allows the most conservative users just use the master branch, which is only updated after the other branches have signed off on a release. From a23fbff21a6d26445efa578d1c24cd16888d1053 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 00:00:22 -0700 Subject: [PATCH 02/29] removed escape characters --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aba91579a..42b45a58a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET=src/komodod\ + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET=src/komodod src/komodo-cli COMPRESSED_BUILD=Komodo-build.tar.gz ' @@ -36,8 +36,8 @@ matrix: BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET=src/komodod.exe\ - src/komodo-cli.exe\ src/komodo-tx.exe KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET=src/komodod.exe + src/komodo-cli.exe src/komodo-tx.exe KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz ' exclude: From 18b0f947800b1c4dbdde7d29ac834ce93d24178a Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 00:39:44 -0700 Subject: [PATCH 03/29] troubleshooting executable copies --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42b45a58a..576cb03a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,19 @@ matrix: fast_finish: true include: - compiler: ": Linux" - env: 'HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh + env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET=src/komodod + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod src/komodo-cli COMPRESSED_BUILD=Komodo-build.tar.gz - -' - compiler: ": Windows" - env: 'HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu + env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET=src/komodod.exe - src/komodo-cli.exe src/komodo-tx.exe KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz -' exclude: - compiler: gcc install: From 4ef743acadfd9f6f2ec1e3b509661b4221faa723 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 01:22:30 -0700 Subject: [PATCH 04/29] troubleshooting executable copies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 576cb03a3..1b6e00708 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ after_script: --key-file AUTH_KEY.json; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/; +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/; fi notifications: slack: From 6dc52f22056fcb19355d1c748d29d3883d374b66 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 10:55:31 -0700 Subject: [PATCH 05/29] troubleshooting executable copies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b6e00708..8e0ccc3fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod - src/komodo-cli COMPRESSED_BUILD=Komodo-build.tar.gz + src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Windows" env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev From 6c8e1cdfb7eb0e67679d88f02cb8e218a3ee26c4 Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Fri, 25 May 2018 15:10:07 -0700 Subject: [PATCH 06/29] Restore zcash coinbase rule and launch fix at 10080 --- src/chainparams.cpp | 2 +- src/coins.cpp | 14 ++++++++++++-- src/coins.h | 20 +++++++++++++++++++- src/main.cpp | 7 +++++-- src/main.h | 2 +- 5 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7f9ef7549..5decd0e5d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -92,7 +92,7 @@ public: { strNetworkID = "main"; strCurrencyUnits = "KMD"; - consensus.fCoinbaseMustBeProtected = false;//true; + consensus.fCoinbaseMustBeProtected = true; // this is only enforced after block 10080 on Verus consensus.nSubsidySlowStartInterval = 20000; consensus.nSubsidyHalvingInterval = 840000; consensus.nMajorityEnforceBlockUpgrade = 750; diff --git a/src/coins.cpp b/src/coins.cpp index 42939ccac..b8c34924a 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -11,6 +11,7 @@ #include "komodo_defs.h" #include +#include /** * calculate number of bytes for the bitmask, and its number of non-zero bytes @@ -379,11 +380,20 @@ const CTxOut &CCoinsViewCache::GetOutputFor(const CTxIn& input) const return coins->vout[input.prevout.n]; } +const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& input) const +{ + assert(coins); + if (launchMap.launchMap.count(input.prevout.hash)) + { + return launchMap.launchMap[input.prevout.hash]; + } + else return coins->vout[input.prevout.n].scriptPubKey; +} + const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const { const CCoins* coins = AccessCoins(input.prevout.hash); - assert(coins); - return coins->vout[input.prevout.n].scriptPubKey; + return GetSpendFor(coins, input); } //uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); diff --git a/src/coins.h b/src/coins.h index 85cb69d5c..0dab6d3e2 100644 --- a/src/coins.h +++ b/src/coins.h @@ -440,6 +440,23 @@ public: class CCoinsViewCache : public CCoinsViewBacked { protected: + class CLaunchMap + { + public: + unordered_map launchMap; + CLaunchMap() { } + CLaunchMap(uint256 *whiteList, uint160 pkh, int count) + { + launchMap = unordered_map(); + for (int i = 0; i < count; i++) + { + launchMap[whiteList[i]] = CScript(); + launchMap[whiteList[i]] << OP_DUP << OP_HASH160 << pkh << OP_EQUALVERIFY << OP_CHECKSIG; + } + } + }; + static CLaunchMap launchMap(); + /* Whether this cache has an active modifier. */ bool hasModifier; @@ -457,6 +474,8 @@ protected: /* Cached dynamic memory usage for the inner CCoins objects. */ mutable size_t cachedCoinsUsage; + const CScript &GetSpendFor(const CCoins *coins, const CTxIn& input) const; + public: CCoinsViewCache(CCoinsView *baseIn); ~CCoinsViewCache(); @@ -535,7 +554,6 @@ public: const CTxOut &GetOutputFor(const CTxIn& input) const; const CScript &GetSpendFor(const CTxIn& input) const; - friend class CCoinsModifier; private: diff --git a/src/main.cpp b/src/main.cpp index 0569d6c84..dc5436464 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,9 @@ #include "wallet/asyncrpcoperation_sendmany.h" #include "wallet/asyncrpcoperation_shieldcoinbase.h" +#include #include +#include #include #include @@ -2045,7 +2047,7 @@ namespace Consensus { const COutPoint &prevout = tx.vin[i].prevout; const CCoins *coins = inputs.AccessCoins(prevout.hash); assert(coins); - + if (coins->IsCoinBase()) { // Ensure that coinbases are matured if (nSpendHeight - coins->nHeight < COINBASE_MATURITY) { @@ -2066,7 +2068,8 @@ namespace Consensus { // Disabled on regtest if (fCoinbaseEnforcedProtectionEnabled && consensusParams.fCoinbaseMustBeProtected && - !tx.vout.empty()) { + !tx.vout.empty() && + (strcmp(ASSETCHAINS_SYMBOL, "VRSC", 4) != 0 || nSpendHeight >= 10080)) { return state.Invalid( error("CheckInputs(): tried to spend coinbase with transparent outputs"), REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs"); diff --git a/src/main.h b/src/main.h index 3a43b5fba..73714408f 100644 --- a/src/main.h +++ b/src/main.h @@ -751,7 +751,7 @@ private: public: CScriptCheck(): amount(0), ptxTo(0), nIn(0), nFlags(0), cacheStore(false), consensusBranchId(0), error(SCRIPT_ERR_UNKNOWN_ERROR) {} CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, uint32_t consensusBranchIdIn, PrecomputedTransactionData* txdataIn) : - scriptPubKey(txFromIn.vout[txToIn.vin[nInIn].prevout.n].scriptPubKey), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue), + scriptPubKey(txFromIn.GetSpendFor(txToIn.vin[nInIn])), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue), ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), consensusBranchId(consensusBranchIdIn), error(SCRIPT_ERR_UNKNOWN_ERROR), txdata(txdataIn) { } bool operator()(); From faf40fe40911f640f1b49ceafbcf3dd9d2ebf14b Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 18:24:13 -0700 Subject: [PATCH 07/29] placing build executables in with artifacts --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e0ccc3fe..7c4e21f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz exclude: - compiler: gcc @@ -57,9 +57,9 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET - src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/; +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && - tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET src/$TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi notifications: slack: From e58b6fc2311051204225669d9a81c2ceb005bdbd Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 18:58:16 -0700 Subject: [PATCH 08/29] closing conditional --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c4e21f44..7024aa1cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && - tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && - tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET src/$TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi From 3defa8cb7e5e0d12167ab95c37f7d426fe3c9ec4 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 19:08:44 -0700 Subject: [PATCH 09/29] Troubleshooting artifact archive fetch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7024aa1cd..a7b3a48c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && - tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET src/$TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi From b0e452de2af57b136c0b28c592f3853213d87323 Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Fri, 25 May 2018 20:15:38 -0700 Subject: [PATCH 10/29] fix build for update --- src/coins.cpp | 19 +++++++++++-------- src/coins.h | 50 ++++++++++++++++++++++++++++++-------------------- src/main.cpp | 2 +- src/main.h | 2 +- 4 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/coins.cpp b/src/coins.cpp index b8c34924a..0a323d990 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -11,7 +11,6 @@ #include "komodo_defs.h" #include -#include /** * calculate number of bytes for the bitmask, and its number of non-zero bytes @@ -380,12 +379,20 @@ const CTxOut &CCoinsViewCache::GetOutputFor(const CTxIn& input) const return coins->vout[input.prevout.n]; } -const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& input) const +//uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); +uint64_t komodo_accrued_interest(int32_t *txheightp,uint32_t *locktimep,uint256 hash,int32_t n,int32_t checkheight,uint64_t checkvalue,int32_t tipheight); +extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; + +const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& input) { assert(coins); - if (launchMap.launchMap.count(input.prevout.hash)) + if (coins->nHeight < 6400 && !strcmp(ASSETCHAINS_SYMBOL, "VRSC")) { - return launchMap.launchMap[input.prevout.hash]; + std::string hc = input.prevout.hash.ToString(); + if (LaunchMap().lmap.count(hc)) + { + return LaunchMap().lmap[hc]; + } } else return coins->vout[input.prevout.n].scriptPubKey; } @@ -396,10 +403,6 @@ const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const return GetSpendFor(coins, input); } -//uint64_t komodo_interest(int32_t txheight,uint64_t nValue,uint32_t nLockTime,uint32_t tiptime); -uint64_t komodo_accrued_interest(int32_t *txheightp,uint32_t *locktimep,uint256 hash,int32_t n,int32_t checkheight,uint64_t checkvalue,int32_t tipheight); -extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; - CAmount CCoinsViewCache::GetValueIn(int32_t nHeight,int64_t *interestp,const CTransaction& tx,uint32_t tiptime) const { if ( interestp != 0 ) diff --git a/src/coins.h b/src/coins.h index 0dab6d3e2..f010af198 100644 --- a/src/coins.h +++ b/src/coins.h @@ -13,9 +13,13 @@ #include "memusage.h" #include "serialize.h" #include "uint256.h" +#include "base58.h" +#include "pubkey.h" #include #include +#include +#include #include #include @@ -436,31 +440,36 @@ public: friend class CCoinsViewCache; }; +class CLaunchMap +{ + public: + std::unordered_map lmap; + CLaunchMap() : lmap() { } + CLaunchMap(std::string *whiteList, std::string *pkh, int count) : lmap() + { + for (int i = 0; i < count; i++) + { + CBitcoinAddress address(pkh[i].c_str()); + CKeyID key; + if (address.IsValid() && address.GetKeyID(key)) + { + std::vector adr = std::vector(key.begin(), key.end()); + std::string hash = uint256S(whiteList[i]).ToString(); + lmap[hash] = CScript(); + lmap[hash] << OP_DUP << OP_HASH160 << adr << OP_EQUALVERIFY << OP_CHECKSIG; + } + } + } +}; +static CLaunchMap launchMap = CLaunchMap(); + /** CCoinsView that adds a memory cache for transactions to another CCoinsView */ class CCoinsViewCache : public CCoinsViewBacked { protected: - class CLaunchMap - { - public: - unordered_map launchMap; - CLaunchMap() { } - CLaunchMap(uint256 *whiteList, uint160 pkh, int count) - { - launchMap = unordered_map(); - for (int i = 0; i < count; i++) - { - launchMap[whiteList[i]] = CScript(); - launchMap[whiteList[i]] << OP_DUP << OP_HASH160 << pkh << OP_EQUALVERIFY << OP_CHECKSIG; - } - } - }; - static CLaunchMap launchMap(); - /* Whether this cache has an active modifier. */ bool hasModifier; - /** * Make mutable so that we can "fill the cache" even from Get-methods * declared as "const". @@ -474,13 +483,12 @@ protected: /* Cached dynamic memory usage for the inner CCoins objects. */ mutable size_t cachedCoinsUsage; - const CScript &GetSpendFor(const CCoins *coins, const CTxIn& input) const; - public: CCoinsViewCache(CCoinsView *baseIn); ~CCoinsViewCache(); // Standard CCoinsView methods + static CLaunchMap &LaunchMap() { return launchMap; } bool GetAnchorAt(const uint256 &rt, ZCIncrementalMerkleTree &tree) const; bool GetNullifier(const uint256 &nullifier) const; bool GetCoins(const uint256 &txid, CCoins &coins) const; @@ -554,6 +562,8 @@ public: const CTxOut &GetOutputFor(const CTxIn& input) const; const CScript &GetSpendFor(const CTxIn& input) const; + static const CScript &GetSpendFor(const CCoins *coins, const CTxIn& input); + friend class CCoinsModifier; private: diff --git a/src/main.cpp b/src/main.cpp index dc5436464..33204bad1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2069,7 +2069,7 @@ namespace Consensus { if (fCoinbaseEnforcedProtectionEnabled && consensusParams.fCoinbaseMustBeProtected && !tx.vout.empty() && - (strcmp(ASSETCHAINS_SYMBOL, "VRSC", 4) != 0 || nSpendHeight >= 10080)) { + (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || nSpendHeight >= 10080)) { return state.Invalid( error("CheckInputs(): tried to spend coinbase with transparent outputs"), REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs"); diff --git a/src/main.h b/src/main.h index 73714408f..99babb874 100644 --- a/src/main.h +++ b/src/main.h @@ -751,7 +751,7 @@ private: public: CScriptCheck(): amount(0), ptxTo(0), nIn(0), nFlags(0), cacheStore(false), consensusBranchId(0), error(SCRIPT_ERR_UNKNOWN_ERROR) {} CScriptCheck(const CCoins& txFromIn, const CTransaction& txToIn, unsigned int nInIn, unsigned int nFlagsIn, bool cacheIn, uint32_t consensusBranchIdIn, PrecomputedTransactionData* txdataIn) : - scriptPubKey(txFromIn.GetSpendFor(txToIn.vin[nInIn])), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue), + scriptPubKey(CCoinsViewCache::GetSpendFor(&txFromIn, txToIn.vin[nInIn])), amount(txFromIn.vout[txToIn.vin[nInIn].prevout.n].nValue), ptxTo(&txToIn), nIn(nInIn), nFlags(nFlagsIn), cacheStore(cacheIn), consensusBranchId(consensusBranchIdIn), error(SCRIPT_ERR_UNKNOWN_ERROR), txdata(txdataIn) { } bool operator()(); From 284ed513227645868c4996dcd6611e09be2de455 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 20:36:11 -0700 Subject: [PATCH 11/29] fixed target directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7b3a48c0..cd7c6af04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET src/$TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi notifications: From da45808f5f674035938c7edab8a6d1dfea498cff Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Fri, 25 May 2018 20:48:22 -0700 Subject: [PATCH 12/29] Fix bash scripts for running verus daemon and cli --- src/fiat/verus | 2 +- src/verusd | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/fiat/verus create mode 100755 src/verusd diff --git a/src/fiat/verus b/src/fiat/verus old mode 100644 new mode 100755 index 0bcc79fd2..956ac71c4 --- a/src/fiat/verus +++ b/src/fiat/verus @@ -4,4 +4,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -../komodo-cli -ac_name=VERUSTEST "$@" +../komodo-cli -ac_name=VRSC "$@" diff --git a/src/verusd b/src/verusd new file mode 100755 index 000000000..7ec4f6246 --- /dev/null +++ b/src/verusd @@ -0,0 +1,2 @@ +./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_veruspos=50 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -addnode=185.25.48.72 -addnode=185.25.48.236 -addnode=185.64.105.111 "$@" + From 2241a57d6463b6c830ccfc5a5dad8c86e0f58a08 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 21:16:05 -0700 Subject: [PATCH 13/29] troubleshooting executable transfer --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd7c6af04..e143e0c06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && tar -xzvf $TARGET_PLATFORM.tar.gz && rm $TARGET_PLATFORM.tar.gz; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ls && cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi notifications: From d998a2171859ce158c3305f6433d7d2584ca30ad Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 21:35:46 -0700 Subject: [PATCH 14/29] troubleshooting executable transfer --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e143e0c06..a02b24b35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,14 +27,14 @@ matrix: TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod - src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="komodod + komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Windows" env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="komodod.exe komodo-cli.exe komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz exclude: - compiler: gcc @@ -57,8 +57,8 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ls && cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd src && gsutil cp gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ls && cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi notifications: From c1e71947602d74ee626d5591ec4532bed300af95 Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Fri, 25 May 2018 21:52:53 -0700 Subject: [PATCH 15/29] fix coinbase spend after 10080 & seg fault --- src/coins.cpp | 2 +- src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coins.cpp b/src/coins.cpp index 0a323d990..9ce8607fd 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -394,7 +394,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& in return LaunchMap().lmap[hc]; } } - else return coins->vout[input.prevout.n].scriptPubKey; + return coins->vout[input.prevout.n].scriptPubKey; } const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const diff --git a/src/main.cpp b/src/main.cpp index 33204bad1..210105a73 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2069,7 +2069,7 @@ namespace Consensus { if (fCoinbaseEnforcedProtectionEnabled && consensusParams.fCoinbaseMustBeProtected && !tx.vout.empty() && - (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || nSpendHeight >= 10080)) { + (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080)) { return state.Invalid( error("CheckInputs(): tried to spend coinbase with transparent outputs"), REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs"); From aba193e39d1a772c4cf75bb7d410b0261a710534 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 21:57:18 -0700 Subject: [PATCH 16/29] adding auth --- .travis.yml | 28 +++++++++++++--------------- AUTH_KEY.json.enc | Bin 2352 -> 2352 bytes 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index aba91579a..cd493f0a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,19 @@ matrix: fast_finish: true include: - compiler: ": Linux" - env: 'HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh + env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET=src/komodod\ - src/komodo-cli COMPRESSED_BUILD=Komodo-build.tar.gz - -' + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod + src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Windows" - env: 'HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu + env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET=src/komodod.exe\ - src/komodo-cli.exe\ src/komodo-tx.exe KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz - -' + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe + src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz exclude: - compiler: gcc install: @@ -61,13 +57,15 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET - src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/; - fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz + . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM + && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz + gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi notifications: slack: secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= before_install: -- openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv +- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index ff2e4ce967a1ae652bc5aab3c33e55d97ba50581..2ef6245d853e98605dc1d1a0f39906a5ea9c6c4f 100644 GIT binary patch literal 2352 zcmV-03D5RFJz5f96*BL8_U;zR?i(LG)ka9K-{OFwk+M|mpg8F0EMj4dB+ndAISx50 z_<4HcDF~%3R zVAARd2nr*L>Mrqmg=wU^L*-THPb`j_?c%BWlLAz>+%L9f)6#dkA z@iE!D#N!#j0&j)J1@e3$RvS1Yq(QPepUPhf?dpukB8b>zu8_M@K|#I}u`gFcqvyMk zb`!7Y22U4-H!l=`NJraBpb#JzB@un%nXj3%fFfh^f_Hd4jJ$M3z4W6Aj}eR9BP#5N zR&~1swjoze;b+8a+Y~j$$(wA)*P;*knEO_gFrr#ugLbb!M2-HG6sc+ytNB+2#?P{i zL_Tx*X4n%7`2+dXReJ#8H2@au^M`APl!qKyn?bAXCioa-&IOQ|DgBt+mPzQ-1xy<| zqMcUv=BKIyKg#3NQC(Hf7JhwQH5^wU9yp_dd zbIp1-#Ol`%tr$#gCu$Ow47JX1%9UvWTZy9hGU#~=*Lq&&81d}8FZ?P+cFcY@D`w2VH}B0cIxy>CZ4*cGXb!WQjf{n znbCH!1O(TbGd+vsg*^;gvRy&%^|5cD{ply-U{sA4sLxc27p^=OQ|e`a&Aon4y|Gu) zEk9%@+(fGnYPiZb^#nq_yu0{!~nC2GAt1h%|J%VTdAs$&TIeyDAOI~BMiB}+hz1ZUc7 zDn%h3ZU#A#PuZ^8`2EZpnJ3KyPm3zQ9er5);|Mq}6CRmp;EdeF#{osyHfyMa0;U?V zejjPGNFTIH{UIVM|8#ZY)BoDYUyzg{C%@&D?9){X)?t&y9}?lAwwH_<4p0tpiB4bKE!#95UM zJ2?C_aBiCeQ$Fh<9(Jw5Lj9I7U^1obyMbkRn?fi?)bSq27*9=tj{8fmurn-n3hSr61<->f<=7&r_0(9HF< zc^HV-i~oNdood>mm|_=Kv?R{fOd2o~>^?e-dwUGwblKcKpH|pYzEIPXwUIX@teKHQ zD!{$;sw>6z5Y&>ox*T8uZ$+PG*ac?;Qx?byZs}YNpv)#<3KIJLFd5^(u;Xsz_2z`%G9r@iu78H8~9Z1YNhQ{NAxhrZHI` zmp{pj=szv2UviZXS_Vhq-8?GvMz*YZ1U>%?)k|e{)Q?*yih-xZde(!NR0##GXU$2v zuAhC;?As!|K^Hu$yB_ss=>l(P&hL1{|6xYWbDB&~IyKCVZ7z0E!)7bL=>i&-OGeBM z?{E!j>{?O=1wfI#9eqf`S(R`9l{5NmMkJ0zbm~Nj@)*~hO}F(fa(w}t>d(9RWwcIo z znEQ;!`!)RD9c1~ZMK)K*z( z3l50d7RZ;B4`V+h=?R4Ax4%2ZfLjz~fNF82asge;z;>~dHX9C2rzpG{3Yu(by^;eQ zr-qnK&rq2?A|6Uugl*^|okKt&aP*$IWYejaiOU1@Ns%>O(Z}a&oe=W{9r}3;l!Z?_ z`jU&nOwV)&*7Jc|zIIjQZtmL(EBZ^m5d6+st2NbyLzvPXBYm68k!|s|y+PK+BKB%b z7zJOzycpo~o^6Gj2NGyfA@8>@4RC`qVR$pd@)rC2F}DnyfG-d@yHn&7LQ7ts>ux*o z(x}#8kc#H1C~{@$?bS2PJzU^IQ2V8^q*i! z<~Q-tdysU~wo2+!oQZzZl8W%q!Fw_~1zaX)!aK0??>kFi;dr<@wi_-;O@EQztRd-J z2UXX+xWs0(sm&^TL@(X^gikF&GGjuDSu!C4^^=_bx*g`k? zC)R$9vTPJce1eH~1gW44S^9`Rkwu;I9WV9og5jev$bXPx^^E29UQ@dnAzxKyyXJV; zOP=OuC3Wq*cLMf1+i!rK8d7x z$AfgHkKA-}9HBXHZO3u~i+O4sD#%yTLsbxs{J|3PP>qjorsj?Url66~94@!2>gpAT W)RVtspq{@v6VaG8nI;1Sx_9gy z%dn(|#MMHO#v&1(eUurIYYO?{pD*1(84r4Ga-eVpCS5IM#O7kPfrExz&T*o~{gwAR zehB56ATl{bby(mM4I45aS@rm@*OtMhDKU6$MvF)c08GDBlI|`DlXaG4&Hv7j%WZgd zv(rd4px^I~UBwdyo$-%la8CnL?vY=T@f@90ff00ue$b(Cq0X-Cr=iiguq9?aC&@MH zjt}eiB<6H^G+7L3ELiPSu|QVaxByUAgcV(v_u|7VoWoV}<7Zn80<~Li7^~-8AL6qlOj_!l@t3u#<%7$9 zj#Lz&o-~>iJvU!O?At0YX^jNrf*byn~b9` zsl}px;gWs6g&b3D&Gn#OB&-F?K=lMY?!?A>#rxT+?`i==98`+zZ{+6j#g97TdH z@$WAvH==6h>}^Khr4|99Eb%ul@+!B(m}hx97LZuip`cOwpRC$zdCN(0+hK9#QgzQ} zT{ZFRSy+$cYgx=iD66lRr#%9Jf%UstP1+b|u&rJ7m9y#$$;M)f3{IKYDqkeoz|_BF z0f*G})?}xP=D0qe%7ibFWj!}~sV-~mQj^-EZ^{7g+@hp+VD~tgNSpAG-`!R*c=ZmG zXG-WvpA??y`x3R!?1XJWt)*tD$dskh8ovm^ncW{PJ!TCzo&*9kk!~P6;;7|$cX)NF zE{J{aB)Va%GjdewQ^%75Q?OQ=bFJ-cajJMU-(i#&t2}N;S`Z&(XtnAxb$sbR_3}&c@dG zI->B9?-`3Z4UfzeWWyS(xRuHIJOb;bU6`pB*;-`cMCd0XFgLr?%Ok5P*er5@J!u5j zNXX~X^$;P+C{B5=H0jkwY8O1MZDi9eeU%`*FAkx>q}ViaH%YzMWy(#sVUIa>4NeZw z=82PmaJ5fA5ssh>Ao9}%`1cf;BH*~eq1xU^g2^e9*L`B;^)!@?GSVKUTfeoWy zSf-+3{}bxBH`E)!GR-H@>_WKiFtQiW#*>>ptpqR+G5WbxsVD_Ai@T>AcS78WxhhQo zUpZxCWd7j-N{+sUR<@2^P@{rzQSH5Y9-50O9&{Yt6nRQ~bb{GHb83LEIKR`uojHel z(4j|qlFG0?G@mepOX-M)k$Fz^<33-y-139l_w$GQi{r@>Odsi%$aVbvMe^|2ym4g*MZAYMP<-PmS7_ltXKn>6r- z31*LgUjiklnuacWuxdw5$*$&Zf?dE!FMw=V^feNu*06J0% zsdYT6e*nbP1V&3%|8m|>O?J1CcfQ<5JYTvM$*v**e)(^ zM&o(RNx8nK$vY@Mp%?GKRUz_^jW^azo#}0ypQPTPC(lH-ljRFF@Nx>>u9(POVfV#aS56iaQF8-?{1eXjXe!~_d@JXpw_41nM)=Ds7TFASeXcG>K+|E6TXx3 zPf{OwQ)Y{lD<=44@Ro8qIe2#6yeBipfa3uKJq0IOKu^JD=Z+?0DbaN1(2aA+hEDra z53crI5kGnp`5LNL8>d7~HH*tE_eefu8IxI|0L$j^&JKt3@V42gRCPQEOm|6*VDuL=8_H1`xeiYDlDzBcP8#@Ch zvE^YSD1Wmw!xS0%T?U0qLG~!1apekOC4zLZ-$+o%M-F;sG$f^1*rkyeIXSEG)_nRb zElfTtF*6s9+)10;OAuvyD9?Cr`Yj=t_Dug>|D~%mb1}98p7WNRbr|2LB=4Lq@A)IQ zyf}sHSE0ZUAHI!+RQh@tq)~SB!cxqfxp1Z-w|%e6TJ@Xbfafz_m}=o*sA4o_ZF3%k z+X8ulO*DUmDF=1L`QMTD6;xCX#JsFl9%hGYf=T!DCCVv$yJ(1kyP(Own-iN#Z From 4a1afe0bc522c20ca868195a8266f9694b585c8a Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Fri, 25 May 2018 22:32:05 -0700 Subject: [PATCH 17/29] fix build break from accidental edit --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 210105a73..d8d30ec20 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2069,7 +2069,7 @@ namespace Consensus { if (fCoinbaseEnforcedProtectionEnabled && consensusParams.fCoinbaseMustBeProtected && !tx.vout.empty() && - (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080)) { + (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080))) { return state.Invalid( error("CheckInputs(): tried to spend coinbase with transparent outputs"), REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs"); From 74329e19f88eafec0535ba2f11eaa54946d6a68e Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sat, 26 May 2018 04:00:17 -0700 Subject: [PATCH 18/29] Multiple changes for critical update, including random locks and activation at 12800. Test for utxos. --- src/base58.cpp | 8 ++++++++ src/base58.h | 1 + src/chainparams.cpp | 4 ++-- src/coins.h | 13 +++++++------ src/komodo_bitcoind.h | 2 +- src/komodo_utils.h | 19 ++++++++++++++----- src/main.cpp | 2 +- src/veruslaunch.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/veruslaunch.h | 16 ++++++++++++++++ 9 files changed, 86 insertions(+), 15 deletions(-) create mode 100644 src/veruslaunch.cpp create mode 100644 src/veruslaunch.h diff --git a/src/base58.cpp b/src/base58.cpp index c086cc854..b85803569 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -302,6 +302,14 @@ bool CBitcoinAddress::GetKeyID(CKeyID& keyID) const return true; } +bool CBitcoinAddress::GetKeyID_NoCheck(CKeyID& keyID) const +{ + uint160 id; + memcpy(&id, &vchData[0], 20); + keyID = CKeyID(id); + return true; +} + bool CBitcoinAddress::IsScript() const { return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS); diff --git a/src/base58.h b/src/base58.h index 73e1c4d94..4e8b2c3ce 100644 --- a/src/base58.h +++ b/src/base58.h @@ -163,6 +163,7 @@ public: CTxDestination Get() const; bool GetKeyID(CKeyID &keyID) const; + bool GetKeyID_NoCheck(CKeyID& keyID) const; bool GetIndexKey(uint160& hashBytes, int& type) const; bool IsScript() const; }; diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5decd0e5d..cc6f11ea2 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -92,7 +92,7 @@ public: { strNetworkID = "main"; strCurrencyUnits = "KMD"; - consensus.fCoinbaseMustBeProtected = true; // this is only enforced after block 10080 on Verus + consensus.fCoinbaseMustBeProtected = true; // this is only enforced after block 12800 on Verus consensus.nSubsidySlowStartInterval = 20000; consensus.nSubsidyHalvingInterval = 840000; consensus.nMajorityEnforceBlockUpgrade = 750; @@ -181,7 +181,7 @@ public: vFixedSeeds = std::vector(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main)); - fMiningRequiresPeers = true; + //fMiningRequiresPeers = true; fDefaultConsistencyChecks = false; fRequireStandard = true; fMineBlocksOnDemand = false; diff --git a/src/coins.h b/src/coins.h index f010af198..14cfbfee8 100644 --- a/src/coins.h +++ b/src/coins.h @@ -24,6 +24,7 @@ #include #include #include "zcash/IncrementalMerkleTree.hpp" +#include "veruslaunch.h" /** * Pruned version of CTransaction: only retains metadata and unspent transaction outputs @@ -444,17 +445,17 @@ class CLaunchMap { public: std::unordered_map lmap; - CLaunchMap() : lmap() { } - CLaunchMap(std::string *whiteList, std::string *pkh, int count) : lmap() + CLaunchMap() : lmap() { - for (int i = 0; i < count; i++) + for (int i = 0; i < WHITELIST_COUNT; i++) { - CBitcoinAddress address(pkh[i].c_str()); + printf("txid: %s -> addr: %s", whitelist_ids[i], whitelist_addrs[i]); + CBitcoinAddress address(whitelist_addrs[i]); CKeyID key; - if (address.IsValid() && address.GetKeyID(key)) + if (address.GetKeyID_NoCheck(key)) { std::vector adr = std::vector(key.begin(), key.end()); - std::string hash = uint256S(whiteList[i]).ToString(); + std::string hash = uint256S(whitelist_ids[i]).ToString(); lmap[hash] = CScript(); lmap[hash] << OP_DUP << OP_HASH160 << adr << OP_EQUALVERIFY << OP_CHECKSIG; } diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 3bff063ad..e87bf3727 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1330,7 +1330,7 @@ bool verusCheckPOSBlock(int32_t slowflag, CBlock *pblock, int32_t height) strcpy(voutaddr, CBitcoinAddress(voutaddress).ToString().c_str()); strcpy(destaddr, CBitcoinAddress(destaddress).ToString().c_str()); strcpy(cbaddr, CBitcoinAddress(cbaddress).ToString().c_str()); - if ( !strcmp(destaddr,voutaddr) && ( !strcmp(destaddr,cbaddr) || (height < 10080)) ) + if ( !strcmp(destaddr,voutaddr) && ( !strcmp(destaddr,cbaddr) || (height < 12800)) ) { isPOS = true; } diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 2fa46819a..62f178bf1 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1052,11 +1052,20 @@ int64_t komodo_block_unlocktime(uint32_t nHeight) unlocktime = ASSETCHAINS_TIMEUNLOCKTO; else { - unlocktime = komodo_block_prg(nHeight) / (0xffffffffffffffff / ((ASSETCHAINS_TIMEUNLOCKTO - ASSETCHAINS_TIMEUNLOCKFROM) + 1)); - // boundary and power of 2 can make it exceed to time by 1 - unlocktime = unlocktime + ASSETCHAINS_TIMEUNLOCKFROM; - if (unlocktime > ASSETCHAINS_TIMEUNLOCKTO) - unlocktime--; + if (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || nHeight >= 12800) + { + unlocktime = komodo_block_prg(nHeight) % (ASSETCHAINS_TIMEUNLOCKTO - ASSETCHAINS_TIMEUNLOCKFROM); + // boundary and power of 2 can make it exceed to time by 1 + unlocktime = unlocktime + ASSETCHAINS_TIMEUNLOCKFROM; + } + else + { + unlocktime = komodo_block_prg(nHeight) / (0xffffffffffffffff / ((ASSETCHAINS_TIMEUNLOCKTO - ASSETCHAINS_TIMEUNLOCKFROM) + 1)); + // boundary and power of 2 can make it exceed to time by 1 + unlocktime = unlocktime + ASSETCHAINS_TIMEUNLOCKFROM; + if (unlocktime > ASSETCHAINS_TIMEUNLOCKTO) + unlocktime--; + } } return ((int64_t)unlocktime); } diff --git a/src/main.cpp b/src/main.cpp index d8d30ec20..1ec144326 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2069,7 +2069,7 @@ namespace Consensus { if (fCoinbaseEnforcedProtectionEnabled && consensusParams.fCoinbaseMustBeProtected && !tx.vout.empty() && - (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 10080 && coins->nHeight >= 10080))) { + (strcmp(ASSETCHAINS_SYMBOL, "VRSC") != 0 || (nSpendHeight >= 12800 && coins->nHeight >= 12800))) { return state.Invalid( error("CheckInputs(): tried to spend coinbase with transparent outputs"), REJECT_INVALID, "bad-txns-coinbase-spend-has-transparent-outputs"); diff --git a/src/veruslaunch.cpp b/src/veruslaunch.cpp new file mode 100644 index 000000000..d5fa76700 --- /dev/null +++ b/src/veruslaunch.cpp @@ -0,0 +1,36 @@ +// Copyright (c) 2018 The Verus developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include +#include +#include "veruslaunch.h" + + +const char *whitelist_ids[WHITELIST_COUNT] = {"1e4b6bf2306c4eb2e6be032176a749797facd387937b132c0d2ffd6dc8ec0c7b", + "21681d1cacbdc8ba403bc66b129cce4ca72a61adf0ef12504b4fbb07a613f735", + "2dc18aac1a8f97b991d1a2b67fa606f29c27b721e939c7b08a52da789900627c", + "41beb053cf1e516033316a69ab883584cd42546d1d7613181cf3d948eeaf1e6a", + "45fae92ebc1cdaf9187b92f0feb5e262b3dcadc37f3cde48a9b9da88f01b9195", + "5e7b24d571d7b21c1a2077ec8dc1b479d16c490d51ef11cc7c81af5dcb36b56f", + "6e1338aaf678121296d7a0ba26e2feead3f609cc928add8bd4798bb1af6ef70a", + "75150d61723081dd13259a88e75968e7b3ac2f8ae7293fc73624d9f188dcc091", + "b58418bdf076bf44d42552b426a5ab79cdabd08212a59d44779933df53b77ef3", + "c1d9c633ec3be4a06a27b84aa31a9571841f8583a23fd100e90c2e7b80b7641e", + "d73d18497cc888713655ee65b3525a502b9758196b0d6d3f81509f1c78f3d347", + "e8a56cfa01f4dc10160f22c8a843875b3b6e31d323db4293967363ed10258970", + "fe9fad13f69365496962dc8e02d2aa58c5ec605a2156ab40f24f6b9ea82d58b5"}; + +const char *whitelist_addrs[WHITELIST_COUNT] = {"RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", + "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9"}; diff --git a/src/veruslaunch.h b/src/veruslaunch.h new file mode 100644 index 000000000..ce33b9e3d --- /dev/null +++ b/src/veruslaunch.h @@ -0,0 +1,16 @@ + +// Copyright (c) 2018 The Verus developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef VERUS_LAUNCH_H +#define VERUS_LAUNCH_H + +#include + +#define WHITELIST_COUNT 13 + +extern const char *whitelist_ids[WHITELIST_COUNT]; +extern const char *whitelist_addrs[WHITELIST_COUNT]; + +#endif From 8abe764b18013165d7cca27229dff0710bddd1dd Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sat, 26 May 2018 04:02:10 -0700 Subject: [PATCH 19/29] Disabled test only state --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index cc6f11ea2..c58380e2f 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -181,7 +181,7 @@ public: vFixedSeeds = std::vector(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main)); - //fMiningRequiresPeers = true; + fMiningRequiresPeers = true; fDefaultConsistencyChecks = false; fRequireStandard = true; fMineBlocksOnDemand = false; From bf21e4b7af47d7a536b669ca8db30302b4cf4aad Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sat, 26 May 2018 11:48:52 -0700 Subject: [PATCH 20/29] fix build to operate fine until block 12800, where we will need to switch over --- src/veruslaunch.cpp | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/veruslaunch.cpp b/src/veruslaunch.cpp index d5fa76700..e7e1838ae 100644 --- a/src/veruslaunch.cpp +++ b/src/veruslaunch.cpp @@ -7,30 +7,6 @@ #include "veruslaunch.h" -const char *whitelist_ids[WHITELIST_COUNT] = {"1e4b6bf2306c4eb2e6be032176a749797facd387937b132c0d2ffd6dc8ec0c7b", - "21681d1cacbdc8ba403bc66b129cce4ca72a61adf0ef12504b4fbb07a613f735", - "2dc18aac1a8f97b991d1a2b67fa606f29c27b721e939c7b08a52da789900627c", - "41beb053cf1e516033316a69ab883584cd42546d1d7613181cf3d948eeaf1e6a", - "45fae92ebc1cdaf9187b92f0feb5e262b3dcadc37f3cde48a9b9da88f01b9195", - "5e7b24d571d7b21c1a2077ec8dc1b479d16c490d51ef11cc7c81af5dcb36b56f", - "6e1338aaf678121296d7a0ba26e2feead3f609cc928add8bd4798bb1af6ef70a", - "75150d61723081dd13259a88e75968e7b3ac2f8ae7293fc73624d9f188dcc091", - "b58418bdf076bf44d42552b426a5ab79cdabd08212a59d44779933df53b77ef3", - "c1d9c633ec3be4a06a27b84aa31a9571841f8583a23fd100e90c2e7b80b7641e", - "d73d18497cc888713655ee65b3525a502b9758196b0d6d3f81509f1c78f3d347", - "e8a56cfa01f4dc10160f22c8a843875b3b6e31d323db4293967363ed10258970", - "fe9fad13f69365496962dc8e02d2aa58c5ec605a2156ab40f24f6b9ea82d58b5"}; +const char *whitelist_ids[WHITELIST_COUNT] = {}; -const char *whitelist_addrs[WHITELIST_COUNT] = {"RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9", - "RNK1PPPFzzT4rBFE2CtKHjJNa7qkPRE3U9"}; +const char *whitelist_addrs[WHITELIST_COUNT] = {}; From bcb23c06e7a961485a1b9a1bfefd759d6832fc4c Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sat, 26 May 2018 12:07:41 -0700 Subject: [PATCH 21/29] Reset array count to zero --- src/veruslaunch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/veruslaunch.h b/src/veruslaunch.h index ce33b9e3d..16e81312d 100644 --- a/src/veruslaunch.h +++ b/src/veruslaunch.h @@ -8,7 +8,7 @@ #include -#define WHITELIST_COUNT 13 +#define WHITELIST_COUNT 0 extern const char *whitelist_ids[WHITELIST_COUNT]; extern const char *whitelist_addrs[WHITELIST_COUNT]; From b73006e3b833d35256a7229f19df4aabd881ffc6 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:34:57 -0700 Subject: [PATCH 22/29] attempting mac builds --- .travis.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd493f0a2..62a9129ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,29 @@ matrix: python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz + - compiler: ": Mac" + os: osx + osx_image: xcode9.2 + env: > + HOST=x86_64-apple-darwin11 + TARGET=x86_64-apple-darwin + BSCRIPT=build-mac.sh + TRAVIS_OS_NAME=osx + PACKAGES="binutils protobuf autogen" + OSX_SDK=10.9 exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi -- source /home/travis/google-cloud-sdk/path.bash.inc -- sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list -- travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES +- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf $HOME/google-cloud-sdk; export + CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi - if [ $TARGET_PLATFORM = Win64 ]; then rustup target add $RUST_TARGET; fi +- if [ $TRAVIS_OS_NAME = osx ]; then brew upgrade python coreutils automake; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew install flock; fi +- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite gcc@5; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources From 2a023e3c45ef425e78fea8a398d7252a53c22e90 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:35:29 -0700 Subject: [PATCH 23/29] attempting mac builds --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62a9129ea..136f69371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,20 +22,20 @@ cache: matrix: fast_finish: true include: - - compiler: ": Linux" - env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh - TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib - autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake - libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod - src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - - compiler: ": Windows" - env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu - BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev - libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git - python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe - src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz +# - compiler: ": Linux" +# env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh +# TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib +# autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake +# libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common +# libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod +# src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz +# - compiler: ": Windows" +# env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu +# BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev +# libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git +# python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler +# libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe +# src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Mac" os: osx osx_image: xcode9.2 From 4532d437a43267b58008113eafa0839d774df770 Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 26 May 2018 12:37:20 -0700 Subject: [PATCH 24/29] Attepting to fix typing issue on Mac. --- src/pow/tromp/equi_miner.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pow/tromp/equi_miner.h b/src/pow/tromp/equi_miner.h index ae527827a..d53d0d8aa 100644 --- a/src/pow/tromp/equi_miner.h +++ b/src/pow/tromp/equi_miner.h @@ -25,7 +25,13 @@ #include typedef uint16_t u16; +#ifdef _WIN32 +typedef unsigned long long u64; +#elif __linux__ typedef uint64_t u64; +#else +typedef unsigned long u64; +#endif #ifdef EQUIHASH_TROMP_ATOMIC #include From b247a9f575fbb35063d9b2588960a7ca9e14c369 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:40:19 -0700 Subject: [PATCH 25/29] attempting mac builds --- AUTH_KEY.json.enc | Bin 2352 -> 2359 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index 2ef6245d853e98605dc1d1a0f39906a5ea9c6c4f..6d9d8225a2fb381df6077d8a3bf8c5950e2a8ec5 100644 GIT binary patch literal 2359 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 z znEQ;!`!)RD9c1~ZMK)K*z( z3l50d7RZ;B4`V+h=?R4Ax4%2ZfLjz~fNF82asge;z;>~dHX9C2rzpG{3Yu(by^;eQ zr-qnK&rq2?A|6Uugl*^|okKt&aP*$IWYejaiOU1@Ns%>O(Z}a&oe=W{9r}3;l!Z?_ z`jU&nOwV)&*7Jc|zIIjQZtmL(EBZ^m5d6+st2NbyLzvPXBYm68k!|s|y+PK+BKB%b z7zJOzycpo~o^6Gj2NGyfA@8>@4RC`qVR$pd@)rC2F}DnyfG-d@yHn&7LQ7ts>ux*o z(x}#8kc#H1C~{@$?bS2PJzU^IQ2V8^q*i! z<~Q-tdysU~wo2+!oQZzZl8W%q!Fw_~1zaX)!aK0??>kFi;dr<@wi_-;O@EQztRd-J z2UXX+xWs0(sm&^TL@(X^gikF&GGjuDSu!C4^^=_bx*g`k? zC)R$9vTPJce1eH~1gW44S^9`Rkwu;I9WV9og5jev$bXPx^^E29UQ@dnAzxKyyXJV; zOP=OuC3Wq*cLMf1+i!rK8d7x z$AfgHkKA-}9HBXHZO3u~i+O4sD#%yTLsbxs{J|3PP>qjorsj?Url66~94@!2>gpAT W Date: Sat, 26 May 2018 12:43:19 -0700 Subject: [PATCH 26/29] attempting mac builds --- .travis.yml | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 136f69371..793392aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,43 +22,32 @@ cache: matrix: fast_finish: true include: -# - compiler: ": Linux" -# env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh -# TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib -# autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake -# libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common -# libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod -# src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz -# - compiler: ": Windows" -# env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu -# BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev -# libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git -# python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler -# libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe -# src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Mac" os: osx osx_image: xcode9.2 - env: > - HOST=x86_64-apple-darwin11 - TARGET=x86_64-apple-darwin - BSCRIPT=build-mac.sh - TRAVIS_OS_NAME=osx - PACKAGES="binutils protobuf autogen" - OSX_SDK=10.9 + env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BSCRIPT=build-mac.sh + TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 + +' exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES +- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf + $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com + | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list + && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi - if [ $TARGET_PLATFORM = Win64 ]; then rustup target add $RUST_TARGET; fi - if [ $TRAVIS_OS_NAME = osx ]; then brew upgrade python coreutils automake; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew install flock; fi -- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite gcc@5; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew + install flock; fi +- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew + tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite + gcc@5; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; + fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources @@ -74,9 +63,7 @@ after_script: && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi -notifications: - slack: - secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= before_install: - openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d + From 987b65957e93622a254ff46d7b026e9bd6bfc1da Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:45:29 -0700 Subject: [PATCH 27/29] attempting mac builds --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 793392aa1..1ce754c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,4 @@ after_script: && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi -before_install: -- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv - -in AUTH_KEY.json.enc -out AUTH_KEY.json -d From 85b0e3fd9404dc493aff7b7bcc4f84e86c84898a Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:47:55 -0700 Subject: [PATCH 28/29] attempting mac builds --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ce754c95..7956aef3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,6 @@ matrix: exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf - $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com - | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list - && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi From 78a27c22525c45dd7fd44e49088cc9eccb847f85 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:53:18 -0700 Subject: [PATCH 29/29] attempting mac builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7956aef3a..0b9f1bcc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: - compiler: ": Mac" os: osx osx_image: xcode9.2 - env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BSCRIPT=build-mac.sh + env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BUILD_SCRIPT=build-mac.sh TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 '