Skip to content

Commit 7a321b7

Browse files
xdn-projectxdn-project
committed
XDN merged mining support
1 parent 01adc3c commit 7a321b7

File tree

597 files changed

+1042
-697
lines changed

Some content is hidden

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

597 files changed

+1042
-697
lines changed

‎ReleaseNotes.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Release notes 4.0.0-beta
2+
3+
- Empowering XDN network security with merged mining with any CryptoNote cryptocurrency
4+
- Second step to the PoA with the new type of PoW merged mining blocks
5+
16
Release notes 3.1.0-beta
27

38
- Messages 2.0 core support

‎include/BlockchainExplorerData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/CryptoNote.h

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

@@ -59,6 +59,16 @@ struct Transaction : public TransactionPrefix {
5959
std::vector<std::vector<Crypto::Signature>> signatures;
6060
};
6161

62+
struct RootBlock {
63+
uint8_t majorVersion;
64+
uint8_t minorVersion;
65+
Crypto::Hash previousBlockHash;
66+
uint16_t transactionCount;
67+
std::vector<Crypto::Hash> baseTransactionBranch;
68+
Transaction baseTransaction;
69+
std::vector<Crypto::Hash> blockchainBranch;
70+
};
71+
6272
struct BlockHeader {
6373
uint8_t majorVersion;
6474
uint8_t minorVersion;
@@ -68,6 +78,7 @@ struct BlockHeader {
6878
};
6979

7080
struct Block : public BlockHeader {
81+
RootBlock rootBlock;
7182
Transaction baseTransaction;
7283
std::vector<Crypto::Hash> transactionHashes;
7384
};

‎include/CryptoTypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/IBlockchainExplorer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/INode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/IObservable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/IStreamSerializable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/ITransaction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

‎include/ITransfersContainer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2011-2016 The Cryptonote developers
2-
// Copyright (c) 2014-2016 XDN developers
2+
// Copyright (c) 2014-2016 XDN-project developers
33
// Distributed under the MIT/X11 software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

0 commit comments

Comments
 (0)