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

2025-07-22 20:26:50 +00:00 · 2022-06-02 12:38:05 +01:00
parent f7dabcaeb0 987446cf7f
commit 0c3988202e
82 changed files with 4605 additions and 152 deletions
--- a/src/test/resources/test-chain-v2-founder-rewards.json
+++ b/src/test/resources/test-chain-v2-founder-rewards.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-leftover-reward.json
+++ b/src/test/resources/test-chain-v2-leftover-reward.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-minting.json
+++ b/src/test/resources/test-chain-v2-minting.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder-extremes.json
+++ b/src/test/resources/test-chain-v2-qora-holder-extremes.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder.json
+++ b/src/test/resources/test-chain-v2-qora-holder.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-levels.json
+++ b/src/test/resources/test-chain-v2-reward-levels.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 6,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-scaling.json
+++ b/src/test/resources/test-chain-v2-reward-scaling.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2.json
+++ b/src/test/resources/test-chain-v2.json
@@ -53,7 +53,8 @@
 		"newBlockSigHeight": 999999,
 		"shareBinFix": 999999,
 		"calcChainWeightTimestamp": 0,
-		"transactionV5Timestamp": 0
+		"transactionV5Timestamp": 0,
+		"transactionV6Timestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,