fix: upgrade swift_numberkit and remove UInt64 casts

hashgraph · Sep 17, 2024 · 5b160d8 · 5b160d8
1 parent 346f855
commit 5b160d8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 27 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -221,8 +221,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/objecthub/swift-numberkit.git",
       "state" : {
-        "revision" : "0f9c918dcea73f6ff4ff762b8e83a0991ca668d9",
-        "version" : "2.4.2"
+        "revision" : "33af3f9011e45dcd8ee696492d30dbcd5a8a67f3",
+        "version" : "2.6.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -85,7 +85,7 @@ let package = Package(
         .library(name: "Hedera", targets: ["Hedera"])
     ],
     dependencies: [
-        .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.4.1"),
+        .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.5.1"),
         .package(url: "https://github.com/thebarndog/swift-dotenv.git", from: "1.0.0"),
         .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.23.0"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0"),

diff --git a/Sources/Hedera/CustomFee.swift b/Sources/Hedera/CustomFee.swift
@@ -299,7 +299,7 @@ public struct FractionalFee: CustomFee, Equatable, ValidateChecksums {
 
     /// Create a new `CustomFixedFee`.
     public init(
-        amount: Rational<UInt64> = "1/1",
+        amount: Rational<Int64> = "1/1",
         minimumAmount: UInt64 = 0,
         maximumAmount: UInt64 = 0,
         assessmentMethod: FeeAssessmentMethod = .exclusive,
@@ -320,8 +320,8 @@ public struct FractionalFee: CustomFee, Equatable, ValidateChecksums {
         feeCollectorAccountId: AccountId?,
         allCollectorsAreExempt: Bool
     ) {
-        denominator = UInt64(proto.fractionalAmount.denominator)
-        numerator = UInt64(proto.fractionalAmount.numerator)
+        denominator = proto.fractionalAmount.denominator
+        numerator = proto.fractionalAmount.numerator
         minimumAmount = UInt64(proto.minimumAmount)
         maximumAmount = UInt64(proto.maximumAmount)
         assessmentMethod = .init(netOfTransfers: proto.netOfTransfers)
@@ -330,7 +330,7 @@ public struct FractionalFee: CustomFee, Equatable, ValidateChecksums {
     }
 
     /// The fraction of the transferred units to assess as a fee.
-    public var amount: Rational<UInt64> {
+    public var amount: Rational<Int64> {
         get {
             Rational(numerator, denominator)
         }
@@ -341,14 +341,14 @@ public struct FractionalFee: CustomFee, Equatable, ValidateChecksums {
     }
 
     /// Denominator of `amount`
-    public var denominator: UInt64
+    public var denominator: Int64
 
     /// Numerator of `amount`
-    public var numerator: UInt64
+    public var numerator: Int64
 
     /// Sets the fraction of the transferred units to assess as a fee.
     @discardableResult
-    public mutating func amount(_ amount: Rational<UInt64>) -> Self {
+    public mutating func amount(_ amount: Rational<Int64>) -> Self {
         self.amount = amount
 
         return self
@@ -361,7 +361,7 @@ public struct FractionalFee: CustomFee, Equatable, ValidateChecksums {
     ///
     /// - Returns: `self`.
     @discardableResult
-    public mutating func denominator(_ denominator: UInt64) -> Self {
+    public mutating func denominator(_ denominator: Int64) -> Self {
         self.denominator = denominator
 
         return self
@@ -374,7 +374,7 @@ public struct FractionalFee: CustomFee, Equatable, ValidateChecksums {
     ///
     /// - Returns: `self`.
     @discardableResult
-    public mutating func numerator(_ numerator: UInt64) -> Self {
+    public mutating func numerator(_ numerator: Int64) -> Self {
         self.numerator = numerator
 
         return self
@@ -468,7 +468,7 @@ public struct RoyaltyFee: CustomFee, Equatable {
 
     /// Create a new `CustomRoyaltyFee`.
     public init(
-        exchangeValue: Rational<UInt64> = "1/1",
+        exchangeValue: Rational<Int64> = "1/1",
         fallbackFee: FixedFee? = nil,
         feeCollectorAccountId: AccountId? = nil,
         allCollectorsAreExempt: Bool = false
@@ -484,8 +484,8 @@ public struct RoyaltyFee: CustomFee, Equatable {
 
     /// Create a new `CustomRoyaltyFee`
     public init(
-        numerator: UInt64 = 1,
-        denominator: UInt64 = 1,
+        numerator: Int64 = 1,
+        denominator: Int64 = 1,
         fallbackFee: FixedFee? = nil,
         feeCollectorAccountId: AccountId? = nil,
         allCollectorsAreExempt: Bool = false
@@ -504,8 +504,8 @@ public struct RoyaltyFee: CustomFee, Equatable {
     ) {
         let fallbackFee = proto.hasFallbackFee ? proto.fallbackFee : nil
         self.init(
-            numerator: UInt64(proto.exchangeValueFraction.numerator),
-            denominator: UInt64(proto.exchangeValueFraction.denominator),
+            numerator: proto.exchangeValueFraction.numerator,
+            denominator: proto.exchangeValueFraction.denominator,
             fallbackFee: fallbackFee.map { protoFee in
                 FixedFee(fromFee: protoFee, feeCollectorAccountId: nil, allCollectorsAreExempt: false)
             },
@@ -515,7 +515,7 @@ public struct RoyaltyFee: CustomFee, Equatable {
     }
 
     /// The fraction of fungible value exchanged for an NFT to collect as royalty.
-    public var exchangeValue: Rational<UInt64> {
+    public var exchangeValue: Rational<Int64> {
         get {
             Rational(numerator, denominator)
         }
@@ -526,14 +526,14 @@ public struct RoyaltyFee: CustomFee, Equatable {
     }
 
     /// Denominator of `exchangeValue`
-    public var denominator: UInt64
+    public var denominator: Int64
 
     /// Numerator of `exchangeValue`
-    public var numerator: UInt64
+    public var numerator: Int64
 
     /// Sets the fraction of fungible value exchanged for an NFT to collect as royalty.
     @discardableResult
-    public mutating func exchangeValue(_ exchangeValue: Rational<UInt64>) -> Self {
+    public mutating func exchangeValue(_ exchangeValue: Rational<Int64>) -> Self {
         self.exchangeValue = exchangeValue
 
         return self
@@ -546,7 +546,7 @@ public struct RoyaltyFee: CustomFee, Equatable {
     ///
     /// - Returns: `self`.
     @discardableResult
-    public mutating func denominator(_ denominator: UInt64) -> Self {
+    public mutating func denominator(_ denominator: Int64) -> Self {
         self.denominator = denominator
 
         return self
@@ -559,7 +559,7 @@ public struct RoyaltyFee: CustomFee, Equatable {
     ///
     /// - Returns: `self`.
     @discardableResult
-    public mutating func numerator(_ numerator: UInt64) -> Self {
+    public mutating func numerator(_ numerator: Int64) -> Self {
         self.numerator = numerator
 
         return self

diff --git a/Sources/Hedera/Protobufs/Rational+ProtobufCodable.swift b/Sources/Hedera/Protobufs/Rational+ProtobufCodable.swift
@@ -1,17 +1,17 @@
 import HederaProtobufs
 import NumberKit
 
-extension Rational: ProtobufCodable where T == UInt64 {
+extension Rational: ProtobufCodable where T == Int64 {
     internal typealias Protobuf = Proto_Fraction
 
     internal init(protobuf proto: Protobuf) {
-        self.init(UInt64(proto.numerator), UInt64(proto.denominator))
+        self.init(proto.numerator, proto.denominator)
     }
 
     internal func toProtobuf() -> Protobuf {
         .with { proto in
-            proto.numerator = Int64(self.numerator)
-            proto.denominator = Int64(self.denominator)
+            proto.numerator = self.numerator
+            proto.denominator = self.denominator
         }
     }
 }