diff --git a/iguana/iguana_realtime.c b/iguana/iguana_realtime.c index 5643ccfc5..6830dc3ab 100755 --- a/iguana/iguana_realtime.c +++ b/iguana/iguana_realtime.c @@ -291,7 +291,7 @@ int32_t iguana_realtime_update(struct supernet_info *myinfo,struct iguana_info * bp->lastRT = (uint32_t)time(NULL); iguana_RTramchainalloc("RTbundle",coin,bp); bp->isRT = 1; - printf("%s rdata.%p RTheight.%d hwm.%d RTdatabad.%d\n",coin->symbol,coin->RTramchain.H.data,coin->RTheight,coin->blocks.hwmchain.height,coin->RTdatabad); + //printf("%s rdata.%p RTheight.%d hwm.%d RTdatabad.%d\n",coin->symbol,coin->RTramchain.H.data,coin->RTheight,coin->blocks.hwmchain.height,coin->RTdatabad); while ( (rdata= coin->RTramchain.H.data) != 0 && coin->RTheight <= coin->blocks.hwmchain.height-offset && coin->RTdatabad == 0 ) { dest = &coin->RTramchain; @@ -345,7 +345,7 @@ int32_t iguana_realtime_update(struct supernet_info *myinfo,struct iguana_info * flag++; //coin->blocks.RO[bp->bundleheight+bundlei] = block->RO; coin->RTheight++; - printf(">>>> RT.%d hwm.%d L.%d T.%d U.%d S.%d P.%d X.%d -> size.%ld\n",coin->RTheight,coin->blocks.hwmchain.height,coin->longestchain,dest->H.txidind,dest->H.unspentind,dest->H.spendind,dest->pkind,dest->externalind,(long)dest->H.data->allocsize); + //printf(">>>> RT.%d hwm.%d L.%d T.%d U.%d S.%d P.%d X.%d -> size.%ld\n",coin->RTheight,coin->blocks.hwmchain.height,coin->longestchain,dest->H.txidind,dest->H.unspentind,dest->H.spendind,dest->pkind,dest->externalind,(long)dest->H.data->allocsize); if ( coin->RTramchain.H.data != 0 ) coin->RTramchain.H.data->numblocks = bundlei + 1; else break; diff --git a/iguana/iguana_sign.c b/iguana/iguana_sign.c index 0dc493007..7c3792cb6 100755 --- a/iguana/iguana_sign.c +++ b/iguana/iguana_sign.c @@ -42,6 +42,11 @@ int32_t iguana_vinparse(struct iguana_info *coin,int32_t rwflag,uint8_t *seriali else if ( msg->vinscript != 0 && msg->scriptlen > 0 ) { memcpy(&serialized[len],msg->vinscript,msg->scriptlen), len += msg->scriptlen; // pubkeys here + if ( msg->suffixlen > 0 && msg->redeemscript != 0 ) + { + printf("msgsuffixlen.%d\n",msg->suffixlen); + memcpy(&serialized[len],&msg->redeemscript[msg->scriptlen - msg->suffixlen],msg->suffixlen), len += msg->suffixlen; + } if ( (p2shlen= msg->p2shlen) > 0 && msg->redeemscript != 0 ) { if ( p2shlen > msg->suffixlen ) @@ -62,8 +67,6 @@ int32_t iguana_vinparse(struct iguana_info *coin,int32_t rwflag,uint8_t *seriali } else return(-1); memcpy(&serialized[len],msg->redeemscript,p2shlen), len += p2shlen; } - if ( msg->suffixlen > 0 ) - memcpy(&serialized[len],&msg->redeemscript[msg->scriptlen - msg->suffixlen],msg->suffixlen), len += msg->suffixlen; } } len += iguana_rwnum(rwflag,&serialized[len],sizeof(msg->sequence),&msg->sequence); @@ -633,6 +636,7 @@ int32_t iguana_msgtx_Vset(struct iguana_info *coin,uint8_t *serialized,int32_t m } } msgtx->vins[vini].scriptlen = scriptlen; + printf("USERDATALEN.%d\n",vp->userdatalen); if ( vp->userdatalen != 0 ) { memcpy(&script[scriptlen],vp->userdata,vp->userdatalen); @@ -657,9 +661,11 @@ int32_t iguana_msgtx_Vset(struct iguana_info *coin,uint8_t *serialized,int32_t m memcpy(&script[scriptlen],vp->p2shscript,p2shlen), scriptlen += p2shlen; if ( (msgtx->vins[vini].suffixlen= vp->suffixlen) > 0 ) { + printf("suffixlen.%d\n",vp->suffixlen); memcpy(&script[scriptlen],&vp->p2shscript[vp->p2shlen - vp->suffixlen],vp->suffixlen); scriptlen += vp->suffixlen; } + msgtx->vins[vini].scriptlen = scriptlen; } len += scriptlen; } diff --git a/iguana/tests/decoderawtransaction b/iguana/tests/decoderawtransaction index 08d658954..87ef3eb80 100755 --- a/iguana/tests/decoderawtransaction +++ b/iguana/tests/decoderawtransaction @@ -1 +1 @@ -curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTCD\",\"method\":\"decoderawtransaction\",\"params\":[\"010000000ab4a457019668ae0c9cb7b54351015893e45f94cd1b59b8ebc53f7f410ace79e50d82812700000000d547304402202bf1b52f1dafc82f022e53ca6fc02c1d1b512a6d80a29ca8e40c7ae20a149433022019912bdf6942398d87dcbf03d2042a082ac4b4aff3f5865767faf90b94b4ae6901483045022100f04bd1f5f783e0c857e0cbcf0f7cd8a987c8d8bd6df90b370fc2b1ea5ed37d0e0220269d8744786567b5511fcadcf67fe0f352c49be644c5f4d9118b7667d25bfe3b012102b64e7a2e75d18b9d220a6d59840e433d3028951d3b68fa53446cae8ee644030221034e59dd68726514acbff46e90881e7914b5bdecef244f033311d39006e2ce23baffffffff01706f9800000000001976a91454a752f0d71b89d7c014ed0be29ca231c9546f9f88ac00000000\"]}" +curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTCD\",\"method\":\"decoderawtransaction\",\"params\":[\"010000002ec9a45701048f2f330b71f5cbef5d7b1cd161b1cf2dee06ddb15b670d46a41fca3a25beed00000000904730440220039cc97a4b266bef6802db4ae6219637842e97db025529240c01ea207cbd317502204d3796090624c86c43ee150cdc99e313483fe41c6d630d22d167e828688caaeb014730440220388f36c50854292d4a62d631d012b33d1f02fdd8623180151548947eacc06a4002207fe79c455ba5860b15e7b74fa31cf25c4a0f93c1e488f446d3322712067fb73d01ffffffff01706f9800000000001976a91454a752f0d71b89d7c014ed0be29ca231c9546f9f88ac00000000\"]}" diff --git a/iguana/tests/sendrawtransaction b/iguana/tests/sendrawtransaction index 82ebdacc2..09d9dbfda 100755 --- a/iguana/tests/sendrawtransaction +++ b/iguana/tests/sendrawtransaction @@ -1,2 +1,2 @@ -curl --url "http://127.0.0.1:7778" --data "{\"method\":\"sendrawtransaction\",\"params\":[\"01000000da9fa4570175ea2861981d895188b777551fffb07098dd5c53742c796e5905652181b478eb00000000d6483045022100c41f44d34a87cb6ccee6b266173c5e5f007e1d182027d99a7fe23d8bd8e5209f022074926d0650759aa020f0eac7548e627beb040b76d6cc86386a8edc1af1610a9001483045022100fedac947dd4a674228bbf3ba6acd0c6b188608f001dbe8f812d6619642d84dbe022055cc276dc2bd64b20184d3458298e50a43bf592b47b818ec4b074df95efaa7a101210201f76dba39941225e8615c0b53fc6927595b4b4d13e87146a94f08013a66386421032e81aa7e50e5c524cf5480ba2786ac8d7dc26f1ac9be6d56fb009c4e7588fedcffffffff01706f9800000000001976a91454a752f0d71b89d7c014ed0be29ca231c9546f9f88ac00000000\"]}" +curl --url "http://127.0.0.1:7778" --data "{\"method\":\"sendrawtransaction\",\"params\":[\"010000002ec9a45701048f2f330b71f5cbef5d7b1cd161b1cf2dee06ddb15b670d46a41fca3a25beed00000000904730440220039cc97a4b266bef6802db4ae6219637842e97db025529240c01ea207cbd317502204d3796090624c86c43ee150cdc99e313483fe41c6d630d22d167e828688caaeb014730440220388f36c50854292d4a62d631d012b33d1f02fdd8623180151548947eacc06a4002207fe79c455ba5860b15e7b74fa31cf25c4a0f93c1e488f446d3322712067fb73d01ffffffff01706f9800000000001976a91454a752f0d71b89d7c014ed0be29ca231c9546f9f88ac00000000\"]}"