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

Derive PoW difficulty from the file size. Exact values TBC.

Browse Source
This commit is contained in:
CalDescent 2021-07-13 22:18:21 +01:00
parent 00d4f35f2c
commit 9384a50879
2 changed files with 80 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package org.qortal.transaction;
import java.math.BigInteger;
import java.util.List;
import java.util.stream.Collectors;
@ -28,7 +29,9 @@ public class ArbitraryTransaction extends Transaction {
public static final int MAX_CHUNK_HASHES_LENGTH = 8000;
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_DIFFICULTY = 10; // leading zero bits
public static final int POW_MIN_DIFFICULTY = 12; // leading zero bits
public static final int POW_MAX_DIFFICULTY = 19; // leading zero bits
public static final long MAX_FILE_SIZE = DataFile.MAX_FILE_SIZE;
// Constructors
@ -65,7 +68,7 @@ public class ArbitraryTransaction extends Transaction {
// Clear nonce from transactionBytes
ArbitraryTransactionTransformer.clearNonce(transactionBytes);
int difficulty = POW_DIFFICULTY;
int difficulty = difficultyForFileSize(arbitraryTransactionData.getSize());
// Calculate nonce
this.arbitraryTransactionData.setNonce(MemoryPoW.compute2(transactionBytes, POW_BUFFER_SIZE, difficulty));
@ -155,7 +158,7 @@ public class ArbitraryTransaction extends Transaction {
// Clear nonce from transactionBytes
ArbitraryTransactionTransformer.clearNonce(transactionBytes);
int difficulty = POW_DIFFICULTY;
int difficulty = difficultyForFileSize(arbitraryTransactionData.getSize());
// Check nonce
return MemoryPoW.verify2(transactionBytes, POW_BUFFER_SIZE, difficulty, nonce);
@ -213,4 +216,13 @@ public class ArbitraryTransaction extends Transaction {
return null;
}
// Helper methods
public int difficultyForFileSize(long size) {
final BigInteger powRange = BigInteger.valueOf(POW_MAX_DIFFICULTY - POW_MIN_DIFFICULTY);
final BigInteger multiplier = BigInteger.valueOf(100);
final BigInteger percentage = BigInteger.valueOf(size).multiply(multiplier).divide(BigInteger.valueOf(MAX_FILE_SIZE));
return POW_MIN_DIFFICULTY + powRange.multiply(percentage).divide(multiplier).intValue();
}
}

65
src/test/java/org/qortal/test/arbitrary/ArbitraryTransactionTests.java Normal file
View File

@ -0,0 +1,65 @@
package org.qortal.test.arbitrary;
import org.junit.Before;
import org.junit.Test;
import org.qortal.data.PaymentData;
import org.qortal.data.transaction.ArbitraryTransactionData;
import org.qortal.repository.DataException;
import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager;
import org.qortal.test.common.*;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transaction.ArbitraryTransaction;
import org.qortal.transaction.Transaction;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.*;
public class ArbitraryTransactionTests extends Common {
private static final int version = 4;
private static final String recipient = Common.getTestAccount(null, "bob").getAddress();
@Before
public void beforeTest() throws DataException {
Common.useDefaultSettings();
}
@Test
public void testDifficultyCalculation() throws DataException {
try (final Repository repository = RepositoryManager.getRepository()) {
TestAccount alice = Common.getTestAccount(repository, "alice");
ArbitraryTransactionData.DataType dataType = ArbitraryTransactionData.DataType.DATA_HASH;
List<PaymentData> payments = new ArrayList<>();
ArbitraryTransactionData transactionData = new ArbitraryTransactionData(TestTransaction.generateBase(alice),
5, ArbitraryTransaction.SERVICE_ARBITRARY_DATA, 0, 0, null, dataType, null, payments);
ArbitraryTransaction transaction = (ArbitraryTransaction) Transaction.fromData(repository, transactionData);
assertEquals(12, transaction.difficultyForFileSize(1));
assertEquals(12, transaction.difficultyForFileSize(5123456));
assertEquals(12, transaction.difficultyForFileSize(74 * 1024 * 1024));
assertEquals(13, transaction.difficultyForFileSize(75 * 1024 * 1024));
assertEquals(13, transaction.difficultyForFileSize(144 * 1024 * 1024));
assertEquals(14, transaction.difficultyForFileSize(145 * 1024 * 1024));
assertEquals(14, transaction.difficultyForFileSize(214 * 1024 * 1024));
assertEquals(15, transaction.difficultyForFileSize(215 * 1024 * 1024));
assertEquals(15, transaction.difficultyForFileSize(289 * 1024 * 1024));
assertEquals(16, transaction.difficultyForFileSize(290 * 1024 * 1024));
assertEquals(16, transaction.difficultyForFileSize(359 * 1024 * 1024));
assertEquals(17, transaction.difficultyForFileSize(360 * 1024 * 1024));
assertEquals(17, transaction.difficultyForFileSize(429 * 1024 * 1024));
assertEquals(18, transaction.difficultyForFileSize(430 * 1024 * 1024));
assertEquals(18, transaction.difficultyForFileSize(499 * 1024 * 1024));
assertEquals(19, transaction.difficultyForFileSize(500 * 1024 * 1024));
}
}
}