Skip to content

Commit

Permalink
Merge pull request dashpay#12 from barrystyle/0.14-release
Browse files Browse the repository at this point in the history
0.14 release
  • Loading branch information
barrystyle authored Sep 2, 2019
2 parents 48ecde9 + dbf52ef commit 20c30d6
Show file tree
Hide file tree
Showing 185 changed files with 3,422 additions and 3,455 deletions.
59 changes: 14 additions & 45 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
Dash Core staging tree 0.14.0
===============================
PACGlobal staging tree 0.14.0
=============================

`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)
https://www.pacglobal.io/

https://www.dash.org


What is Dash?
What is PACGlobal?
----------------

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

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


License
-------

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

Development Process
-------------------

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

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

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

### Automated Testing

Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to
submit new unit tests for old code. Unit tests can be compiled and run
(assuming they weren't disabled in configure) with: `make check`. Further details on running
and extending unit tests can be found in [/src/test/README.md](/src/test/README.md).

There are also [regression and integration tests](/qa) of the RPC interface, written
in Python, that are run automatically on the build server.
These tests can be run (if the [test dependencies](/qa) are installed) with: `qa/pull-tester/rpc-tests.py`

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.

### Manual Quality Assurance (QA) Testing

Changes should be tested by somebody other than the developer who wrote the
code. This is especially important for large or high-risk changes. It is useful
to add a test plan to the pull request description if testing the changes is
not straightforward.

Translations
------------

Changes to translations as well as new translations can be submitted to
[Dash Core's Transifex page](https://www.transifex.com/projects/p/dash/).

Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.

**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.
Credits
-------

Translators should also follow the [forum](https://www.dash.org/forum/topic/dash-worldwide-collaboration.88/).
PACGlobal uses the Dash Core platform; building upon it to provide extra functionality.
2 changes: 1 addition & 1 deletion src/amount.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "tinyformat.h"

const std::string CURRENCY_UNIT = "DASH";
const std::string CURRENCY_UNIT = "PAC";

CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nBytes_)
{
Expand Down
2 changes: 1 addition & 1 deletion src/base58.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class CBase58Data
bool operator> (const CBase58Data& b58) const { return CompareTo(b58) > 0; }
};

/** base58-encoded Dash addresses.
/** base58-encoded PACGlobal addresses.
* Public-key-hash-addresses have version 76 (or 140 testnet).
* The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
* Script-hash-addresses have version 16 (or 19 testnet).
Expand Down
6 changes: 3 additions & 3 deletions src/batchedlogger.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef DASH_BATCHEDLOGGER_H
#define DASH_BATCHEDLOGGER_H
#ifndef PAC_BATCHEDLOGGER_H
#define PAC_BATCHEDLOGGER_H

#include "tinyformat.h"

Expand All @@ -29,4 +29,4 @@ class CBatchedLogger
void Flush();
};

#endif//DASH_BATCHEDLOGGER_H
#endif//PAC_BATCHEDLOGGER_H
4 changes: 2 additions & 2 deletions src/bip39.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/

#ifndef DASH_BIP39_H
#define DASH_BIP39_H
#ifndef PAC_BIP39_H
#define PAC_BIP39_H

#include "support/allocators/secure.h"

Expand Down
4 changes: 3 additions & 1 deletion src/blockencodings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

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

assert(header.IsNull() && txn_available.empty());
header = cmpctblock.header;
vchBlockSig = cmpctblock.vchBlockSig;
txn_available.resize(cmpctblock.BlockTxCount());

int32_t lastprefilledindex = -1;
Expand Down Expand Up @@ -179,6 +180,7 @@ ReadStatus PartiallyDownloadedBlock::FillBlock(CBlock& block, const std::vector<
assert(!header.IsNull());
uint256 hash = header.GetHash();
block = header;
block.vchBlockSig = vchBlockSig;
block.vtx.resize(txn_available.size());

size_t tx_missing_offset = 0;
Expand Down
4 changes: 3 additions & 1 deletion src/blockencodings.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class CBlockHeaderAndShortTxIDs {

public:
CBlockHeader header;
std::vector<unsigned char> vchBlockSig;

// Dummy for deserialization
CBlockHeaderAndShortTxIDs() {}
Expand All @@ -160,7 +161,7 @@ class CBlockHeaderAndShortTxIDs {
inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(header);
READWRITE(nonce);

READWRITE(vchBlockSig);
uint64_t shorttxids_size = (uint64_t)shorttxids.size();
READWRITE(COMPACTSIZE(shorttxids_size));
if (ser_action.ForRead()) {
Expand Down Expand Up @@ -198,6 +199,7 @@ class PartiallyDownloadedBlock {
CTxMemPool* pool;
public:
CBlockHeader header;
std::vector<unsigned char> vchBlockSig;
PartiallyDownloadedBlock(CTxMemPool* poolIn) : pool(poolIn) {}

// extra_txn is a list of extra transactions to look at, in <hash, reference> form
Expand Down
6 changes: 3 additions & 3 deletions src/bls/bls.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef DASH_CRYPTO_BLS_H
#define DASH_CRYPTO_BLS_H
#ifndef PAC_CRYPTO_BLS_H
#define PAC_CRYPTO_BLS_H

#include "hash.h"
#include "serialize.h"
Expand Down Expand Up @@ -475,4 +475,4 @@ typedef std::shared_ptr<BLSSignatureVector> BLSSignatureVectorPtr;

bool BLSInit();

#endif // DASH_CRYPTO_BLS_H
#endif // PAC_CRYPTO_BLS_H
6 changes: 3 additions & 3 deletions src/bls/bls_batchverifier.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef DASH_CRYPTO_BLS_BATCHVERIFIER_H
#define DASH_CRYPTO_BLS_BATCHVERIFIER_H
#ifndef PAC_CRYPTO_BLS_BATCHVERIFIER_H
#define PAC_CRYPTO_BLS_BATCHVERIFIER_H

#include "bls.h"

Expand Down Expand Up @@ -232,4 +232,4 @@ class CBLSBatchVerifier
}
};

#endif //DASH_CRYPTO_BLS_BATCHVERIFIER_H
#endif //PAC_CRYPTO_BLS_BATCHVERIFIER_H
6 changes: 3 additions & 3 deletions src/bls/bls_ies.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef DASH_CRYPTO_BLS_IES_H
#define DASH_CRYPTO_BLS_IES_H
#ifndef PAC_CRYPTO_BLS_IES_H
#define PAC_CRYPTO_BLS_IES_H

#include "bls.h"
#include "streams.h"
Expand Down Expand Up @@ -161,4 +161,4 @@ class CBLSIESMultiRecipientObjects : public CBLSIESMultiRecipientBlobs
}
};

#endif // DASH_CRYPTO_BLS_IES_H
#endif // PAC_CRYPTO_BLS_IES_H
6 changes: 3 additions & 3 deletions src/bls/bls_worker.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#ifndef DASH_CRYPTO_BLS_WORKER_H
#define DASH_CRYPTO_BLS_WORKER_H
#ifndef PAC_CRYPTO_BLS_WORKER_H
#define PAC_CRYPTO_BLS_WORKER_H

#include "bls.h"

Expand Down Expand Up @@ -202,4 +202,4 @@ class CBLSWorkerCache
}
};

#endif //DASH_CRYPTO_BLS_WORKER_H
#endif //PAC_CRYPTO_BLS_WORKER_H
Loading

0 comments on commit 20c30d6

Please sign in to comment.