feat: add missing TCK endpoints (#493)

* WIP update Swift tck server

Signed-off-by: Rob Walworth <[email protected]>

* feat: add missing endpoints

Signed-off-by: Rob Walworth <[email protected]>

* refactor: formatting

Signed-off-by: Rob Walworth <[email protected]>

* refactor: please the linter

Signed-off-by: Rob Walworth <[email protected]>

* fix: workflows

Signed-off-by: Rob Walworth <[email protected]>

* fix: add include

Signed-off-by: Rob Walworth <[email protected]>

* fix: trying something

Signed-off-by: Rob Walworth <[email protected]>

* fix: tests

Signed-off-by: Rob Walworth <[email protected]>

* refactor: remove unnecessary imports and better organize

Signed-off-by: Rob Walworth <[email protected]>

---------

Signed-off-by: Rob Walworth <[email protected]>

Author: rwalworth

.github/workflows/swift-ci.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         swift: ["5.9", "5.10"]
-        os: [macos-13, macos-latest]
+        os: [macos-13, macos-14]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -65,7 +65,7 @@ jobs:
     strategy:
       matrix:
         swift: ["5.9", "5.10"]
-        os: [macos-13, macos-latest]
+        os: [macos-13, macos-14]
 
     needs: [build]
     runs-on: ${{ matrix.os }}

Examples/TransferCrypto/main.swift

@@ -13,8 +13,8 @@ internal enum Program {
         client.setOperator(env.operatorAccountId, env.operatorKey)
 
         let transactionResponse = try await TransferTransaction()
-            .hbarTransfer("0.0.1001", 20)
-            .hbarTransfer("0.0.6189", -20)
+            .hbarTransfer(AccountId.fromString("0.0.1001"), 20)
+            .hbarTransfer(AccountId.fromString("0.0.6189"), -20)
             .execute(client)
 
         // either of these values can be used to lookup transactions in an explorer such as

Sources/Hiero/Account/AccountAllowanceApproveTransaction.swift

@@ -91,26 +91,18 @@ public final class AccountAllowanceApproveTransaction: Transaction {
     public func approveTokenNftAllowance(
         _ nftId: NftId,
         _ ownerAccountId: AccountId,
-        _ spenderAccountId: AccountId
+        _ spenderAccountId: AccountId,
+        _ delegatingSpenderAccountId: AccountId? = nil
     ) -> Self {
-        ensureNotFrozen()
-
-        if var allowance = nftAllowances.first(where: { (allowance) in
-            allowance.tokenId == nftId.tokenId && allowance.spenderAccountId == spenderAccountId
-                && allowance.ownerAccountId == ownerAccountId && allowance.approvedForAll == nil
-        }) {
-            allowance.serials.append(nftId.serial)
-        } else {
-            nftAllowances.append(
-                TokenNftAllowance(
-                    tokenId: nftId.tokenId,
-                    ownerAccountId: ownerAccountId,
-                    spenderAccountId: spenderAccountId,
-                    serials: [nftId.serial],
-                    approvedForAll: nil,
-                    delegatingSpenderAccountId: nil
-                ))
-        }
+        nftAllowances.append(
+            TokenNftAllowance(
+                tokenId: nftId.tokenId,
+                ownerAccountId: ownerAccountId,
+                spenderAccountId: spenderAccountId,
+                serials: [nftId.serial],
+                approvedForAll: nil,
+                delegatingSpenderAccountId: delegatingSpenderAccountId
+            ))
 
         return self
     }
@@ -136,6 +128,27 @@ public final class AccountAllowanceApproveTransaction: Transaction {
         return self
     }
 
+    /// Delete the NFT allowance on all serial numbers (present and future).
+    @discardableResult
+    public func deleteTokenNftAllowanceAllSerials(
+        _ tokenId: TokenId,
+        _ ownerAccountId: AccountId,
+        _ spenderAccountId: AccountId
+    ) -> Self {
+
+        nftAllowances.append(
+            TokenNftAllowance(
+                tokenId: tokenId,
+                ownerAccountId: ownerAccountId,
+                spenderAccountId: spenderAccountId,
+                serials: [],
+                approvedForAll: false,
+                delegatingSpenderAccountId: nil
+            ))
+
+        return self
+    }
+
     public func getNftApprovals() -> [TokenNftAllowance] {
         self.nftAllowances
     }

Sources/Hiero/ChunkedTransaction.swift

@@ -127,7 +127,9 @@ public class ChunkedTransaction: Transaction {
                 .executeAll(client, timeoutPerChunk: timeoutPerChunk)
         }
 
-        precondition(self.data.count < self.maxMessageSize, "todo: throw an actual error here")
+        if self.data.count > self.maxMessageSize {
+            throw HError.illegalState("transaction requires \(self.data.count) but only has \(self.maxMessageSize)")
+        }
 
         var responses: [Response] = []
 

Sources/Hiero/File/FileCreateTransaction.swift

@@ -15,7 +15,7 @@ public final class FileCreateTransaction: Transaction {
         fileMemo = data.memo
         keys = try .fromProtobuf(data.keys)
         contents = data.contents
-        expirationTime = data.hasExpirationTime ? .fromProtobuf(data.expirationTime) : nil
+        expirationTime = data.hasExpirationTime ? .fromProtobuf(data.expirationTime) : .now + .days(90)
 
         // hedera doesn't have these currently.
         autoRenewPeriod = nil
@@ -115,7 +115,7 @@ public final class FileCreateTransaction: Transaction {
     }
 
     /// The time at which this file should expire.
-    public var expirationTime: Timestamp? = .now + .days(90) {
+    public var expirationTime: Timestamp = .now + .days(90) {
         willSet {
             ensureNotFrozen(fieldName: "expirationTime")
         }
@@ -158,7 +158,7 @@ extension FileCreateTransaction: ToProtobuf {
             proto.keys = keys.toProtobuf()
             proto.contents = contents
 
-            expirationTime?.toProtobufInto(&proto.expirationTime)
+            expirationTime.toProtobufInto(&proto.expirationTime)
         }
     }
 }

Sources/Hiero/HError.swift

@@ -29,6 +29,7 @@ public struct HError: Error, CustomStringConvertible {
         case cannotCreateChecksum
         case freezeUnsetNodeAccountIds
         case uninitialized
+        case illegalState
     }
 
     public let description: String
@@ -104,6 +105,10 @@ public struct HError: Error, CustomStringConvertible {
     internal static func unitialized(_ description: String) -> Self {
         Self(kind: .uninitialized, description: description)
     }
+
+    internal static func illegalState(_ description: String) -> Self {
+        Self(kind: .illegalState, description: description)
+    }
 }
 
 extension HError: LocalizedError {

Sources/Hiero/Token/AbstractTokenTransferTransaction.swift

@@ -144,7 +144,7 @@ public class AbstractTokenTransferTransaction: Transaction {
     public func approvedTokenTransferWithDecimals(
         _ tokenId: TokenId, _ accountId: AccountId, _ amount: Int64, _ expectedDecimals: UInt32
     ) -> Self {
-        doTokenTransferWithDecimals(tokenId, accountId, amount, false, expectedDecimals)
+        doTokenTransferWithDecimals(tokenId, accountId, amount, true, expectedDecimals)
     }
 
     /// Add a non-approved nft transfer to the transaction.

Sources/Hiero/Token/TokenAllowance.swift

@@ -30,7 +30,7 @@ extension TokenAllowance: TryProtobufCodable {
             proto.tokenID = tokenId.toProtobuf()
             proto.owner = ownerAccountId.toProtobuf()
             proto.spender = spenderAccountId.toProtobuf()
-            proto.amount = Int64(amount)
+            proto.amount = Int64(truncatingIfNeeded: amount)
         }
     }
 }

Sources/Hiero/TransferTransaction.swift

@@ -42,6 +42,12 @@ public final class TransferTransaction: AbstractTokenTransferTransaction {
         doHbarTransfer(accountId, amount.toTinybars(), false)
     }
 
+    /// Add a non-approved hbar transfer to the transaction.
+    @discardableResult
+    public func hbarTransfer(_ evmAddress: EvmAddress, _ amount: Hbar) -> Self {
+        doHbarTransfer(AccountId.fromEvmAddress(evmAddress), amount.toTinybars(), false)
+    }
+
     /// Add an approved hbar transfer to the transaction.
     @discardableResult
     public func approvedHbarTransfer(_ accountId: AccountId, _ amount: Hbar) -> Self {
@@ -53,6 +59,18 @@ public final class TransferTransaction: AbstractTokenTransferTransaction {
         _ amount: Int64,
         _ approved: Bool
     ) -> Self {
+        for (index, transfer) in transfers.enumerated()
+        where transfer.accountId == accountId && transfer.isApproval == approved {
+            let newTinybars = transfer.amount + amount
+            if newTinybars == 0 {
+                transfers.remove(at: index)
+            } else {
+                transfers[index].amount = newTinybars
+            }
+
+            return self
+        }
+
         transfers.append(Transfer(accountId: accountId, amount: amount, isApproval: approved))
 
         return self

Sources/Hiero/Version.swift

@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: Apache-2.0
 public enum VersionInfo {
-    public static let version = "v0.40.0-12-gd45ff38"
+    public static let version = "v0.42.0-dev"
 }