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 increase-online-timestamp-modulus

Browse Source 
# Conflicts:
#	src/main/java/org/qortal/block/Block.java
#	src/main/java/org/qortal/controller/OnlineAccountsManager.java
This commit is contained in:
CalDescent
2022-07-01 13:03:19 +01:00
parent ef51cf5702 ca7d58c272
commit f77093731c
72 changed files with 4775 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,9 @@
"shareBinFix": 999999,
"calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
"transactionV6Timestamp": 0,
"disableReferenceTimestamp": 9999999999999,
"aggregateSignatureTimestamp": 0
},
"genesisInfo": {
"version": 4,