Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chain-weight-consensus

Browse Source 
# Conflicts:
#	src/main/java/org/qortal/block/BlockChain.java
#	src/main/resources/blockchain.json
#	src/test/resources/test-chain-v2-founder-rewards.json
#	src/test/resources/test-chain-v2-leftover-reward.json
#	src/test/resources/test-chain-v2-minting.json
#	src/test/resources/test-chain-v2-qora-holder-extremes.json
#	src/test/resources/test-chain-v2-qora-holder.json
#	src/test/resources/test-chain-v2-reward-scaling.json
#	src/test/resources/test-chain-v2.json
This commit is contained in:
CalDescent
2021-05-02 18:18:20 +01:00
parent 1e6e5e66da fac02dbc7d
commit 241e2bef85
53 changed files with 2471 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/blockchain.json
View File

@@ -49,6 +49,8 @@
},
"featureTriggers": {
"atFindNextTransactionFix": 275000,
"newBlockSigHeight": 320000,
"shareBinFix": 399000,
"calcChainWeightTimestamp": 1616000000000
},
"genesisInfo": {