Skip to content

Commit

Permalink
testing stable build, also new logo
Browse files Browse the repository at this point in the history
  • Loading branch information
kaypon authored and thedon-chris committed Aug 2, 2018
1 parent 02367b7 commit 226f4cf
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 49 deletions.
2 changes: 1 addition & 1 deletion doc/developer-notes.md
Expand Up @@ -165,7 +165,7 @@ Threads

- ThreadRPCServer : Remote procedure call handler, listens on port 7932 for connections and services them.

- BTCPrivate Miner : Generates BTCPrivate (if wallet is enabled).
- Anon Miner : Generates Anon (if wallet is enabled).

- Shutdown : Does an orderly shutdown of everything.

Expand Down
2 changes: 1 addition & 1 deletion doc/testnet.md
Expand Up @@ -13,7 +13,7 @@ touch ~/.anon/anon.conf
```

#### Windows
Click on Start/Windows Logo and type `cmd` once there type `start %AppData%\`. It will open the explorer in that directory. Create a new folder called "BTCPrivate" and a text file. Open the text file and save as as `anonrivate.conf` (be sure you remove the txt extension) in the directory. An empty file is sufficient
Click on Start/Windows Logo and type `cmd` once there type `start %AppData%\`. It will open the explorer in that directory. Create a new folder called "Anon" and a text file. Open the text file and save as as `anon.conf` (be sure you remove the txt extension) in the directory. An empty file is sufficient

Create a Batch file in the BTCP directory called "start-wallet.bat" with the following:

Expand Down
4 changes: 2 additions & 2 deletions libzcashconsensus.pc.in
Expand Up @@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: BTCPrivate consensus library
Description: Library for the BTCPrivate consensus protocol.
Name: Anonymous Bitcoin consensus library
Description: Library for the Anon consensus protocol.
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lzcashconsensus
Cflags: -I${includedir}
Expand Down
121 changes: 81 additions & 40 deletions src/metrics.h
Expand Up @@ -73,43 +73,84 @@ void ThreadShowMetricsScreen();

const std::string METRICS_ART =
std::string("") +
" #%%%%%%%%%%%%%%%%%%%%%(. \n"+
" *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#. \n"+
" .%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
" .%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
" (%%%%%%%%%%%%%%%%%%%%%%%%%,(%%%%%%%%%%%%%%%%%%%%%%%%. \n"+
" #%%%%%%%%%%%%%%%%%%%%%%%%%%* %%%%%%%%%%%%%%%%%%%%%%%* \n"+
" #%%%%%%%%%%%%%%%%%%%%%%%%%%%% ,%%%% %%%%%%%%%%%%%%%. \n"+
" ,%%%%%%%%%%%%%%%%%%*#%%%%%%%%%* %%%%( #%%%%%%%%%%%%%%%%% \n"+
" #%%%%%%%%%%%%%%%%%%( *#% .%%%% %%%%%%%%%%%%%%%%%%%. \n"+
" %%%%%%%%%%%%%%%%%%%% *#%( #%%%%%%%%%%%%%%%%%%%%/ \n"+
" %%%%%%%%%%%%%%%%%%%%%#/. %%%%%%%%%%%%%%%%%%%%%%( \n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%%%# .#%%%%%%%%%%%%%%%%%%( \n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%% , %%%%%%%%%%%%%%%%%, \n"+
" /%%%%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%( %%%%%%%%%%%%%%%% \n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%# %%%%%%%%%%%%%%%# \n"+
" (%%%%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%% /%%%%%%%%%%%%%%% \n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%% /%%%%%%%%%%%%%%%/\n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%% %%%%%%%%%%%%%%%%#\n"+
".%%%%%%%%%%%%%%%%%%%%%%%%%%%% .,**, #%%%%%%%%%%%%%%%%%\n"+
",%%%%%%%%%%%%%%%%%%%%%%%%%%%* %%%%%%%%%%%%%%%%%%%\n"+
".%%%%%%%%%%%%%%%%%%%%%%%%%%% , /%%%%%%%%%%%%%%%%%%%%%%\n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%%%%%%%%%#**%%%%%%%%%%%%%%%%%%%#\n"+
" %%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%% %%%%%%%%%%%%%%%%%%*\n"+
" (%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%% \n"+
" %%%%%%%%%%%%%%%%%#*#%%%% %%%%%%%%%%%%%%%, #%%%%%%%%%%%%%%%# \n"+
" /%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%% \n"+
" %%%%%%%%%%%%%%% %%%%%%%%%%%%%%( %%%%%%%%%%%%%%%, \n"+
" %%%%%%%%%%%%%/. #%%%( %%%%%%%%%%%%%%%( \n"+
" %%%%%%%%%%%%%%%%%%%#* .%%%% %%%%%%%%%%%%%%%( \n"+
" %%%%%%%%%%%%%%%%%%%%%/ %%%%# ,%%%%%%%%%%%%%%%/ \n"+
" #%%%%%%%%%%%%%%%%%%% .%%%% ,%%%%%%%%%%%%%%%%%. \n"+
" ,%%%%%%%%%%%%%%%%%/ %%%%# #%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \n"+
" #%%%%%%%%%%%%%%% .%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%. \n"+
" %%%%%%%%%%%%%%%(. %%%%# #%%%%%%%%%%%%%%%%%%%%%%%%%%* \n"+
" #%%%%%%%%%%%%%%%%%%%%(. %%%%%%%%%%%%%%%%%%%%%%%%%. \n"+
" .%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
" ,%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
" /%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#. \n"+
" *#%%%%%%%%%%%%%%%%%%%%%(. ";
// " #%%%%%%%%%%%%%%%%%%%%%(. \n"+
// " *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#. \n"+
// " .%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
// " .%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
// " (%%%%%%%%%%%%%%%%%%%%%%%%%,(%%%%%%%%%%%%%%%%%%%%%%%%. \n"+
// " #%%%%%%%%%%%%%%%%%%%%%%%%%%* %%%%%%%%%%%%%%%%%%%%%%%* \n"+
// " #%%%%%%%%%%%%%%%%%%%%%%%%%%%% ,%%%% %%%%%%%%%%%%%%%. \n"+
// " ,%%%%%%%%%%%%%%%%%%*#%%%%%%%%%* %%%%( #%%%%%%%%%%%%%%%%% \n"+
// " #%%%%%%%%%%%%%%%%%%( *#% .%%%% %%%%%%%%%%%%%%%%%%%. \n"+
// " %%%%%%%%%%%%%%%%%%%% *#%( #%%%%%%%%%%%%%%%%%%%%/ \n"+
// " %%%%%%%%%%%%%%%%%%%%%#/. %%%%%%%%%%%%%%%%%%%%%%( \n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%%%# .#%%%%%%%%%%%%%%%%%%( \n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%%%%% , %%%%%%%%%%%%%%%%%, \n"+
// " /%%%%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%( %%%%%%%%%%%%%%%% \n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%# %%%%%%%%%%%%%%%# \n"+
// " (%%%%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%% /%%%%%%%%%%%%%%% \n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%% /%%%%%%%%%%%%%%%/\n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%% %%%%%%%%%%%%%%%%#\n"+
// ".%%%%%%%%%%%%%%%%%%%%%%%%%%%% .,**, #%%%%%%%%%%%%%%%%%\n"+
// ",%%%%%%%%%%%%%%%%%%%%%%%%%%%* %%%%%%%%%%%%%%%%%%%\n"+
// ".%%%%%%%%%%%%%%%%%%%%%%%%%%% , /%%%%%%%%%%%%%%%%%%%%%%\n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%%%%%%%%%#**%%%%%%%%%%%%%%%%%%%#\n"+
// " %%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%% %%%%%%%%%%%%%%%%%%*\n"+
// " (%%%%%%%%%%%%%%%%%%%%%%%%* #%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%% \n"+
// " %%%%%%%%%%%%%%%%%#*#%%%% %%%%%%%%%%%%%%%, #%%%%%%%%%%%%%%%# \n"+
// " /%%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%% #%%%%%%%%%%%%%%% \n"+
// " %%%%%%%%%%%%%%% %%%%%%%%%%%%%%( %%%%%%%%%%%%%%%, \n"+
// " %%%%%%%%%%%%%/. #%%%( %%%%%%%%%%%%%%%( \n"+
// " %%%%%%%%%%%%%%%%%%%#* .%%%% %%%%%%%%%%%%%%%( \n"+
// " %%%%%%%%%%%%%%%%%%%%%/ %%%%# ,%%%%%%%%%%%%%%%/ \n"+
// " #%%%%%%%%%%%%%%%%%%% .%%%% ,%%%%%%%%%%%%%%%%%. \n"+
// " ,%%%%%%%%%%%%%%%%%/ %%%%# #%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \n"+
// " #%%%%%%%%%%%%%%% .%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%. \n"+
// " %%%%%%%%%%%%%%%(. %%%%# #%%%%%%%%%%%%%%%%%%%%%%%%%%* \n"+
// " #%%%%%%%%%%%%%%%%%%%%(. %%%%%%%%%%%%%%%%%%%%%%%%%. \n"+
// " .%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
// " ,%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%# \n"+
// " /%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#. \n"+
// " *#%%%%%%%%%%%%%%%%%%%%%(. ";


" -%oshdmmmmmmmmmmmmmmmmdhs+` \n"+
" .%shmmmmhso%:-..``````..-:%osy- :+:` \n"+
" :odmmdy+:` ``..--::::::::::--.. `+ss-`+o: \n"+
" -smmmy+. `.-:%%%%%%%%%%%%%%%%%%%:. -ss+`-ss+` `+- \n"+
" `+dmmy%` .-:%%%%%%%%%%%%%%%%%%%%%%-` `+ss:`+ss: smmd+` \n"+
" `ommmo. .-%%%%%%%%%%%%%%%%%%%%%%%%%. .oso.-sso. .. .ommmo` \n"+
" +mmd+``.:%%%%%%%%%%%%%%%%%%%%%%%%%:` %ss%`%ss% `:%%:.``+dmm+` \n"+
" :dmm+``-%%%%%%%%%%%%%%%%%%%%%%%%%%%. .oso..oso. .%%%%%%%-``+mmd- \n"+
" ommy. .%%%%%%%%%%%%%%%%%%%%%%%%%%%:` :ss%`:ss%` `:%%%%%%%%%:. .ymmo` \n"+
" `hmm% `:%%%%%%%%%%%%%%%%%%%%%%%%%%%- `oss:.oss- .:%%%%%%%%%%%%:` +mmh` \n"+
" .dmm- .%%%%%%%%%%%%%%%%%%%%%%%%%%%:` -ssssssss. -%%%%%%%%%%%%%%%%. -dmd. \n"+
" .dmd. -%%%%%%%%%%%%%%%%%%%%%%%%%%%- `+sssssssss: -%%%%%%%%%%%%%%%%%- -dmd. \n"+
" `hmm. -%%%%%%%%%%%%%%%%%%%%%%%%%%:. -sssssssssss+ .%%%%%%%%%%%%%%%%%%- -mmh` \n"+
" smm: .%%%%%%%%%%%%%%%%%%%%%%%%%%:` %sssssss+sssss` %%%%%%%%%%%%%%%%%%%. %mmo \n"+
"-mmy `%%%%%%%%%%%%%%%%%%%%%%%%%%. .osssssso- ossss- -%%%%%%%%%%%%%%%%%%%` ymm-\n"+
"hmm. :%%%%%%%%%%%%%%%%%%%%%%%%:` :sssssss+` %ssss+ .%%%%%%%%%%%%%%%%%%%- .mmy\n"+
"mmy `%%%%%%%%%%%%%%%%%%%%%%%%- .osssssss- -sssss` `%%%%%%%%%%%%%%%%%%%%` ymm\n"+
"mm% .%%%%%%%%%%%%%%%%%%%%%%:` :sssssss+` -` sssss- :%%%%%%%%%%%%%%%%%%%. %mm\n"+
"mm. :%%%%%%%%%%%%%%%%%%%%%- `+sssssss: `:%. +ssss% .%%%%%%%%%%%%%%%%%%%- -mm\n"+
"mm` ``..--::%%%%%%%%%%%:. -ssssssso. -%%%- :sssss` `%%%%%%%%%%%%%%%%%%%: .mm\n"+
"mm` ::-.` ``..--::%-` `%sssssss% `:%%%%% `sssss- :%%%%%%%%%%%%%%%%%%: .mm\n"+
"mm. ossssso++%:-.` .osssssso. .%%%%%%%. ossss% -%%%%%%%%%%%%%%%%%%- -mm\n"+
"mm% %ssssssssssssssoo+%:%sssssss%` .::%%%%%%- %sssss `%%%%%%%%%%%%%%%%%%. %mm\n"+
"mmy `.-:%+osssssssssssssssssss+-.` ``.--- .sssss. :%%%%%%%%%%%%%%%%%` ymm\n"+
"hmm. `.` `.-:%+ossssssssssssssso+%:-.` sssss% -%%%%%%%%%%%%%%%%- .mmy\n"+
"-mms `%%%%::--.. `+ss-:sss+sssssssssssssssoo+::osssso `%%%%%%%%%%%%%%%%` smm-\n"+
" smm: .%%%%%%%:. -ss+`-ss+` `.-:%+osssssssssssssssss. :%%%%%%%%%%%%%%. :mms \n"+
" `dmm. -%%%%%- `+ss:`+ss: `-..`` `.-:%+osssssssss: -%%%%%%%%%%%%%- -mmh` \n"+
" .dmd. -%%%. -sso.-sso` -%%%%%%%::--..` `.-osssso .%%%%%%%%%%%%- .dmd. \n"+
" .dmd- .:` `%ss%`%ss: `:%%%%%%%%%%%%%%%%::--. :sssss` :%%%%%%%%%%. -dmd. \n"+
" .hmm% .oso..oso. .%%%%%%%%%%%%%%%%%%%%%%%` `sssss: -%%%%%%%%:` %mmh. \n"+
" `sh. :ss%`:ss%` `:%%%%%%%%%%%%%%%%%%%%%%%%. +ssss+ .%%%%%%%- .ymms` \n"+
" `oss-`oss- .:%%%%%%%%%%%%%%%%%%%%%%%%%: -sssss` %%%%%-``+mmd: \n"+
" -s+`:ss+` -%%%%%%%%%%%%%%%%%%%%%%%%%%%%` `sssss- :%:-``%dmmo` \n"+
" ` %ss- -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. +ssss+ .. .+dmmo` \n"+
" `:` `+:``.-:%%%%%%%%%%%%%%%%%%%%%%%%%: -ssss% `:ymmd+` \n"+
" +mmmy%. `.-:%%%%%%%%%%%%%%%%%%%%%%` `%:. .%ymmms: \n"+
" `:sdmmds%-` `..--::::::::::::--.. `-%sdmmds:` \n"+
" .%sdmmmdys+%:-.``` ```.-:%+sydmmmds%. \n"+
" `-%oyhmmmmmmmmmmmmmmmmmmhyo%-` \n"+;
10 changes: 5 additions & 5 deletions src/util.cpp
Expand Up @@ -455,13 +455,13 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
boost::filesystem::path GetDefaultDataDir()
{
namespace fs = boost::filesystem;
// Windows < Vista: C:\Documents and Settings\Username\Application Data\BTCPrivate
// Windows >= Vista: C:\Users\Username\AppData\Roaming\BTCPrivate
// Mac: ~/Library/Application Support/BTCPrivate
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Anon
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Anon
// Mac: ~/Library/Application Support/Anon
// Unix: ~/.anon
#ifdef WIN32
// Windows
return GetSpecialFolderPath(CSIDL_APPDATA) / "BTCPrivate";
return GetSpecialFolderPath(CSIDL_APPDATA) / "Anon";
#else
fs::path pathRet;
char* pszHome = getenv("HOME");
Expand All @@ -473,7 +473,7 @@ boost::filesystem::path GetDefaultDataDir()
// Mac
pathRet /= "Library/Application Support";
TryCreateDirectory(pathRet);
return pathRet / "BTCPrivate";
return pathRet / "Anon";
#else
// Unix
return pathRet / ".anon";
Expand Down

0 comments on commit 226f4cf

Please sign in to comment.