HIP-904: Allow autoMaxTokenAssociation to accept -1 & TokenReject

hiero-ledger · Jul 26, 2024 · 6500d03 · 6500d03
1 parent 0a31d43
commit 6500d03
Show file tree

Hide file tree

Showing 41 changed files with 2,590 additions and 477 deletions.
diff --git a/Sources/Hedera/Account/AccountBalance.swift b/Sources/Hedera/Account/AccountBalance.swift
@@ -21,7 +21,7 @@
 import Foundation
 import HederaProtobufs
 
-private struct TokenBalance {
+private struct TokenBalance: Sendable {
     fileprivate let id: TokenId
     fileprivate let balance: UInt64
     fileprivate let decimals: UInt32
@@ -67,11 +67,10 @@ public struct AccountBalance: Sendable {
     /// Token balances for the referenced account.
     ///
     /// This access is *`O(n)`*.
-    @available(*, deprecated, message: "use a mirror query")
     public var tokenBalances: [TokenId: UInt64] { tokenBalancesInner }
 
     // hack to work around deprecated warning
-    private var tokenDecimalsInner: [TokenId: UInt32] {
+    public var tokenDecimalsInner: [TokenId: UInt32] {
         Dictionary(uniqueKeysWithValues: tokensInner.map { ($0.id, $0.decimals) })
     }
 

diff --git a/Sources/Hedera/Account/AccountCreateTransaction.swift b/Sources/Hedera/Account/AccountCreateTransaction.swift
@@ -32,7 +32,7 @@ public final class AccountCreateTransaction: Transaction {
         autoRenewPeriod: Duration? = .days(90),
         autoRenewAccountId: AccountId? = nil,
         accountMemo: String = "",
-        maxAutomaticTokenAssociations: UInt32 = 0,
+        maxAutomaticTokenAssociations: Int32 = 0,
         alias: EvmAddress? = nil,
         stakedAccountId: AccountId? = nil,
         stakedNodeId: UInt64? = nil,
@@ -59,7 +59,7 @@ public final class AccountCreateTransaction: Transaction {
         self.receiverSignatureRequired = data.receiverSigRequired
         self.autoRenewPeriod = data.hasAutoRenewPeriod ? .fromProtobuf(data.autoRenewPeriod) : nil
         self.accountMemo = data.memo
-        self.maxAutomaticTokenAssociations = UInt32(data.maxAutomaticTokenAssociations)
+        self.maxAutomaticTokenAssociations = data.maxAutomaticTokenAssociations
 
         if let id = data.stakedID {
             switch id {
@@ -175,15 +175,15 @@ public final class AccountCreateTransaction: Transaction {
     }
 
     /// The maximum number of tokens that an Account can be implicitly associated with.
-    public var maxAutomaticTokenAssociations: UInt32 {
+    public var maxAutomaticTokenAssociations: Int32 {
         willSet {
             ensureNotFrozen()
         }
     }
 
     /// Sets the maximum number of tokens that an Account can be implicitly associated with.
     @discardableResult
-    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: UInt32) -> Self {
+    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: Int32) -> Self {
         self.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
 
         return self
@@ -288,7 +288,7 @@ extension AccountCreateTransaction: ToProtobuf {
             autoRenewPeriod?.toProtobufInto(&proto.autoRenewPeriod)
             // autoRenewAccountId?.toProtobufInto(&proto.autoRenewAccount)
             proto.memo = accountMemo
-            proto.maxAutomaticTokenAssociations = Int32(maxAutomaticTokenAssociations)
+            proto.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
 
             if let alias = alias {
                 proto.alias = alias.data

diff --git a/Sources/Hedera/Account/AccountInfo.swift b/Sources/Hedera/Account/AccountInfo.swift
@@ -44,7 +44,7 @@ public struct AccountInfo: Sendable {
         autoRenewPeriod: Duration?,
         accountMemo: String,
         ownedNfts: UInt64,
-        maxAutomaticTokenAssociations: UInt32,
+        maxAutomaticTokenAssociations: Int32,
         aliasKey: PublicKey?,
         ethereumNonce: UInt64,
         ledgerId: LedgerId,
@@ -140,7 +140,7 @@ public struct AccountInfo: Sendable {
     public let ownedNfts: UInt64
 
     /// The maximum number of tokens that an Account can be implicitly associated with.
-    public let maxAutomaticTokenAssociations: UInt32
+    public let maxAutomaticTokenAssociations: Int32
 
     /// The public key which aliases to this account.
     public let aliasKey: PublicKey?
@@ -193,7 +193,7 @@ extension AccountInfo: TryProtobufCodable {
             autoRenewPeriod: .fromProtobuf(autoRenewPeriod),
             accountMemo: proto.memo,
             ownedNfts: UInt64(proto.ownedNfts),
-            maxAutomaticTokenAssociations: UInt32(proto.maxAutomaticTokenAssociations),
+            maxAutomaticTokenAssociations: proto.maxAutomaticTokenAssociations,
             aliasKey: try .fromAliasBytes(proto.alias),
             ethereumNonce: UInt64(proto.ethereumNonce),
             ledgerId: .fromBytes(proto.ledgerID),
@@ -217,7 +217,7 @@ extension AccountInfo: TryProtobufCodable {
             autoRenewPeriod?.toProtobufInto(&proto.autoRenewPeriod)
             proto.memo = accountMemo
             proto.ownedNfts = Int64(ownedNfts)
-            proto.maxAutomaticTokenAssociations = Int32(maxAutomaticTokenAssociations)
+            proto.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
             proto.alias = aliasKey?.toProtobufBytes() ?? Data()
             proto.ethereumNonce = Int64(ethereumNonce)
             proto.ledgerID = ledgerId.bytes

diff --git a/Sources/Hedera/Account/AccountUpdateTransaction.swift b/Sources/Hedera/Account/AccountUpdateTransaction.swift
@@ -73,7 +73,7 @@ public final class AccountUpdateTransaction: Transaction {
         self.accountMemo = data.hasMemo ? data.memo.value : nil
         self.maxAutomaticTokenAssociations =
             data.hasMaxAutomaticTokenAssociations
-            ? UInt32(data.maxAutomaticTokenAssociations.value) : nil
+            ? data.maxAutomaticTokenAssociations.value : nil
         self.stakedAccountId = stakedAccountId
         self.stakedNodeId = stakedNodeId
         self.declineStakingReward = data.hasDeclineReward ? data.declineReward.value : nil
@@ -227,15 +227,15 @@ public final class AccountUpdateTransaction: Transaction {
     }
 
     /// The maximum number of tokens that an Account can be implicitly associated with.
-    public var maxAutomaticTokenAssociations: UInt32? {
+    public var maxAutomaticTokenAssociations: Int32? {
         willSet {
             ensureNotFrozen()
         }
     }
 
     /// Sets the maximum number of tokens that an Account can be implicitly associated with.
     @discardableResult
-    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: UInt32) -> Self {
+    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: Int32) -> Self {
         self.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
 
         return self
@@ -350,7 +350,7 @@ extension AccountUpdateTransaction: ToProtobuf {
 
             if let maxAutomaticTokenAssociations = maxAutomaticTokenAssociations {
                 proto.maxAutomaticTokenAssociations = Google_Protobuf_Int32Value(
-                    Int32(maxAutomaticTokenAssociations))
+                    maxAutomaticTokenAssociations)
             }
 
             if let stakedAccountId = stakedAccountId {

diff --git a/Sources/Hedera/AnyTransaction.swift b/Sources/Hedera/AnyTransaction.swift
@@ -51,6 +51,7 @@ internal enum ServicesTransactionDataList {
     case tokenMint([Proto_TokenMintTransactionBody])
     case tokenPause([Proto_TokenPauseTransactionBody])
     case tokenRevokeKyc([Proto_TokenRevokeKycTransactionBody])
+    case tokenReject([Proto_TokenRejectTransactionBody])
     case tokenUnfreeze([Proto_TokenUnfreezeAccountTransactionBody])
     case tokenUnpause([Proto_TokenUnpauseTransactionBody])
     case tokenUpdate([Proto_TokenUpdateTransactionBody])
@@ -235,6 +236,10 @@ internal enum ServicesTransactionDataList {
             array.append(data)
             self = .tokenUpdateNfts(array)
 
+        case (.tokenReject(var array), .tokenReject(let data)):
+            array.append(data)
+            self = .tokenReject(array)
+
         default:
             throw HError.fromProtobuf("mismatched transaction types")
         }
@@ -302,6 +307,7 @@ extension ServicesTransactionDataList: TryFromProtobuf {
         case .nodeDelete: throw HError.fromProtobuf("Unsupported transaction `NodeDeleteTransaction`")
         case .nodeCreate: throw HError.fromProtobuf("Unsupported transaction `NodeCreateTransaction`")
         case .nodeUpdate: throw HError.fromProtobuf("Unsupported transaction `NodeUpdateTransaction`")
+        case .tokenReject(let data): value = .tokenReject([data])
         }
 
         for transaction in iter {

diff --git a/Sources/Hedera/Contract/ContractCreateFlow.swift b/Sources/Hedera/Contract/ContractCreateFlow.swift
@@ -52,7 +52,7 @@ public final class ContractCreateFlow {
             constructorParameters: Data = Data(),
             gas: UInt64 = 0,
             initialBalance: Hbar = .zero,
-            maxAutomaticTokenAssociations: UInt32 = 0,
+            maxAutomaticTokenAssociations: Int32 = 0,
             declineStakingReward: Bool = false,
             adminKey: Key? = nil,
             autoRenewAccountId: AccountId? = nil,
@@ -79,7 +79,7 @@ public final class ContractCreateFlow {
         fileprivate var constructorParameters: Data
         fileprivate var gas: UInt64
         fileprivate var initialBalance: Hbar
-        fileprivate var maxAutomaticTokenAssociations: UInt32
+        fileprivate var maxAutomaticTokenAssociations: Int32
         fileprivate var declineStakingReward: Bool
         fileprivate var adminKey: Key?
         // fileprivate var proxyAccountId: AccountId?
@@ -220,7 +220,7 @@ public final class ContractCreateFlow {
     }
 
     /// The maximum number of tokens that the contract can be automatically associated with.
-    public var maxAutomaticTokenAssociations: UInt32 {
+    public var maxAutomaticTokenAssociations: Int32 {
         get { contractCreateData.maxAutomaticTokenAssociations }
         set(value) { contractCreateData.maxAutomaticTokenAssociations = value }
     }
@@ -229,7 +229,7 @@ public final class ContractCreateFlow {
     ///
     /// - Returns: `self`
     @discardableResult
-    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: UInt32) -> Self {
+    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: Int32) -> Self {
         self.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
 
         return self

diff --git a/Sources/Hedera/Contract/ContractCreateTransaction.swift b/Sources/Hedera/Contract/ContractCreateTransaction.swift
@@ -56,7 +56,7 @@ public final class ContractCreateTransaction: Transaction {
         autoRenewPeriod: Duration? = .days(90),
         constructorParameters: Data? = nil,
         contractMemo: String = "",
-        maxAutomaticTokenAssociations: UInt32 = 0,
+        maxAutomaticTokenAssociations: Int32 = 0,
         autoRenewAccountId: AccountId? = nil,
         stakedAccountId: AccountId? = nil,
         stakedNodeId: UInt64? = nil,
@@ -117,7 +117,7 @@ public final class ContractCreateTransaction: Transaction {
         self.autoRenewPeriod = .fromProtobuf(data.autoRenewPeriod)
         self.constructorParameters = !data.constructorParameters.isEmpty ? data.constructorParameters : nil
         self.contractMemo = data.memo
-        self.maxAutomaticTokenAssociations = UInt32(data.maxAutomaticTokenAssociations)
+        self.maxAutomaticTokenAssociations = data.maxAutomaticTokenAssociations
         self.autoRenewAccountId = data.hasAutoRenewAccountID ? try .fromProtobuf(data.autoRenewAccountID) : nil
         self.stakedAccountId = stakedAccountId
         self.stakedNodeId = stakedNodeId
@@ -285,15 +285,15 @@ public final class ContractCreateTransaction: Transaction {
     }
 
     /// The maximum number of tokens that this contract can be automatically associated with.
-    public var maxAutomaticTokenAssociations: UInt32 {
+    public var maxAutomaticTokenAssociations: Int32 {
         willSet {
             ensureNotFrozen()
         }
     }
 
     /// Sets the maximum number of tokens that this contract can be automatically associated with.
     @discardableResult
-    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: UInt32) -> Self {
+    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: Int32) -> Self {
         self.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
 
         return self

diff --git a/Sources/Hedera/Contract/ContractInfo.swift b/Sources/Hedera/Contract/ContractInfo.swift
@@ -59,7 +59,7 @@ public struct ContractInfo {
     public let autoRenewAccountId: AccountId?
 
     /// The maximum number of tokens that a contract can be implicitly associated with.
-    public let maxAutomaticTokenAssociations: UInt32
+    public let maxAutomaticTokenAssociations: Int32
 
     /// Ledger ID for the network the response was returned from.
     public let ledgerId: LedgerId
@@ -103,7 +103,7 @@ extension ContractInfo: TryProtobufCodable {
             balance: .fromTinybars(Int64(proto.balance)),
             isDeleted: proto.deleted,
             autoRenewAccountId: try .fromProtobuf(autoRenewAccountId),
-            maxAutomaticTokenAssociations: UInt32(proto.maxAutomaticTokenAssociations),
+            maxAutomaticTokenAssociations: proto.maxAutomaticTokenAssociations,
             ledgerId: .fromBytes(proto.ledgerID),
             stakingInfo: try .fromProtobuf(proto.stakingInfo)
         )
@@ -122,7 +122,7 @@ extension ContractInfo: TryProtobufCodable {
             proto.balance = UInt64(balance.toTinybars())
             proto.deleted = isDeleted
             autoRenewAccountId?.toProtobufInto(&proto.autoRenewAccountID)
-            proto.maxAutomaticTokenAssociations = Int32(maxAutomaticTokenAssociations)
+            proto.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
             proto.ledgerID = ledgerId.bytes
             proto.stakingInfo = stakingInfo.toProtobuf()
         }

diff --git a/Sources/Hedera/Contract/ContractUpdateTransaction.swift b/Sources/Hedera/Contract/ContractUpdateTransaction.swift
@@ -32,7 +32,7 @@ public final class ContractUpdateTransaction: Transaction {
         adminKey: Key? = nil,
         autoRenewPeriod: Duration? = nil,
         contractMemo: String? = nil,
-        maxAutomaticTokenAssociations: UInt32? = nil,
+        maxAutomaticTokenAssociations: Int32? = nil,
         autoRenewAccountId: AccountId? = nil,
         proxyAccountId: AccountId? = nil,
         stakedAccountId: AccountId? = nil,
@@ -87,7 +87,7 @@ public final class ContractUpdateTransaction: Transaction {
         self.autoRenewPeriod = data.hasAutoRenewPeriod ? .fromProtobuf(data.autoRenewPeriod) : nil
         self.contractMemo = memo
         self.maxAutomaticTokenAssociations =
-            data.hasMaxAutomaticTokenAssociations ? UInt32(data.maxAutomaticTokenAssociations.value) : nil
+            data.hasMaxAutomaticTokenAssociations ? data.maxAutomaticTokenAssociations.value : nil
         self.autoRenewAccountId = data.hasAutoRenewAccountID ? try .fromProtobuf(data.autoRenewAccountID) : nil
         self.proxyAccountId = data.hasProxyAccountID ? try .fromProtobuf(data.proxyAccountID) : nil
         self.stakedAccountId = stakedAccountId
@@ -180,15 +180,15 @@ public final class ContractUpdateTransaction: Transaction {
     }
 
     /// The maximum number of tokens that this contract can be automatically associated with.
-    public var maxAutomaticTokenAssociations: UInt32? {
+    public var maxAutomaticTokenAssociations: Int32? {
         willSet {
             ensureNotFrozen()
         }
     }
 
     /// Sets the maximum number of tokens that this contract can be automatically associated with.
     @discardableResult
-    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: UInt32?) -> Self {
+    public func maxAutomaticTokenAssociations(_ maxAutomaticTokenAssociations: Int32?) -> Self {
         self.maxAutomaticTokenAssociations = maxAutomaticTokenAssociations
 
         return self

diff --git a/Sources/Hedera/FeeSchedule/RequestType.swift b/Sources/Hedera/FeeSchedule/RequestType.swift
@@ -256,8 +256,8 @@ public enum RequestType {
     /// Delete a node
     case nodeDelete
 
-    /// Get the info for a node
-    case nodeGetInfo
+    /// Reject a Token
+    case tokenReject
 
     // this literally can't be smaller.
     // swiftlint:disable:next function_body_length
@@ -341,7 +341,7 @@ public enum RequestType {
         case .nodeCreate: self = .nodeCreate
         case .nodeDelete: self = .nodeDelete
         case .nodeUpdate: self = .nodeUpdate
-        case .nodeGetInfo: self = .nodeGetInfo
+        case .tokenReject: self = .tokenReject
 
         case .UNRECOGNIZED(let code):
             throw HError.fromProtobuf("unrecognized RequestType: `\(code)`")
@@ -427,7 +427,7 @@ public enum RequestType {
         case .nodeCreate: return .nodeCreate
         case .nodeUpdate: return .nodeUpdate
         case .nodeDelete: return .nodeDelete
-        case .nodeGetInfo: return .nodeGetInfo
+        case .tokenReject: return .tokenReject
         }
     }
 }
diff --git a/Sources/Hedera/Schedule/ScheduleInfo.swift b/Sources/Hedera/Schedule/ScheduleInfo.swift
@@ -115,6 +115,7 @@ public struct ScheduleInfo: Sendable {
                 case .nodeCreate(let data): proto.data = .nodeCreate(data)
                 case .nodeUpdate(let data): proto.data = .nodeUpdate(data)
                 case .nodeDelete(let data): proto.data = .nodeDelete(data)
+                case .tokenReject(let data): proto.data = .tokenReject(data)
                 case nil: break
                 }