Skip to content

Commit

Permalink
Rename bitcoin.org to ioncore.xyz, ref: ioncoincore#13
Browse files Browse the repository at this point in the history
  • Loading branch information
cevap authored and ckti committed Mar 29, 2021
1 parent 307b926 commit 3e06ab5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 14 deletions.
2 changes: 1 addition & 1 deletion contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Source: https://github.com/cevap/ion
Files: *
Copyright: 2009-2012, Bitcoin Core Developers
License: Expat
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
Comment: The Bitcoin Core Developers encompasses the current developers listed on ioncore.xyz,
as well as the numerous contributors to the project.

Files: src/json/*
Expand Down
2 changes: 1 addition & 1 deletion contrib/verifysfbinaries/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### Verify SF Binaries ###
This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org.
This script attempts to download the signature file `SHA256SUMS.asc` from https://ioncore.xyz.

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.

Expand Down
8 changes: 4 additions & 4 deletions contrib/verifysfbinaries/verify.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

### This script attempts to download the signature file SHA256SUMS.asc from bitcoin.org
### This script attempts to download the signature file SHA256SUMS.asc from ioncore.xyz
### 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.
Expand All @@ -18,11 +18,11 @@ WORKINGDIR="/tmp/bitcoin"
TMPFILE="hashes.tmp"

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

SIGNATUREFILENAME="SHA256SUMS.asc"
RCSUBDIR="test/"
BASEDIR="https://bitcoin.org/bin/"
BASEDIR="https://ioncore.xyz/bin/"
VERSIONPREFIX="bitcoin-"
RCVERSIONSTRING="rc"

Expand Down Expand Up @@ -62,7 +62,7 @@ WGETOUT=$(wget -N "$BASEDIR$SIGNATUREFILENAME" 2>&1)
#and then see if wget completed successfully
if [ $? -ne 0 ]; then
echo "Error: couldn't fetch signature file. Have you specified the version number in the following format?"
echo "[bitcoin-]<version>-[rc[0-9]] (example: bitcoin-0.9.2-rc1)"
echo "[bitcoin-]<version>-[rc[0-9]] (example: bitcoin-3.0.4-rc1)"
echo "wget output:"
echo "$WGETOUT"|sed 's/^/\t/g'
exit 2
Expand Down
3 changes: 3 additions & 0 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ static Checkpoints::MapCheckpoints mapCheckpointsTestnet =
boost::assign::map_list_of
( 1, uint256("000000b86fdd7f2ae9e9973e73790492989113075a2d5c581495ab7bb2ad5711") ) // First block
( 10, uint256("0000008c29a7d680710d1cc821d79f33ba0159bc26d9e233bccfabd668b0430e") ) // Confirmation of first block
( 73, uint256("0000000000414be74794bb2e455e24c0e446ad36df162c69a81742dc07f51d0d") ) //
( 74, uint256("1881b795f7531232ba90ade14c16b7f0cf9392b6c9fe76a3d5bfeab9150b7dca") ) // ERROR: AcceptBlock : prev block 1881b795f7531232ba90ade14c16b7f0cf9392b6c9fe76a3d5bfeab9150b7dca is invalid, unable to add block c54904618b734eeb3f098b442934586806f869e80656eacfba65ca91a091cf31
( 75, uint256("c54904618b734eeb3f098b442934586806f869e80656eacfba65ca91a091cf31") ) // ERROR: AcceptBlock : prev block 1881b795f7531232ba90ade14c16b7f0cf9392b6c9fe76a3d5bfeab9150b7dca is invalid, unable to add block c54904618b734eeb3f098b442934586806f869e80656eacfba65ca91a091cf31
( 300, uint256("000000125e3e3d005aa72281e02b4ebaabc2fa9aed817b9365a8d29bb7901c10") ) // Last POW Block
( 75000, uint256("20faec3994dac57fb88748e29139974522c91036e1bf8ff204c769a90fab5a12") ) // Fork June 2017
( 85000, uint256("43ee28cd1f804dafe05ef120569726e50e9e6f2b634746925742cbd9f738c201") ) // Fork June 2017
Expand Down
16 changes: 12 additions & 4 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3071,11 +3071,19 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
*/
if (block.IsProofOfStake()) {

if (pindex->nHeight <= 73 && Params().NetworkID() == CBaseChainParams::TESTNET)
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
REJECT_INVALID, "PoS-early");
if (Params().NetworkID() == CBaseChainParams::TESTNET)){

if (pindex->nHeight <= 73)
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
REJECT_INVALID, "PoS-early");

if (pindex->nHeight != 75 && Params().NetworkID() == CBaseChainParams::TESTNET)
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
REJECT_INVALID, "PoS-early");

}

if (pindex->nHeight <= 454)
if (pindex->nHeight <= 454 && Params().NetworkID() != CBaseChainParams::TESTNET && Params().NetworkID() != CBaseChainParams::REGTEST)
return state.DoS(100, error("ConnectBlock() : PoS period not active"),
REJECT_INVALID, "PoS-early");
}
Expand Down
8 changes: 4 additions & 4 deletions src/test/netbase_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ bool static TestSplitHost(string test, string host, int port)

BOOST_AUTO_TEST_CASE(netbase_splithost)
{
BOOST_CHECK(TestSplitHost("www.bitcoin.org", "www.bitcoin.org", -1));
BOOST_CHECK(TestSplitHost("[www.bitcoin.org]", "www.bitcoin.org", -1));
BOOST_CHECK(TestSplitHost("www.bitcoin.org:80", "www.bitcoin.org", 80));
BOOST_CHECK(TestSplitHost("[www.bitcoin.org]:80", "www.bitcoin.org", 80));
BOOST_CHECK(TestSplitHost("www.ioncore.xyz", "www.ioncore.xyz", -1));
BOOST_CHECK(TestSplitHost("[www.ioncore.xyz]", "www.ioncore.xyz", -1));
BOOST_CHECK(TestSplitHost("www.ioncore.xyz:80", "www.ioncore.xyz", 80));
BOOST_CHECK(TestSplitHost("[www.ioncore.xyz]:80", "www.ioncore.xyz", 80));
BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", -1));
BOOST_CHECK(TestSplitHost("127.0.0.1:12700", "127.0.0.1", 12700));
BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", -1));
Expand Down

0 comments on commit 3e06ab5

Please sign in to comment.