Merge pull request #1662 from MixinNetwork/bugfix/web3

Fix solana dapp operations

Author: over140

Mixin/Service/Web3/SolanaTransferOperation.swift

@@ -43,7 +43,7 @@ class SolanaTransferOperation: Web3TransferOperation {
     }
 
     func fee(for transaction: Solana.Transaction) async throws -> Fee? {
-        let lamportsPerSignature = try await client.getRecentBlockhash().lamportsPerSignature
+        let lamportsPerSignature: UInt64 = 5000
         guard let tokenCount = transaction.fee(lamportsPerSignature: lamportsPerSignature) else {
             return nil
         }
@@ -57,7 +57,7 @@ class SolanaTransferOperation: Web3TransferOperation {
         do {
             Logger.web3.info(category: "SolanaTransfer", message: "Start")
             let priv = try await TIP.deriveSolanaPrivateKey(pin: pin)
-            let recentBlockhash = try await client.getRecentBlockhash().blockhash
+            let recentBlockhash = try await client.getLatestBlockhash()
             Logger.web3.info(category: "SolanaTransfer", message: "Using blockhash: \(recentBlockhash)")
             guard let blockhash = Data(base58EncodedString: recentBlockhash) else {
                 throw SigningError.invalidBlockhash

Mixin/UserInterface/Controllers/Web3/Model/SolanaRPCClient.swift

@@ -3,11 +3,6 @@ import Alamofire
 
 struct SolanaRPCClient {
 
-    struct RecentBlockhash {
-        let blockhash: String
-        let lamportsPerSignature: UInt64
-    }
-    
     struct ResponseError: Error, Decodable, CustomStringConvertible {
 
         struct Data: Decodable {
@@ -66,32 +61,24 @@ struct SolanaRPCClient {
         return value != nil
     }
 
-    func getRecentBlockhash() async throws -> RecentBlockhash {
+    func getLatestBlockhash() async throws -> String {
 
         struct Result: Decodable {
 
             struct Value: Decodable {
-                
-                struct FeeCalculator: Decodable {
-                    let lamportsPerSignature: UInt64
-                }
-                
                 let blockhash: String
-                let feeCalculator: FeeCalculator
-                
             }
 
             let value: Value
 
         }
 
         let response: Response<Result> = try await post(
-            method: "getRecentBlockhash",
+            method: "getLatestBlockhash",
             params: nil
         )
         let value = try response.getResult().value
-        return RecentBlockhash(blockhash: value.blockhash,
-                               lamportsPerSignature: value.feeCalculator.lamportsPerSignature)
+        return value.blockhash
     }
 
     func sendTransaction(signedTransaction: String) async throws -> String {