Bump to transaction version 6 at a future undecided timestamp.

This commit is contained in:
CalDescent 2022-04-22 20:35:17 +01:00
parent 522ef282c8
commit de4f004a08
11 changed files with 28 additions and 11 deletions

View File

@ -69,7 +69,8 @@ public class BlockChain {
newBlockSigHeight, newBlockSigHeight,
shareBinFix, shareBinFix,
calcChainWeightTimestamp, calcChainWeightTimestamp,
transactionV5Timestamp; transactionV5Timestamp,
transactionV6Timestamp;
} }
// Custom transaction fees // Custom transaction fees
@ -405,6 +406,10 @@ public class BlockChain {
return this.featureTriggers.get(FeatureTrigger.transactionV5Timestamp.name()).longValue(); return this.featureTriggers.get(FeatureTrigger.transactionV5Timestamp.name()).longValue();
} }
public long getTransactionV6Timestamp() {
return this.featureTriggers.get(FeatureTrigger.transactionV6Timestamp.name()).longValue();
}
// More complex getters for aspects that change by height or timestamp // More complex getters for aspects that change by height or timestamp
public long getRewardAtHeight(int ourHeight) { public long getRewardAtHeight(int ourHeight) {

View File

@ -393,7 +393,10 @@ public abstract class Transaction {
* @return transaction version number * @return transaction version number
*/ */
public static int getVersionByTimestamp(long timestamp) { public static int getVersionByTimestamp(long timestamp) {
if (timestamp >= BlockChain.getInstance().getTransactionV5Timestamp()) { if (timestamp >= BlockChain.getInstance().getTransactionV6Timestamp()) {
return 6;
}
else if (timestamp >= BlockChain.getInstance().getTransactionV5Timestamp()) {
return 5; return 5;
} }
return 4; return 4;

View File

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

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 6, "shareBinFix": 6,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,

View File

@ -52,7 +52,8 @@
"newBlockSigHeight": 999999, "newBlockSigHeight": 999999,
"shareBinFix": 999999, "shareBinFix": 999999,
"calcChainWeightTimestamp": 0, "calcChainWeightTimestamp": 0,
"transactionV5Timestamp": 0 "transactionV5Timestamp": 0,
"transactionV6Timestamp": 0
}, },
"genesisInfo": { "genesisInfo": {
"version": 4, "version": 4,