Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(transfer-tx): Add get token/nftTransfers to public API #200

Merged
merged 1 commit into from
Aug 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 52 additions & 12 deletions Sources/Hedera/TransferTransaction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,34 @@ public final class TransferTransaction: Transaction {
uniquingKeysWith: { (first, second) in first })
}

private var tokenTransfers: [TransferTransaction.TokenTransfer] = [] {
public var tokenTransfers: [TokenId: [AccountId: Int64]] {
Dictionary(
tokenTransfersInner.lazy.map { item in
(
item.tokenId,
Dictionary(
item.transfers.lazy.map { ($0.accountId, $0.amount) },
uniquingKeysWith: { (first, second) in first }
)
)
},
uniquingKeysWith: { (first, second) in first }
)
}

public var tokenNftTransfers: [TokenId: [TokenNftTransfer]] {
Dictionary(
tokenTransfersInner.lazy.map { item in
(
item.tokenId,
item.nftTransfers.map { TokenNftTransfer(nftTransfer: $0, withTokenId: item.tokenId) }
)
},
uniquingKeysWith: { (first, second) in first }
)
}

private var tokenTransfersInner: [TransferTransaction.TokenTransfer] = [] {
willSet {
ensureNotFrozen(fieldName: "tokenTransfers")
}
Expand All @@ -97,7 +124,7 @@ public final class TransferTransaction: Transaction {
internal init(protobuf proto: Proto_TransactionBody, _ data: Proto_CryptoTransferTransactionBody) throws {
// init fields
transfers = try .fromProtobuf(data.transfers.accountAmounts)
tokenTransfers = try .fromProtobuf(data.tokenTransfers)
tokenTransfersInner = try .fromProtobuf(data.tokenTransfers)

try super.init(protobuf: proto)
}
Expand Down Expand Up @@ -187,11 +214,12 @@ public final class TransferTransaction: Transaction {
) -> Self {
let transfer = Transfer(accountId: accountId, amount: amount, isApproval: approved)

if let firstIndex = tokenTransfers.firstIndex(where: { (tokenTransfer) in tokenTransfer.tokenId == tokenId }) {
tokenTransfers[firstIndex].expectedDecimals = expectedDecimals
tokenTransfers[firstIndex].transfers.append(transfer)
if let firstIndex = tokenTransfersInner.firstIndex(where: { (tokenTransfer) in tokenTransfer.tokenId == tokenId
}) {
tokenTransfersInner[firstIndex].expectedDecimals = expectedDecimals
tokenTransfersInner[firstIndex].transfers.append(transfer)
} else {
tokenTransfers.append(
tokenTransfersInner.append(
TokenTransfer(
tokenId: tokenId,
transfers: [transfer],
Expand All @@ -216,12 +244,12 @@ public final class TransferTransaction: Transaction {
isApproval: approved
)

if let index = tokenTransfers.firstIndex(where: { (transfer) in transfer.tokenId == nftId.tokenId }) {
var tmp = tokenTransfers[index]
if let index = tokenTransfersInner.firstIndex(where: { transfer in transfer.tokenId == nftId.tokenId }) {
var tmp = tokenTransfersInner[index]
tmp.nftTransfers.append(transfer)
tokenTransfers[index] = tmp
tokenTransfersInner[index] = tmp
} else {
tokenTransfers.append(
tokenTransfersInner.append(
TokenTransfer(
tokenId: nftId.tokenId,
transfers: [],
Expand All @@ -236,7 +264,7 @@ public final class TransferTransaction: Transaction {

internal override func validateChecksums(on ledgerId: LedgerId) throws {
try transfers.validateChecksums(on: ledgerId)
try tokenTransfers.validateChecksums(on: ledgerId)
try tokenTransfersInner.validateChecksums(on: ledgerId)
try super.validateChecksums(on: ledgerId)
}

Expand Down Expand Up @@ -327,7 +355,7 @@ extension TransferTransaction: ToProtobuf {
internal func toProtobuf() -> Protobuf {
.with { proto in
proto.transfers = .with { $0.accountAmounts = transfers.toProtobuf() }
proto.tokenTransfers = tokenTransfers.toProtobuf()
proto.tokenTransfers = tokenTransfersInner.toProtobuf()
}
}
}
Expand All @@ -337,3 +365,15 @@ extension TransferTransaction {
.cryptoTransfer(toProtobuf())
}
}

extension TokenNftTransfer {
fileprivate init(nftTransfer: TransferTransaction.NftTransfer, withTokenId tokenId: TokenId) {
self.init(
tokenId: tokenId,
sender: nftTransfer.senderAccountId,
receiver: nftTransfer.receiverAccountId,
serial: nftTransfer.serial,
isApproved: nftTransfer.isApproval
)
}
}