private/apostol-dm
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug.

Browse Source
This commit is contained in:
Преподобный Ален
2022-10-31 18:35:49 +03:00
parent 068e8ae2f9
commit 94ffb25f8a
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/dm.cpp
View File

@@ -200,20 +200,27 @@ namespace Apostol {
CIniFile Bitcoin(Config()->ConfPrefix() + "bitcoin.conf"); CIniFile Bitcoin(Config()->ConfPrefix() + "bitcoin.conf");
if (Bitcoin.ReadBool("main", "testnet", false)) { 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_hd = hd_private::testnet;
BitcoinConfig.version_ec = ec_private::testnet; BitcoinConfig.version_ec = ec_private::testnet;
BitcoinConfig.version_key = payment_address::testnet_p2kh; BitcoinConfig.version_key = payment_address::testnet_p2kh;
BitcoinConfig.version_script = payment_address::testnet_p2sh; 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"; BitcoinConfig.Symbol = "tBTC";
} else { } else {
BitcoinConfig.endpoint = Bitcoin.ReadString("endpoint", "url", BitcoinConfig.endpoint); BitcoinConfig.endpoint = Bitcoin.ReadString("endpoint", "url", BitcoinConfig.endpoint);
BitcoinConfig.Miner.Fee = Bitcoin.ReadString("miner", "fee", "1%"); BitcoinConfig.Miner.Fee = Bitcoin.ReadString("miner", "fee", "1%");
BitcoinConfig.Miner.min = Bitcoin.ReadInteger("miner", "min", 200); BitcoinConfig.Miner.min = Bitcoin.ReadInteger("miner", "min", 200);
BitcoinConfig.Miner.max = Bitcoin.ReadInteger("miner", "max", 2000); BitcoinConfig.Miner.max = Bitcoin.ReadInteger("miner", "max", 2000);
BitcoinConfig.min_output = Bitcoin.ReadInteger("transaction", "min_output", 200); BitcoinConfig.min_output = Bitcoin.ReadInteger("transaction", "min_output", 200);
}
if (BitcoinConfig.Miner.min < 0) if (BitcoinConfig.Miner.min < 0)
BitcoinConfig.Miner.min = 0; BitcoinConfig.Miner.min = 0;
@@ -223,7 +230,6 @@ namespace Apostol {
if (BitcoinConfig.Miner.min > BitcoinConfig.Miner.max) if (BitcoinConfig.Miner.min > BitcoinConfig.Miner.max)
BitcoinConfig.Miner.min = BitcoinConfig.Miner.max; BitcoinConfig.Miner.min = BitcoinConfig.Miner.max;
}
CApplication::StartProcess(); CApplication::StartProcess();
} }