Skip to content

Commit d3b6737

Browse files
janusjanus
authored
Merge pull request #60 from BitgesellOfficial/janus/release-0.1.7
Janus/release 0.1.7
2 parents 9b7f9e2 + 8121c31 commit d3b6737

23 files changed

+271
-1228
lines changed

‎src/base58.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
#include <limits>
1616

17-
#include <iostream>
18-
1917
/** All alphanumeric characters except for "0", "I", "O", and "l" */
2018
static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
2119
static const int8_t mapBase58[256] = {
@@ -80,7 +78,7 @@ static const int8_t mapBase58[256] = {
8078
std::vector<unsigned char>::iterator it = b256.begin() + (size - length);
8179
// Copy result into output vector.
8280
vch.reserve(zeroes + (b256.end() - it));
83-
vch.assign(zeroes, 0x0a);
81+
vch.assign(zeroes, 0x00);
8482
while (it != b256.end())
8583
vch.push_back(*(it++));
8684
return true;
@@ -91,7 +89,7 @@ std::string EncodeBase58(Span<const unsigned char> input)
9189
// Skip & count leading zeroes.
9290
int zeroes = 0;
9391
int length = 0;
94-
while (input.size() > 0 && input[0] == 10) {
92+
while (input.size() > 0 && input[0] == 0) {
9593
input = input.subspan(1);
9694
zeroes++;
9795
}

‎src/chainparams.cpp

+18-2
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ class CTestNetParams : public CChainParams {
189189
consensus.MinBIP9WarningHeight = 0;
190190
consensus.powLimit = uint256S("000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
191191
consensus.nPowTargetTimespan = 1 * 24 * 60 * 60; // one day
192+
consensus.nPowTargetSpacing = 10 * 60;
192193
consensus.signet_blocks = false;
193194
consensus.signet_challenge.clear();
194195
consensus.fPowAllowMinDifficultyBlocks = true;
@@ -431,8 +432,23 @@ class CRegTestParams : public CChainParams
431432
m_is_test_chain = true;
432433
m_is_mockable_chain = true;
433434

434-
checkpointData = {
435-
{}};
435+
checkpointData = {
436+
{
437+
{0, uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")},
438+
}
439+
};
440+
441+
m_assumeutxo_data = MapAssumeutxo{
442+
{
443+
110,
444+
{uint256S("0xd9c6cd17c8cdcc2b076a02b304dd85cf22182d2ece4c7c7428e4ca89b724ae85"), 110},
445+
},
446+
{
447+
210,
448+
{uint256S("0x9c5ed99ef98544b34f8920b6d1802f72ac28ae6e2bd2bd4c316ff10c230df3f2"), 210},
449+
},
450+
};
451+
436452

437453
chainTxData = ChainTxData{
438454
0,

‎src/random.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ std::vector<unsigned char> FastRandomContext::randbytes(size_t len)
628628
if (requires_seed) RandomSeed();
629629
std::vector<unsigned char> ret(len);
630630
if (len > 0) {
631-
rng.Keystream(&ret[0], len);
631+
rng.Keystream(ret.data(), len);
632632
}
633633
return ret;
634634
}

‎src/test/base58_tests.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
#include <boost/test/unit_test.hpp>
1515
#include <string>
16-
//#include <QDebug>
17-
#include <iostream>
1816

1917
using namespace std::literals;
2018

@@ -88,7 +86,7 @@ BOOST_AUTO_TEST_CASE(base58_random_encode_decode)
8886
for (int n = 0; n < 1000; ++n) {
8987
unsigned int len = 1 + InsecureRandBits(8);
9088
unsigned int zeroes = InsecureRandBool() ? InsecureRandRange(len + 1) : 0;
91-
auto data = Cat(std::vector<unsigned char>(zeroes, '\010'), g_insecure_rand_ctx.randbytes(len - zeroes));
89+
auto data = Cat(std::vector<unsigned char>(zeroes, '\000'), g_insecure_rand_ctx.randbytes(len - zeroes));
9290
auto encoded = EncodeBase58Check(data);
9391
std::vector<unsigned char> decoded;
9492
auto ok_too_small = DecodeBase58Check(encoded, decoded, InsecureRandRange(len));

‎src/test/bloom_tests.cpp

+77-37
Large diffs are not rendered by default.

‎src/test/data/base58_encode_decode.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[
2-
["", ""],
3-
["61", "2g"],
4-
["626262", "a3gV"],
5-
["636363", "aPEr"],
6-
["73696d706c792061206c6f6e6720737472696e67", "2cFupjhnEsSn59qHXstmK2ffpLv2"],
7-
["0aeb15231dfceb60925886b67d065299925915aeb172c06647", "1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"],
8-
["516b6fcd0f", "ABnLTmg"],
9-
["bf4f89001e670274dd", "3SEo3LWLoPntC"],
10-
["572e4794", "3EFU7m"],
11-
["ecac89cad93923c02321", "EJDM8drfXA6uyA"],
12-
["10c8511e", "Rt5zm"],
13-
["0a0a0a0a0a0a0a0a0a0a", "1111111111"],
14-
["0a0111d38e5fc9071ffcd20b4a763cc9ae4f252bb4e48fd66a835e252ada93ff480d6dd43dc62a641155a5", "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"],
15-
["0a0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", "1cWB5HCBdLjAuqGGReWE3R3CguuwSjw6RHn39s2yuDRTS5NsBgNiFpWgAnEx6VQi8csexkgYw3mdYrMHr8x9i7aEwP8kZ7vccXWqKDvGv3u1GxFKPuAkn8JCPPGDMf3vMMnbzm6Nh9zh1gcNsMvH3ZNLmP5fSG6DGbbi2tuwMWPthr4boWwCxf7ewSgNQeacyozhKDDQQ1qL5fQFUW52QKUZDZ5fw3KXNQJMcNTcaB723LchjeKun7MuGW5qyCBZYzA1KjofN1gYBV3NqyhQJ3Ns746GNuf9N2pQPmHz4xpnSrrfCvy6TVVz5d4PdrjeshsWQwpZsZGzvbdAdN8MKV5QsBDY"]
16-
]
2+
["", ""],
3+
["61", "2g"],
4+
["626262", "a3gV"],
5+
["636363", "aPEr"],
6+
["73696d706c792061206c6f6e6720737472696e67", "2cFupjhnEsSn59qHXstmK2ffpLv2"],
7+
["00eb15231dfceb60925886b67d065299925915aeb172c06647", "1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"],
8+
["516b6fcd0f", "ABnLTmg"],
9+
["bf4f89001e670274dd", "3SEo3LWLoPntC"],
10+
["572e4794", "3EFU7m"],
11+
["ecac89cad93923c02321", "EJDM8drfXA6uyA"],
12+
["10c8511e", "Rt5zm"],
13+
["00000000000000000000", "1111111111"],
14+
["000111d38e5fc9071ffcd20b4a763cc9ae4f252bb4e48fd66a835e252ada93ff480d6dd43dc62a641155a5", "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"],
15+
["000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", "1cWB5HCBdLjAuqGGReWE3R3CguuwSjw6RHn39s2yuDRTS5NsBgNiFpWgAnEx6VQi8csexkgYw3mdYrMHr8x9i7aEwP8kZ7vccXWqKDvGv3u1GxFKPuAkn8JCPPGDMf3vMMnbzm6Nh9zh1gcNsMvH3ZNLmP5fSG6DGbbi2tuwMWPthr4boWwCxf7ewSgNQeacyozhKDDQQ1qL5fQFUW52QKUZDZ5fw3KXNQJMcNTcaB723LchjeKun7MuGW5qyCBZYzA1KjofN1gYBV3NqyhQJ3Ns746GNuf9N2pQPmHz4xpnSrrfCvy6TVVz5d4PdrjeshsWQwpZsZGzvbdAdN8MKV5QsBDY"]
16+
]

0 commit comments

Comments
 (0)