From 94ffb25f8a231e51cb50b20ce07c294ca18cbc30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BD?= Date: Mon, 31 Oct 2022 18:35:49 +0300 Subject: [PATCH] Fixed bug. --- src/app/dm.cpp | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/app/dm.cpp b/src/app/dm.cpp index 223ad9a..29c0e8f 100644 --- a/src/app/dm.cpp +++ b/src/app/dm.cpp @@ -200,31 +200,37 @@ namespace Apostol { CIniFile Bitcoin(Config()->ConfPrefix() + "bitcoin.conf"); if (Bitcoin.ReadBool("main", "testnet", false)) { - BitcoinConfig.endpoint = "tcp://testnet.libbitcoin.net:19091"; + BitcoinConfig.endpoint = Bitcoin.ReadString("endpoint", "url", "tcp://testnet.libbitcoin.net:19091"); + BitcoinConfig.version_hd = hd_private::testnet; BitcoinConfig.version_ec = ec_private::testnet; BitcoinConfig.version_key = payment_address::testnet_p2kh; BitcoinConfig.version_script = payment_address::testnet_p2sh; - BitcoinConfig.min_output = 1000; - BitcoinConfig.Miner.Fee = "3000"; + + BitcoinConfig.Miner.Fee = Bitcoin.ReadString("miner", "fee", "3000"); + BitcoinConfig.Miner.min = Bitcoin.ReadInteger("miner", "min", 1000); + BitcoinConfig.Miner.max = Bitcoin.ReadInteger("miner", "max", 2000); + BitcoinConfig.min_output = Bitcoin.ReadInteger("transaction", "min_output", 200); + BitcoinConfig.Symbol = "tBTC"; } else { BitcoinConfig.endpoint = Bitcoin.ReadString("endpoint", "url", BitcoinConfig.endpoint); + BitcoinConfig.Miner.Fee = Bitcoin.ReadString("miner", "fee", "1%"); BitcoinConfig.Miner.min = Bitcoin.ReadInteger("miner", "min", 200); BitcoinConfig.Miner.max = Bitcoin.ReadInteger("miner", "max", 2000); BitcoinConfig.min_output = Bitcoin.ReadInteger("transaction", "min_output", 200); - - if (BitcoinConfig.Miner.min < 0) - BitcoinConfig.Miner.min = 0; - - if (BitcoinConfig.Miner.max < 0) - BitcoinConfig.Miner.max = 0; - - if (BitcoinConfig.Miner.min > BitcoinConfig.Miner.max) - BitcoinConfig.Miner.min = BitcoinConfig.Miner.max; } + if (BitcoinConfig.Miner.min < 0) + BitcoinConfig.Miner.min = 0; + + if (BitcoinConfig.Miner.max < 0) + BitcoinConfig.Miner.max = 0; + + if (BitcoinConfig.Miner.min > BitcoinConfig.Miner.max) + BitcoinConfig.Miner.min = BitcoinConfig.Miner.max; + CApplication::StartProcess(); } //--------------------------------------------------------------------------------------------------------------