Fix proxy breakage with attempting to validate btcaddress that isn't used

This commit is contained in:
Con Kolivas 2014-08-25 21:50:45 +10:00
parent a748af0615
commit f802a7843b

View File

@ -2594,18 +2594,20 @@ int stratifier(proc_instance_t *pi)
buf = send_recv_proc(ckp->generator, "ping");
} while (!buf);
if (!test_address(ckp, ckp->btcaddress)) {
LOGEMERG("Fatal: btcaddress invalid according to bitcoind");
goto out;
}
if (!ckp->proxy) {
if (!test_address(ckp, ckp->btcaddress)) {
LOGEMERG("Fatal: btcaddress invalid according to bitcoind");
goto out;
}
/* Store this for use elsewhere */
hex2bin(scriptsig_header_bin, scriptsig_header, 41);
address_to_pubkeytxn(pubkeytxnbin, ckp->btcaddress);
/* Store this for use elsewhere */
hex2bin(scriptsig_header_bin, scriptsig_header, 41);
address_to_pubkeytxn(pubkeytxnbin, ckp->btcaddress);
if (test_address(ckp, ckp->donaddress)) {
ckp->donvalid = true;
address_to_pubkeytxn(donkeytxnbin, ckp->donaddress);
if (test_address(ckp, ckp->donaddress)) {
ckp->donvalid = true;
address_to_pubkeytxn(donkeytxnbin, ckp->donaddress);
}
}
/* Set the initial id to time as high bits so as to not send the same