Skip to content

Commit e460138

Browse files
committed
undo config changes that broke dependents
1 parent 8e33212 commit e460138

File tree

3 files changed

+238
-171
lines changed

3 files changed

+238
-171
lines changed

assets/compat/bitcoin.conf.template

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,60 +15,60 @@ rpcallowip=0.0.0.0/0
1515
}}
1616
rpcuser={{rpc.username}}
1717
rpcpassword={{rpc.password}}
18-
{{#FOREACH rpc.auth
19-
rpcauth={{rpc.auth}}
18+
{{#FOREACH rpc.advanced.auth
19+
rpcauth={{rpc.advanced.auth}}
2020
}}
21-
rpcservertimeout={{rpc.servertimeout}}
22-
rpcthreads={{rpc.threads}}
23-
rpcworkqueue={{rpc.workqueue}}
21+
rpcservertimeout={{rpc.advanced.servertimeout}}
22+
rpcthreads={{rpc.advanced.threads}}
23+
rpcworkqueue={{rpc.advanced.workqueue}}
2424

2525
## MEMPOOL
26-
{{#IF mempool.mempoolfullrbf
26+
{{#IF advanced.mempool.mempoolfullrbf
2727
mempoolfullrbf=1
2828
}}
29-
{{#IF !mempool.mempoolfullrbf
29+
{{#IF !advanced.mempool.mempoolfullrbf
3030
mempoolfullrbf=0
3131
}}
32-
{{#IF mempool.persistmempool
32+
{{#IF advanced.mempool.persistmempool
3333
persistmempool=1
3434
}}
35-
{{#IF !mempool.persistmempool
35+
{{#IF !advanced.mempool.persistmempool
3636
persistmempool=0
3737
}}
38-
maxmempool={{mempool.maxmempool}}
39-
mempoolexpiry={{mempool.mempoolexpiry}}
38+
maxmempool={{advanced.mempool.maxmempool}}
39+
mempoolexpiry={{advanced.mempool.mempoolexpiry}}
4040

4141
## PEERS
42-
{{#IF peers.listen
42+
{{#IF advanced.peers.listen
4343
listen=1
4444
bind=0.0.0.0:8333
4545
}}
46-
{{#IF !peers.listen
46+
{{#IF !advanced.peers.listen
4747
listen=0
4848
}}
4949

50-
{{#IF peers.onlyconnect
51-
{{#FOREACH peers.addnode
52-
{{#IF peers.addnode.port
53-
connect={{peers.addnode.hostname}}:{{peers.addnode.port}}
50+
{{#IF advanced.peers.onlyconnect
51+
{{#FOREACH advanced.peers.addnode
52+
{{#IF advanced.peers.addnode.port
53+
connect={{advanced.peers.addnode.hostname}}:{{advanced.peers.addnode.port}}
5454
}}
55-
{{#IF !peers.addnode.port
56-
connect={{peers.addnode.hostname}}
55+
{{#IF !advanced.peers.addnode.port
56+
connect={{advanced.peers.addnode.hostname}}
5757
}}
5858
}}
5959
}}
6060

61-
{{#IF !peers.onlyconnect
62-
{{#FOREACH peers.addnode
63-
{{#IF peers.addnode.port
64-
addnode={{peers.addnode.hostname}}:{{peers.addnode.port}}
61+
{{#IF !advanced.peers.onlyconnect
62+
{{#FOREACH advanced.peers.addnode
63+
{{#IF advanced.peers.addnode.port
64+
addnode={{advanced.peers.addnode.hostname}}:{{advanced.peers.addnode.port}}
6565
}}
66-
{{#IF !peers.addnode.port
67-
addnode={{peers.addnode.hostname}}
66+
{{#IF !advanced.peers.addnode.port
67+
addnode={{advanced.peers.addnode.hostname}}
6868
}}
6969
}}
7070
}}
71-
{{#IF peers.onlyonion
71+
{{#IF advanced.peers.onlyonion
7272
onlynet=onion
7373
}}
7474

@@ -102,11 +102,13 @@ avoidpartialspends=0
102102
discardfee={{wallet.discardfee}}
103103

104104
## ZERO MQ
105+
{{#IF zmq-enabled
105106
zmqpubrawblock=tcp://0.0.0.0:28332
106107
zmqpubhashblock=tcp://0.0.0.0:28332
107108
zmqpubrawtx=tcp://0.0.0.0:28333
108109
zmqpubhashtx=tcp://0.0.0.0:28333
109110
zmqpubsequence=tcp://0.0.0.0:28333
111+
}}
110112

111113
## TXINDEX
112114
{{#IF txindex

0 commit comments

Comments
 (0)