No options in wallet + fix proxy settings #904

pull sipa wants to merge 4 commits into bitcoin:master from sipa:nooptionsinwallet+fixproxysetting changing 12 files +187 −143

sipa commented at 10:46 PM on February 26, 2012: member

This is a version of #890 rebased on top of #899, plus an extra fix for storing the proxy port in the settings as well.

Fix addrProxy setting

Before 0.6 addrProxy was a CAddress, but netbase changed it to CService.
Retain compatibility by wrapping/unwrapping with a CAddress when saving
or loading.

This commit retains compatibility with 0.6.0rc1 (which wrote the setting
as a CService) by trying to parse twice.

4a10d4c6dc

bitcoind changes to stop storing settings in wallet.dat. 972060ce0e
Reworked QT settings 3f8cb2c565
Store addrProxy port in settings 42c8b56f62
gavinandresen merged this on Feb 27, 2012
gavinandresen closed this on Feb 27, 2012
ptschip referenced this in commit b853490d13 on Jan 19, 2018
lateminer referenced this in commit 6f597629d8 on Oct 30, 2019
DrahtBot locked this on Sep 8, 2021

Contributors

sipa

Linked (view graph)

#890 Move options from wallet.dat to QT settings files #899 Fix addrProxy setting