Browse Source

test

release/v0.1
jl777 9 years ago
parent
commit
d3078f00fe
  1. 4
      iguana/iguana_accept.c
  2. 2
      iguana/iguana_blocks.c
  3. 2
      iguana/iguana_init.c
  4. 5
      iguana/iguana_msg.c
  5. 4
      iguana/iguana_tx.c

4
iguana/iguana_accept.c

@ -299,8 +299,10 @@ int32_t iguana_peerhdrrequest(struct iguana_info *coin,uint8_t *serialized,int32
{ {
iguana_blockunconv(&msgB,block,1); iguana_blockunconv(&msgB,block,1);
len += iguana_rwblock(coin->chain->hashalgo,1,&checkhash2,&serialized[sizeof(struct iguana_msghdr) + len],&msgB); len += iguana_rwblock(coin->chain->hashalgo,1,&checkhash2,&serialized[sizeof(struct iguana_msghdr) + len],&msgB);
if ( coin->MAXPEERS == 1 )
checkhash2 = basilisk_blockhash(coin,bp->bundleheight + i);
flag++; flag++;
if ( coin->MAXPEERS == 1 && bits256_cmp(checkhash2,block->RO.hash2) != 0 ) if ( bits256_cmp(checkhash2,block->RO.hash2) != 0 )
{ {
char str[65],str2[65]; char str[65],str2[65];
printf("iguana_peerhdrrequest blockhash.%d error (%s) vs (%s)\n",height+i,bits256_str(str,checkhash2),bits256_str(str2,block->RO.hash2)); printf("iguana_peerhdrrequest blockhash.%d error (%s) vs (%s)\n",height+i,bits256_str(str,checkhash2),bits256_str(str2,block->RO.hash2));

2
iguana/iguana_blocks.c

@ -191,8 +191,6 @@ int32_t iguana_blockvalidate(struct iguana_info *coin,int32_t *validp,struct igu
*validp = 0; *validp = 0;
iguana_serialize_block(coin->chain,&hash2,serialized,block); iguana_serialize_block(coin->chain,&hash2,serialized,block);
*validp = (memcmp(hash2.bytes,block->RO.hash2.bytes,sizeof(hash2)) == 0); *validp = (memcmp(hash2.bytes,block->RO.hash2.bytes,sizeof(hash2)) == 0);
if ( coin->MAXPEERS == 1 )
*validp = 1;
block->valid = *validp; block->valid = *validp;
char str[65]; char str2[65]; char str[65]; char str2[65];
if ( *validp == 0 ) if ( *validp == 0 )

2
iguana/iguana_init.c

@ -95,7 +95,7 @@ bits256 iguana_genesis(struct iguana_info *coin,struct iguana_chain *chain)
//memset(hash2.bytes,0,sizeof(hash2)); //memset(hash2.bytes,0,sizeof(hash2));
//return(hash2); //return(hash2);
} } else memcpy(hash2.bytes,chain->genesis_hashdata,sizeof(hash2));
bits256_str(str,hash2); bits256_str(str,hash2);
printf("genesis.(%s) len.%d hash.%s\n",chain->genesis_hex,(int32_t)sizeof(msg.H),str); printf("genesis.(%s) len.%d hash.%s\n",chain->genesis_hex,(int32_t)sizeof(msg.H),str);
iguana_blockconv(&block,&msg,hash2,0); iguana_blockconv(&block,&msg,hash2,0);

5
iguana/iguana_msg.c

@ -106,7 +106,7 @@ int32_t iguana_rwblock(int32_t (*hashalgo)(uint8_t *blockhashp,uint8_t *serializ
int32_t iguana_serialize_block(struct iguana_chain *chain,bits256 *hash2p,uint8_t serialized[sizeof(struct iguana_msgblock)],struct iguana_block *block) int32_t iguana_serialize_block(struct iguana_chain *chain,bits256 *hash2p,uint8_t serialized[sizeof(struct iguana_msgblock)],struct iguana_block *block)
{ {
struct iguana_msgblock msg; struct iguana_msgblock msg; int32_t len;
memset(&msg,0,sizeof(msg)); memset(&msg,0,sizeof(msg));
msg.H.version = block->RO.version; msg.H.version = block->RO.version;
msg.H.prev_block = block->RO.prev_block; msg.H.prev_block = block->RO.prev_block;
@ -115,7 +115,8 @@ int32_t iguana_serialize_block(struct iguana_chain *chain,bits256 *hash2p,uint8_
msg.H.bits = block->RO.bits; msg.H.bits = block->RO.bits;
msg.H.nonce = block->RO.nonce; msg.H.nonce = block->RO.nonce;
msg.txn_count = block->RO.txn_count; msg.txn_count = block->RO.txn_count;
return(iguana_rwblock(chain->hashalgo,1,hash2p,serialized,&msg)); len = iguana_rwblock(chain->hashalgo,1,hash2p,serialized,&msg);
return(len);
} }
int32_t iguana_rwblockhash(int32_t rwflag,uint8_t *serialized,uint32_t *nVersionp,uint32_t *varintp,bits256 *hashes,bits256 *stophash) int32_t iguana_rwblockhash(int32_t rwflag,uint8_t *serialized,uint32_t *nVersionp,uint32_t *varintp,bits256 *hashes,bits256 *stophash)

4
iguana/iguana_tx.c

@ -231,7 +231,9 @@ int32_t iguana_peerblockrequest(struct iguana_info *coin,uint8_t *blockspace,int
iguana_blockunconv(&msgB,block,0); iguana_blockunconv(&msgB,block,0);
msgB.txn_count = block->RO.txn_count; msgB.txn_count = block->RO.txn_count;
total = iguana_rwblock(coin->chain->hashalgo,1,&checkhash2,&blockspace[sizeof(struct iguana_msghdr) + 0],&msgB); total = iguana_rwblock(coin->chain->hashalgo,1,&checkhash2,&blockspace[sizeof(struct iguana_msghdr) + 0],&msgB);
if ( coin->MAXPEERS > 1 && bits256_cmp(checkhash2,block->RO.hash2) != 0 ) if ( coin->MAXPEERS == 1 )
checkhash2 = basilisk_blockhash(coin,bp->bundleheight + bundlei);
if ( bits256_cmp(checkhash2,block->RO.hash2) != 0 )
{ {
static int counter; static int counter;
if ( counter++ < 100 ) if ( counter++ < 100 )

Loading…
Cancel
Save