Get the latest balance from the server before doing contribution

Resolves brave/brave-browser#3897
brave · Mar 27, 2019 · cba09ed · cba09ed
1 parent 3266871
commit cba09ed
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 7 deletions.
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/bat_contribution.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/bat_contribution.cc
@@ -204,7 +204,7 @@ void BatContribution::ReconcilePublisherList(
     new_list.push_back(new_publisher);
   }
 
-  StartReconcile(viewing_id, category, new_list, {}, budget);
+  InitReconcile(viewing_id, category, new_list, {}, budget);
 }
 
 void BatContribution::ResetReconcileStamp() {
@@ -259,12 +259,56 @@ void BatContribution::StartAutoContribute() {
                 _2));
 }
 
-void BatContribution::StartReconcile(
+void BatContribution::OnWalletPropertiesForReconcile(
+    const std::string& viewing_id,
+    const ledger::REWARDS_CATEGORY category,
+    const braveledger_bat_helper::PublisherList& list,
+    const braveledger_bat_helper::Directions& directions,
+    double budget,
+    const ledger::Result result,
+    std::unique_ptr<ledger::WalletInfo> info) {
+  if (result != ledger::Result::LEDGER_OK || !info) {
+    BLOG(ledger_, ledger::LogLevel::LOG_ERROR) <<
+         "We couldn't get balance from the server.";
+    OnReconcileComplete(ledger::Result::LEDGER_ERROR,
+                        viewing_id,
+                        category);
+    return;
+  }
+
+  StartReconcile(viewing_id,
+                 category,
+                 list,
+                 directions,
+                 budget,
+                 info->balance_);
+}
+
+void BatContribution::InitReconcile(
     const std::string& viewing_id,
     const ledger::REWARDS_CATEGORY category,
     const braveledger_bat_helper::PublisherList& list,
     const braveledger_bat_helper::Directions& directions,
     double budget) {
+  ledger_->FetchWalletProperties(
+      std::bind(&BatContribution::OnWalletPropertiesForReconcile,
+                this,
+                viewing_id,
+                category,
+                list,
+                directions,
+                budget,
+                _1,
+                _2));
+}
+
+void BatContribution::StartReconcile(
+    const std::string& viewing_id,
+    const ledger::REWARDS_CATEGORY category,
+    const braveledger_bat_helper::PublisherList& list,
+    const braveledger_bat_helper::Directions& directions,
+    double budget,
+    double balance) {
   if (ledger_->ReconcileExists(viewing_id)) {
     BLOG(ledger_, ledger::LogLevel::LOG_ERROR) <<
       "Unable to reconcile with the same viewing id: " << viewing_id;
@@ -274,7 +318,6 @@ void BatContribution::StartReconcile(
 
   auto reconcile = braveledger_bat_helper::CURRENT_RECONCILE();
   double fee = .0;
-  double balance = ledger_->GetBalance();
 
   if (category == ledger::REWARDS_CATEGORY::AUTO_CONTRIBUTE) {
     if (list.size() == 0 || budget > balance || budget == 0) {

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/bat_contribution.h b/vendor/bat-native-ledger/src/bat/ledger/internal/bat_contribution.h
@@ -42,6 +42,9 @@
 
 // Contribution process
 
+// PHASE 0
+// 1. InitReconcile
+
 // PHASE 1 (reconcile)
 // 1. StartReconcile
 // 2. Reconcile
@@ -110,15 +113,24 @@ class BatContribution {
 
   void OnStartUp();
 
-  // Starting point for contribution
-  // We determinate which contribution we want to do and do appropriate actions
-  void StartReconcile(
+  // Initial point for contribution
+  // In this step we get balance from the server
+  void InitReconcile(
       const std::string &viewing_id,
       const ledger::REWARDS_CATEGORY category,
       const braveledger_bat_helper::PublisherList& list,
       const braveledger_bat_helper::Directions& directions = {},
       double budget = 0);
 
+  // We determinate which contribution we want to do and do appropriate actions
+  void StartReconcile(
+      const std::string &viewing_id,
+      const ledger::REWARDS_CATEGORY category,
+      const braveledger_bat_helper::PublisherList& list,
+      const braveledger_bat_helper::Directions& directions,
+      double budget,
+      double balance);
+
   // Called when timer is triggered
   void OnTimer(uint32_t timer_id);
 
@@ -170,6 +182,15 @@ class BatContribution {
   // Triggers contribution process for auto contribute table
   void StartAutoContribute();
 
+  void OnWalletPropertiesForReconcile(
+      const std::string& viewing_id,
+      const ledger::REWARDS_CATEGORY category,
+      const braveledger_bat_helper::PublisherList& list,
+      const braveledger_bat_helper::Directions& directions,
+      double budget,
+      const ledger::Result result,
+      std::unique_ptr<ledger::WalletInfo> info);
+
   void Reconcile(const std::string &viewing_id);
 
   void ReconcileCallback(const std::string& viewing_id,

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc
@@ -740,7 +740,7 @@ void LedgerImpl::DoDirectDonation(const ledger::PublisherInfo& publisher,
   auto direction_list =
       std::vector<braveledger_bat_helper::RECONCILE_DIRECTION> { direction };
   braveledger_bat_helper::PublisherList list;
-  bat_contribution_->StartReconcile(GenerateGUID(),
+  bat_contribution_->InitReconcile(GenerateGUID(),
                          ledger::REWARDS_CATEGORY::DIRECT_DONATION,
                          list,
                          direction_list);