AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Remove fix in order for the chain history to remain valid

Browse Source
This commit is contained in:
AlphaX-Projects 2024-02-03 14:05:11 +01:00
parent 4f9a4a2091
commit 55f941467f
5 changed files with 2 additions and 4936 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/qortal/block/Block.java
View File

@ -1556,11 +1556,6 @@ public class Block {
if (this.blockData.getHeight() == BlockChain.getInstance().getSelfSponsorshipAlgoV1Height()) {
SelfSponsorshipAlgoV1Block.processAccountPenalties(this);
}
// Disabled because is fixed
//if (this.blockData.getHeight() == BlockChain.getInstance().getPenaltyFixHeight()) {
// PenaltyFix.processPenaltiesFix(this);
//}
}
// We're about to (test-)process a batch of transactions,
@ -1854,11 +1849,6 @@ public class Block {
SelfSponsorshipAlgoV1Block.orphanAccountPenalties(this);
}
// Disabled because is fixed
//if (this.blockData.getHeight() == BlockChain.getInstance().getPenaltyFixHeight()) {
// PenaltyFix.orphanPenaltiesFix(this);
//}
// Account levels and block rewards are only processed/orphaned on block reward distribution blocks
if (this.isRewardDistributionBlock()) {
// Block rewards, including transaction fees, removed after transactions undone

7
src/main/java/org/qortal/block/BlockChain.java
View File

@ -79,8 +79,7 @@ public class BlockChain {
arbitraryOptionalFeeTimestamp,
unconfirmableRewardSharesHeight,
disableTransferPrivsTimestamp,
enableTransferPrivsTimestamp,
penaltyFixHeight
enableTransferPrivsTimestamp
}
// Custom transaction fees
@ -591,10 +590,6 @@ public class BlockChain {
return this.featureTriggers.get(FeatureTrigger.enableTransferPrivsTimestamp.name()).longValue();
}
public int getPenaltyFixHeight() {
return this.featureTriggers.get(FeatureTrigger.penaltyFixHeight.name()).intValue();
}
// More complex getters for aspects that change by height or timestamp
public long getRewardAtHeight(int ourHeight) {

187
src/main/java/org/qortal/block/PenaltyFix.java
View File

@ -1,187 +0,0 @@
package org.qortal.block;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.eclipse.persistence.jaxb.JAXBContextFactory;
import org.eclipse.persistence.jaxb.UnmarshallerProperties;
import org.qortal.api.model.AccountPenaltyStats;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.AccountData;
import org.qortal.data.account.AccountPenaltyData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.utils.Base58;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.UnmarshalException;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.stream.StreamSource;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
public final class PenaltyFix {
private static final Logger LOGGER = LogManager.getLogger(PenaltyFix.class);
private static final String PENALTY_FIX_SOURCE = "penalty-fix.json";
private static final String PENALTY_FIX_HASH = BlockChain.getInstance().getPenaltyFixHash();
private static final List<AccountPenaltyData> penalties = accountsPenaltyFix();
private PenaltyFix() {
/* Do not instantiate */
}
@SuppressWarnings("unchecked")
private static List<AccountPenaltyData> accountsPenaltyFix() {
Unmarshaller unmarshaller;
try {
// Create JAXB context aware of classes we need to unmarshal
JAXBContext pf = JAXBContextFactory.createContext(new Class[] {
AccountPenaltyData.class
}, null);
// Create unmarshaller
unmarshaller = pf.createUnmarshaller();
// Set the unmarshaller media type to JSON
unmarshaller.setProperty(UnmarshallerProperties.MEDIA_TYPE, "application/json");
// Tell unmarshaller that there's no JSON root element in the JSON input
unmarshaller.setProperty(UnmarshallerProperties.JSON_INCLUDE_ROOT, false);
} catch (JAXBException e) {
String message = "Failed to setup unmarshaller for penalty fix";
LOGGER.error(message, e);
throw new RuntimeException(message, e);
}
ClassLoader classLoader = BlockChain.class.getClassLoader();
InputStream pfIn = classLoader.getResourceAsStream(PENALTY_FIX_SOURCE);
StreamSource pfSource = new StreamSource(pfIn);
try {
// Attempt to unmarshal JSON stream to BlockChain config
return (List<AccountPenaltyData>) unmarshaller.unmarshal(pfSource, AccountPenaltyData.class).getValue();
} catch (UnmarshalException e) {
String message = "Failed to parse penalty fix";
LOGGER.error(message, e);
throw new RuntimeException(message, e);
} catch (JAXBException e) {
String message = "Unexpected JAXB issue while processing penalty fix";
LOGGER.error(message, e);
throw new RuntimeException(message, e);
}
}
public static void processPenaltiesFix(Block block) throws DataException {
// Create reverse penalties
List<AccountPenaltyData> reversePenalties = penalties.stream()
.map(penalty -> new AccountPenaltyData(penalty.getAddress(), 0 +5000000))
.collect(Collectors.toList());
Set<AccountPenaltyData> penaltiesFix = new HashSet<AccountPenaltyData>(reversePenalties);
final String PENALTY_FIX_HASH_VERIFY = getHash(penaltiesFix.stream().map(p -> p.getAddress()).collect(Collectors.toList()));
// Verify if we are on same penalty hash
if (PENALTY_FIX_HASH.equals(PENALTY_FIX_HASH_VERIFY)) {
LOGGER.info("Verify hash passed! Running process penalty fix - this will take a while...");
logPenaltyStats(block.repository);
long startTime = System.currentTimeMillis();
block.repository.getAccountRepository().updateBlocksMintedPenalties(penaltiesFix);
long totalTime = System.currentTimeMillis() - startTime;
LOGGER.info("{} penalty addresses processed. Total time taken: {} seconds", reversePenalties.size(), (int)(totalTime / 1000.0f));
logPenaltyStats(block.repository);
int updatedCount = updateAccountLevels(block.repository, penaltiesFix);
LOGGER.info("Account levels updated for {} penalty addresses", updatedCount);
} else {
LOGGER.info("Verify hash failed! Stopping process penalty fix!");
}
}
public static void orphanPenaltiesFix(Block block) throws DataException {
// Create inverse penalties
List<AccountPenaltyData> inversePenalties = penalties.stream()
.map(penalty -> new AccountPenaltyData(penalty.getAddress(), 0 -5000000))
.collect(Collectors.toList());
Set<AccountPenaltyData> penaltiesFix = new HashSet<AccountPenaltyData>(inversePenalties);
final String PENALTY_FIX_HASH_VERIFY = getHash(penaltiesFix.stream().map(p -> p.getAddress()).collect(Collectors.toList()));
// Verify if we are on same penalty hash
if (PENALTY_FIX_HASH.equals(PENALTY_FIX_HASH_VERIFY)) {
LOGGER.info("Verify hash passed! Running orphan penalty fix - this will take a while...");
logPenaltyStats(block.repository);
long startTime = System.currentTimeMillis();
block.repository.getAccountRepository().updateBlocksMintedPenalties(penaltiesFix);
long totalTime = System.currentTimeMillis() - startTime;
LOGGER.info("{} penalty addresses processed. Total time taken: {} seconds", inversePenalties.size(), (int)(totalTime / 1000.0f));
logPenaltyStats(block.repository);
int updatedCount = updateAccountLevels(block.repository, penaltiesFix);
LOGGER.info("Account levels updated for {} penalty addresses", updatedCount);
} else {
LOGGER.info("Verify hash failed! Stopping orphan penalty fix!");
}
}
private static int updateAccountLevels(Repository repository, Set<AccountPenaltyData> accountPenalties) throws DataException {
final List<Integer> cumulativeBlocksByLevel = BlockChain.getInstance().getCumulativeBlocksByLevel();
final int maximumLevel = cumulativeBlocksByLevel.size() - 1;
int updatedCount = 0;
for (AccountPenaltyData penaltyData : accountPenalties) {
AccountData accountData = repository.getAccountRepository().getAccount(penaltyData.getAddress());
final int effectiveBlocksMinted = accountData.getBlocksMinted() + accountData.getBlocksMintedAdjustment() + accountData.getBlocksMintedPenalty();
// Shortcut for penalties
if (effectiveBlocksMinted < 0) {
accountData.setLevel(0);
repository.getAccountRepository().setLevel(accountData);
updatedCount++;
LOGGER.trace(() -> String.format("Block minter %s dropped to level %d", accountData.getAddress(), accountData.getLevel()));
continue;
}
for (int newLevel = maximumLevel; newLevel >= 0; --newLevel) {
if (effectiveBlocksMinted >= cumulativeBlocksByLevel.get(newLevel)) {
accountData.setLevel(newLevel);
repository.getAccountRepository().setLevel(accountData);
updatedCount++;
LOGGER.trace(() -> String.format("Block minter %s increased to level %d", accountData.getAddress(), accountData.getLevel()));
break;
}
}
}
return updatedCount;
}
private static void logPenaltyStats(Repository repository) {
try {
LOGGER.info(getPenaltyStats(repository));
} catch (DataException e) {}
}
private static AccountPenaltyStats getPenaltyStats(Repository repository) throws DataException {
List<AccountData> accounts = repository.getAccountRepository().getPenaltyAccounts();
return AccountPenaltyStats.fromAccounts(accounts);
}
public static String getHash(List<String> penaltyAddresses) {
if (penaltyAddresses == null || penaltyAddresses.isEmpty()) {
return null;
}
Collections.sort(penaltyAddresses);
return Base58.encode(Crypto.digest(StringUtils.join(penaltyAddresses).getBytes(StandardCharsets.UTF_8)));
}
}

5
src/main/resources/blockchain.json
View File

@ -35,7 +35,6 @@
"blockRewardBatchStartHeight": 1508000,
"blockRewardBatchSize": 1000,
"blockRewardBatchAccountsBlockCount": 25,
"penaltyFixHash": "DG23E4Y63wC8FquG9FKAnfKwatvdJV3Z3iYnozMHn2A3",
"rewardsByHeight": [
{ "height": 1, "reward": 5.00 },
{ "height": 259201, "reward": 4.75 },
@ -101,9 +100,7 @@
"arbitraryOptionalFeeTimestamp": 1680278400000,
"unconfirmableRewardSharesHeight": 1575500,
"disableTransferPrivsTimestamp": 1706745000000,
"enableTransferPrivsTimestamp": 1709251200000,
"penaltyFixHeight": 1589200
"enableTransferPrivsTimestamp": 1709251200000
},
"checkpoints": [
{ "height": 1136300, "signature": "3BbwawEF2uN8Ni5ofpJXkukoU8ctAPxYoFB7whq9pKfBnjfZcpfEJT4R95NvBDoTP8WDyWvsUvbfHbcr9qSZuYpSKZjUQTvdFf6eqznHGEwhZApWfvXu6zjGCxYCp65F4jsVYYJjkzbjmkCg5WAwN5voudngA23kMK6PpTNygapCzXt" }

4729
src/main/resources/penalty-fix.json
View File

File diff suppressed because it is too large Load Diff