Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-25 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into online-accounts-mempow-v2

Browse Source 
# Conflicts:
#	src/main/java/org/qortal/block/BlockChain.java
This commit is contained in:
CalDescent
2022-07-10 16:50:28 +01:00
parent fe2c63e8e4 57bd3c3459
commit 0904de3f71
26 changed files with 445 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/resources/test-chain-v2-qora-holder-extremes.json
View File

@@ -10,7 +10,11 @@
],
"requireGroupForApproval": false,
"minAccountLevelToRewardShare": 5,
"maxRewardSharesPerMintingAccount": 20,
"maxRewardSharesPerFounderMintingAccount": 6,
"maxRewardSharesByTimestamp": [
{ "timestamp": 0, "maxShares": 6 },
{ "timestamp": 9999999999999, "maxShares": 3 }
],
"founderEffectiveMintingLevel": 10,
"onlineAccountSignaturesMinLifetime": 3600000,
"onlineAccountSignaturesMaxLifetime": 86400000,
@@ -52,6 +56,7 @@
"atFindNextTransactionFix": 0,
"newBlockSigHeight": 999999,
"shareBinFix": 999999,
"rewardShareLimitTimestamp": 9999999999999,
"calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0,
"transactionV6Timestamp": 0,