diff --git a/tools/genconf/GenConf.hs b/tools/genconf/GenConf.hs index 76c697f55c..6f7662299c 100644 --- a/tools/genconf/GenConf.hs +++ b/tools/genconf/GenConf.hs @@ -20,10 +20,7 @@ import System.Process -- chainweb imports import Chainweb.Chainweb import Chainweb.HostAddress -import Chainweb.Mempool.P2pConfig import Chainweb.Miner.Config -import Chainweb.NodeId -import Chainweb.Utils import Chainweb.Version import P2P.Node.Configuration @@ -73,21 +70,10 @@ getConf = do host <- getUserInput (hostMsg ip) (Just hostname) (const $ return Nothing) Nothing port <- getUserInput portMsg (Just 443) (return . portFromText) Nothing coord <- getUserInput mineCoordMsg (Just True) (return . yesorno2Bool) Nothing - return ChainwebConfiguration - { _configChainwebVersion = Mainnet01 - , _configNodeId = NodeId 0 -- FIXME - , _configCuts = defaultCutConfig - , _configMining = defaultMining & miningCoordination . coordinationEnabled .~ coord - , _configHeaderStream = False - , _configReintroTxs = True - , _configP2p = defaultP2pConfiguration - & p2pConfigPeer . peerConfigAddr - .~ HostAddress host port - , _configTransactionIndex = defaultEnableConfig defaultTransactionIndexConfig - , _configThrottling = defaultThrottlingConfig - , _configMempoolP2p = defaultEnableConfig defaultMempoolP2pConfig - , _configBlockGasLimit = 100000 - } + return $ + defaultChainwebConfiguration Mainnet01 + & configMining . miningCoordination . coordinationEnabled .~ coord + & configP2p . p2pConfigPeer . peerConfigAddr .~ HostAddress host port where hostMsg ip = "What is your publicly reachable domain name / IP address (default: " <> T.unpack ip <> ")?" portMsg = "Which port would you like to use (default: 443)?"