diff --git a/iguana/iguana_msg.c b/iguana/iguana_msg.c index 2bf4af6df..919dcb37d 100755 --- a/iguana/iguana_msg.c +++ b/iguana/iguana_msg.c @@ -672,29 +672,33 @@ int32_t iguana_rwtx(struct supernet_info *myinfo,uint8_t zcash,int32_t rwflag,st for (; serialized[len]!=0&&lenversion == 2 ) + if ( zcash != 0 && msg->version > 1 ) { uint32_t numjoinsplits; struct iguana_msgjoinsplit joinsplit; uint8_t joinsplitpubkey[33],joinsplitsig[64]; len += iguana_rwvarint32(rwflag,&serialized[len],&numjoinsplits); - char str[65]; - printf("[%ld] numjoinsplits.%d version.%d numvins.%d numvouts.%d locktime.%u %s\n",sizeof(joinsplit),numjoinsplits,msg->version,msg->tx_in,msg->tx_out,msg->lock_time,bits256_str(str,*txidp)); if ( numjoinsplits > 0 ) { for (i=0; iversion,msg->tx_in,msg->tx_out,msg->lock_time,bits256_str(str,*txidp)); } } *txidp = bits256_doublesha256(txidstr,txstart,len); diff --git a/includes/iguana_structs.h b/includes/iguana_structs.h index 81f2ef046..b6e3b2dab 100755 --- a/includes/iguana_structs.h +++ b/includes/iguana_structs.h @@ -106,7 +106,7 @@ struct iguana_msgblockhdr uint32_t timestamp,bits,nonce; } PACKEDSTRUCT; -#define ZKSNARK_PROOF_SIZE 584 +#define ZKSNARK_PROOF_SIZE 296 #define ZCASH_SOLUTION_ELEMENTS 1344 struct iguana_msgzblockhdr @@ -175,8 +175,8 @@ struct iguana_msgjoinsplit uint64_t vpub_old,vpub_new; bits256 anchor,nullifiers[2],commitments[2],ephemeralkey; bits256 randomseed,vmacs[2]; - uint8_t zkproof[ZKSNARK_PROOF_SIZE-1]; - uint8_t ciphertexts[2][217]; + uint8_t zkproof[ZKSNARK_PROOF_SIZE]; + uint8_t ciphertexts[2][601]; }PACKEDSTRUCT; struct iguana_packet { struct queueitem DL; struct iguana_peer *addr; struct tai embargo; int32_t datalen,getdatablock; uint8_t serialized[]; };