Skip to content

Commit 20c30d6

Browse files
authored
Merge pull request dashpay#12 from barrystyle/0.14-release
0.14 release
2 parents 48ecde9 + dbf52ef commit 20c30d6

File tree

185 files changed

+3422
-3455
lines changed

Some content is hidden

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

185 files changed

+3422
-3455
lines changed

README.md

+14-45
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
1-
Dash Core staging tree 0.14.0
2-
===============================
1+
PACGlobal staging tree 0.14.0
2+
=============================
33

4-
`master:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=master)](https://travis-ci.org/dashpay/dash) `develop:` [![Build Status](https://travis-ci.org/dashpay/dash.svg?branch=develop)](https://travis-ci.org/dashpay/dash/branches)
4+
https://www.pacglobal.io/
55

6-
https://www.dash.org
76

8-
9-
What is Dash?
7+
What is PACGlobal?
108
----------------
119

12-
Dash is an experimental digital currency that enables anonymous, instant
13-
payments to anyone, anywhere in the world. Dash uses peer-to-peer technology
10+
PACGlobal is an experimental digital currency that enables anonymous, instant
11+
payments to anyone, anywhere in the world. PACGlobal uses peer-to-peer technology
1412
to operate with no central authority: managing transactions and issuing money
15-
are carried out collectively by the network. Dash Core is the name of the open
13+
are carried out collectively by the network. PACGlobal is the name of the open
1614
source software which enables the use of this currency.
1715

1816
For more information, as well as an immediately useable, binary version of
19-
the Dash Core software, see https://www.dash.org/get-dash/.
17+
the PACGlobal software, see https://www.pacglobal.io/
2018

2119

2220
License
2321
-------
2422

25-
Dash Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
23+
PACGlobal is released under the terms of the MIT license. See [COPYING](COPYING) for more
2624
information or see https://opensource.org/licenses/MIT.
2725

2826
Development Process
2927
-------------------
3028

3129
The `master` branch is meant to be stable. Development is normally done in separate branches.
32-
[Tags](https://github.com/dashpay/dash/tags) are created to indicate new official,
33-
stable release versions of Dash Core.
30+
[Tags](https://github.com/PACGlobalOfficial/PAC/tags) are created to indicate new official,
31+
stable release versions of PACGlobal.
3432

3533
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
3634

@@ -42,36 +40,7 @@ requests than we can review and test on short notice. Please be patient and help
4240
other people's pull requests, and remember this is a security-critical project where any mistake might cost people
4341
lots of money.
4442

45-
### Automated Testing
46-
47-
Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to
48-
submit new unit tests for old code. Unit tests can be compiled and run
49-
(assuming they weren't disabled in configure) with: `make check`. Further details on running
50-
and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).
51-
52-
There are also [regression and integration tests](/qa) of the RPC interface, written
53-
in Python, that are run automatically on the build server.
54-
These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py`
55-
56-
The Travis CI system makes sure that every pull request is built for Windows, Linux, and OS X, and that unit/sanity tests are run automatically.
57-
58-
### Manual Quality Assurance (QA) Testing
59-
60-
Changes should be tested by somebody other than the developer who wrote the
61-
code. This is especially important for large or high-risk changes. It is useful
62-
to add a test plan to the pull request description if testing the changes is
63-
not straightforward.
64-
65-
Translations
66-
------------
67-
68-
Changes to translations as well as new translations can be submitted to
69-
[Dash Core's Transifex page](https://www.transifex.com/projects/p/dash/).
70-
71-
Translations are periodically pulled from Transifex and merged into the git repository. See the
72-
[translation process](doc/translation_process.md) for details on how this works.
73-
74-
**Important**: We do not accept translation changes as GitHub pull requests because the next
75-
pull from Transifex would automatically overwrite them again.
43+
Credits
44+
-------
7645

77-
Translators should also follow the [forum](https://www.dash.org/forum/topic/dash-worldwide-collaboration.88/).
46+
PACGlobal uses the Dash Core platform; building upon it to provide extra functionality.

src/amount.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "tinyformat.h"
99

10-
const std::string CURRENCY_UNIT = "DASH";
10+
const std::string CURRENCY_UNIT = "PAC";
1111

1212
CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_)
1313
{

src/base58.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class CBase58Data
9595
bool operator> (const CBase58Data& b58) const { return CompareTo(b58) > 0; }
9696
};
9797

98-
/** base58-encoded Dash addresses.
98+
/** base58-encoded PACGlobal addresses.
9999
* Public-key-hash-addresses have version 76 (or 140 testnet).
100100
* The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
101101
* Script-hash-addresses have version 16 (or 19 testnet).

src/batchedlogger.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT/X11 software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef DASH_BATCHEDLOGGER_H
6-
#define DASH_BATCHEDLOGGER_H
5+
#ifndef PAC_BATCHEDLOGGER_H
6+
#define PAC_BATCHEDLOGGER_H
77

88
#include "tinyformat.h"
99

@@ -29,4 +29,4 @@ class CBatchedLogger
2929
void Flush();
3030
};
3131

32-
#endif//DASH_BATCHEDLOGGER_H
32+
#endif//PAC_BATCHEDLOGGER_H

src/bip39.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
* OTHER DEALINGS IN THE SOFTWARE.
2222
*/
2323

24-
#ifndef DASH_BIP39_H
25-
#define DASH_BIP39_H
24+
#ifndef PAC_BIP39_H
25+
#define PAC_BIP39_H
2626

2727
#include "support/allocators/secure.h"
2828

src/blockencodings.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
CBlockHeaderAndShortTxIDs::CBlockHeaderAndShortTxIDs(const CBlock& block) :
2121
nonce(GetRand(std::numeric_limits<uint64_t>::max())),
22-
shorttxids(block.vtx.size() - 1), prefilledtxn(1), header(block) {
22+
shorttxids(block.vtx.size() - 1), prefilledtxn(1), header(block), vchBlockSig(block.vchBlockSig) {
2323
FillShortTxIDSelector();
2424
//TODO: Use our mempool prior to block acceptance to predictively fill more than just the coinbase
2525
prefilledtxn[0] = {0, block.vtx[0]};
@@ -55,6 +55,7 @@ ReadStatus PartiallyDownloadedBlock::InitData(const CBlockHeaderAndShortTxIDs& c
5555

5656
assert(header.IsNull() && txn_available.empty());
5757
header = cmpctblock.header;
58+
vchBlockSig = cmpctblock.vchBlockSig;
5859
txn_available.resize(cmpctblock.BlockTxCount());
5960

6061
int32_t lastprefilledindex = -1;
@@ -179,6 +180,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
179180
assert(!header.IsNull());
180181
uint256 hash = header.GetHash();
181182
block = header;
183+
block.vchBlockSig = vchBlockSig;
182184
block.vtx.resize(txn_available.size());
183185

184186
size_t tx_missing_offset = 0;

src/blockencodings.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ class CBlockHeaderAndShortTxIDs {
144144

145145
public:
146146
CBlockHeader header;
147+
std::vector<unsigned char> vchBlockSig;
147148

148149
// Dummy for deserialization
149150
CBlockHeaderAndShortTxIDs() {}
@@ -160,7 +161,7 @@ class CBlockHeaderAndShortTxIDs {
160161
inline void SerializationOp(Stream& s, Operation ser_action) {
161162
READWRITE(header);
162163
READWRITE(nonce);
163-
164+
READWRITE(vchBlockSig);
164165
uint64_t shorttxids_size = (uint64_t)shorttxids.size();
165166
READWRITE(COMPACTSIZE(shorttxids_size));
166167
if (ser_action.ForRead()) {
@@ -198,6 +199,7 @@ class PartiallyDownloadedBlock {
198199
CTxMemPool* pool;
199200
public:
200201
CBlockHeader header;
202+
std::vector<unsigned char> vchBlockSig;
201203
PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}
202204

203205
// extra_txn is a list of extra transactions to look at, in <hash, reference> form

src/bls/bls.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef DASH_CRYPTO_BLS_H
6-
#define DASH_CRYPTO_BLS_H
5+
#ifndef PAC_CRYPTO_BLS_H
6+
#define PAC_CRYPTO_BLS_H
77

88
#include "hash.h"
99
#include "serialize.h"
@@ -475,4 +475,4 @@ typedef std::shared_ptr<BLSSignatureVector> BLSSignatureVectorPtr;
475475

476476
bool BLSInit();
477477

478-
#endif // DASH_CRYPTO_BLS_H
478+
#endif // PAC_CRYPTO_BLS_H

src/bls/bls_batchverifier.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT/X11 software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef DASH_CRYPTO_BLS_BATCHVERIFIER_H
6-
#define DASH_CRYPTO_BLS_BATCHVERIFIER_H
5+
#ifndef PAC_CRYPTO_BLS_BATCHVERIFIER_H
6+
#define PAC_CRYPTO_BLS_BATCHVERIFIER_H
77

88
#include "bls.h"
99

@@ -232,4 +232,4 @@ class CBLSBatchVerifier
232232
}
233233
};
234234

235-
#endif //DASH_CRYPTO_BLS_BATCHVERIFIER_H
235+
#endif //PAC_CRYPTO_BLS_BATCHVERIFIER_H

src/bls/bls_ies.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef DASH_CRYPTO_BLS_IES_H
6-
#define DASH_CRYPTO_BLS_IES_H
5+
#ifndef PAC_CRYPTO_BLS_IES_H
6+
#define PAC_CRYPTO_BLS_IES_H
77

88
#include "bls.h"
99
#include "streams.h"
@@ -161,4 +161,4 @@ class CBLSIESMultiRecipientObjects : public CBLSIESMultiRecipientBlobs
161161
}
162162
};
163163

164-
#endif // DASH_CRYPTO_BLS_IES_H
164+
#endif // PAC_CRYPTO_BLS_IES_H

src/bls/bls_worker.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT/X11 software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef DASH_CRYPTO_BLS_WORKER_H
6-
#define DASH_CRYPTO_BLS_WORKER_H
5+
#ifndef PAC_CRYPTO_BLS_WORKER_H
6+
#define PAC_CRYPTO_BLS_WORKER_H
77

88
#include "bls.h"
99

@@ -202,4 +202,4 @@ class CBLSWorkerCache
202202
}
203203
};
204204

205-
#endif //DASH_CRYPTO_BLS_WORKER_H
205+
#endif //PAC_CRYPTO_BLS_WORKER_H

0 commit comments

Comments
 (0)