From d209491abf01aa4da4acb540b80d24411525a85a Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 13 Feb 2018 22:25:30 +0200
Subject: [PATCH] Test

---
 src/komodo_gateway.h | 13 ++++++-------
 src/komodo_utils.h   |  4 ++--
 src/miner.cpp        | 27 +--------------------------
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index d814bd6bf..b5ec33fb5 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -653,7 +653,7 @@ void komodo_passport_iteration();
 int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above block is valid pax pricing
 {
     static uint256 array[64]; static int32_t numbanned,indallvouts;
-    int32_t i,j,k,n,ht,baseid,txn_count,activation,num,opretlen,offset=1,errs=0,matched=0,kmdheights[256],otherheights[256]; uint256 hash,txids[256]; char symbol[KOMODO_ASSETCHAIN_MAXLEN],base[KOMODO_ASSETCHAIN_MAXLEN]; uint16_t vouts[256]; int8_t baseids[256]; uint8_t *script,opcode,rmd160s[256*20]; uint64_t total,available,deposited,issued,withdrawn,approved,redeemed,checktoshis,seed; int64_t values[256],srcvalues[256]; struct pax_transaction *pax; struct komodo_state *sp;
+    int32_t i,j,k,n,ht,baseid,txn_count,activation,num,opretlen,offset=1,errs=0,matched=0,kmdheights[256],otherheights[256]; uint256 hash,txids[256]; char symbol[KOMODO_ASSETCHAIN_MAXLEN],base[KOMODO_ASSETCHAIN_MAXLEN]; uint16_t vouts[256]; int8_t baseids[256]; uint8_t *script,opcode,rmd160s[256*20]; uint64_t total,subsidy,available,deposited,issued,withdrawn,approved,redeemed,checktoshis,seed; int64_t values[256],srcvalues[256]; struct pax_transaction *pax; struct komodo_state *sp;
     activation = 235300;
     if ( *(int32_t *)&array[0] == 0 )
         numbanned = komodo_bannedset(&indallvouts,array,(int32_t)(sizeof(array)/sizeof(*array)));
@@ -721,6 +721,9 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
     }
     if ( ASSETCHAINS_SYMBOL[0] != 0 && ASSETCHAINS_COMMISSION != 0 )
     {
+        script = (uint8_t *)block.vtx[0].vout[0].scriptPubKey.data();
+        if ( script[0] != 33 || script[34] != OP_CHECKSIG || memcmp(script+1,ASSETCHAINS_OVERRIDE_PUBKEY33,33) != 0 )
+            return(-1);
         total = 0;
         for (i=1; i<txn_count; i++)
         {
@@ -730,12 +733,8 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
         }
         if ( (checktoshis = (total * ASSETCHAINS_COMMISSION) / COIN) != 0 )
         {
-            if ( block.vtx[0].vout.size() != 2 || block.vtx[0].vout[1].nValue != checktoshis )
-                return(-1);
-            if ( block.vtx[0].vout[1].scriptPubKey.size() != 35 )
-                return(-1);
-            script = (uint8_t *)block.vtx[0].vout[1].scriptPubKey.data();
-            if ( script[0] != 33 || script[34] != OP_CHECKSIG || memcmp(script+1,ASSETCHAINS_OVERRIDE_PUBKEY33,33) != 0 )
+            subsidy = GetBlockSubsidy(height,chainparams.GetConsensus());
+            if ( block.vtx[0].vout.size() != 1 || block.vtx[0].vout[0].nValue != checktoshis+subsidy )
                 return(-1);
         }
     }
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 22cc4fdf2..2d9d31dfb 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1563,12 +1563,12 @@ void komodo_args(char *argv0)
             ASSETCHAINS_DECAY = 0;
             printf("ASSETCHAINS_DECAY cant be more than 100000000\n");
         }
-        if ( strlen(ASSETCHAINS_OVERRIDE_PUBKEY.c_str()) == 66 && ASSETCHAINS_COMMISSION > 0 && ASSETCHAINS_COMMISSION <= 1000000 )
+        if ( strlen(ASSETCHAINS_OVERRIDE_PUBKEY.c_str()) == 66 && ASSETCHAINS_COMMISSION > 0 && ASSETCHAINS_COMMISSION <= 100000000 )
             decode_hex(ASSETCHAINS_OVERRIDE_PUBKEY33,33,(char *)ASSETCHAINS_OVERRIDE_PUBKEY.c_str());
         else
         {
             ASSETCHAINS_COMMISSION = 0;
-            printf("ASSETCHAINS_COMMISSION needs an ASETCHAINS_OVERRIDE_PUBKEY\n");
+            printf("ASSETCHAINS_COMMISSION needs an ASETCHAINS_OVERRIDE_PUBKEY and cant be more than 100000000 (100%%)\n");
         }
         if ( ASSETCHAINS_ENDSUBSIDY != 0 || ASSETCHAINS_REWARD != 0 || ASSETCHAINS_HALVING != 0 || ASSETCHAINS_DECAY != 0 || ASSETCHAINS_COMMISSION != 0 )
         {
diff --git a/src/miner.cpp b/src/miner.cpp
index d447327a0..ddd484759 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -554,7 +554,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey)
     {
         for (i=0; i<65; i++)
             fprintf(stderr,"%d ",komodo_minerid(chainActive.Tip()->nHeight-i,0));
-        fprintf(stderr," minerids.special %d from ht.%d\n",komodo_is_special(chainActive.Tip()->nHeight+1,NOTARY_PUBKEY33,chainActive.Tip()->nHeight);
+        fprintf(stderr," minerids.special %d from ht.%d\n",komodo_is_special(chainActive.Tip()->nHeight+1,NOTARY_PUBKEY33,chainActive.Tip()->nHeight));
     }
     return CreateNewBlock(scriptPubKey);
 }
@@ -753,31 +753,6 @@ void static BitcoinMiner()
                         continue;
                     } else fprintf(stderr,"%s vouts.%d mining.%d vs %d\n",ASSETCHAINS_SYMBOL,(int32_t)pblock->vtx[0].vout.size(),Mining_height,ASSETCHAINS_MINHEIGHT);
                 }
-                else if ( ASSETCHAINS_COMMISSION != 0 )
-                {
-                    total = 0;
-                    for (i=1; i<pblock->vtx.size(); i++)
-                    {
-                        n = pblock->vtx[i].vout.size();
-                        for (j=0; j<n; j++)
-                            total += pblock->vtx[i].vout[j].nValue;
-                    }
-                    if ( (checktoshis = (total * ASSETCHAINS_COMMISSION) / COIN) != 0 )
-                    {
-                        pblock->vtx[0].vout.resize((long)2);
-                        pblock->vtx[0].vout[1].nValue = checktoshis;
-                        pblock->vtx[0].vout[1].scriptPubKey.resize((long)35);
-                        script = (uint8_t *)pblock->vtx[0].vout[1].scriptPubKey.data();
-                        script[0] = 33;
-                        for (i=0; i<33; i++)
-                            script[i+1] = ASSETCHAINS_OVERRIDE_PUBKEY33[i];
-                        script[34] = OP_CHECKSIG;
-                    }
-                }
-                else
-                {
-                    pblock->vtx[0].vout.resize((long)1);
-                }
             }
             IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
             LogPrintf("Running KomodoMiner.%s with %u transactions in block (%u bytes)\n",solver.c_str(),pblock->vtx.size(),::GetSerializeSize(*pblock,SER_NETWORK,PROTOCOL_VERSION));