|
|
@ -68,7 +68,8 @@ public class BlockChain { |
|
|
|
atFindNextTransactionFix, |
|
|
|
atFindNextTransactionFix, |
|
|
|
newBlockSigHeight, |
|
|
|
newBlockSigHeight, |
|
|
|
shareBinFix, |
|
|
|
shareBinFix, |
|
|
|
calcChainWeightTimestamp; |
|
|
|
calcChainWeightTimestamp, |
|
|
|
|
|
|
|
transactionV5Timestamp; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** Map of which blockchain features are enabled when (height/timestamp) */ |
|
|
|
/** Map of which blockchain features are enabled when (height/timestamp) */ |
|
|
@ -391,6 +392,10 @@ public class BlockChain { |
|
|
|
return this.featureTriggers.get(FeatureTrigger.calcChainWeightTimestamp.name()).longValue(); |
|
|
|
return this.featureTriggers.get(FeatureTrigger.calcChainWeightTimestamp.name()).longValue(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public long getTransactionV5Timestamp() { |
|
|
|
|
|
|
|
return this.featureTriggers.get(FeatureTrigger.transactionV5Timestamp.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) { |
|
|
|