jl777 8 years ago
parent
commit
87087cfd33
  1. 2
      basilisk/basilisk_swap.c
  2. 10
      iguana/iguana_interpreter.c
  3. 7
      iguana/iguana_scripts.c
  4. 2
      iguana/tests/decoderawtransactionB

2
basilisk/basilisk_swap.c

@ -1555,7 +1555,7 @@ void basilisk_swaploop(void *_swap)
} }
} }
printf("finished swapstate.%x other.%x\n",swap->statebits,swap->otherstatebits); printf("finished swapstate.%x other.%x\n",swap->statebits,swap->otherstatebits);
sleep(3 + (swap->iambob == 0)*10); sleep(1 + (swap->iambob == 0));
basilisk_sendstate(myinfo,swap,data,maxlen); basilisk_sendstate(myinfo,swap,data,maxlen);
basilisk_swapget(myinfo,swap,0x80000000,data,maxlen,basilisk_verify_otherstatebits); basilisk_swapget(myinfo,swap,0x80000000,data,maxlen,basilisk_verify_otherstatebits);
} }

10
iguana/iguana_interpreter.c

@ -1337,8 +1337,8 @@ int32_t bitcoin_assembler(struct iguana_info *coin,cJSON *logarray,uint8_t scrip
} }
else if ( (op->flags & IGUANA_CRYPTOFLAG) != 0 ) else if ( (op->flags & IGUANA_CRYPTOFLAG) != 0 )
{ {
uint8_t rmd160[20],revdata[0x100]; bits256 hash; uint8_t revrmd160[20],rmd160[20],revdata[0x100]; bits256 hash;
if ( (datalen= iguana_databuf(revdata,args[0])) <= sizeof(revdata) ) if ( (datalen= iguana_databuf(databuf,args[0])) <= sizeof(revdata) )
{ {
//for (i=0; i<datalen; i++) //for (i=0; i<datalen; i++)
// revdata[i] = databuf[datalen - 1 - i]; // revdata[i] = databuf[datalen - 1 - i];
@ -1354,8 +1354,10 @@ int32_t bitcoin_assembler(struct iguana_info *coin,cJSON *logarray,uint8_t scrip
iguana_pushdata(stacks,0,rmd160,sizeof(rmd160)); iguana_pushdata(stacks,0,rmd160,sizeof(rmd160));
break; break;
case IGUANA_OP_HASH160: case IGUANA_OP_HASH160:
calc_rmd160_sha256(rmd160,revdata,datalen); calc_rmd160_sha256(revrmd160,revdata,datalen);
iguana_pushdata(stacks,0,rmd160,sizeof(rmd160)); for (i=0; i<20; i++)
rmd160[i] = revrmd160[19 - i];
iguana_pushdata(stacks,0,rmd160,sizeof(rmd160));
break; break;
case IGUANA_OP_SHA256: case IGUANA_OP_SHA256:
vcalc_sha256(0,hash.bytes,revdata,datalen); vcalc_sha256(0,hash.bytes,revdata,datalen);

7
iguana/iguana_scripts.c

@ -36,8 +36,13 @@ int32_t bitcoin_p2shspend(uint8_t *script,int32_t n,uint8_t rmd160[20])
int32_t bitcoin_revealsecret160(uint8_t *script,int32_t n,uint8_t secret160[20]) int32_t bitcoin_revealsecret160(uint8_t *script,int32_t n,uint8_t secret160[20])
{ {
int32_t i;
script[n++] = SCRIPT_OP_HASH160; script[n++] = SCRIPT_OP_HASH160;
script[n++] = 0x14; memcpy(&script[n],secret160,0x14); n += 0x14; script[n++] = 0x14;
for (i=0; i<20; i++)
script[n+i] = secret160[19-i];
//memcpy(&script[n],secret160,0x14);
n += 0x14;
script[n++] = SCRIPT_OP_EQUALVERIFY; script[n++] = SCRIPT_OP_EQUALVERIFY;
return(n); return(n);
} }

2
iguana/tests/decoderawtransactionB

@ -1 +1 @@
curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTCD\",\"method\":\"decoderawtransaction\",\"params\":[\"01000000171fe857014a96c1601ac7dde7e9e938576f29231ed4a118b2b5eaaf9bd67c4fba1628ee8200000000d9473044022057a2334780d4d9a3056ad94305cb791a97f93712960d3c28bd0fe7ea1a1e3dde022020d290a335f0256a883e479ce8b094b5825d7255f04e6cc932214338400d159801483045022100d95d280dee78d5898b951333e57a441c36afc22b335d17347be2ed254ed3959102202089f6461c79c056cf4ec168ee0d5e7fba88444faa790110b3ece3c4670db93e0147522102ede537352694a7bd6946dd6a0df6b1a7a9901cc62c4849761c5c3bcef36ce8ec2103e0b630d5cb045e5d3946f7135ef3598e35b07ccb68f55c3491e79f62a9192d8b52aeffffffff01706f9800000000001976a9148ee61a3161993f4f7b7081259bf5f3322d65d3f888ac00000000\"]}" curl --url "http://127.0.0.1:7778" --data "{\"coin\":\"BTCD\",\"method\":\"decoderawtransaction\",\"params\":[\"01000000e54ce857013758a47167e70d79da65c98ea85153f5585201caef2941d035e9d46b4a4b2aba00000000db00483045022100e4f539cd49b9e7c69ce7a486a37671a7a8f3260a4801576fb086450342efd67102204157d8fa172c48abed5c33ed9228a77d42825d59901c06c0d2d4a778b92f1b82014830450221008f1a9aa8b0fdcad174f981c53ddd74f09d054a2ec9fe7328b4b7354cb83f3d7f02201fac19a9e0f2c32707f0e9fbc2a97540d225cdb8a1cb8ed06025f6b170035c400147522102b33efbc5046df029620fdc84f6b294a725ba66a585851f63400f3c10781f86bc2103ee87c99f4665df9a9958de06493498392bc1c977936c2b84a4461f9e593c145352aeffffffff01706f9800000000001976a9148ee61a3161993f4f7b7081259bf5f3322d65d3f888ac00000000\"]}"

Loading…
Cancel
Save