From edf0cd7edbc8488ca8d475bbab3fec2f6c3cbb75 Mon Sep 17 00:00:00 2001 From: Gareth Davies Date: Mon, 12 Nov 2018 19:18:34 -0800 Subject: [PATCH 1/3] Adding addnode to generated zcash.conf --- src/connection.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/connection.cpp b/src/connection.cpp index 68aef68..37fcdfa 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -106,6 +106,7 @@ void ConnectionLoader::createZcashConf() { QTextStream out(&file); + out << "addnode=mainnet.z.cash\n"; out << "server=1\n"; out << "rpcuser=zec-qt-wallet\n"; out << "rpcpassword=" % randomPassword() << "\n"; From cee7593876146714de6d73e4fcf031486496e9d1 Mon Sep 17 00:00:00 2001 From: adityapk00 Date: Mon, 12 Nov 2018 19:19:20 -0800 Subject: [PATCH 2/3] #44 - add mainnet.z.cash to default conf --- src/connection.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/connection.cpp b/src/connection.cpp index 68aef68..a8aacb2 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -107,6 +107,7 @@ void ConnectionLoader::createZcashConf() { QTextStream out(&file); out << "server=1\n"; + out << "addnode=mainnet.z.cash\n"; out << "rpcuser=zec-qt-wallet\n"; out << "rpcpassword=" % randomPassword() << "\n"; file.close(); From 82368596df3ed125060bdbba96657e544958df79 Mon Sep 17 00:00:00 2001 From: adityapk00 Date: Mon, 12 Nov 2018 19:21:17 -0800 Subject: [PATCH 3/3] fix merge conflict --- src/connection.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/connection.cpp b/src/connection.cpp index 4c77b92..a8aacb2 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -106,7 +106,6 @@ void ConnectionLoader::createZcashConf() { QTextStream out(&file); - out << "addnode=mainnet.z.cash\n"; out << "server=1\n"; out << "addnode=mainnet.z.cash\n"; out << "rpcuser=zec-qt-wallet\n";