Merge pull request #162 from manishdait/improve-transaction-info

feat: Added more functionality to TransactionRepository and TransactionInfo

Author: hendrikebbers

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/BalanceModification.java

@@ -0,0 +1,6 @@
+package com.openelements.hiero.base.data;
+
+public enum BalanceModification {
+    CREDIT,
+    DEBIT
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/NftTransfer.java

@@ -0,0 +1,18 @@
+package com.openelements.hiero.base.data;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.hedera.hashgraph.sdk.TokenId;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
+import java.util.Objects;
+
+public record NftTransfer(
+        boolean isApproval,
+        @Nullable AccountId receiverAccountId,
+        @Nullable AccountId senderAccountId,
+        long serialNumber,
+        @Nullable TokenId tokenId
+) {
+    public NftTransfer {}
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/Result.java

@@ -0,0 +1,6 @@
+package com.openelements.hiero.base.data;
+
+public enum Result {
+    SUCCESS,
+    FAIL
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/StakingRewardTransfer.java

@@ -0,0 +1,15 @@
+package com.openelements.hiero.base.data;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import org.jspecify.annotations.NonNull;
+
+import java.util.Objects;
+
+public record StakingRewardTransfer(
+        @NonNull AccountId account,
+        long amount
+) {
+    public StakingRewardTransfer {
+        Objects.requireNonNull(account, "account cannot be null");
+    }
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/TokenTransfer.java

@@ -0,0 +1,19 @@
+package com.openelements.hiero.base.data;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import com.hedera.hashgraph.sdk.TokenId;
+import org.jspecify.annotations.NonNull;
+
+import java.util.Objects;
+
+public record TokenTransfer(
+        @NonNull TokenId tokenId,
+        @NonNull AccountId account,
+        long amount,
+        boolean isApproval
+) {
+    public TokenTransfer {
+        Objects.requireNonNull(tokenId, "tokenId cannot be null");
+        Objects.requireNonNull(account, "account cannot be null");
+    }
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/TransactionInfo.java

@@ -1,11 +1,47 @@
 package com.openelements.hiero.base.data;
 
+import java.time.Instant;
+import java.util.List;
 import java.util.Objects;
+
+import com.openelements.hiero.base.protocol.data.TransactionType;
 import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 
-public record TransactionInfo(@NonNull String transactionId) {
+public record TransactionInfo(
+        @NonNull String transactionId,
+        byte[] bytes,
+        long chargedTxFee,
+        @NonNull Instant consensusTimestamp,
+        @Nullable String entityId,
+        @NonNull String maxFee,
+        byte[] memo,
+        @NonNull TransactionType name,
+        @NonNull List<NftTransfer> nftTransfers,
+        @Nullable String node,
+        int nonce,
+        @Nullable Instant parentConsensusTimestamp,
+        @NonNull String result,
+        boolean scheduled,
+        @NonNull List<StakingRewardTransfer> stakingRewardTransfers,
+        @NonNull List<TokenTransfer> tokenTransfers,
+        byte[] transactionHash,
+        @NonNull List<Transfer> transfers,
+        @NonNull String validDurationSeconds,
+        @NonNull Instant validStartTimestamp
 
+) {
     public TransactionInfo {
         Objects.requireNonNull(transactionId, "transactionId must not be null");
+        Objects.requireNonNull(consensusTimestamp, "consensusTimestamp must not be null");
+        Objects.requireNonNull(maxFee, "maxFee must not be null");
+        Objects.requireNonNull(name, "name must not be null");
+        Objects.requireNonNull(nftTransfers, "nftTransfers must not be null");
+        Objects.requireNonNull(stakingRewardTransfers, "stakingRewardTransfers must not be null");
+        Objects.requireNonNull(tokenTransfers, "tokenTransfers must not be null");
+        Objects.requireNonNull(transfers, "transfers must not be null");
+        Objects.requireNonNull(validDurationSeconds, "validDurationSeconds must not be null");
+        Objects.requireNonNull(validStartTimestamp, "validStartTimestamp must not be null");
+
     }
 }

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/data/Transfer.java

@@ -0,0 +1,16 @@
+package com.openelements.hiero.base.data;
+
+import com.hedera.hashgraph.sdk.AccountId;
+import org.jspecify.annotations.NonNull;
+
+import java.util.Objects;
+
+public record Transfer(
+        @NonNull AccountId account,
+        long amount,
+        boolean isApproval
+) {
+    public Transfer {
+        Objects.requireNonNull(account, "account cannot be null");
+    }
+}

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/AbstractMirrorNodeClient.java

@@ -11,6 +11,7 @@
 import com.openelements.hiero.base.data.Nft;
 import com.openelements.hiero.base.data.NftMetadata;
 import com.openelements.hiero.base.data.TokenInfo;
+import com.openelements.hiero.base.data.TransactionInfo;
 import com.openelements.hiero.base.mirrornode.MirrorNodeClient;
 import java.util.List;
 import java.util.Objects;
@@ -75,6 +76,13 @@ public final Optional<TokenInfo> queryTokenById(@NonNull TokenId tokenId) throws
         return getJsonConverter().toTokenInfo(json);
     }
 
+    @Override
+    @NonNull
+    public final Optional<TransactionInfo> queryTransaction(@NonNull String transactionId) throws HieroException {
+        final JSON json = getRestClient().queryTransaction(transactionId);
+        return getJsonConverter().toTransactionInfo(json);
+    }
+
     @Override
     public @NonNull Optional<NftMetadata> getNftMetadata(TokenId tokenId) throws HieroException {
         throw new UnsupportedOperationException("Not yet implemented");

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/MirrorNodeJsonConverter.java

@@ -35,6 +35,9 @@ public interface MirrorNodeJsonConverter<JSON> {
     @NonNull
     List<NetworkFee> toNetworkFees(@NonNull JSON json);
 
+    @NonNull
+    Optional<TransactionInfo> toTransactionInfo(@NonNull JSON json);
+
     @NonNull
     List<TransactionInfo> toTransactionInfos(@NonNull JSON json);
 

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/TransactionRepositoryImpl.java

@@ -2,12 +2,16 @@
 
 import com.hedera.hashgraph.sdk.AccountId;
 import com.openelements.hiero.base.HieroException;
+import com.openelements.hiero.base.data.BalanceModification;
+import com.openelements.hiero.base.data.Result;
 import com.openelements.hiero.base.mirrornode.TransactionRepository;
 import com.openelements.hiero.base.mirrornode.MirrorNodeClient;
 import com.openelements.hiero.base.data.Page;
 import com.openelements.hiero.base.data.TransactionInfo;
 import java.util.Objects;
 import java.util.Optional;
+
+import com.openelements.hiero.base.protocol.data.TransactionType;
 import org.jspecify.annotations.NonNull;
 
 
@@ -25,6 +29,30 @@ public Page<TransactionInfo> findByAccount(@NonNull final AccountId accountId) t
         return this.mirrorNodeClient.queryTransactionsByAccount(accountId);
     }
 
+    @Override
+    public @NonNull Page<TransactionInfo> findByAccountAndType(@NonNull AccountId accountId, @NonNull TransactionType type)
+            throws HieroException {
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        Objects.requireNonNull(type, "type must not be null");
+        return mirrorNodeClient.queryTransactionsByAccountAndType(accountId, type);
+    }
+
+    @Override
+    public @NonNull Page<TransactionInfo> findByAccountAndResult(@NonNull AccountId accountId, @NonNull Result result)
+            throws HieroException {
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        Objects.requireNonNull(result, "result must not be null");
+        return mirrorNodeClient.queryTransactionsByAccountAndResult(accountId, result);
+    }
+
+    @Override
+    public @NonNull Page<TransactionInfo> findByAccountAndModification(@NonNull AccountId accountId, @NonNull BalanceModification type)
+            throws HieroException {
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        Objects.requireNonNull(type, "type must not be null");
+        return mirrorNodeClient.queryTransactionsByAccountAndModification(accountId, type);
+    }
+
     @NonNull
     @Override
     public Optional<TransactionInfo> findById(@NonNull final String transactionId) throws HieroException {