Fix brave/brave-ios#7242: Bump BraveCore to v1.51.110 (brave/brave-io…

…s#7377)

Sources/Brave/Frontend/Rewards/BraveRewards.swift

@@ -64,37 +64,40 @@ public class BraveRewards: NSObject {
     ledger?.initializeLedgerService { [weak self] in
       guard let self = self, let ledger = self.ledger else { return }
       if self.ads.isEnabled {
-        if self.ads.isAdsServiceRunning() {
-          self.updateAdsWithWalletInfo()
-        } else {
-          self.ads.initialize { success in
-            if success {
-              self.updateAdsWithWalletInfo()
-            }
-          }
-        }
+        self.fetchWalletAndInitializeAds()
       }
       self.ledgerServiceDidStart?(ledger)
       completion?()
     }
   }
 
-  private func updateAdsWithWalletInfo() {
+  private(set) var isAdsInitialized: Bool = false
+  private func fetchWalletAndInitializeAds() {
+    if isAdsInitialized {
+      return
+    }
+    isAdsInitialized = true
     guard let ledger = ledger else { return }
     ledger.currentWalletInfo { wallet in
-      guard let wallet = wallet else { return }
-      let seed = wallet.recoverySeed.map(\.uint8Value)
-      self.ads.updateWalletInfo(
-        wallet.paymentId,
-        base64Seed: Data(seed).base64EncodedString()
-      )
+      if let wallet = wallet {
+        let seed = wallet.recoverySeed.map(\.uint8Value)
+        self.ads.updateWalletInfo(
+          wallet.paymentId,
+          base64Seed: Data(seed).base64EncodedString()
+        )
+      }
+      self.ads.initialize() { success in
+        if !success {
+          self.isAdsInitialized = false
+        }
+      }
     }
   }
 
   private var braveNewsObservation: AnyCancellable?
 
   private var shouldShutdownAds: Bool {
-    ads.isAdsServiceRunning() && !ads.isEnabled && !Preferences.BraveNews.isEnabled.value
+    ads.isAdsServiceRunning() && isAdsInitialized && !ads.isEnabled && !Preferences.BraveNews.isEnabled.value
   }
 
   /// Propose that the ads service should be shutdown based on whether or not that all features
@@ -103,6 +106,7 @@ public class BraveRewards: NSObject {
     if !shouldShutdownAds { return }
     ads.shutdown {
       self.ads = BraveAds(stateStoragePath: self.configuration.storageURL.appendingPathComponent("ads").path)
+      self.isAdsInitialized = false
     }
   }
 
@@ -130,15 +134,7 @@ public class BraveRewards: NSObject {
         if !newValue {
           self.proposeAdsShutdown()
         } else {
-          if self.ads.isAdsServiceRunning() {
-            self.updateAdsWithWalletInfo()
-          } else {
-            self.ads.initialize { success in
-              if success {
-                self.updateAdsWithWalletInfo()
-              }
-            }
-          }
+          self.fetchWalletAndInitializeAds()
         }
         self.didChangeValue(for: \.isEnabled)
       }
@@ -165,7 +161,7 @@ public class BraveRewards: NSObject {
     try? FileManager.default.removeItem(
       at: configuration.storageURL.appendingPathComponent("ledger")
     )
-    if ads.isAdsServiceRunning(), !Preferences.BraveNews.isEnabled.value {
+    if ads.isAdsServiceRunning(), isAdsInitialized, !Preferences.BraveNews.isEnabled.value {
       ads.shutdown { [self] in
         try? FileManager.default.removeItem(
           at: configuration.storageURL.appendingPathComponent("ads")

Sources/BraveWallet/Preview Content/MockJsonRpcService.swift

@@ -214,6 +214,10 @@ class MockJsonRpcService: BraveWalletJsonRpcService {
   func ensGetContentHash(_ domain: String, completion: @escaping ([NSNumber], Bool, BraveWallet.ProviderError, String) -> Void) {
     completion([], false, .internalError, "Error Message")
   }
+
+  func isSolanaBlockhashValid(_ chainId: String, blockhash: String, commitment: String?, completion: @escaping (Bool, BraveWallet.SolanaProviderError, String) -> Void) {
+    completion(true, .success, "")
+  }
 }
 
 extension BraveWallet.NetworkInfo {

package.json

@@ -12,7 +12,7 @@
   "license": "MPL-2.0",
   "dependencies": {
     "@mozilla/readability": "^0.4.2",
-    "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.51.104/brave-core-ios-1.51.104.tgz",
+    "brave-core-ios": "https://github.com/brave/brave-browser/releases/download/v1.51.110/brave-core-ios-1.51.110.tgz",
     "leo-sf-symbols": "github:brave/leo-sf-symbols#b66549a239c5d4d9db1bdcc0b847d5b1f1762e10",
     "page-metadata-parser": "^1.1.3",
     "webpack-cli": "^4.8.0"