fix: get fee by getFeeForMessage

iotexproject · Dec 12, 2024 · 0090cd6 · 0090cd6
1 parent d0a2d61
commit 0090cd6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Sources/SolanaSwift/APIClient/SolanaAPIClient.swift b/Sources/SolanaSwift/APIClient/SolanaAPIClient.swift
@@ -121,6 +121,9 @@ public protocol SolanaAPIClient {
     ///
     func getFees(commitment: Commitment?) async throws -> Fee
 
+    // getFees is Deprecated
+    func getFeeForMessage(message: String, commitment: Commitment?) async throws -> FeeForMessage
+
     /// Returns minimum balance required to make account rent exempt
     /// - Parameters:
     ///  - dataLength: account data length

diff --git a/Sources/SolanaSwift/BlockchainClient/BlockchainClient.swift b/Sources/SolanaSwift/BlockchainClient/BlockchainClient.swift
@@ -29,24 +29,26 @@ public class BlockchainClient: SolanaBlockchainClient {
     ) async throws -> PreparedTransaction {
         // form transaction
         var transaction = Transaction(instructions: instructions, recentBlockhash: nil, feePayer: feePayer)
-
+        var blockhash = try await apiClient.getRecentBlockhash()
+        transaction.recentBlockhash = blockhash
+
         let feeCalculator: FeeCalculator
         if let fc = fc {
             feeCalculator = fc
         } else {
-            let lps = try? await apiClient.getFees(commitment: nil).feeCalculator?.lamportsPerSignature
+            let message = try transaction.serializeMessage().base64EncodedString()
+            let feeForMessage = try await apiClient.getFeeForMessage(message: message, commitment: nil)
             let minRentExemption = try await apiClient.getMinimumBalanceForRentExemption(span: 165)
-            let lamportsPerSignature = lps ?? 5000
+            let lamportsPerSignature = feeForMessage ?? 5000
             feeCalculator = DefaultFeeCalculator(
                 lamportsPerSignature: lamportsPerSignature,
                 minRentExemption: minRentExemption
             )
         }
-        let blockhash = try await apiClient.getRecentBlockhash()
+        blockhash = try await apiClient.getRecentBlockhash()
         transaction.recentBlockhash = blockhash
-
+        
         let expectedFee = try feeCalculator.calculateNetworkFee(transaction: transaction)
-
         // if any signers, sign
         if !signers.isEmpty {
             try transaction.sign(signers: signers)

diff --git a/Sources/SolanaSwift/Models/Models.swift b/Sources/SolanaSwift/Models/Models.swift
@@ -104,9 +104,7 @@ public struct Fee: Decodable {
     public let lastValidSlot: UInt64?
 }
 
-public struct FeeForMessage: Decodable {
-    public let value: UInt64?
-}
+public typealias FeeForMessage = UInt64?
 
 public struct FeeCalculatorResponse: Decodable {
     public let lamportsPerSignature: Lamports