From c7a3aca61018f34fc580c1f8d197fdb9d8bc9cd3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 13 Mar 2017 05:17:29 +0200 Subject: [PATCH] Test --- src/komodo_gateway.h | 63 +++++++++++++++++++++++++++--------- src/main.cpp | 12 +++---- src/primitives/transaction.h | 2 +- 3 files changed, 53 insertions(+), 24 deletions(-) diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h index aab7bd2b1..a20e4c452 100644 --- a/src/komodo_gateway.h +++ b/src/komodo_gateway.h @@ -588,30 +588,61 @@ int32_t komodo_gateway_deposits(CMutableTransaction *txNew,char *base,int32_t to return(0); } -int32_t komodo_check_deposit(int32_t height,CBlock *block) // verify above block is valid pax pricing +char *banned_txids[] = { - int32_t i,j,n,ht,num,opretlen,offset=1,errs=0,matched=0,kmdheights[64],otherheights[64]; uint256 hash,txids[64]; char symbol[16],base[16]; uint16_t vouts[64]; int8_t baseids[64]; uint8_t *script,opcode,rmd160s[64*20]; uint64_t available,deposited,issued,withdrawn,approved,redeemed; int64_t values[64],srcvalues[64]; struct pax_transaction *pax; struct komodo_state *sp; + "c85dcffb16d5a45bd239021ad33443414d60224760f11d535ae2063e5709efee", // 235296 + "a01671c8775328a41304e31a6693bbd35e9acbab28ab117f729eaba9cb769461", // 235265 + "fa9943525f2e6c32cbc243294b08187e314d83a2870830180380c3c12a9fd33c", // 235253 +}; + +void komodo_bannedset(uint256 *array,int32_t max) +{ + int32_t i; + for (i=0; ivtx[0].vout.size(); - script = (uint8_t *)block->vtx[0].vout[n-1].scriptPubKey.data(); + txn_count = block.vtx.size(); + for (i=0; ivtx[0].vout[1].nValue != 0 ) + if ( n == 2 && block.vtx[0].vout[1].nValue != 0 ) { - //fprintf(stderr,">>>>>>>> <<<<<<<<<< ht.%d illegal nonz output %.8f n.%d\n",height,dstr(block->vtx[0].vout[1].nValue),n); - //if ( height > 235300 && block->vtx[0].vout[1].nValue >= 100000*COIN ) - // block->vtx[0].vout[1].nValue = 0; - if ( height > 236000 ) + //fprintf(stderr,">>>>>>>> <<<<<<<<<< ht.%d illegal nonz output %.8f n.%d\n",height,dstr(block.vtx[0].vout[1].nValue),n); + if ( height > 235300 ) return(-1); } return(0); } - //fprintf(stderr,"ht.%d n.%d nValue %.8f (%d %d %d)\n",height,n,dstr(block->vtx[0].vout[1].nValue),KOMODO_PAX,komodo_isrealtime(&ht),KOMODO_PASSPORT_INITDONE); + //fprintf(stderr,"ht.%d n.%d nValue %.8f (%d %d %d)\n",height,n,dstr(block.vtx[0].vout[1].nValue),KOMODO_PAX,komodo_isrealtime(&ht),KOMODO_PASSPORT_INITDONE); if ( komodo_isrealtime(&ht) == 0 || KOMODO_PASSPORT_INITDONE == 0 ) //KOMODO_PAX == 0 || return(0); offset += komodo_scriptitemlen(&opretlen,&script[offset]); @@ -629,7 +660,7 @@ int32_t komodo_check_deposit(int32_t height,CBlock *block) // verify above block opcode = 'I'; if ( komodo_baseid(symbol) < 0 ) { - if ( block->vtx[0].vout.size() != 1 ) + if ( block.vtx[0].vout.size() != 1 ) { printf("%s has more than one coinbase?\n",symbol); return(-1); @@ -637,7 +668,7 @@ int32_t komodo_check_deposit(int32_t height,CBlock *block) // verify above block return(0); } } - if ( script[offset] == opcode && opretlen < block->vtx[0].vout[n-1].scriptPubKey.size() ) + if ( script[offset] == opcode && opretlen < block.vtx[0].vout[n-1].scriptPubKey.size() ) { if ( (num= komodo_issued_opreturn(base,txids,vouts,values,srcvalues,kmdheights,otherheights,baseids,rmd160s,&script[offset],opretlen,opcode == 'X')) > 0 ) { @@ -657,11 +688,11 @@ int32_t komodo_check_deposit(int32_t height,CBlock *block) // verify above block printf("checkdeposit.[%s]: skip %s %.8f when avail %.8f deposited %.8f, issued %.8f withdrawn %.8f approved %.8f redeemed %.8f\n",ASSETCHAINS_SYMBOL,symbol,dstr(pax->fiatoshis),dstr(available),dstr(deposited),dstr(issued),dstr(withdrawn),dstr(approved),dstr(redeemed)); continue; } - if ( ((opcode == 'I' && (pax->fiatoshis == 0 || pax->fiatoshis == block->vtx[0].vout[i].nValue)) || (opcode == 'X' && (pax->komodoshis == 0 || pax->komodoshis == block->vtx[0].vout[i].nValue))) ) + if ( ((opcode == 'I' && (pax->fiatoshis == 0 || pax->fiatoshis == block.vtx[0].vout[i].nValue)) || (opcode == 'X' && (pax->komodoshis == 0 || pax->komodoshis == block.vtx[0].vout[i].nValue))) ) { if ( pax->marked != 0 && height >= 80820 ) { - printf(">>>>>>>>>>> %c errs.%d i.%d match %.8f vs %.8f paxmarked.%d kht.%d ht.%d\n",opcode,errs,i,dstr(opcode == 'I' ? pax->fiatoshis : pax->komodoshis),dstr(block->vtx[0].vout[i].nValue),pax->marked,pax->height,pax->otherheight); + printf(">>>>>>>>>>> %c errs.%d i.%d match %.8f vs %.8f paxmarked.%d kht.%d ht.%d\n",opcode,errs,i,dstr(opcode == 'I' ? pax->fiatoshis : pax->komodoshis),dstr(block.vtx[0].vout[i].nValue),pax->marked,pax->height,pax->otherheight); if ( pax->komodoshis != 0 || pax->fiatoshis != 0 ) errs++; else matched++; // onetime init bypass @@ -678,12 +709,12 @@ int32_t komodo_check_deposit(int32_t height,CBlock *block) // verify above block for (j=0; j<32; j++) printf("%02x",((uint8_t *)&txids[i-1])[j]); printf(" cant paxfind %c txid\n",opcode); - printf(">>>>>>>>>>> %c errs.%d i.%d match %.8f vs %.8f pax.%p\n",opcode,errs,i,dstr(opcode == 'I' ? pax->fiatoshis : pax->komodoshis),dstr(block->vtx[0].vout[i].nValue),pax); + printf(">>>>>>>>>>> %c errs.%d i.%d match %.8f vs %.8f pax.%p\n",opcode,errs,i,dstr(opcode == 'I' ? pax->fiatoshis : pax->komodoshis),dstr(block.vtx[0].vout[i].nValue),pax); } } else if ( kmdheights[i-1] > 0 && otherheights[i-1] > 0 ) { - hash = block->GetHash(); + hash = block.GetHash(); for (j=0; j<32; j++) printf("%02x",((uint8_t *)&hash)[j]); printf(" kht.%d ht.%d %.8f %.8f blockhash couldnt find vout.[%d]\n",kmdheights[i-1],otherheights[i-1],dstr(values[i-1]),dstr(srcvalues[i]),i); diff --git a/src/main.cpp b/src/main.cpp index a488018b8..4adbc26a5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2026,11 +2026,9 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex // but it must be corrected before txout nversion ever influences a network rule. if (outsBlock.nVersion < 0) outs->nVersion = outsBlock.nVersion; - if ( i != 0 || tx.vout.size() != 2 || tx.vout[1].nValue < COIN ) - { - if (*outs != outsBlock) - fClean = fClean && error("DisconnectBlock(): added transaction mismatch? database corrupted"); - } + if (*outs != outsBlock) + fClean = fClean && error("DisconnectBlock(): added transaction mismatch? database corrupted"); + // remove outputs outs->Clear(); } @@ -3131,7 +3129,7 @@ bool CheckBlockHeader(int32_t height,CBlockIndex *pindex, const CBlockHeader& bl return true; } -int32_t komodo_check_deposit(int32_t height,CBlock *block); +int32_t komodo_check_deposit(int32_t height,const CBlock& block); bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidationState& state, libzcash::ProofVerifier& verifier, bool fCheckPOW, bool fCheckMerkleRoot) @@ -3190,7 +3188,7 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat if (nSigOps > MAX_BLOCK_SIGOPS) return state.DoS(100, error("CheckBlock(): out-of-bounds SigOpCount"), REJECT_INVALID, "bad-blk-sigops", true); - if ( komodo_check_deposit(height,(CBlock *)&block) < 0 ) + if ( komodo_check_deposit(height,block) < 0 ) return(false); return true; } diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 433ce879b..1645285fc 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -333,7 +333,7 @@ public: // structure, including the hash. const int32_t nVersion; const std::vector vin; - std::vector vout; + const std::vector vout; const uint32_t nLockTime; const std::vector vjoinsplit; const uint256 joinSplitPubKey;