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

Small reorganization.

Browse Source
This commit is contained in:
CalDescent 2021-07-15 19:47:53 +01:00
parent bb76fa80cd
commit 8a654834ac
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -303,19 +303,21 @@ public class ArbitraryResource {
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_DATA);
} }
String creatorAddress = Crypto.toAddress(creatorPublicKey); final String creatorAddress = Crypto.toAddress(creatorPublicKey);
byte[] lastReference = repository.getAccountRepository().getLastReference(creatorAddress); final byte[] lastReference = repository.getAccountRepository().getLastReference(creatorAddress);
BaseTransactionData baseTransactionData = new BaseTransactionData(NTP.getTime(), Group.NO_GROUP, final BaseTransactionData baseTransactionData = new BaseTransactionData(NTP.getTime(), Group.NO_GROUP,
lastReference, creatorPublicKey, BlockChain.getInstance().getUnitFee(), null); lastReference, creatorPublicKey, BlockChain.getInstance().getUnitFee(), null);
int size = (int)dataFile.size(); final int size = (int)dataFile.size();
ArbitraryTransactionData.DataType dataType = ArbitraryTransactionData.DataType.DATA_HASH; final int version = 5;
byte[] digest = dataFile.digest(); final int nonce = 0;
byte[] chunkHashes = dataFile.chunkHashes(); final ArbitraryTransactionData.DataType dataType = ArbitraryTransactionData.DataType.DATA_HASH;
List<PaymentData> payments = new ArrayList<>(); final byte[] digest = dataFile.digest();
final byte[] chunkHashes = dataFile.chunkHashes();
final List<PaymentData> payments = new ArrayList<>();
ArbitraryTransactionData transactionData = new ArbitraryTransactionData(baseTransactionData, ArbitraryTransactionData transactionData = new ArbitraryTransactionData(baseTransactionData,
5, service, 0, size, name, method, version, service, nonce, size, name, method,
secret, compression, digest, dataType, chunkHashes, payments); secret, compression, digest, dataType, chunkHashes, payments);
ArbitraryTransaction transaction = (ArbitraryTransaction) Transaction.fromData(repository, transactionData); ArbitraryTransaction transaction = (ArbitraryTransaction) Transaction.fromData(repository, transactionData);

20
src/main/java/org/qortal/api/resource/WebsiteResource.java
View File

@ -114,19 +114,21 @@ public class WebsiteResource {
try (final Repository repository = RepositoryManager.getRepository()) { try (final Repository repository = RepositoryManager.getRepository()) {
String creatorAddress = Crypto.toAddress(creatorPublicKey); final String creatorAddress = Crypto.toAddress(creatorPublicKey);
byte[] lastReference = repository.getAccountRepository().getLastReference(creatorAddress); final byte[] lastReference = repository.getAccountRepository().getLastReference(creatorAddress);
BaseTransactionData baseTransactionData = new BaseTransactionData(NTP.getTime(), Group.NO_GROUP, final BaseTransactionData baseTransactionData = new BaseTransactionData(NTP.getTime(), Group.NO_GROUP,
lastReference, creatorPublicKey, BlockChain.getInstance().getUnitFee(), null); lastReference, creatorPublicKey, BlockChain.getInstance().getUnitFee(), null);
int size = (int)dataFile.size(); final int size = (int)dataFile.size();
ArbitraryTransactionData.DataType dataType = ArbitraryTransactionData.DataType.DATA_HASH; final int version = 5;
byte[] digest = dataFile.digest(); final int nonce = 0;
byte[] chunkHashes = dataFile.chunkHashes(); final ArbitraryTransactionData.DataType dataType = ArbitraryTransactionData.DataType.DATA_HASH;
List<PaymentData> payments = new ArrayList<>(); final byte[] digest = dataFile.digest();
final byte[] chunkHashes = dataFile.chunkHashes();
final List<PaymentData> payments = new ArrayList<>();
ArbitraryTransactionData transactionData = new ArbitraryTransactionData(baseTransactionData, ArbitraryTransactionData transactionData = new ArbitraryTransactionData(baseTransactionData,
5, service, 0, size, name, method, 5, service, nonce, size, name, method,
secret, compression, digest, dataType, chunkHashes, payments); secret, compression, digest, dataType, chunkHashes, payments);
ArbitraryTransaction transaction = (ArbitraryTransaction) Transaction.fromData(repository, transactionData); ArbitraryTransaction transaction = (ArbitraryTransaction) Transaction.fromData(repository, transactionData);