mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-24 14:50:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

AbstractBitcoinNetParams: Move assignment of interval and subsidyDecreaseBlockCount to here.

Browse source 
This also adds a test of isDifficultyTransitionPoint().
This commit is contained in:
Andreas Schildbach 2020-05-12 12:11:37 +02:00
parent 0fe5f99798
commit 3db1b651c9
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/params/AbstractBitcoinNetParams.java
View file

@ -56,6 +56,8 @@ public abstract class AbstractBitcoinNetParams extends NetworkParameters {
public AbstractBitcoinNetParams() { public AbstractBitcoinNetParams() {
super(); super();
interval = INTERVAL;
subsidyDecreaseBlockCount = 210000;
} }
/** /**

2
core/src/main/java/org/bitcoinj/params/MainNetParams.java
View file

@ -34,7 +34,6 @@ public class MainNetParams extends AbstractBitcoinNetParams {
public MainNetParams() { public MainNetParams() {
super(); super();
interval = INTERVAL;
targetTimespan = TARGET_TIMESPAN; targetTimespan = TARGET_TIMESPAN;
maxTarget = Utils.decodeCompactBits(0x1d00ffffL); maxTarget = Utils.decodeCompactBits(0x1d00ffffL);
dumpedPrivateKeyHeader = 128; dumpedPrivateKeyHeader = 128;
@ -56,7 +55,6 @@ public class MainNetParams extends AbstractBitcoinNetParams {
genesisBlock.setTime(1231006505L); genesisBlock.setTime(1231006505L);
genesisBlock.setNonce(2083236893); genesisBlock.setNonce(2083236893);
id = ID_MAINNET; id = ID_MAINNET;
subsidyDecreaseBlockCount = 210000;
spendableCoinbaseDepth = 100; spendableCoinbaseDepth = 100;
String genesisHash = genesisBlock.getHashAsString(); String genesisHash = genesisBlock.getHashAsString();
checkState(genesisHash.equals("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"), checkState(genesisHash.equals("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"),

2
core/src/main/java/org/bitcoinj/params/TestNet3Params.java
View file

@ -46,7 +46,6 @@ public class TestNet3Params extends AbstractBitcoinNetParams {
super(); super();
id = ID_TESTNET; id = ID_TESTNET;
packetMagic = 0x0b110907; packetMagic = 0x0b110907;
interval = INTERVAL;
targetTimespan = TARGET_TIMESPAN; targetTimespan = TARGET_TIMESPAN;
maxTarget = Utils.decodeCompactBits(0x1d00ffffL); maxTarget = Utils.decodeCompactBits(0x1d00ffffL);
port = 18333; port = 18333;
@ -58,7 +57,6 @@ public class TestNet3Params extends AbstractBitcoinNetParams {
genesisBlock.setDifficultyTarget(0x1d00ffffL); genesisBlock.setDifficultyTarget(0x1d00ffffL);
genesisBlock.setNonce(414098458); genesisBlock.setNonce(414098458);
spendableCoinbaseDepth = 100; spendableCoinbaseDepth = 100;
subsidyDecreaseBlockCount = 210000;
String genesisHash = genesisBlock.getHashAsString(); String genesisHash = genesisBlock.getHashAsString();
checkState(genesisHash.equals("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943")); checkState(genesisHash.equals("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"));
alertSigningKey = Utils.HEX.decode("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a"); alertSigningKey = Utils.HEX.decode("04302390343f91cc401d56d68b123028bf52e5fca1939df127f63c6467cdf9c8e2c14b61104cf817d0b780da337893ecc4aaff1309e536162dabbdb45200ca2b0a");

7
core/src/test/java/org/bitcoinj/params/AbstractBitcoinNetParamsTest.java
View file

@ -29,6 +29,13 @@ public class AbstractBitcoinNetParamsTest {
} }
}; };
@Test
public void isDifficultyTransitionPoint() {
assertFalse(BITCOIN_PARAMS.isDifficultyTransitionPoint(2014));
assertTrue(BITCOIN_PARAMS.isDifficultyTransitionPoint(2015));
assertFalse(BITCOIN_PARAMS.isDifficultyTransitionPoint(2016));
}
@Test @Test
public void isRewardHalvingPoint() { public void isRewardHalvingPoint() {
assertTrue(BITCOIN_PARAMS.isRewardHalvingPoint(209999)); assertTrue(BITCOIN_PARAMS.isRewardHalvingPoint(209999));