Merge branch 'chat-reference'

# Conflicts: # src/main/java/org/qortal/block/BlockChain.java # src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java # src/main/resources/blockchain.json # src/test/resources/test-chain-v2-block-timestamps.json # src/test/resources/test-chain-v2-disable-reference.json # src/test/resources/test-chain-v2-founder-rewards.json # src/test/resources/test-chain-v2-leftover-reward.json # src/test/resources/test-chain-v2-minting.json # src/test/resources/test-chain-v2-qora-holder-extremes.json # src/test/resources/test-chain-v2-qora-holder-reduction.json # src/test/resources/test-chain-v2-qora-holder.json # src/test/resources/test-chain-v2-reward-levels.json # src/test/resources/test-chain-v2-reward-scaling.json # src/test/resources/test-chain-v2-reward-shares.json # src/test/resources/test-chain-v2.json
2025-07-22 20:26:50 +00:00 · 2023-01-02 17:32:38 +00:00
parent 98b92a5bf1 2b6ae57a27
commit cecf28ab7b
23 changed files with 125 additions and 33 deletions
--- a/src/test/resources/test-chain-v2-block-timestamps.json
+++ b/src/test/resources/test-chain-v2-block-timestamps.json
@@ -73,7 +73,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-disable-reference.json
+++ b/src/test/resources/test-chain-v2-disable-reference.json
@@ -76,7 +76,8 @@
 		"disableReferenceTimestamp": 0,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-founder-rewards.json
+++ b/src/test/resources/test-chain-v2-founder-rewards.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-leftover-reward.json
+++ b/src/test/resources/test-chain-v2-leftover-reward.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-minting.json
+++ b/src/test/resources/test-chain-v2-minting.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 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
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder-reduction.json
+++ b/src/test/resources/test-chain-v2-qora-holder-reduction.json
@@ -78,7 +78,8 @@
 		"aggregateSignatureTimestamp": 0,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder.json
+++ b/src/test/resources/test-chain-v2-qora-holder.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-levels.json
+++ b/src/test/resources/test-chain-v2-reward-levels.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-scaling.json
+++ b/src/test/resources/test-chain-v2-reward-scaling.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-shares.json
+++ b/src/test/resources/test-chain-v2-reward-shares.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2.json
+++ b/src/test/resources/test-chain-v2.json
@@ -77,7 +77,8 @@
 		"disableReferenceTimestamp": 9999999999999,
 		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
 		"onlineAccountMinterLevelValidationHeight": 0,
-		"selfSponsorshipAlgoV1Height": 999999999
+		"selfSponsorshipAlgoV1Height": 999999999,
+		"chatReferenceTimestamp": 0
 	},
 	"genesisInfo": {
 		"version": 4,