Skip to content

Commit 1602b94

Browse files
rubber-duckie-aurubber-duckie-au
authored
Merge pull request #66 from IamLupo/master
Merge Final Updates
2 parents 662ed28 + 5029d36 commit 1602b94

752 files changed

Lines changed: 90710 additions & 63635 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
1+
## Ignore directories
2+
build
3+
release
4+
5+
## Ignore files
16
src/*.exe
27
src/DigitalNote
38
src/DigitalNoted
4-
src/test_DigitalNote
5-
src/build.h
69
.*.swp
710
*.*~*
811
*.bak
912
*.rej
1013
*.orig
1114
*.o
1215
*.patch
16+
*.gch
17+
*.exe
1318
.DigitalNote
14-
#compilation and Qt preprocessor part
15-
.qmake.stash
16-
Makefile
19+
DigitalNoted
1720
DigitalNote-qt
1821
DigitalNote-Qt.dmg
1922
DigitalNote-Qt.app
20-
#resources cpp
21-
qrc_*.cpp
22-
#qt creator
2323
*.pro.user
24-
#mac specific
2524
.DS_Store
26-
build
25+
Makefile
26+
Makefile.*
27+
.qmake.stash
2728

28-
!src/leveldb/Makefile
29+
## leveldb lib
30+
!src/leveldb/Makefile
31+
src/leveldb-2.11/build
32+
qdbusxml2cpp_wrapper.bat
33+
uic_wrapper.bat
34+
digitalnote-qt_plugin_import.cpp

‎DigitalNote.app.pro‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
include(include/definitions.pri)
2+
3+
DIGITALNOTE_APP_NAME = app
4+
DIGITALNOTE_PATH = $$PWD
5+
6+
include(DigitalNote_config.pri)
7+
8+
include(include/base.pri)
9+
10+
TARGET = DigitalNote-qt
11+
12+
DEFINES += ENABLE_WALLET
13+
14+
include(include/build_path.pri)
15+
include(include/compiler_settings.pri)
16+
include(include/security.pri)
17+
include(include/qt.pri)
18+
include(include/release.pri)
19+
include(include/msse2.pri)
20+
21+
include(include/app/qt_settings.pri)
22+
include(include/app/forums.pri)
23+
include(include/app/headers.pri)
24+
include(include/app/other_files.pri)
25+
include(include/app/resources.pri)
26+
include(include/app/sources.pri)
27+
include(include/app/translations.pri)
28+
29+
## Compile Options
30+
include(include/options/use_update_alternatives.pri)
31+
include(include/options/use_0.pri)
32+
include(include/options/use_build_info.pri)
33+
include(include/options/use_dbus.pri)
34+
include(include/options/use_pch.pri)
35+
include(include/options/use_unity_build.pri)
36+
include(include/options/use_force_std.pri)
37+
38+
## Libraries
39+
include(include/libs.pri)
40+
41+
system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)

‎DigitalNote.daemon.pro‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
include(include/definitions.pri)
2+
3+
DIGITALNOTE_APP_NAME = daemon
4+
DIGITALNOTE_PATH = $$PWD
5+
6+
include(DigitalNote_config.pri)
7+
8+
include(include/base.pri)
9+
10+
TARGET = DigitalNoted
11+
12+
DEFINES += ENABLE_WALLET
13+
14+
include(include/build_path.pri)
15+
include(include/compiler_settings.pri)
16+
include(include/security.pri)
17+
include(include/qt.pri)
18+
include(include/release.pri)
19+
include(include/msse2.pri)
20+
21+
include(include/daemon/qt_settings.pri)
22+
include(include/daemon/headers.pri)
23+
include(include/daemon/sources.pri)
24+
25+
## Compile Options
26+
include(include/options/use_update_alternatives.pri)
27+
include(include/options/use_0.pri)
28+
include(include/options/use_build_info.pri)
29+
include(include/options/use_pch.pri)
30+
include(include/options/use_unity_build.pri)
31+
include(include/options/use_force_std.pri)
32+
33+
## Libraries
34+
include(include/libs.pri)
35+
36+
system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)

‎DigitalNote_config.pri‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
DIGITALNOTE_VERSION_MAJOR = 2
2+
DIGITALNOTE_VERSION_MINOR = 0
3+
DIGITALNOTE_VERSION_REVISION = 0
4+
DIGITALNOTE_VERSION_BUILD = 1
5+
6+
DIGITALNOTE_LIB_LEVELDB_DIR = $${DIGITALNOTE_PATH}/src/leveldb
7+
DIGITALNOTE_LIB_LEVELDB_NEW_DIR = $${DIGITALNOTE_PATH}/src/leveldb-2.11
8+
DIGITALNOTE_LIB_SECP256K1_DIR = $${DIGITALNOTE_PATH}/src/secp256k1
9+
10+
win32 {
11+
## Config your lib directory names
12+
DIGITALNOTE_LIB_BOOST_DIR = $${DIGITALNOTE_PATH}/../libs/boost_1_75_0
13+
DIGITALNOTE_LIB_BOOST_SUFFIX = -mgw7-mt-d-x64-1_75
14+
DIGITALNOTE_LIB_OPENSSL_DIR = $${DIGITALNOTE_PATH}/../libs/openssl-1.0.2u
15+
DIGITALNOTE_LIB_BDB_DIR = $${DIGITALNOTE_PATH}/../libs/db-6.2.32.NC
16+
DIGITALNOTE_LIB_EVENT_DIR = $${DIGITALNOTE_PATH}/../libs/libevent-2.1.11-stable
17+
DIGITALNOTE_LIB_GMP_DIR = $${DIGITALNOTE_PATH}/../libs/gmp-6.2.1
18+
DIGITALNOTE_LIB_MINIUPNP_DIR = $${DIGITALNOTE_PATH}/../libs/miniupnpc-2.1
19+
DIGITALNOTE_LIB_QRENCODE_DIR = $${DIGITALNOTE_PATH}/../libs/qrencode-4.1.1
20+
}
21+
22+
macx {
23+
DIGITALNOTE_LIB_BOOST_DIR = /usr/local/Cellar/boost/1.76.0
24+
DIGITALNOTE_LIB_BOOST_SUFFIX = -mt
25+
DIGITALNOTE_LIB_OPENSSL_DIR = /usr/local/Cellar/openssl@1.1/1.1.1k
26+
DIGITALNOTE_LIB_BDB_DIR = /usr/local/Cellar/berkeley-db@6.2.32
27+
DIGITALNOTE_LIB_BDB_SUFFIX = -6.2
28+
DIGITALNOTE_LIB_EVENT_DIR = /usr/local
29+
DIGITALNOTE_LIB_GMP_DIR = /usr/local
30+
DIGITALNOTE_LIB_MINIUPNP_DIR = /usr/local/Cellar/miniupnpc/2.2.2
31+
DIGITALNOTE_LIB_QRENCODE_DIR = /usr/local
32+
33+
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
34+
}

‎README.md‎

Lines changed: 84 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
**PLEASE NOTE:** MASTER branch now is for stable pre-release updates. We have developed a RELEASE branch for latest OFFICIAL Releases. Please use the following clone command to retrieve the latest release version
22

33
```
4-
git clone -b release --single-branch https://github.com/DigitalNoteXDN/DigitalNote-2 DigitalNote
4+
git clone --single-branch https://github.com/IamLupo/DigitalNote-2.git DigitalNote
55
```
66

77
DigitalNote [XDN] 2014-2018 (CryptoNote Base), 2018-2020 (Current) integration/staging tree
@@ -71,27 +71,86 @@ sudo -i
7171
```
7272
### CREATE SWAP FILE FOR DAEMON BUILD (if system has less than 2GB of RAM)
7373
```
74-
cd ~; sudo fallocate -l 3G /swapfile; ls -lh /swapfile; sudo chmod 600 /swapfile; ls -lh /swapfile; sudo mkswap /swapfile; sudo swapon /swapfile; sudo swapon --show; sudo cp /etc/fstab /etc/fstab.bak; echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
74+
cd ~
75+
sudo fallocate -l 3G /swapfile
76+
ls -lh /swapfile
77+
sudo chmod 600 /swapfile
78+
ls -lh /swapfile
79+
sudo mkswap /swapfile
80+
sudo swapon /swapfile
81+
sudo swapon --show
82+
sudo cp /etc/fstab /etc/fstab.bak
83+
echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
7584
```
7685

7786
### Dependencies install
7887
```
79-
cd ~; sudo apt-get install -y ntp git build-essential libssl-dev libdb-dev libdb++-dev libboost-all-dev libqrencode-dev libcurl4-openssl-dev curl libzip-dev; apt-get update -y; apt-get install -y git make automake build-essential libboost-all-dev; apt-get install -y yasm binutils libcurl4-openssl-dev openssl libssl-dev; sudo apt-get install -y libgmp-dev; sudo apt-get install -y libtool;
88+
cd ~
89+
sudo apt-get install -y ntp
90+
sudo apt-get install -y git
91+
sudo apt-get install -y build-essential
92+
sudo apt-get install -y libssl-dev
93+
sudo apt-get install -y libdb-dev
94+
sudo apt-get install -y libdb++-dev
95+
sudo apt-get install -y libboost-all-dev
96+
sudo apt-get install -y libqrencode-dev
97+
sudo apt-get install -y libcurl4-openssl-dev
98+
sudo apt-get install -y curl
99+
sudo apt-get install -y libzip-dev
100+
101+
sudo apt-get update -y
102+
103+
sudo apt-get install -y git
104+
sudo apt-get install -y make
105+
sudo apt-get install -y automake
106+
sudo apt-get install -y yasm
107+
sudo apt-get install -y binutils
108+
sudo apt-get install -y libcurl4-openssl-dev
109+
sudo apt-get install -y openssl
110+
sudo apt-get install -y libgmp-dev
111+
sudo apt-get install -y libtool
112+
sudo apt-get install -y qt5-default
113+
sudo apt-get install -y qttools5-dev-tools
114+
sudo apt-get install -y miniupnpc
115+
sudo apt-get install -y qt5-qmake
116+
sudo apt-get install -y libevent-dev
80117
```
81118

82119
### Dependencies build and link
83120
```
84-
cd ~; wget http://download.oracle.com/berkeley-db/db-6.2.32.NC.tar.gz; tar zxf db-6.2.32.NC.tar.gz; cd db-6.2.32.NC/build_unix; ../dist/configure --enable-cxx --disable-shared; make; sudo make install; sudo ln -s /usr/local/BerkeleyDB.6.2/lib/libdb-6.2.so /usr/lib/libdb-6.2.so; sudo ln -s /usr/local/BerkeleyDB.6.2/lib/libdb_cxx-6.2.so /usr/lib/libdb_cxx-6.2.so; export BDB_INCLUDE_PATH="/usr/local/BerkeleyDB.6.2/include"; export BDB_LIB_PATH="/usr/local/BerkeleyDB.6.2/lib"
121+
cd ~;
122+
wget http://download.oracle.com/berkeley-db/db-6.2.32.NC.tar.gz
123+
tar zxf db-6.2.32.NC.tar.gz
124+
cd db-6.2.32.NC/build_unix
125+
../dist/configure --enable-cxx --disable-shared
126+
make
127+
sudo make install
128+
sudo ln -s /usr/local/BerkeleyDB.6.2/lib/libdb-6.2.so /usr/lib/libdb-6.2.so
129+
sudo ln -s /usr/local/BerkeleyDB.6.2/lib/libdb_cxx-6.2.so /usr/lib/libdb_cxx-6.2.so
130+
export BDB_INCLUDE_PATH="/usr/local/BerkeleyDB.6.2/include"
131+
export BDB_LIB_PATH="/usr/local/BerkeleyDB.6.2/lib"
85132
```
86133

87134
### GitHub pull (Source Download)
88135
```
89-
cd ~; git clone https://github.com/DigitalNoteXDN/DigitalNote-2 DigitalNote
136+
git clone --single-branch https://github.com/IamLupo/DigitalNote-2.git DigitalNote
137+
cd DigitalNote
90138
```
91139

92140
### Build DigitalNote daemon
141+
142+
With UPNP:
93143
```
94-
cd ~; cd ~/DigitalNote/src; chmod a+x obj; chmod a+x leveldb/build_detect_platform; chmod a+x secp256k1; chmod a+x leveldb; chmod a+x ~/DigitalNote/src; chmod a+x ~/DigitalNote; make -f makefile.unix USE_UPNP=-; cd ~; cp -r ~/DigitalNote/src/DigitalNoted /usr/local/bin/DigitalNoted;
144+
qmake -qt=qt5 DigitalNote.daemon.pro USE_FORCE_STD_17=1
145+
make -j 4
146+
sudo cp -r DigitalNoted /usr/local/bin/DigitalNoted
147+
```
148+
149+
**Recommended Without** UPNP:
150+
```
151+
qmake -qt=qt5 DigitalNote.daemon.pro USE_FORCE_STD_17=1 USE_UPNP=-
152+
make -j 4
153+
sudo cp -r DigitalNoted /usr/local/bin/DigitalNoted
95154
```
96155

97156
### (Optional) Build DigitalNote-QT (GUI wallet) on Linux
@@ -100,26 +159,31 @@ cd ~; cd ~/DigitalNote/src; chmod a+x obj; chmod a+x leveldb/build_detect_platfo
100159

101160
If you recompiling some other time you don't have to repeat previous steps, but need to define those variables. Skip this command if this is your first build and previous steps were performed in current terminal session.
102161
```
103-
export BDB_INCLUDE_PATH="/usr/local/BerkeleyDB.6.2/include"; export BDB_LIB_PATH="/usr/local/BerkeleyDB.6.2/lib"
162+
export BDB_INCLUDE_PATH="/usr/local/BerkeleyDB.6.2/include"
163+
export BDB_LIB_PATH="/usr/local/BerkeleyDB.6.2/lib"
104164
```
105165

106166
With UPNP:
107-
108167
```
109-
cd ~; cd ~/DigitalNote; qmake -qt=qt5; make
168+
qmake -qt=qt5 DigitalNote.app.pro USE_FORCE_STD_17=1 USE_UPNP=- USE_DBUS=1 USE_QRCODE=1
169+
make -j 4
110170
```
111171

112172
**Recommended Without** UPNP:
113-
114173
```
115-
cd ~; cd ~/DigitalNote; qmake -qt=qt5 USE_UPNP=-; make
174+
qmake -qt=qt5 DigitalNote.app.pro USE_FORCE_STD_17=1 USE_UPNP=- USE_DBUS=1 USE_QRCODE=1
175+
make -j 4
116176
```
117177

118178

119-
120179
### Create config file for daemon
121180
```
122-
cd ~; sudo ufw allow 18092/tcp; sudo ufw allow 18094/tcp; sudo ufw allow 22/tcp; sudo mkdir ~/.XDN; cat << "CONFIG" >> ~/.XDN/DigitalNote.conf
181+
sudo ufw allow 18092/tcp
182+
sudo ufw allow 18094/tcp
183+
sudo ufw allow 22/tcp
184+
sudo mkdir ~/.XDN
185+
186+
cat << "CONFIG" >> ~/.XDN/DigitalNote.conf
123187
listen=1
124188
server=1
125189
daemon=1
@@ -131,25 +195,17 @@ port=18092
131195
rpcconnect=127.0.0.1
132196
rpcallowip=127.0.0.1
133197
CONFIG
134-
chmod 700 ~/.XDN/DigitalNote.conf; chmod 700 ~/.XDN; ls -la ~/.XDN
135-
```
136198
137-
### Run DigitalNote daemon
138-
```
139-
cd ~; DigitalNoted; DigitalNoted getinfo
199+
chmod 700 ~/.XDN/DigitalNote.conf
200+
chmod 700 ~/.XDN
201+
ls -la ~/.XDN
140202
```
141203

142-
### Troubleshooting
143-
### for basic troubleshooting run the following commands when compiling:
144-
### this is for minupnpc errors compiling
145-
146-
```
147-
make clean -f makefile.unix USE_UPNP=-
148-
make -f makefile.unix USE_UPNP=-
149-
```
150-
### Updating daemon in bin directory
204+
### Run DigitalNote daemon
151205
```
152-
cd ~; cp -r ~/DigitalNote/src/DigitalNoted /usr/local/bin
206+
cd ~
207+
DigitalNoted
208+
DigitalNoted getinfo
153209
```
154210

155211
License

‎include/app/forums.pri‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
FORMS += src/qt/forms/aboutdialog.ui
2+
FORMS += src/qt/forms/addeditadrenalinenode.ui
3+
FORMS += src/qt/forms/addressbookpage.ui
4+
FORMS += src/qt/forms/adrenalinenodeconfigdialog.ui
5+
FORMS += src/qt/forms/askpassphrasedialog.ui
6+
FORMS += src/qt/forms/blockbrowser.ui
7+
FORMS += src/qt/forms/coincontroldialog.ui
8+
FORMS += src/qt/forms/editaddressdialog.ui
9+
FORMS += src/qt/forms/editconfigdialog.ui
10+
FORMS += src/qt/forms/importprivatekeydialog.ui
11+
FORMS += src/qt/forms/masternodemanager.ui
12+
FORMS += src/qt/forms/messagepage.ui
13+
FORMS += src/qt/forms/optionsdialog.ui
14+
FORMS += src/qt/forms/overviewpage.ui
15+
FORMS += src/qt/forms/rpcconsole.ui
16+
FORMS += src/qt/forms/sendcoinsdialog.ui
17+
FORMS += src/qt/forms/sendcoinsentry.ui
18+
FORMS += src/qt/forms/sendmessagesdialog.ui
19+
FORMS += src/qt/forms/sendmessagesentry.ui
20+
FORMS += src/qt/forms/signverifymessagedialog.ui
21+
FORMS += src/qt/forms/transactiondescdialog.ui
22+
FORMS += src/qt/plugins/mrichtexteditor/mrichtextedit.ui

0 commit comments

Comments
 (0)