From 511c8d24b39336cb4a3ee9c53cee6729f100e8ec Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Thu, 24 May 2018 10:47:54 -0700 Subject: [PATCH 1/7] Fixing AUTH to external storage --- .travis.yml | 2 +- AUTH_KEY.json.enc | Bin 2362 -> 2352 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b928435c9..d7c14c3e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,5 +69,5 @@ 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_c502152b68fb_key -iv $encrypted_c502152b68fb_iv +- openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index 2ef582ad0ecc5d8cedc5d6bf156adde97421b9b6..ff2e4ce967a1ae652bc5aab3c33e55d97ba50581 100644 GIT binary patch literal 2352 zcmV-03D5R59`P)q^pyA-VDOrZG1LAZVy<&1^AS&>)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 literal 2362 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 From eb272b0eb671d19873a6e2b2da37bcebc908d6dc Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Thu, 24 May 2018 18:05:13 -0700 Subject: [PATCH 2/7] Cleaned up Travis config --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7c14c3e6..aba91579a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,8 +61,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 mkdir -p src/komodo-build && cp $KOMODO_EXEC_SET - src/komodo-build && cd src && tar -czvf $COMPRESSED_BUILD komodo-build; 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 notifications: From 52cf66e138eb09f82b408b70ace4bc4149d2068c Mon Sep 17 00:00:00 2001 From: David Dawes Date: Thu, 24 May 2018 20:28:26 -0700 Subject: [PATCH 3/7] Add conditional compiulation for Windows fix. --- src/crypto/haraka.h | 4 ++++ src/miner.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/crypto/haraka.h b/src/crypto/haraka.h index 203f8fbf6..1cb5ea662 100644 --- a/src/crypto/haraka.h +++ b/src/crypto/haraka.h @@ -30,7 +30,11 @@ Optimized Implementations for Haraka256 and Haraka512 #define NUMROUNDS 5 +#ifdef _WIN32 +typedef unsigned long long u64; +#else typedef unsigned long u64; +#endif typedef __m128i u128; extern u128 rc[40]; diff --git a/src/miner.cpp b/src/miner.cpp index 2c2d414c8..ef41e6db0 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1228,7 +1228,11 @@ void static BitcoinMiner_noeq() if ((UintToArith256(pblock->nNonce) & mask) == mask) { +#ifdef _WIN32 + printf("%llu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576); +#else printf("%lu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576); +#endif break; } From a23fbff21a6d26445efa578d1c24cd16888d1053 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 00:00:22 -0700 Subject: [PATCH 4/7] 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 5/7] 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 6/7] 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 7/7] 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