Merge pull request Start9Labs#121 from Start9Labs/fix/config

fix config

Author: MattDHill

assets/compat/bitcoin.conf.template

@@ -15,60 +15,60 @@ rpcallowip=0.0.0.0/0
 }}
 rpcuser={{rpc.username}}
 rpcpassword={{rpc.password}}
-{{#FOREACH rpc.auth
-rpcauth={{rpc.auth}}
+{{#FOREACH rpc.advanced.auth
+rpcauth={{rpc.advanced.auth}}
 }}
-rpcservertimeout={{rpc.servertimeout}}
-rpcthreads={{rpc.threads}}
-rpcworkqueue={{rpc.workqueue}}
+rpcservertimeout={{rpc.advanced.servertimeout}}
+rpcthreads={{rpc.advanced.threads}}
+rpcworkqueue={{rpc.advanced.workqueue}}
 
 ## MEMPOOL
-{{#IF mempool.mempoolfullrbf
+{{#IF advanced.mempool.mempoolfullrbf
 mempoolfullrbf=1
 }}
-{{#IF !mempool.mempoolfullrbf
+{{#IF !advanced.mempool.mempoolfullrbf
 mempoolfullrbf=0
 }}
-{{#IF mempool.persistmempool
+{{#IF advanced.mempool.persistmempool
 persistmempool=1
 }}
-{{#IF !mempool.persistmempool
+{{#IF !advanced.mempool.persistmempool
 persistmempool=0
 }}
-maxmempool={{mempool.maxmempool}}
-mempoolexpiry={{mempool.mempoolexpiry}}
+maxmempool={{advanced.mempool.maxmempool}}
+mempoolexpiry={{advanced.mempool.mempoolexpiry}}
 
 ## PEERS
-{{#IF peers.listen
+{{#IF advanced.peers.listen
 listen=1
 bind=0.0.0.0:8333
 }}
-{{#IF !peers.listen
+{{#IF !advanced.peers.listen
 listen=0
 }}
 
-{{#IF peers.onlyconnect
-{{#FOREACH peers.addnode
-{{#IF peers.addnode.port
-connect={{peers.addnode.hostname}}:{{peers.addnode.port}}
+{{#IF advanced.peers.onlyconnect
+{{#FOREACH advanced.peers.addnode
+{{#IF advanced.peers.addnode.port
+connect={{advanced.peers.addnode.hostname}}:{{advanced.peers.addnode.port}}
 }}
-{{#IF !peers.addnode.port
-connect={{peers.addnode.hostname}}
+{{#IF !advanced.peers.addnode.port
+connect={{advanced.peers.addnode.hostname}}
 }}
 }}
 }}
 
-{{#IF !peers.onlyconnect
-{{#FOREACH peers.addnode
-{{#IF peers.addnode.port
-addnode={{peers.addnode.hostname}}:{{peers.addnode.port}}
+{{#IF !advanced.peers.onlyconnect
+{{#FOREACH advanced.peers.addnode
+{{#IF advanced.peers.addnode.port
+addnode={{advanced.peers.addnode.hostname}}:{{advanced.peers.addnode.port}}
 }}
-{{#IF !peers.addnode.port
-addnode={{peers.addnode.hostname}}
+{{#IF !advanced.peers.addnode.port
+addnode={{advanced.peers.addnode.hostname}}
 }}
 }}
 }}
-{{#IF peers.onlyonion
+{{#IF advanced.peers.onlyonion
 onlynet=onion
 }}
 
@@ -102,11 +102,13 @@ avoidpartialspends=0
 discardfee={{wallet.discardfee}}
 
 ## ZERO MQ
+{{#IF zmq-enabled
 zmqpubrawblock=tcp://0.0.0.0:28332
 zmqpubhashblock=tcp://0.0.0.0:28332
 zmqpubrawtx=tcp://0.0.0.0:28333
 zmqpubhashtx=tcp://0.0.0.0:28333
 zmqpubsequence=tcp://0.0.0.0:28333
+}}
 
 ## TXINDEX
 {{#IF txindex

manager/src/main.rs

@@ -402,7 +402,9 @@ fn inner_main(reindex: bool) -> Result<(), Box<dyn Error>> {
         "-conf=/root/.bitcoin/bitcoin.conf".to_owned(),
     ];
     if config
-        .get(&Value::String("peers".to_owned()))
+        .get(&Value::String("advanced".to_owned()))
+        .and_then(|v| v.as_mapping())
+        .and_then(|v| v.get(&Value::String("peers".to_owned())))
         .and_then(|v| v.as_mapping())
         .and_then(|v| v.get(&Value::String("onlyonion".to_owned())))
         .and_then(|v| v.as_bool())
@@ -453,7 +455,8 @@ fn inner_main(reindex: bool) -> Result<(), Box<dyn Error>> {
             rpc_client: RpcClient::new("http://127.0.0.1:18332/".parse().unwrap()),
             tor: Some(TorState {
                 proxy: format!("{}:9050", var("EMBASSY_IP")?).parse()?,
-                only: config[&Value::from("peers")][&Value::from("onlyonion")]
+                only: config[&Value::from("advanced")][&Value::from("peers")]
+                    [&Value::from("onlyonion")]
                     .as_bool()
                     .unwrap(),
             }),

manifest.yaml

@@ -1,6 +1,6 @@
 id: bitcoind
 title: "Bitcoin Core"
-version: 25.0.0.1
+version: 25.0.0.2
 eos-version: 0.3.4.3
 release-notes: |
   * Update to latest upstream (v25.0)