Skip to content

Commit

Permalink
Push private key import fix to master.
Browse files Browse the repository at this point in the history
  • Loading branch information
Myckel Habets committed May 11, 2016
1 parent 6362761 commit 4d2beba
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 3 deletions.
91 changes: 91 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
*.tar.gz

*.exe
src/auroracoin
src/auroracoind
src/auroracoin-cli
src/test/test_auroracoin
src/qt/test/test_auroracoin-qt

Makefile.in
aclocal.m4
autom4te.cache/
config.log
config.status
configure
src/auroracoin-config.h
src/auroracoin-config.h.in
src/bitcoin-config.h
src/bitcoin-config.h.in
src/build-aux/
src/stamp-h1
share/setup.nsi
share/qt/Info.plist

src/qt/*.moc
src/qt/moc_*.cpp
src/qt5/moc*.cpp
src/qt/forms/ui_*.h
src/qt/qrc_*.cpp.n

src/qt/test/moc*.cpp

.deps
.dirstamp
.*.swp
*.*~*
*.bak
*.rej
*.orig
*.o
*.o-*
*.Po
*.patch
.auroracoin
*.a
*.pb.cc
*.pb.h

*.log
*.trs
*.dmg

*.json.h
*.raw.h

# Compilation and Qt preprocessor part
*.qm
Makefile
auroracoin-qt
Auroracoin-Qt.app

# Unit-tests
Makefile.test
auroracoin-qt_test

# Resources cpp
qrc_*.cpp

# Qt creator
*.pro.user

# Mac specific
.DS_Store
build

#lcov
*.gcno
/*.info
test_auroracoin.coverage/
total.coverage/
coverage_percent.txt

#build tests
linux-coverage-build
linux-build
win32-build
qa/pull-tester/run-auroracoind-for-test.sh
qa/pull-tester/build-tests.sh
qa/pull-tester/run-bitcoind-for-test.sh

!src/leveldb*/Makefile
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2016)
define(_CLIENT_VERSION_MINOR, 03)
define(_CLIENT_VERSION_MINOR, 05)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
Expand Down
2 changes: 1 addition & 1 deletion src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class CMainParams : public CChainParams {
base58Prefixes[PUBKEY_ADDRESS] = list_of(23);
base58Prefixes[SCRIPT_ADDRESS] = list_of(5);
base58Prefixes[SECRET_KEY] = list_of(176);
base58Prefixes[SECRET_KEY_OLD] = list_of(158);
base58Prefixes[SECRET_KEY_OLD] = list_of(151);
base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x88)(0xB2)(0x1E);
base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x88)(0xAD)(0xE4);
// Convert the pnSeeds array into usable address objects.
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 2016
#define CLIENT_VERSION_MINOR 03
#define CLIENT_VERSION_MINOR 05
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 0

Expand Down

0 comments on commit 4d2beba

Please sign in to comment.