Skip to content

Commit 6439a59

Browse files
author
cevap
committed
Rename bitcoin.org to ioncore.xyz, ref: #13
1 parent 67b8736 commit 6439a59

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed

contrib/debian/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Source: https://github.com/cevap/ion
77
Files: *
88
Copyright: 2009-2012, Bitcoin Core Developers
99
License: Expat
10-
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
10+
Comment: The Bitcoin Core Developers encompasses the current developers listed on ioncore.xyz,
1111
as well as the numerous contributors to the project.
1212

1313
Files: src/json/*

contrib/verifysfbinaries/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Verify SF Binaries ###
2-
This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org.
2+
This script attempts to download the signature file `SHA256SUMS.asc` from https://ioncore.xyz.
33

44
It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file.
55

contrib/verifysfbinaries/verify.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
### This script attempts to download the signature file SHA256SUMS.asc from bitcoin.org
3+
### This script attempts to download the signature file SHA256SUMS.asc from ioncore.xyz
44
### It first checks if the signature passes, and then downloads the files specified in
55
### the file, and checks if the hashes of these files match those that are specified
66
### in the signature file.
@@ -18,11 +18,11 @@ WORKINGDIR="/tmp/bitcoin"
1818
TMPFILE="hashes.tmp"
1919

2020
#this URL is used if a version number is not specified as an argument to the script
21-
SIGNATUREFILE="https://bitcoin.org/bin/0.9.2.1/SHA256SUMS.asc"
21+
SIGNATUREFILE="https://ioncore.xyz/bin/3.0.4.1/SHA256SUMS.asc"
2222

2323
SIGNATUREFILENAME="SHA256SUMS.asc"
2424
RCSUBDIR="test/"
25-
BASEDIR="https://bitcoin.org/bin/"
25+
BASEDIR="https://ioncore.xyz/bin/"
2626
VERSIONPREFIX="bitcoin-"
2727
RCVERSIONSTRING="rc"
2828

@@ -62,7 +62,7 @@ WGETOUT=$(wget -N "$BASEDIR$SIGNATUREFILENAME" 2>&1)
6262
#and then see if wget completed successfully
6363
if [ $? -ne 0 ]; then
6464
echo "Error: couldn't fetch signature file. Have you specified the version number in the following format?"
65-
echo "[bitcoin-]<version>-[rc[0-9]] (example: bitcoin-0.9.2-rc1)"
65+
echo "[bitcoin-]<version>-[rc[0-9]] (example: bitcoin-3.0.4-rc1)"
6666
echo "wget output:"
6767
echo "$WGETOUT"|sed 's/^/\t/g'
6868
exit 2

src/chainparams.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ static Checkpoints::MapCheckpoints mapCheckpointsTestnet =
7070
boost::assign::map_list_of
7171
( 1, uint256("000000b86fdd7f2ae9e9973e73790492989113075a2d5c581495ab7bb2ad5711") ) // First block
7272
( 10, uint256("0000008c29a7d680710d1cc821d79f33ba0159bc26d9e233bccfabd668b0430e") ) // Confirmation of first block
73+
( 73, uint256("0000000000414be74794bb2e455e24c0e446ad36df162c69a81742dc07f51d0d") ) //
74+
( 74, uint256("1881b795f7531232ba90ade14c16b7f0cf9392b6c9fe76a3d5bfeab9150b7dca") ) // ERROR: AcceptBlock : prev block 1881b795f7531232ba90ade14c16b7f0cf9392b6c9fe76a3d5bfeab9150b7dca is invalid, unable to add block c54904618b734eeb3f098b442934586806f869e80656eacfba65ca91a091cf31
75+
( 75, uint256("c54904618b734eeb3f098b442934586806f869e80656eacfba65ca91a091cf31") ) // ERROR: AcceptBlock : prev block 1881b795f7531232ba90ade14c16b7f0cf9392b6c9fe76a3d5bfeab9150b7dca is invalid, unable to add block c54904618b734eeb3f098b442934586806f869e80656eacfba65ca91a091cf31
7376
( 300, uint256("000000125e3e3d005aa72281e02b4ebaabc2fa9aed817b9365a8d29bb7901c10") ) // Last POW Block
7477
( 75000, uint256("20faec3994dac57fb88748e29139974522c91036e1bf8ff204c769a90fab5a12") ) // Fork June 2017
7578
( 85000, uint256("43ee28cd1f804dafe05ef120569726e50e9e6f2b634746925742cbd9f738c201") ) // Fork June 2017

src/main.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3071,11 +3071,19 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
30713071
*/
30723072
if (block.IsProofOfStake()) {
30733073

3074-
if (pindex->nHeight <= 73 && Params().NetworkID() == CBaseChainParams::TESTNET)
3075-
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
3076-
REJECT_INVALID, "PoS-early");
3074+
if (Params().NetworkID() == CBaseChainParams::TESTNET)){
3075+
3076+
if (pindex->nHeight <= 73)
3077+
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
3078+
REJECT_INVALID, "PoS-early");
3079+
3080+
if (pindex->nHeight != 75 && Params().NetworkID() == CBaseChainParams::TESTNET)
3081+
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
3082+
REJECT_INVALID, "PoS-early");
3083+
3084+
}
30773085

3078-
if (pindex->nHeight <= 454)
3086+
if (pindex->nHeight <= 454 && Params().NetworkID() != CBaseChainParams::TESTNET && Params().NetworkID() != CBaseChainParams::REGTEST)
30793087
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
30803088
REJECT_INVALID, "PoS-early");
30813089
}

src/test/netbase_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ bool static TestSplitHost(string test, string host, int port)
5858

5959
BOOST_AUTO_TEST_CASE(netbase_splithost)
6060
{
61-
BOOST_CHECK(TestSplitHost("www.bitcoin.org", "www.bitcoin.org", -1));
62-
BOOST_CHECK(TestSplitHost("[www.bitcoin.org]", "www.bitcoin.org", -1));
63-
BOOST_CHECK(TestSplitHost("www.bitcoin.org:80", "www.bitcoin.org", 80));
64-
BOOST_CHECK(TestSplitHost("[www.bitcoin.org]:80", "www.bitcoin.org", 80));
61+
BOOST_CHECK(TestSplitHost("www.ioncore.xyz", "www.ioncore.xyz", -1));
62+
BOOST_CHECK(TestSplitHost("[www.ioncore.xyz]", "www.ioncore.xyz", -1));
63+
BOOST_CHECK(TestSplitHost("www.ioncore.xyz:80", "www.ioncore.xyz", 80));
64+
BOOST_CHECK(TestSplitHost("[www.ioncore.xyz]:80", "www.ioncore.xyz", 80));
6565
BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", -1));
6666
BOOST_CHECK(TestSplitHost("127.0.0.1:12700", "127.0.0.1", 12700));
6767
BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", -1));

0 commit comments

Comments
 (0)