Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unifies master & windows development branches #8

Merged
merged 2 commits into from
Feb 9, 2018
Merged

Unifies master & windows development branches #8

merged 2 commits into from
Feb 9, 2018

Conversation

joshgentry
Copy link
Contributor

This pull request's goals are to accomplish the following:

  1. Merge the latest "watch only addresses" fix from the Windows branch into the master branch
  2. Begin the process of removing the need for a special platform-specific branch

Minor side-bonuses:

  1. .gitignore was updated
  2. Some, not all, copyright notifications were updated

Follow-up work coming down the pipeline, enabled in part by the branch unification:

  • Clean up code style inconsistencies
  • Add final correctness
  • Remove batch file hack for Windows
  • Correct file directory determination logic
  • Remove embedded binary files (*.exe); replacing them with release file fetch & hash check or build as part of the GUI build process

So if you notice the above are missing, they'll be coming :)

@@ -0,0 +1,5 @@
handlers=java.util.logging.FileHandler
java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
java.util.logging.FileHandler.pattern=%h/Library/Application\ Support/zcash4mac/zcash4mac.log
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably needs to be changed, we don't want to log to the zcash4mac log file 😈

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure at this point if it's even used but I'll update it in case (to be later validated)

echo addnode=explorer.myhush.org
echo addnode=hushipv4.matthewreichardt.com
echo addnode=mmc01.madbuda.me
echo addnode=stilgar.leto.net
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hushipv4.matthewreichardt.com, node.myhush.network and mmc01.madbuda.me are no longer up, they were run by former core devs.

My server stilgar also has the hostname of stilgar.myhush.org now, please use that.

Our DNS Seed host should also be added here: dnsseed.myhush.org. Currently it is not working, but I think we can believe it will be working soon, and add it as a node for people. When it does work, it will greatly help new nodes sync to the network.

@@ -570,6 +571,12 @@ public static void possiblyCreateHUSHConfigFile()
configOut.println("rpcpassword=Pass" + Math.abs(r.nextInt()) + "" +
Math.abs(r.nextInt()) + "" +
Math.abs(r.nextInt()));
configOut.println("addnode=node.myhush.network");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the same nodes here and update stilgar to stilgar.myhush.org. The host zdash.suprnova.cc seems to be good still, that can be kept. And dnsseed.myhush.org

@@ -6,7 +6,7 @@
* /____\____\__,_|___/_| |_|____/ \_/\_/ |_|_| |_|\__, | \_/\_/ \__,_|_|_|\___|\__|\___/|___|
* |___/
*
* Copyright (c) 2016 Ivan Vaklinov <ivan@vaklinov.com>
* Copyright (c) 2017-2018 The Hush Developers <contact@myhush.org>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of removing the copyright line, it's is more appropriate and correct to add a brand new line, leaving
the old copyright years and names alone. So just keep your current Copyright line and revive the line that was deleted. For example, here is a copyright lines of the src/rpcmining.cpp file from hush.git:

src/rpcmining.cpp
1:// Copyright (c) 2010 Satoshi Nakamoto
2-// Copyright (c) 2009-2014 The Bitcoin Core developers
3-// Copyright (c) 2017      The Hush developers

Please fix this each file, since we want to give credit where credit is due.

Copy link
Member

@leto leto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, I really like this PR, there are just a few small tweaks related to hostnames and copyright lines that need to be updated, and then I would love to merge this.

@joshgentry
Copy link
Contributor Author

@leto addressed your requests in 08756c5

Please take a look when you get a chance 😄

Copy link
Member

@leto leto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@leto leto merged commit 1d40d9e into MyHush:master Feb 9, 2018
@joshgentry joshgentry deleted the master-merge-windows branch February 9, 2018 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants