Browse Source

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

master
Con Kolivas 10 years ago
parent
commit
f802a7843b
  1. 22
      src/stratifier.c

22
src/stratifier.c

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

Loading…
Cancel
Save