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 online-accounts-mempow-v2-block-updates

Browse Source 
# Conflicts:
#	src/test/resources/test-chain-v2-no-sig-agg.json
This commit is contained in:
CalDescent
2022-09-10 13:50:26 +01:00
parent 82edc4d9f3 d4fbc1687b
commit 0e42e7b05a
31 changed files with 763 additions and 3624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,14 +40,24 @@
{ "height": 2851201, "reward": 2.25 },
{ "height": 3110401, "reward": 2.00 }
],
"sharesByLevel": [
"sharesByLevelV1": [
{ "id": 1, "levels": [ 1, 2 ], "share": 0.05 },
{ "id": 2, "levels": [ 3, 4 ], "share": 0.10 },
{ "id": 3, "levels": [ 5, 6 ], "share": 0.15 },
{ "id": 4, "levels": [ 7, 8 ], "share": 0.20 },
{ "id": 5, "levels": [ 9, 10 ], "share": 0.25 }
],
"qoraHoldersShare": 0.20,
"sharesByLevelV2": [
{ "id": 1, "levels": [ 1, 2 ], "share": 0.06 },
{ "id": 2, "levels": [ 3, 4 ], "share": 0.13 },
{ "id": 3, "levels": [ 5, 6 ], "share": 0.19 },
{ "id": 4, "levels": [ 7, 8 ], "share": 0.26 },
{ "id": 5, "levels": [ 9, 10 ], "share": 0.32 }
],
"qoraHoldersShareByHeight": [
{ "height": 1, "share": 0.20 },
{ "height": 9999999, "share": 0.01 }
],
"qoraPerQortReward": 250,
"minAccountsToActivateShareBin": 30,
"shareBinActivationMinLevel": 7,
@@ -65,6 +75,7 @@
"atFindNextTransactionFix": 275000,
"newBlockSigHeight": 320000,
"shareBinFix": 399000,
"sharesByLevelV2Height": 9999999,
"rewardShareLimitTimestamp": 1657382400000,
"calcChainWeightTimestamp": 1620579600000,
"transactionV5Timestamp": 1642176000000,