From 5bf2ae888b046b8172f31281cc26f4069f5133f0 Mon Sep 17 00:00:00 2001 From: Mihail Fedorov Date: Sun, 4 Dec 2016 13:35:31 +0100 Subject: [PATCH 01/20] Reduce image size --- Dockerfile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37efb1c0e..0850c7d6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,6 @@ -FROM ubuntu:16.04 +FROM kolobus/komodod:ubuntu MAINTAINER Mihail Fedorov -# All the stuff -# And clean out packages, keep space minimal -RUN apt-get -y update && \ - apt-get -y upgrade && \ - apt-get -y install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev \ - unzip python zlib1g-dev wget bsdmainutils automake libboost-all-dev libssl-dev libprotobuf-dev \ - protobuf-compiler libqt4-dev libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - ADD ./ /komodo ENV HOME /komodo WORKDIR /komodo @@ -28,4 +18,3 @@ RUN ln -sf /komodo/src/komodod /usr/bin/komodod && \ ln -sf /komodo/zcutil/docker-komodo-cli.sh /usr/bin/komodo-cli CMD ["entrypoint"] - From d03fbd981fce86504b78d2a9582e4da988d59823 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 5 Dec 2016 10:01:43 -0300 Subject: [PATCH 02/20] disable 100000 --- src/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fe832ac0f..8e8223c1f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -550,7 +550,6 @@ CBlockTreeDB *pblocktree = NULL; // Komodo globals -#define KOMODO_TESTNET_EXPIRATION 100000 #define KOMODO_PAX #define KOMODO_ZCASH #include "komodo.h" @@ -2155,8 +2154,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints())); - if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" - return(false); + //if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" + // return(false); // Do not allow blocks that contain transactions which 'overwrite' older transactions, // unless those are already completely spent. BOOST_FOREACH(const CTransaction& tx, block.vtx) { From 0bcadd8a52e5683ed9a9b15693e8ae5cc9a3c1b9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 5 Dec 2016 10:02:20 -0300 Subject: [PATCH 03/20] disable 100000 --- src/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fe832ac0f..8e8223c1f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -550,7 +550,6 @@ CBlockTreeDB *pblocktree = NULL; // Komodo globals -#define KOMODO_TESTNET_EXPIRATION 100000 #define KOMODO_PAX #define KOMODO_ZCASH #include "komodo.h" @@ -2155,8 +2154,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints())); - if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" - return(false); + //if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" + // return(false); // Do not allow blocks that contain transactions which 'overwrite' older transactions, // unless those are already completely spent. BOOST_FOREACH(const CTransaction& tx, block.vtx) { From da49ef71b3ebee75d2225e908707fad766b6d45a Mon Sep 17 00:00:00 2001 From: Mihail Fedorov Date: Mon, 5 Dec 2016 19:26:22 +0300 Subject: [PATCH 04/20] docker updated --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0850c7d6c..71136b3af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -FROM kolobus/komodod:ubuntu -MAINTAINER Mihail Fedorov +FROM kolobus/ubuntu:komodo +MAINTAINER Mihail Fedorov ADD ./ /komodo ENV HOME /komodo @@ -9,7 +9,7 @@ WORKDIR /komodo RUN cd /komodo && \ ./autogen.sh && \ ./configure --with-incompatible-bdb --with-gui || true && \ - ./zcutil/build.sh -j4 + ./zcutil/build.sh -j$(nproc) # Unknown stuff goes here From 4c000337a26632fc3a13440f87741d27c1885c7a Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 7 Dec 2016 13:00:46 +0200 Subject: [PATCH 05/20] test --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 0fb8a74d7..fc6876d85 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -485,7 +485,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above { printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d\n",symbol,height,opcode,matched,num); // can easily happen depending on order of loading - if ( height > 100000 ) //&& opcode == 'X' ) + if ( height > 110000 ) //&& opcode == 'X' ) { printf("REJECT: ht.%d (%c) matched.%d vs num.%d\n",height,opcode,matched,num); return(-1); From d2baf46fc2f15ac0ad2c0a6e7dedbb55583b634d Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 9 Dec 2016 17:11:44 +0200 Subject: [PATCH 06/20] Revert "test" This reverts commit 4c000337a26632fc3a13440f87741d27c1885c7a. --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index fc6876d85..0fb8a74d7 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -485,7 +485,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above { printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d\n",symbol,height,opcode,matched,num); // can easily happen depending on order of loading - if ( height > 110000 ) //&& opcode == 'X' ) + if ( height > 100000 ) //&& opcode == 'X' ) { printf("REJECT: ht.%d (%c) matched.%d vs num.%d\n",height,opcode,matched,num); return(-1); From 76b6eacf41395ddd2badd5d5dc3352e603c59df2 Mon Sep 17 00:00:00 2001 From: Mihail Fedorov Date: Fri, 16 Dec 2016 01:56:42 +0300 Subject: [PATCH 07/20] docker stuff updated --- zcutil/docker-entrypoint.sh | 9 ++------- zcutil/docker-komodo-cli.sh | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/zcutil/docker-entrypoint.sh b/zcutil/docker-entrypoint.sh index c7df89d70..aae6fc7e4 100755 --- a/zcutil/docker-entrypoint.sh +++ b/zcutil/docker-entrypoint.sh @@ -14,12 +14,6 @@ rpcpassword=${rpcpassword:-`dd if=/dev/urandom bs=33 count=1 2>/dev/null | base6 txindex=1 bind=${listenip:-127.0.0.1} rpcbind=${listenip:-127.0.0.1} -addnode=5.9.102.210 -addnode=78.47.196.146 -addnode=178.63.69.164 -addnode=88.198.65.74 -addnode=5.9.122.241 -addnode=144.76.94.38 EOF cat $HOME/.komodo/komodo.conf @@ -27,9 +21,10 @@ fi echo "...Checking fetch-params" $HOME/zcutil/fetch-params.sh - echo "Initialization completed successfully" echo + +# ToDo: Needs some rework. I was sick if [ $# -gt 0 ]; then args=("$@") diff --git a/zcutil/docker-komodo-cli.sh b/zcutil/docker-komodo-cli.sh index 3b555725f..121587bdf 100755 --- a/zcutil/docker-komodo-cli.sh +++ b/zcutil/docker-komodo-cli.sh @@ -1,11 +1,6 @@ #!/bin/bash -if [ -z ${assetchain+x} ]; then - /komodo/src/komodo-cli $1 $2 $3 $4 +# ToDo: check for docker arg ac_name -else - - /komodo/src/komodo-cli -ac_name=$assetchain $1 $2 $3 $4 - -fi +/komodo/src/komodo-cli $1 $2 $3 $4 From b039abf96ca8e18ca4b6afce6bfc6b91ab1350e4 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 3 Jan 2017 14:57:13 +0200 Subject: [PATCH 08/20] Revert "disable 100000" This reverts commit d03fbd981fce86504b78d2a9582e4da988d59823. --- src/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8e8223c1f..fe832ac0f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -550,6 +550,7 @@ CBlockTreeDB *pblocktree = NULL; // Komodo globals +#define KOMODO_TESTNET_EXPIRATION 100000 #define KOMODO_PAX #define KOMODO_ZCASH #include "komodo.h" @@ -2154,8 +2155,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin } bool fScriptChecks = (!fCheckpointsEnabled || pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints())); - //if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" - // return(false); + if ( KOMODO_TESTNET_EXPIRATION != 0 && pindex->nHeight > KOMODO_TESTNET_EXPIRATION ) // "testnet" + return(false); // Do not allow blocks that contain transactions which 'overwrite' older transactions, // unless those are already completely spent. BOOST_FOREACH(const CTransaction& tx, block.vtx) { From 68b868fd6ddfb1fded75db93b768fb6e2afbe859 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 4 Jan 2017 14:05:46 +0200 Subject: [PATCH 09/20] test --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index f24cfedbd..a55ed39d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1124,8 +1124,10 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa COutPoint outpoint = tx.vin[i].prevout; if (pool.mapNextTx.count(outpoint)) { + static uint32_t counter; // Disable replacement feature for now - fprintf(stderr,"Disable replacement feature for now\n"); + if ( counter++ < 10 ) + fprintf(stderr,"Disable replacement feature for now\n"); return false; } } From 985e8f155920af82a30454842ef7ffbc7f461d7c Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 4 Jan 2017 14:06:30 +0200 Subject: [PATCH 10/20] Revert "test" This reverts commit 68b868fd6ddfb1fded75db93b768fb6e2afbe859. --- src/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a55ed39d5..f24cfedbd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1124,10 +1124,8 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa COutPoint outpoint = tx.vin[i].prevout; if (pool.mapNextTx.count(outpoint)) { - static uint32_t counter; // Disable replacement feature for now - if ( counter++ < 10 ) - fprintf(stderr,"Disable replacement feature for now\n"); + fprintf(stderr,"Disable replacement feature for now\n"); return false; } } From dc64e81e0fb7496e77f0b60f74a3fff36dc465e3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 27 Feb 2017 21:45:10 +0200 Subject: [PATCH 11/20] Remove prints --- src/komodo_gateway.h | 3 +-- src/wallet/wallet.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 62b544da6..5b68296f2 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -683,7 +683,6 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above if ( height > 0 && (height < chainActive.Tip()->nHeight || (height >= chainActive.Tip()->nHeight && komodo_isrealtime(&ht) != 0)) && matched != num ) { printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d tip.%d isRT.%d\n",symbol,height,opcode,matched,num,(int32_t)chainActive.Tip()->nHeight,komodo_isrealtime(&ht)); - // can easily happen depending on order of loading if ( height > 200000 ) { printf("REJECT: ht.%d (%c) matched.%d vs num.%d\n",height,opcode,matched,num); @@ -751,7 +750,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 printf("%02x",pubkey33[i]); printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height); } - if ( komodo_paxcmp(base,kmdheight,value,checktoshis,kmdheight < 225000 ? seed : 0) == 0 ) + if ( komodo_paxcmp(base,kmdheight,value,checktoshis,kmdheight <= 225000 ? seed : 0) == 0 ) { if ( (pax= komodo_paxfind(txid,vout,'D')) == 0 ) { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 091fb5e22..45e8875ec 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2669,7 +2669,7 @@ bool CWallet::CreateTransaction(const vector& vecSend, if ( KOMODO_EXCHANGEWALLET == 0 ) { interest2 += pcoin.first->vout[pcoin.second].interest; - fprintf(stderr,"%.8f ",(double)pcoin.first->vout[pcoin.second].interest/COIN); + //fprintf(stderr,"%.8f ",(double)pcoin.first->vout[pcoin.second].interest/COIN); } int age = pcoin.first->GetDepthInMainChain(); if (age != 0) From d8de3e0e986068ebae88514b567cac247dbab640 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 27 Feb 2017 21:45:21 +0200 Subject: [PATCH 12/20] Revert "Remove prints" This reverts commit dc64e81e0fb7496e77f0b60f74a3fff36dc465e3. --- src/komodo_gateway.h | 3 ++- src/wallet/wallet.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 5b68296f2..62b544da6 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -683,6 +683,7 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above if ( height > 0 && (height < chainActive.Tip()->nHeight || (height >= chainActive.Tip()->nHeight && komodo_isrealtime(&ht) != 0)) && matched != num ) { printf("WOULD REJECT %s: ht.%d (%c) matched.%d vs num.%d tip.%d isRT.%d\n",symbol,height,opcode,matched,num,(int32_t)chainActive.Tip()->nHeight,komodo_isrealtime(&ht)); + // can easily happen depending on order of loading if ( height > 200000 ) { printf("REJECT: ht.%d (%c) matched.%d vs num.%d\n",height,opcode,matched,num); @@ -750,7 +751,7 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3 printf("%02x",pubkey33[i]); printf(" checkpubkey check %.8f v %.8f dest.(%s) kmdheight.%d height.%d\n",dstr(checktoshis),dstr(value),destaddr,kmdheight,height); } - if ( komodo_paxcmp(base,kmdheight,value,checktoshis,kmdheight <= 225000 ? seed : 0) == 0 ) + if ( komodo_paxcmp(base,kmdheight,value,checktoshis,kmdheight < 225000 ? seed : 0) == 0 ) { if ( (pax= komodo_paxfind(txid,vout,'D')) == 0 ) { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 45e8875ec..091fb5e22 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2669,7 +2669,7 @@ bool CWallet::CreateTransaction(const vector& vecSend, if ( KOMODO_EXCHANGEWALLET == 0 ) { interest2 += pcoin.first->vout[pcoin.second].interest; - //fprintf(stderr,"%.8f ",(double)pcoin.first->vout[pcoin.second].interest/COIN); + fprintf(stderr,"%.8f ",(double)pcoin.first->vout[pcoin.second].interest/COIN); } int age = pcoin.first->GetDepthInMainChain(); if (age != 0) From 88b8b1365a34aa6dad8d782dc41078fbdd448b8c Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 12 Mar 2017 12:29:48 +0200 Subject: [PATCH 13/20] Revert "Merge pull request #224 from jl777/dev" This reverts commit 2b58404ddf3edcde29f64af16a12605da6a9592d, reversing changes made to 536b065b7e11972c6f8e3489ce3b87ffbf53421a. --- src/pow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index fdcb43936..7d8097486 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -171,7 +171,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in for (i=0; i<66; i++) printf("%d ",mids[i]); printf(" minerids from ht.%d\n",height); - if ( notaryid >= 0 || height > 225065 ) + if ( notaryid >= 0 || height > 225000 ) return error("CheckProofOfWork(): hash doesn't match nBits"); } } From ec123865e098fe3aca4726e9d9efff02d85010d8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 13 Mar 2017 20:20:46 +0200 Subject: [PATCH 14/20] Test --- src/main.cpp | 12 ++++++++++++ src/miner.cpp | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 307d1d460..be726d4c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3448,13 +3448,25 @@ bool TestBlockValidity(CValidationState &state, const CBlock& block, CBlockIndex // NOTE: CheckBlockHeader is called by CheckBlock if (!ContextualCheckBlockHeader(block, state, pindexPrev)) + { + fprintf(stderr,"TestBlockValidity A error\n"); return false; + } if (!CheckBlock(indexDummy.nHeight,0,block, state, verifier, fCheckPOW, fCheckMerkleRoot)) + { + fprintf(stderr,"TestBlockValidity B error\n"); return false; + } if (!ContextualCheckBlock(block, state, pindexPrev)) + { + fprintf(stderr,"TestBlockValidity C error\n"); return false; + } if (!ConnectBlock(block, state, &indexDummy, viewNew, true)) + { + fprintf(stderr,"TestBlockValidity D error\n"); return false; + } assert(state.IsValid()); return true; diff --git a/src/miner.cpp b/src/miner.cpp index 376c12c63..6d110a46c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -605,7 +605,7 @@ void static BitcoinMiner(CWallet *pwallet) Mining_height = pindexPrev->nHeight+1; Mining_start = (uint32_t)time(NULL); } - //if ( ASSETCHAINS_SYMBOL[0] != 0 ) + if ( ASSETCHAINS_SYMBOL[0] != 0 ) fprintf(stderr,"%s create new block ht.%d\n",ASSETCHAINS_SYMBOL,Mining_height); CBlockTemplate *ptr = CreateNewBlockWithKey(reservekey); if ( ptr == 0 ) @@ -627,7 +627,7 @@ void static BitcoinMiner(CWallet *pwallet) // uint8_t pubkeys[66][33]; int mids[66],gpucount,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); savebits = pblock->nBits; - arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); + ari`th_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); if ( ASSETCHAINS_SYMBOL[0] == 0 && notaryid >= 0 )//komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 ) { j = 65; From 9a947a93730f7d53874fe39fdfe012de27ed8a98 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 00:05:09 +0200 Subject: [PATCH 15/20] typo --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index a13a2f57a..597b5e400 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -636,7 +636,7 @@ void static BitcoinMiner(CWallet *pwallet) // uint8_t pubkeys[66][33]; int mids[66],gpucount,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); savebits = pblock->nBits; - ari`th_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); + arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); if ( ASSETCHAINS_SYMBOL[0] == 0 && notaryid >= 0 )//komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 ) { j = 65; From 5d72480089b6ce65ffee625080b34d65c6a4ad45 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 00:05:36 +0200 Subject: [PATCH 16/20] Typo --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index a13a2f57a..597b5e400 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -636,7 +636,7 @@ void static BitcoinMiner(CWallet *pwallet) // uint8_t pubkeys[66][33]; int mids[66],gpucount,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); savebits = pblock->nBits; - ari`th_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); + arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); if ( ASSETCHAINS_SYMBOL[0] == 0 && notaryid >= 0 )//komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 ) { j = 65; From cb480e421b2caef44dff4fe36d80cc4d54781e74 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 22:01:31 +0200 Subject: [PATCH 17/20] Syntax fix --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 6f216b24d..57aeebdfe 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -495,7 +495,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to continue; { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( height > 236000 ) + if ( pax->height > 236000 ) { if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) pax->validated = pax->komodoshis; From d1775ced1ef74c398fcdb806adcc3632f61d5e5b Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 22:02:23 +0200 Subject: [PATCH 18/20] Syntax --- src/komodo_gateway.h | 2 +- src/main.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 6f216b24d..57aeebdfe 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -495,7 +495,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to continue; { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( height > 236000 ) + if ( pax->height > 236000 ) { if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) pax->validated = pax->komodoshis; diff --git a/src/main.cpp b/src/main.cpp index 31ee26c8e..8f3fdfddd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -875,7 +875,11 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, { static uint32_t counter; if ( counter++ < 100 ) +<<<<<<< Updated upstream printf("MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); +======= + fprintf(stderr,"MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); +>>>>>>> Stashed changes return(false); } } From dbc9ad1fd9358ece10d4b844cd9a472d33aa8222 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 22:04:03 +0200 Subject: [PATCH 19/20] Resolve --- src/main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8f3fdfddd..31ee26c8e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -875,11 +875,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state, { static uint32_t counter; if ( counter++ < 100 ) -<<<<<<< Updated upstream printf("MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); -======= - fprintf(stderr,"MEMPOOL: banned tx.%d being used at ht.%d vini.%d\n",k,(int32_t)chainActive.Tip()->nHeight,j); ->>>>>>> Stashed changes return(false); } } From fc20b90824edbdbc1d6454120b9fcf378c312409 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 14 Mar 2017 22:04:33 +0200 Subject: [PATCH 20/20] Syntax --- src/komodo_gateway.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index 6f216b24d..57aeebdfe 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -495,7 +495,7 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to continue; { #ifdef KOMODO_ASSETCHAINS_WAITNOTARIZE - if ( height > 236000 ) + if ( pax->height > 236000 ) { if ( kmdsp != 0 && kmdsp->NOTARIZED_HEIGHT >= pax->height ) pax->validated = pax->komodoshis;