Merge branch 'master' into increase-online-timestamp-modulus

This commit is contained in:
CalDescent
2022-06-02 12:38:05 +01:00
82 changed files with 4605 additions and 152 deletions

View File

@@ -59,7 +59,8 @@
"newBlockSigHeight": 320000,
"shareBinFix": 399000,
"calcChainWeightTimestamp": 1620579600000,
"transactionV5Timestamp": 1642176000000
"transactionV5Timestamp": 1642176000000,
"transactionV6Timestamp": 9999999999999
},
"genesisInfo": {
"version": 4,