Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interim commit - refactored transaction transformers and fixed unit test compiler errors

Browse Source
This commit is contained in:
catbref
2019-06-01 17:05:45 +01:00
parent 06ba004238
commit 4b3f877dc0
43 changed files with 234 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/qora/at/QoraATAPI.java
View File

@@ -14,12 +14,14 @@ import org.ciyam.at.MachineState;
import org.ciyam.at.OpCode;
import org.ciyam.at.Timestamp;
import org.qora.account.Account;
import org.qora.account.GenesisAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.asset.Asset;
import org.qora.crypto.Crypto;
import org.qora.data.at.ATData;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.ATTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.MessageTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
@@ -268,8 +270,9 @@ public class QoraATAPI extends API {
byte[] reference = this.getLastReference();
BigDecimal amount = BigDecimal.valueOf(unscaledAmount, 8);
ATTransactionData atTransactionData = new ATTransactionData(timestamp, Group.NO_GROUP, reference, this.atData.getATAddress(),
recipient.getAddress(), amount, this.atData.getAssetId(), new byte[0], BigDecimal.ZERO.setScale(8));
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, reference, GenesisAccount.PUBLIC_KEY, BigDecimal.ZERO, null);
ATTransactionData atTransactionData = new ATTransactionData(baseTransactionData, this.atData.getATAddress(),
recipient.getAddress(), amount, this.atData.getAssetId(), new byte[0]);
AtTransaction atTransaction = new AtTransaction(this.repository, atTransactionData);
// Add to our transactions
@@ -286,8 +289,9 @@ public class QoraATAPI extends API {
long timestamp = this.getNextTransactionTimestamp();
byte[] reference = this.getLastReference();
ATTransactionData atTransactionData = new ATTransactionData(timestamp, Group.NO_GROUP, reference,
this.atData.getATAddress(), recipient.getAddress(), BigDecimal.ZERO, this.atData.getAssetId(), message, BigDecimal.ZERO.setScale(8));
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, reference, GenesisAccount.PUBLIC_KEY, BigDecimal.ZERO, null);
ATTransactionData atTransactionData = new ATTransactionData(baseTransactionData, this.atData.getATAddress(),
recipient.getAddress(), BigDecimal.ZERO, this.atData.getAssetId(), message);
AtTransaction atTransaction = new AtTransaction(this.repository, atTransactionData);
// Add to our transactions
@@ -312,8 +316,9 @@ public class QoraATAPI extends API {
byte[] reference = this.getLastReference();
BigDecimal amount = BigDecimal.valueOf(finalBalance, 8);
ATTransactionData atTransactionData = new ATTransactionData(timestamp, Group.NO_GROUP, reference, this.atData.getATAddress(),
creator.getAddress(), amount, this.atData.getAssetId(), new byte[0], BigDecimal.ZERO.setScale(8));
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, reference, GenesisAccount.PUBLIC_KEY, BigDecimal.ZERO, null);
ATTransactionData atTransactionData = new ATTransactionData(baseTransactionData, this.atData.getATAddress(),
creator.getAddress(), amount, this.atData.getAssetId(), new byte[0]);
AtTransaction atTransaction = new AtTransaction(this.repository, atTransactionData);
// Add to our transactions

7
src/main/java/org/qora/data/transaction/DeployAtTransactionData.java
View File

@@ -31,6 +31,7 @@ public class DeployAtTransactionData extends TransactionData {
super(TransactionType.DEPLOY_AT);
}
/** From repository */
public DeployAtTransactionData(BaseTransactionData baseTransactionData,
String aTAddress, String name, String description, String aTType, String tags, byte[] creationBytes, BigDecimal amount, long assetId) {
super(TransactionType.DEPLOY_AT, baseTransactionData);
@@ -45,6 +46,12 @@ public class DeployAtTransactionData extends TransactionData {
this.assetId = assetId;
}
/** From network/API */
public DeployAtTransactionData(BaseTransactionData baseTransactionData,
String name, String description, String aTType, String tags, byte[] creationBytes, BigDecimal amount, long assetId) {
this(baseTransactionData, null, name, description, aTType, tags, creationBytes, amount, assetId);
}
// Getters/Setters
public String getName() {

5
src/main/java/org/qora/transform/transaction/AccountFlagsTransactionTransformer.java
View File

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.AccountFlagsTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
@@ -64,7 +65,9 @@ public class AccountFlagsTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new AccountFlagsTransactionData(timestamp, txGroupId, reference, creatorPublicKey, target, andMask, orMask, xorMask, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new AccountFlagsTransactionData(baseTransactionData, target, andMask, orMask, xorMask);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/AddGroupAdminTransactionTransformer.java
View File

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.AddGroupAdminTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
@@ -58,7 +59,9 @@ public class AddGroupAdminTransactionTransformer extends TransactionTransformer
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new AddGroupAdminTransactionData(timestamp, txGroupId, reference, ownerPublicKey, groupId, member, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new AddGroupAdminTransactionData(baseTransactionData, groupId, member);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

6
src/main/java/org/qora/transform/transaction/ArbitraryTransactionTransformer.java
View File

@@ -12,6 +12,7 @@ import org.qora.block.BlockChain;
import org.qora.crypto.Crypto;
import org.qora.data.PaymentData;
import org.qora.data.transaction.ArbitraryTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.ArbitraryTransactionData.DataType;
import org.qora.transaction.ArbitraryTransaction;
@@ -90,8 +91,9 @@ public class ArbitraryTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new ArbitraryTransactionData(timestamp, txGroupId, reference, senderPublicKey, version, service, data, DataType.RAW_DATA, payments, fee,
signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, senderPublicKey, fee, signature);
return new ArbitraryTransactionData(baseTransactionData, version, service, data, DataType.RAW_DATA, payments);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/BuyNameTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.BuyNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.naming.Name;
@@ -64,7 +65,9 @@ public class BuyNameTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new BuyNameTransactionData(timestamp, txGroupId, reference, buyerPublicKey, name, amount, seller, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, buyerPublicKey, fee, signature);
return new BuyNameTransactionData(baseTransactionData, name, amount, seller);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/CancelAssetOrderTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CancelAssetOrderTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -53,7 +54,9 @@ public class CancelAssetOrderTransactionTransformer extends TransactionTransform
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CancelAssetOrderTransactionData(timestamp, txGroupId, reference, creatorPublicKey, orderId, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new CancelAssetOrderTransactionData(baseTransactionData, orderId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/CancelGroupBanTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CancelGroupBanTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -58,7 +59,9 @@ public class CancelGroupBanTransactionTransformer extends TransactionTransformer
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CancelGroupBanTransactionData(timestamp, txGroupId, reference, adminPublicKey, groupId, member, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, adminPublicKey, fee, signature);
return new CancelGroupBanTransactionData(baseTransactionData, groupId, member);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/CancelGroupInviteTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CancelGroupInviteTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -58,7 +59,9 @@ public class CancelGroupInviteTransactionTransformer extends TransactionTransfor
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CancelGroupInviteTransactionData(timestamp, txGroupId, reference, adminPublicKey, groupId, invitee, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, adminPublicKey, fee, signature);
return new CancelGroupInviteTransactionData(baseTransactionData, groupId, invitee);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/CancelSellNameTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CancelSellNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.naming.Name;
@@ -56,7 +57,9 @@ public class CancelSellNameTransactionTransformer extends TransactionTransformer
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CancelSellNameTransactionData(timestamp, txGroupId, reference, ownerPublicKey, name, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new CancelSellNameTransactionData(baseTransactionData, name);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/CreateAssetOrderTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CreateAssetOrderTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -65,7 +66,9 @@ public class CreateAssetOrderTransactionTransformer extends TransactionTransform
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CreateAssetOrderTransactionData(timestamp, txGroupId, reference, creatorPublicKey, haveAssetId, wantAssetId, amount, price, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new CreateAssetOrderTransactionData(baseTransactionData, haveAssetId, wantAssetId, amount, price);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

6
src/main/java/org/qora/transform/transaction/CreateGroupTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CreateGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
@@ -80,8 +81,9 @@ public class CreateGroupTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CreateGroupTransactionData(timestamp, txGroupId, reference, creatorPublicKey, owner, groupName, description, isOpen, approvalThreshold,
minBlockDelay, maxBlockDelay, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new CreateGroupTransactionData(baseTransactionData, owner, groupName, description, isOpen, approvalThreshold, minBlockDelay, maxBlockDelay);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/CreatePollTransactionTransformer.java
View File

@@ -8,6 +8,7 @@ import java.util.ArrayList;
import java.util.List;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.CreatePollTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.voting.PollOptionData;
@@ -90,7 +91,9 @@ public class CreatePollTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new CreatePollTransactionData(timestamp, txGroupId, reference, creatorPublicKey, owner, pollName, description, pollOptions, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new CreatePollTransactionData(baseTransactionData, owner, pollName, description, pollOptions);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

6
src/main/java/org/qora/transform/transaction/DeployAtTransactionTransformer.java
View File

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.DeployAtTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.DeployAtTransaction;
@@ -95,8 +96,9 @@ public class DeployAtTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new DeployAtTransactionData(timestamp, txGroupId, reference, creatorPublicKey, name, description, ATType, tags, creationBytes, amount, assetId,
fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new DeployAtTransactionData(baseTransactionData, name, description, ATType, tags, creationBytes, amount, assetId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/EnableForgingTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.EnableForgingTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -52,7 +53,9 @@ public class EnableForgingTransactionTransformer extends TransactionTransformer
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new EnableForgingTransactionData(timestamp, txGroupId, reference, creatorPublicKey, target, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new EnableForgingTransactionData(baseTransactionData, target);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

7
src/main/java/org/qora/transform/transaction/GenesisTransactionTransformer.java
View File

@@ -5,10 +5,13 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.account.GenesisAccount;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.GenesisTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
import org.qora.utils.Serialization;
@@ -48,7 +51,9 @@ public class GenesisTransactionTransformer extends TransactionTransformer {
if (timestamp >= BlockChain.getInstance().getQoraV2Timestamp())
assetId = byteBuffer.getLong();
return new GenesisTransactionData(timestamp, recipient, amount, assetId);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, Group.NO_GROUP, null, GenesisAccount.PUBLIC_KEY, BigDecimal.ZERO, null);
return new GenesisTransactionData(baseTransactionData, recipient, amount, assetId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/GroupApprovalTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.GroupApprovalTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -57,7 +58,9 @@ public class GroupApprovalTransactionTransformer extends TransactionTransformer
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new GroupApprovalTransactionData(timestamp, txGroupId, reference, adminPublicKey, pendingSignature, approval, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, adminPublicKey, fee, signature);
return new GroupApprovalTransactionData(baseTransactionData, pendingSignature, approval);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/GroupBanTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.GroupBanTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
@@ -69,7 +70,9 @@ public class GroupBanTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new GroupBanTransactionData(timestamp, txGroupId, reference, adminPublicKey, groupId, offender, reason, timeToLive, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, adminPublicKey, fee, signature);
return new GroupBanTransactionData(baseTransactionData, groupId, offender, reason, timeToLive);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/GroupInviteTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.GroupInviteTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -62,7 +63,9 @@ public class GroupInviteTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new GroupInviteTransactionData(timestamp, txGroupId, reference, adminPublicKey, groupId, invitee, timeToLive, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, adminPublicKey, fee, signature);
return new GroupInviteTransactionData(baseTransactionData, groupId, invitee, timeToLive);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/GroupKickTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.GroupKickTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
@@ -65,7 +66,9 @@ public class GroupKickTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new GroupKickTransactionData(timestamp, txGroupId, reference, adminPublicKey, groupId, member, reason, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, adminPublicKey, fee, signature);
return new GroupKickTransactionData(baseTransactionData, groupId, member, reason);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

6
src/main/java/org/qora/transform/transaction/IssueAssetTransactionTransformer.java
View File

@@ -8,6 +8,7 @@ import java.util.Arrays;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -91,8 +92,9 @@ public class IssueAssetTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new IssueAssetTransactionData(timestamp, txGroupId, reference, issuerPublicKey, owner, assetName,
description, quantity, isDivisible, data, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, issuerPublicKey, fee, signature);
return new IssueAssetTransactionData(baseTransactionData, owner, assetName, description, quantity, isDivisible, data);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/JoinGroupTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.JoinGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -54,7 +55,9 @@ public class JoinGroupTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new JoinGroupTransactionData(timestamp, txGroupId, reference, joinerPublicKey, groupId, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, joinerPublicKey, fee, signature);
return new JoinGroupTransactionData(baseTransactionData, groupId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/LeaveGroupTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.LeaveGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -54,7 +55,9 @@ public class LeaveGroupTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new LeaveGroupTransactionData(timestamp, txGroupId, reference, leaverPublicKey, groupId, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, leaverPublicKey, fee, signature);
return new LeaveGroupTransactionData(baseTransactionData, groupId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

6
src/main/java/org/qora/transform/transaction/MessageTransactionTransformer.java
View File

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.MessageTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.MessageTransaction;
@@ -90,8 +91,9 @@ public class MessageTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new MessageTransactionData(timestamp, txGroupId, reference, senderPublicKey, version, recipient, assetId, amount, data, isText, isEncrypted, fee,
signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, senderPublicKey, fee, signature);
return new MessageTransactionData(baseTransactionData, version, recipient, assetId, amount, data, isText, isEncrypted);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/MultiPaymentTransactionTransformer.java
View File

@@ -10,6 +10,7 @@ import java.util.List;
import org.qora.block.BlockChain;
import org.qora.data.PaymentData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.MultiPaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -66,7 +67,9 @@ public class MultiPaymentTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new MultiPaymentTransactionData(timestamp, txGroupId, reference, senderPublicKey, payments, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, senderPublicKey, fee, signature);
return new MultiPaymentTransactionData(baseTransactionData, payments);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/PaymentTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -56,7 +57,9 @@ public class PaymentTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new PaymentTransactionData(timestamp, txGroupId, reference, senderPublicKey, recipient, amount, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, senderPublicKey, fee, signature);
return new PaymentTransactionData(baseTransactionData, recipient, amount);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/RegisterNameTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.RegisterNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.naming.Name;
@@ -65,7 +66,9 @@ public class RegisterNameTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new RegisterNameTransactionData(timestamp, txGroupId, reference, registrantPublicKey, owner, name, data, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, registrantPublicKey, fee, signature);
return new RegisterNameTransactionData(baseTransactionData, owner, name, data);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/RemoveGroupAdminTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.RemoveGroupAdminTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -58,7 +59,9 @@ public class RemoveGroupAdminTransactionTransformer extends TransactionTransform
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new RemoveGroupAdminTransactionData(timestamp, txGroupId, reference, ownerPublicKey, groupId, admin, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new RemoveGroupAdminTransactionData(baseTransactionData, groupId, admin);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/SellNameTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.SellNameTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.naming.Name;
@@ -60,7 +61,9 @@ public class SellNameTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new SellNameTransactionData(timestamp, txGroupId, reference, ownerPublicKey, name, amount, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new SellNameTransactionData(baseTransactionData, name, amount);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/SetGroupTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.SetGroupTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -54,7 +55,9 @@ public class SetGroupTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new SetGroupTransactionData(timestamp, txGroupId, reference, creatorPublicKey, defaultGroupId, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, creatorPublicKey, fee, signature);
return new SetGroupTransactionData(baseTransactionData, defaultGroupId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/TransferAssetTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.TransferAssetTransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -61,7 +62,9 @@ public class TransferAssetTransactionTransformer extends TransactionTransformer
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new TransferAssetTransactionData(timestamp, txGroupId, reference, senderPublicKey, recipient, amount, assetId, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, senderPublicKey, fee, signature);
return new TransferAssetTransactionData(baseTransactionData, recipient, amount, assetId);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

6
src/main/java/org/qora/transform/transaction/UpdateAssetTransactionTransformer.java
View File

@@ -8,6 +8,7 @@ import java.nio.ByteBuffer;
import org.qora.asset.Asset;
import org.qora.block.BlockChain;
import org.qora.data.transaction.UpdateAssetTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
@@ -71,8 +72,9 @@ public class UpdateAssetTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new UpdateAssetTransactionData(timestamp, txGroupId, reference, ownerPublicKey, assetId, newOwner,
newDescription, newData, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new UpdateAssetTransactionData(baseTransactionData, assetId, newOwner, newDescription, newData);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

7
src/main/java/org/qora/transform/transaction/UpdateGroupTransactionTransformer.java
View File

@@ -7,6 +7,7 @@ import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.UpdateGroupTransactionData;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.group.Group;
import org.qora.group.Group.ApprovalThreshold;
@@ -83,8 +84,10 @@ public class UpdateGroupTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new UpdateGroupTransactionData(timestamp, txGroupId, reference, ownerPublicKey, groupId, newOwner, newDescription, newIsOpen,
newApprovalThreshold, newMinBlockDelay, newMaxBlockDelay, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new UpdateGroupTransactionData(baseTransactionData, groupId, newOwner, newDescription, newIsOpen,
newApprovalThreshold, newMinBlockDelay, newMaxBlockDelay);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/UpdateNameTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.UpdateNameTransactionData;
import org.qora.naming.Name;
@@ -65,7 +66,9 @@ public class UpdateNameTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new UpdateNameTransactionData(timestamp, txGroupId, reference, ownerPublicKey, newOwner, name, newData, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, ownerPublicKey, fee, signature);
return new UpdateNameTransactionData(baseTransactionData, newOwner, name, newData);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {

5
src/main/java/org/qora/transform/transaction/VoteOnPollTransactionTransformer.java
View File

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import org.qora.block.BlockChain;
import org.qora.data.transaction.BaseTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.data.transaction.VoteOnPollTransactionData;
import org.qora.transaction.Transaction.TransactionType;
@@ -63,7 +64,9 @@ public class VoteOnPollTransactionTransformer extends TransactionTransformer {
byte[] signature = new byte[SIGNATURE_LENGTH];
byteBuffer.get(signature);
return new VoteOnPollTransactionData(timestamp, txGroupId, reference, voterPublicKey, pollName, optionIndex, fee, signature);
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, voterPublicKey, fee, signature);
return new VoteOnPollTransactionData(baseTransactionData, pollName, optionIndex);
}
public static int getDataLength(TransactionData transactionData) throws TransformationException {