Skip to content

Commit 1214ce4

Browse files
committed
Merge remote-tracking branch 'upstream/master' into develop
# Conflicts: # README.md
2 parents 6a1ccc0 + 9209654 commit 1214ce4

File tree

3 files changed

+42
-134
lines changed

3 files changed

+42
-134
lines changed

README.md

+20-124
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,32 @@
11
The Dagger (XDAG) cryptocurrency
22
================================
33

4-
- Community site: https://xdag.io
5-
- The Main net was launched January 5, 2018 at 22:45 GMT.
4+
- Community site: https://xdag.io
5+
- The Main net was launched January 5, 2018 at 22:45 GMT
66

77

88
Principles:
99
----------
1010

11-
- Directed acyclic graph (DAG), not blockchain
12-
- Block = transaction = address
13-
- Original idea and implementation
14-
- Mineable, no premine, no ICO
15-
- Mining new money every 64 seconds
11+
- Directed acyclic graph (DAG), not blockchain
12+
- Block = transaction = address
13+
- Original idea and implementation
14+
- Mineable, no premine, no ICO
15+
- Mining new money every 64 seconds
1616

17+
HOW-TO:
18+
----------
1719

18-
Install and run (Linux):
19-
-----------------------
20-
21-
- Install dependencies:
22-
23-
$ sudo dnf install git gcc openssl-devel
24-
or
25-
$ sudo apt-get install git gcc libssl-dev
26-
27-
- Clone from the git repository:
28-
29-
$ git clone https://github.com/XDagger/xdag
30-
31-
- Make:
32-
33-
$ cd xdag/client
34-
$ make
35-
36-
- or automake
37-
38-
$ cd xdag/automake
39-
$ autoreconf -if
40-
$ ./configure
41-
$ make
42-
43-
- Run, for example, the miner with 2 CPU mining threads, in daemon mode, connected to the pool put.xdag.server.here:13654
44-
45-
$ ./xdag -m 2 -d put.xdag.server.here:13654
46-
Enter random characters: [enter]
47-
48-
- Already have an account
49-
50-
Put your wallet.dat, dnet_key.dat and storage folder in this folder.
51-
Then run below command
52-
$./xdag -m 2 -d put.xdag.server.here:13654
53-
54-
- Run terminal connected to the daemon in the same folder:
55-
56-
$ ./xdag -i
57-
xdag> help
58-
[see help]
59-
60-
- See if you are connected to the pool:
61-
62-
xdag> state
63-
[see state]
64-
65-
- See your balance:
66-
67-
xdag> balance
68-
[balance]
69-
70-
- See your address:
71-
72-
xdag> account
73-
[address]
74-
75-
- Transfer funds to another address:
76-
77-
xdag> xfer [amount] [address]
78-
79-
80-
Run (Mac OS):
81-
-----------------------
82-
83-
- Install:
84-
Download binary file from [release page](https://github.com/XDagger/xdag/releases).
85-
Unzip the zip file to what folder you want.
86-
87-
- Run, for example, the miner with 2 CPU mining threads, in daemon mode, connected to the pool put.xdag.server.here:13654
88-
89-
$ ./xdag -m 2 -d put.xdag.server.here:13654
90-
Enter random characters: [enter]
91-
92-
- Already have an account
93-
Put your wallet.dat, dnet_key.dat and storage folder in this folder.
94-
Then run below command
95-
96-
$./xdag -m 2 -d put.xdag.server.here:13654
97-
98-
- Run terminal connected to the daemon in the same folder:
99-
100-
$ ./xdag -i
101-
xdag> help
102-
[see help]
103-
104-
- See if you are connected to the pool:
105-
106-
xdag> state
107-
[see state]
108-
109-
- See your balance:
110-
111-
xdag> balance
112-
[balance]
113-
114-
- See your address:
115-
116-
xdag> account
117-
[address]
118-
119-
- Transfer funds to another address:
120-
121-
xdag> xfer [amount] [address]
122-
123-
Build (Mac Os):
124-
-----------------------
125-
- Install dependencies:
126-
127-
$ brew install openssl
128-
$ ln -s /usr/local/opt/openssl/include/openssl /usr/local/include
129-
$ ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/
130-
131-
- Make
132-
133-
$ cd xdag/client
134-
$ make
20+
- [How to get a wallet](https://github.com/XDagger/xdag/wiki/Get-a-wallet)
21+
- [How to getting started](https://github.com/XDagger/xdag/wiki/Getting-started)
22+
- [How to find pools](https://github.com/XDagger/xdag/wiki/Mineable-Pool-List)
23+
- [How to contribute](https://github.com/XDagger/xdag/blob/master/Contributing.md)
13524

25+
Docs:
26+
----------
27+
- [Whitepaper](https://github.com/XDagger/xdag/blob/master/WhitePaper.md) [中文版](https://github.com/XDagger/xdag/blob/master/WhitePaper%20zh-cn.md)
28+
- [Protocol](https://github.com/XDagger/xdag/blob/master/Protocol.md) [中文版](https://github.com/XDagger/xdag/blob/master/Protocol-cn.md)
29+
- [License](https://github.com/XDagger/xdag/blob/master/LICENSE)
13630

13731
Main chain idea:
13832
---------------
@@ -192,3 +86,5 @@ Maintainers:
19286
---------------
19387
[Evgeniy](https://github.com/jonano614) ( XDAG: gKNRtSL1pUaTpzMuPMznKw49ILtP6qX3, BTC: 1Jonano4esJzZvqNtUY6NwfPme3EMpVs7n )
19488
[Frozen](https://github.com/xrdavies) ( XDAG: +L5dzSh1QZv1We3wi8Of31M8eHwQJq4K )
89+
90+
[Full list of contributors](https://github.com/XDagger/xdag/blob/master/CONTRIBUTORS.md)

client/netdb-white.txt

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
1-
14.152.83.121:13655
21
24.234.35.55:31333
32
45.76.37.252:13654
4-
45.77.175.144:13654
5-
47.91.197.90:13654
63
47.100.202.206:56600
74
47.104.147.94:13655
85
52.69.99.30:13655
96
52.80.150.210:13655
107
52.83.132.76:13655
118
52.83.192.224:13655
9+
54.39.28.77:13654
10+
59.110.170.149:13655
1211
61.164.253.178:13655
1312
78.46.82.220:16775
13+
88.198.100.226:13654
14+
92.223.80.93:16775
1415
95.216.36.234:16775
1516
104.40.243.113:31337
1617
109.196.45.218:3355
18+
119.28.37.154:16775
1719
124.161.87.210:13655
1820
136.243.55.153:16775
19-
136.243.55.153:17775
2021
139.99.120.77:13655
2122
139.99.124.23:13655
2223
139.99.124.100:13655
2324
139.99.124.135:13654
2425
142.44.143.234:888
26+
144.202.120.160:13655
27+
144.217.73.135:13655
28+
145.239.232.52:13655
2529
148.251.139.197:16800
2630
148.251.189.108:13655
2731
149.28.131.30:16775
2832
172.94.63.18:9797
33+
172.94.63.25:25000
2934
172.105.216.53:3356
3035
175.155.35.5:19999
31-
183.236.166.17:13655
36+
188.214.130.18:16775
3237
195.201.168.17:16775
3338
195.201.168.17:17775
39+
195.201.169.202:16775

client/netdb.txt

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
1-
14.152.83.121:13655
21
24.234.35.55:31333
32
45.76.37.252:13654
4-
45.77.175.144:13654
5-
47.91.197.90:13654
63
47.100.202.206:56600
74
47.104.147.94:13655
85
52.69.99.30:13655
96
52.80.150.210:13655
107
52.83.132.76:13655
118
52.83.192.224:13655
9+
54.39.28.77:13654
10+
59.110.170.149:13655
1211
61.164.253.178:13655
1312
78.46.82.220:16775
13+
88.198.100.226:13654
14+
92.223.80.93:16775
1415
95.216.36.234:16775
1516
104.40.243.113:31337
1617
109.196.45.218:3355
18+
119.28.37.154:16775
1719
124.161.87.210:13655
1820
136.243.55.153:16775
19-
136.243.55.153:17775
2021
139.99.120.77:13655
2122
139.99.124.23:13655
2223
139.99.124.100:13655
2324
139.99.124.135:13654
2425
142.44.143.234:888
26+
144.202.120.160:13655
27+
144.217.73.135:13655
28+
145.239.232.52:13655
2529
148.251.139.197:16800
2630
148.251.189.108:13655
2731
149.28.131.30:16775
2832
172.94.63.18:9797
33+
172.94.63.25:25000
2934
172.105.216.53:3356
3035
175.155.35.5:19999
31-
183.236.166.17:13655
36+
188.214.130.18:16775
3237
195.201.168.17:16775
3338
195.201.168.17:17775
39+
195.201.169.202:16775

0 commit comments

Comments
 (0)