diff --git a/app/oracle-server/src/main/scala/org/bitcoins/oracle/server/OracleServerMain.scala b/app/oracle-server/src/main/scala/org/bitcoins/oracle/server/OracleServerMain.scala index 40a01a62f1..71c8c89d5c 100644 --- a/app/oracle-server/src/main/scala/org/bitcoins/oracle/server/OracleServerMain.scala +++ b/app/oracle-server/src/main/scala/org/bitcoins/oracle/server/OracleServerMain.scala @@ -15,6 +15,11 @@ class OracleServerMain(override val args: Array[String]) implicit val conf: DLCOracleAppConfig = DLCOracleAppConfig(datadir, baseConfig) + val bindConfOpt = rpcBindOpt match { + case Some(rpcbind) => Some(rpcbind) + case None => conf.rpcBindOpt + } + for { _ <- conf.start() oracle <- conf.initialize() @@ -24,17 +29,17 @@ class OracleServerMain(override val args: Array[String]) case Some(rpcport) => Server(conf = conf, handlers = routes, - rpcbindOpt = rpcBindOpt, + rpcbindOpt = bindConfOpt, rpcport = rpcport) case None => conf.rpcPortOpt match { case Some(rpcport) => Server(conf = conf, handlers = routes, - rpcbindOpt = rpcBindOpt, + rpcbindOpt = bindConfOpt, rpcport = rpcport) case None => - Server(conf = conf, handlers = routes, rpcbindOpt = rpcBindOpt) + Server(conf = conf, handlers = routes, rpcbindOpt = bindConfOpt) } } diff --git a/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala b/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala index 548af675c5..bc3e66f3ee 100644 --- a/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala +++ b/app/server/src/main/scala/org/bitcoins/server/BitcoinSAppConfig.scala @@ -74,6 +74,14 @@ case class BitcoinSAppConfig( None } } + + def rpcBindOpt: Option[String] = { + if (config.hasPath("bitcoin-s.server.rpcbind")) { + Some(config.getString("bitcoin-s.server.rpcbind")) + } else { + None + } + } } /** diff --git a/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala b/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala index 9ddb6f4212..9727a87673 100644 --- a/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala +++ b/app/server/src/main/scala/org/bitcoins/server/BitcoinSServerMain.scala @@ -286,13 +286,19 @@ class BitcoinSServerMain(override val args: Array[String]) val nodeRoutes = NodeRoutes(nodeApi) val chainRoutes = ChainRoutes(chainApi, nodeConf.network) val coreRoutes = CoreRoutes(Core) + + val bindConfOpt = rpcbindOpt match { + case Some(rpcbind) => Some(rpcbind) + case None => conf.rpcBindOpt + } + val server = { rpcPortOpt match { case Some(rpcport) => Server(conf = nodeConf, handlers = Seq(walletRoutes, nodeRoutes, chainRoutes, coreRoutes), - rpcbindOpt = rpcbindOpt, + rpcbindOpt = bindConfOpt, rpcport = rpcport) case None => conf.rpcPortOpt match { @@ -300,13 +306,13 @@ class BitcoinSServerMain(override val args: Array[String]) Server(conf = nodeConf, handlers = Seq(walletRoutes, nodeRoutes, chainRoutes, coreRoutes), - rpcbindOpt = rpcbindOpt, + rpcbindOpt = bindConfOpt, rpcport = rpcport) case None => Server(conf = nodeConf, handlers = Seq(walletRoutes, nodeRoutes, chainRoutes, coreRoutes), - rpcbindOpt = rpcbindOpt) + rpcbindOpt = bindConfOpt) } } } diff --git a/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/config/DLCOracleAppConfig.scala b/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/config/DLCOracleAppConfig.scala index b09cc1b13c..f18e455c6f 100644 --- a/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/config/DLCOracleAppConfig.scala +++ b/dlc-oracle/src/main/scala/org/bitcoins/dlc/oracle/config/DLCOracleAppConfig.scala @@ -100,6 +100,14 @@ case class DLCOracleAppConfig( } } + def rpcBindOpt: Option[String] = { + if (config.hasPath("bitcoin-s.server.rpcbind")) { + Some(config.getString("bitcoin-s.server.rpcbind")) + } else { + None + } + } + lazy val kmParams: KeyManagerParams = KeyManagerParams(kmConf.seedPath, HDPurpose(DLCOracle.R_VALUE_PURPOSE),