Browse Source

Automagically use asmap.dat for ASN data, if it exists in PWD

pull/7/head
Duke Leto 3 years ago
parent
commit
22f6fa490f
  1. 16
      src/connection.cpp
  2. 2
      src/connection.h
  3. 8
      src/createzcashconfdialog.ui

16
src/connection.cpp

@ -114,7 +114,7 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
} else { } else {
if (Settings::getInstance()->useEmbedded()) { if (Settings::getInstance()->useEmbedded()) {
// HUSH3.conf was not found, so create one // HUSH3.conf was not found, so create one
createZcashConf(); createHushConf();
} else { } else {
// Fall back to manual connect // Fall back to manual connect
doManualConnect(); doManualConnect();
@ -142,14 +142,14 @@ QString randomPassword() {
/** /**
* This will create a new HUSH3.conf and download params if they cannot be found * This will create a new HUSH3.conf and download params if they cannot be found
*/ */
void ConnectionLoader::createZcashConf() { void ConnectionLoader::createHushConf() {
main->logger->write("createZcashConf"); main->logger->write(__func__);
auto confLocation = zcashConfWritableLocation(); auto confLocation = zcashConfWritableLocation();
QFileInfo fi(confLocation); QFileInfo fi(confLocation);
QDialog d(main); QDialog d(main);
Ui_createZcashConf ui; Ui_createHushConf ui;
ui.setupUi(&d); ui.setupUi(&d);
QPixmap logo(":/img/res/zcashdlogo.gif"); QPixmap logo(":/img/res/zcashdlogo.gif");
@ -381,6 +381,14 @@ bool ConnectionLoader::startEmbeddedZcashd() {
// This string should be the exact arg list seperated by single spaces // This string should be the exact arg list seperated by single spaces
QString params = "-ac_name=HUSH3 -ac_sapling=1 -ac_reward=0,1125000000,562500000 -ac_halving=129,340000,840000 -ac_end=128,340000,5422111 -ac_eras=3 -ac_blocktime=150 -ac_cc=2 -ac_ccenable=228,234,235,236,241 -ac_founders=1 -ac_supply=6178674 -ac_perc=11111111 -clientname=GoldenSandtrout -addnode=node1.hush.is -addnode=node2.hush.is -addnode=node3.hush.is -addnode=node4.hush.is -addnode=node5.hush.is -addnode=node6.hush.is -addnode=node7.hush.is -addnode=node8.hush.is -ac_cclib=hush3 -tls=only -ac_script=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac"; QString params = "-ac_name=HUSH3 -ac_sapling=1 -ac_reward=0,1125000000,562500000 -ac_halving=129,340000,840000 -ac_end=128,340000,5422111 -ac_eras=3 -ac_blocktime=150 -ac_cc=2 -ac_ccenable=228,234,235,236,241 -ac_founders=1 -ac_supply=6178674 -ac_perc=11111111 -clientname=GoldenSandtrout -addnode=node1.hush.is -addnode=node2.hush.is -addnode=node3.hush.is -addnode=node4.hush.is -addnode=node5.hush.is -addnode=node6.hush.is -addnode=node7.hush.is -addnode=node8.hush.is -ac_cclib=hush3 -tls=only -ac_script=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac";
// Binaries come with this file
if(QFile( QDir(".").filePath("asmap.dat") ).exists()) {
params += " -asmap=asmap.dat";
} else {
qDebug() << "No ASN map file found";
}
QStringList arguments = params.split(" "); QStringList arguments = params.split(" ");
// Finally, actually start the full node // Finally, actually start the full node

2
src/connection.h

@ -50,7 +50,7 @@ private:
void doAutoConnect(bool tryEzcashdStart = true); void doAutoConnect(bool tryEzcashdStart = true);
void doManualConnect(); void doManualConnect();
void createZcashConf(); void createHushConf();
QString locateZcashConfFile(); QString locateZcashConfFile();
QString zcashConfWritableLocation(); QString zcashConfWritableLocation();
QString zcashParamsDir(); QString zcashParamsDir();

8
src/createzcashconfdialog.ui

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>createZcashConf</class> <class>createHushConf</class>
<widget class="QDialog" name="createZcashConf"> <widget class="QDialog" name="createHushConf">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@ -179,7 +179,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>createZcashConf</receiver> <receiver>createHushConf</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@ -195,7 +195,7 @@
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>createZcashConf</receiver> <receiver>createHushConf</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">

Loading…
Cancel
Save