Fix baking and delegation on P6

(cherry picked from commit 5530963)
Concordium · Jul 28, 2023 · adefa76 · adefa76
1 parent 3f2bb25
commit adefa76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/ConcordiumWallet/Model/AutoGenerated/GASRewards.swift b/ConcordiumWallet/Model/AutoGenerated/GASRewards.swift
@@ -10,13 +10,11 @@ struct GASRewards: Codable {
     let chainUpdate: Double
     let accountCreation: Double
     let baker: Double
-    let finalizationProof: Double
 
     enum CodingKeys: String, CodingKey {
         case chainUpdate = "chainUpdate"
         case accountCreation = "accountCreation"
         case baker = "baker"
-        case finalizationProof = "finalizationProof"
     }
 }
 
@@ -41,14 +39,12 @@ extension GASRewards {
     func with(
         chainUpdate: Double? = nil,
         accountCreation: Double? = nil,
-        baker: Double? = nil,
-        finalizationProof: Double? = nil
+        baker: Double? = nil
     ) -> GASRewards {
         return GASRewards(
             chainUpdate: chainUpdate ?? self.chainUpdate,
             accountCreation: accountCreation ?? self.accountCreation,
-            baker: baker ?? self.baker,
-            finalizationProof: finalizationProof ?? self.finalizationProof
+            baker: baker ?? self.baker
         )
     }
 

diff --git a/ConcordiumWallet/Model/AutoGenerated/MakeCreateTransferRequest.swift b/ConcordiumWallet/Model/AutoGenerated/MakeCreateTransferRequest.swift
@@ -19,7 +19,7 @@ struct MakeCreateTransferRequest: Codable {
     let metadataURL: String?
     let transactionFeeCommission: Double?
     let bakingRewardCommission: Double?
-    let finalizationRewardCommission: Double?
+    let finalizationRewardCommission: String?
     let bakerKeys: GeneratedBakerKeys?
     let keys: AccountKeys?
     let energy: Int?
@@ -85,7 +85,7 @@ extension MakeCreateTransferRequest {
         metadataURL: String?? = nil,
         transactionFeeCommission: Double?? = nil,
         bakingRewardCommission: Double?? = nil,
-        finalizationRewardCommission: Double?? = nil,
+        finalizationRewardCommission: String?? = nil,
         bakerKeys: GeneratedBakerKeys?? = nil,
         keys: AccountKeys?? = nil,
         energy: Int?? = nil,

diff --git a/ConcordiumWallet/Service/MobileWallet.swift b/ConcordiumWallet/Service/MobileWallet.swift
@@ -260,7 +260,7 @@ class MobileWallet: MobileWalletProtocol {
                                                                   metadataURL: metadataURL,
                                                                   transactionFeeCommission: transactionFeeCommission,
                                                                   bakingRewardCommission: bakingRewardCommission,
-                                                                  finalizationRewardCommission: finalizationRewardCommission,
+                                                                  finalizationRewardCommission: finalizationRewardCommission?.string,
                                                                   bakerKeys: bakerKeys,
                                                                   keys: privateAccountKeys,
                                                                   energy: energy,