crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Moved proof of work difficulty definition from ArbitraryTransaction to ArbitraryDataManager

Browse Source
This commit is contained in:
CalDescent 2021-12-28 13:01:26 +00:00
parent 302428f1d1
commit 2452d3c24b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
View File

@ -32,6 +32,10 @@ public class ArbitraryDataManager extends Thread {
private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataManager.class); private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataManager.class);
private static final List<TransactionType> ARBITRARY_TX_TYPE = Arrays.asList(TransactionType.ARBITRARY); private static final List<TransactionType> ARBITRARY_TX_TYPE = Arrays.asList(TransactionType.ARBITRARY);
/** Difficulty (leading zero bits) used in arbitrary data transactions
* Set here so that it can be more easily reduced when running unit tests */
private int powDifficulty = 12; // Must not be final, as unit tests need to reduce this value
/** Request timeout when transferring arbitrary data */ /** Request timeout when transferring arbitrary data */
public static final long ARBITRARY_REQUEST_TIMEOUT = 6 * 1000L; // ms public static final long ARBITRARY_REQUEST_TIMEOUT = 6 * 1000L; // ms
@ -415,4 +419,9 @@ public class ArbitraryDataManager extends Thread {
} }
} }
public int getPowDifficulty() {
return this.powDifficulty;
}
} }

7
src/main/java/org/qortal/transaction/ArbitraryTransaction.java
View File

@ -36,7 +36,6 @@ public class ArbitraryTransaction extends Transaction {
public static final int MAX_METADATA_LENGTH = 32; public static final int MAX_METADATA_LENGTH = 32;
public static final int HASH_LENGTH = TransactionTransformer.SHA256_LENGTH; public static final int HASH_LENGTH = TransactionTransformer.SHA256_LENGTH;
public static final int POW_BUFFER_SIZE = 8 * 1024 * 1024; // bytes public static final int POW_BUFFER_SIZE = 8 * 1024 * 1024; // bytes
public static final int POW_DIFFICULTY = 12; // leading zero bits
public static final int MAX_IDENTIFIER_LENGTH = 64; public static final int MAX_IDENTIFIER_LENGTH = 64;
// Constructors // Constructors
@ -75,7 +74,8 @@ public class ArbitraryTransaction extends Transaction {
ArbitraryTransactionTransformer.clearNonce(transactionBytes); ArbitraryTransactionTransformer.clearNonce(transactionBytes);
// Calculate nonce // Calculate nonce
this.arbitraryTransactionData.setNonce(MemoryPoW.compute2(transactionBytes, POW_BUFFER_SIZE, POW_DIFFICULTY)); int difficulty = ArbitraryDataManager.getInstance().getPowDifficulty();
this.arbitraryTransactionData.setNonce(MemoryPoW.compute2(transactionBytes, POW_BUFFER_SIZE, difficulty));
} }
@Override @Override
@ -196,7 +196,8 @@ public class ArbitraryTransaction extends Transaction {
ArbitraryTransactionTransformer.clearNonce(transactionBytes); ArbitraryTransactionTransformer.clearNonce(transactionBytes);
// Check nonce // Check nonce
return MemoryPoW.verify2(transactionBytes, POW_BUFFER_SIZE, POW_DIFFICULTY, nonce); int difficulty = ArbitraryDataManager.getInstance().getPowDifficulty();
return MemoryPoW.verify2(transactionBytes, POW_BUFFER_SIZE, difficulty, nonce);
} }
return true; return true;