Fixes brave/brave-browser#3697

Removed comment

Moved corrupt wallet check after state files load

Removed extension value

Addressing comments

Run sanity check on panel open to check wallet state.

lint

Author: Jason Sadler

common/extensions/api/brave_rewards.json

@@ -257,6 +257,12 @@
         "description": "Fired when wallet creation failed",
         "parameters": []
       },
+      {
+        "name": "onWalletCorrupted",
+        "type": "function",
+        "description": "Fired when wallet is corrupt",
+        "parameters": []
+      },
       {
         "name": "onPublisherListNormalized",
         "type": "function",

components/brave_rewards/browser/extension_rewards_service_observer.cc

@@ -44,6 +44,12 @@ void ExtensionRewardsServiceObserver::OnWalletInitialized(
         extensions::api::brave_rewards::OnWalletCreated::kEventName,
         std::move(args)));
       event_router->BroadcastEvent(std::move(event));
+    } else if (result == ledger::Result::CORRUPTED_WALLET) {
+      std::unique_ptr<extensions::Event> event(new extensions::Event(
+        extensions::events::BRAVE_START,
+        extensions::api::brave_rewards::OnWalletCorrupted::kEventName,
+        std::move(args)));
+      event_router->BroadcastEvent(std::move(event));
     } else if (result != ledger::Result::LEDGER_OK) {
       std::unique_ptr<extensions::Event> event(new extensions::Event(
         extensions::events::BRAVE_WALLET_FAILED,
@@ -60,6 +66,14 @@ void ExtensionRewardsServiceObserver::OnWalletProperties(
     std::unique_ptr<brave_rewards::WalletProperties> wallet_properties) {
   auto* event_router =
       extensions::EventRouter::Get(profile_);
+  if (error_code == 17) {  // ledger::Result::CORRUPT_WALLET
+    std::unique_ptr<base::ListValue> args(new base::ListValue());
+    std::unique_ptr<extensions::Event> event(new extensions::Event(
+        extensions::events::BRAVE_START,
+        extensions::api::brave_rewards::OnWalletCorrupted::kEventName,
+        std::move(args)));
+    event_router->BroadcastEvent(std::move(event));
+  }
   if (event_router && wallet_properties) {
     extensions::api::brave_rewards::OnWalletProperties::Properties properties;
 

components/brave_rewards/resources/extension/brave_rewards/actions/rewards_panel_actions.ts

@@ -13,6 +13,8 @@ export const onWalletCreated = () => action(types.ON_WALLET_CREATED, {})
 
 export const onWalletCreateFailed = () => action(types.ON_WALLET_CREATE_FAILED, {})
 
+export const onWalletCorrupted = () => action(types.ON_WALLET_CORRUPTED)
+
 export const onTabId = (tabId: number | undefined) => action(types.ON_TAB_ID, {
   tabId
 })

components/brave_rewards/resources/extension/brave_rewards/background/events/rewardsEvents.ts

@@ -63,6 +63,10 @@ chrome.braveRewards.onWalletFailed.addListener(() => {
   rewardsPanelActions.onWalletCreateFailed()
 })
 
+chrome.braveRewards.onWalletCorrupted.addListener(() => {
+  rewardsPanelActions.onWalletCorrupted()
+})
+
 chrome.braveRewards.onPublisherListNormalized.addListener((properties: RewardsExtension.PublisherNormalized[]) => {
   rewardsPanelActions.onPublisherListNormalized(properties)
 })

components/brave_rewards/resources/extension/brave_rewards/background/reducers/rewards_panel_reducer.ts

@@ -39,12 +39,14 @@ export const rewardsPanelReducer = (state: RewardsExtension.State | undefined, a
       state.walletCreating = true
       state.walletCreateFailed = false
       state.walletCreated = false
+      state.walletCorrupted = false
       break
     case types.ON_WALLET_CREATED:
       state = { ...state }
       state.walletCreated = true
       state.walletCreateFailed = false
       state.walletCreating = false
+      state.walletCorrupted = false
       chrome.braveRewards.saveAdsSetting('adsEnabled', 'true')
       chrome.storage.local.get(['is_dismissed'], function (result) {
         if (result && result['is_dismissed'] === 'false') {
@@ -60,6 +62,11 @@ export const rewardsPanelReducer = (state: RewardsExtension.State | undefined, a
       state.walletCreateFailed = true
       state.walletCreating = false
       state.walletCreated = false
+      state.walletCorrupted = false
+      break
+    case types.ON_WALLET_CORRUPTED:
+      state = { ...state }
+      state.walletCorrupted = true
       break
     case types.ON_TAB_ID:
       if (payload.tabId) {

components/brave_rewards/resources/extension/brave_rewards/background/storage.ts

@@ -8,6 +8,7 @@ import { debounce } from '../../../../../common/debounce'
 const keyName = 'rewards-panel-data'
 
 export const defaultState: RewardsExtension.State = {
+  walletCorrupted: false,
   walletCreated: false,
   walletCreating: false,
   walletCreateFailed: false,

components/brave_rewards/resources/extension/brave_rewards/components/app.tsx

@@ -193,13 +193,14 @@ export class RewardsPanel extends React.Component<Props, State> {
       walletCreateFailed,
       walletCreated,
       walletCreating,
-      walletProperties
+      walletProperties,
+      walletCorrupted
     } = this.props.rewardsPanelData
 
     const { balance, grants, rates } = walletProperties
     const converted = utils.convertBalance(balance.toString(), rates)
 
-    if (!walletCreated) {
+    if (!walletCreated || walletCorrupted) {
       return (
         <PanelWelcome
           error={walletCreateFailed}

components/brave_rewards/resources/extension/brave_rewards/constants/rewards_panel_types.ts

@@ -6,6 +6,7 @@ export const enum types {
   CREATE_WALLET = '@@rewards_panel/CREATE_WALLET',
   ON_WALLET_CREATED = '@@rewards_panel/ON_WALLET_CREATED',
   ON_WALLET_CREATE_FAILED = '@@rewards_panel/ON_WALLET_CREATE_FAILED',
+  ON_WALLET_CORRUPTED = '@@rewards_panel/ON_WALLET_CORRUPTED',
   ON_TAB_ID = '@@rewards_panel/ON_TAB_ID',
   ON_TAB_RETRIEVED = '@@rewards_panel/ON_TAB_RETRIEVED',
   ON_PUBLISHER_DATA = '@@rewards_panel/ON_PUBLISHER_DATA',

components/definitions/chromel.d.ts

@@ -56,6 +56,9 @@ declare namespace chrome.braveRewards {
   const onWalletFailed: {
     addListener: (callback: () => void) => void
   }
+  const onWalletCorrupted: {
+    addListener: (callback: () => void) => void
+  }
   const getACEnabled: (callback: (enabled: boolean) => void) => {}
   const onPublisherListNormalized: {
     addListener: (callback: (properties: RewardsExtension.PublisherNormalized[]) => void) => void

components/definitions/rewardsExtensions.d.ts

@@ -9,6 +9,7 @@ declare namespace RewardsExtension {
     report: Report
     grants?: GrantInfo[]
     pendingContributionTotal: number
+    walletCorrupted: boolean
     walletCreated: boolean
     walletCreating: boolean
     walletCreateFailed: boolean

vendor/bat-native-ledger/src/bat/ledger/internal/bat_client.cc

@@ -7,6 +7,8 @@
 #include <ctime>
 #include <sstream>
 #include <map>
+#include <memory>
+#include <utility>
 
 #include "bat/ledger/internal/bat_client.h"
 #include "bat/ledger/internal/bat_helper.h"
@@ -313,7 +315,6 @@ void BatClient::WalletPropertiesCallback(
 
 std::string BatClient::getWalletPassphrase() const {
   braveledger_bat_helper::WALLET_INFO_ST wallet_info = ledger_->GetWalletInfo();
-  DCHECK(wallet_info.keyInfoSeed_.size());
   std::string passPhrase;
   if (wallet_info.keyInfoSeed_.size() == 0) {
     return passPhrase;
@@ -376,7 +377,7 @@ void BatClient::OnNicewareListLoaded(const std::string& pass_phrase,
 }
 
 void BatClient::continueRecover(int result,
-                                size_t *written,
+                                size_t* written,
                                 const std::vector<uint8_t>& newSeed) {
   if (result != 0 || *written == 0) {
     BLOG(ledger_, ledger::LogLevel::LOG_INFO)
@@ -480,6 +481,15 @@ ledger_->LogResponse(__func__, response_status_code, response, headers);
 
 void BatClient::getGrants(const std::string& lang,
                           const std::string& forPaymentId) {
+  // make sure wallet/client state is sane here as this is the first
+  // panel call.
+  const std::string& wallet_payment_id = ledger_->GetPaymentId();
+  const std::string& passphrase = ledger_->GetWalletPassphrase();
+  if (wallet_payment_id.empty() || passphrase.empty()) {
+    braveledger_bat_helper::WALLET_PROPERTIES_ST properties;
+    ledger_->OnWalletProperties(ledger::Result::CORRUPTED_WALLET, properties);
+    return;
+  }
   std::string paymentId = forPaymentId;
   if (paymentId.empty()) {
     paymentId = ledger_->GetPaymentId();

vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc

@@ -280,8 +280,11 @@ void LedgerImpl::OnPublisherStateLoaded(ledger::Result result,
       BLOG(this, ledger::LogLevel::LOG_DEBUG) <<
         "Failed publisher state: " << data;
   }
-
-  OnWalletInitialized(result);
+  if (GetPaymentId().empty() || GetWalletPassphrase().empty()) {
+    OnWalletInitialized(ledger::Result::CORRUPTED_WALLET);
+  } else {
+    OnWalletInitialized(result);
+  }
 }
 
 void LedgerImpl::SaveLedgerState(const std::string& data) {