Fixes contribution with unblinded tokens #4317

NejcZdovc · 2020-01-07T16:30:10Z

Resolves brave/brave-browser#7608

Submitter Checklist:

Test Plan:

test plan defined in brave/brave-browser#7608

Reviewer Checklist:

New files have MPL-2.0 license header.
Request a security/privacy review as needed.
Adequate test coverage exists to prevent regressions
Verify test plan is specified in PR before merging to source

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on.
All relevant documentation has been updated.

NejcZdovc · 2020-01-07T16:30:40Z

vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded.cc

@@ -157,7 +157,7 @@ void Unblinded::OnUnblindedTokens(
      continue;
    }

-    if (item->value + current_amount > reconcile.fee) {
+    if (current_amount >= reconcile.fee) {


this is the fix as we decided to go over if needed

NejcZdovc · 2020-01-07T16:31:08Z

components/brave_rewards/browser/database/database_unblinded_token.cc

@@ -139,7 +148,8 @@ ledger::UnblindedTokenList DatabaseUnblindedToken::GetAllRecords(
    info->public_key = statement.ColumnString(2);
    info->value = statement.ColumnDouble(3);
    info->promotion_id = statement.ColumnString(4);
-    info->expires_at = statement.ColumnInt64(5);
+    info->expires_at =


this fixes ads grants as some may expired, but we don't want to exclude them

NejcZdovc · 2020-01-08T16:00:47Z

components/brave_rewards/browser/database/database_unblinded_token.cc

+    return false;
+  }
+
+  const std::string query = base::StringPrintf(


this fixes users in bad state

Resolves brave/brave-browser#7608

NejcZdovc · 2020-01-08T19:50:31Z

macos failed on audit-network and dist, re-running it now. Everything else passed

gdregalo

looks good from C++ POV

ryanml

lgtm

kjozwiak · 2020-01-09T21:08:01Z

Reproduced the original issue using the following build:

Brave	1.5.10 Chromium: 79.0.3945.88 (Official Build) nightly (64-bit)
Revision	c2a58a36b9411c80829b4b154bfcab97e581f1f3-refs/branch-heads/3945@{#954}
OS	macOS Version 10.15.2 (Build 19C57)

Case #1:

launch Brave using --enable-logging=stderr --rewards=staging=true
restore a wallet that currently has an ad grant (document in the shared GDrive)
claim the UGP grant
send 5 BAT to https://duckduckgo.com/ and ensure it goes through without any issues
send 5 BAT to https://laurenwags.github.io/ and ensure it goes through without any issues
check brave://rewards and ensure that everything is being displayed as expected
ensured that the correct amount of BAT has been deducted from Brave

Case #2:

install 1.5.10 CR: 79.0.3945.88 and launch Brave using --enable-logging=stderr --rewards=staging=true
restore a wallet that currently has an ad grant (document in the shared GDrive)
claim the UGP grant
send 5 BAT to https://duckduckgo.com/ (nothing should go through)
send 5 BAT to https://laurenwags.github.io/ (nothing should go through)
install 1.5.22 CR: 79.0.3945.117 or the latest Nightly (use the same profile as above)
send 5 BAT to https://duckduckgo.com/ and ensure it goes through without any issues
send 5 BAT to https://laurenwags.github.io/ and ensure it goes through without any issues
ensured that the correct amount of BAT has been deducted from Brave

kjozwiak · 2020-01-09T22:11:05Z

@LaurenWags noticed that there was a discrepancy in the amount of BAT that was being deducted from the account when tipping. @NejcZdovc mentioned that the server side fix hasn't been pushed. Waiting on @evq to fix the above server side. Once the fix has been pushed, @LaurenWags and myself will go through the cases outlined via #4317 (comment).

If things are looking good, we'll continue with the uplift process for both #4341 & #4342.

kjozwiak · 2020-01-13T17:36:26Z

As per earlier meetings, the a-c cases will be checked via brave/brave-browser#7709.

kjozwiak · 2020-01-13T18:42:01Z

Verification PASSED on macOS 10.15.2 x64 using the following build:

Brave	1.5.27 Chromium: 79.0.3945.117 (Official Build) nightly (64-bit)
Revision	04f0a055010adab4484f7497fbfdbf312c307f1d-refs/branch-heads/3945@{#1019}
OS	macOS Version 10.15.2 (Build 19C57)

went through the cases outlined under Fixes contribution with unblinded tokens #4317 (comment)

Verification PASSED on macOS 10.14.6 x64 using the following build:

Brave	1.5.27 Chromium: 79.0.3945.117 (Official Build) nightly (64-bit)
Revision	04f0a055010adab4484f7497fbfdbf312c307f1d-refs/branch-heads/3945@{#1019}
OS	macOS Version 10.14.6 (Build 18G103)

Verified Case 1 from Fixes contribution with unblinded tokens #4317 (comment)
- launch Brave using --enable-logging=stderr --rewards=staging=true
- restore a wallet that currently has an ad grant (document in the shared GDrive) and claim ad grant
- claim the UGP grant
- send 1 BAT to https://duckduckgo.com/ and ensure it goes through without any issues
- send 5 BAT to https://laurenwags.github.io/ and ensure it goes through without any issues
- check brave://rewards and ensure that everything is being displayed as expected
- ensured that the correct amount of BAT has been deducted from Brave

Verified Case 2 from Fixes contribution with unblinded tokens #4317 (comment)
- install 1.5.10 CR: 79.0.3945.88 and launch Brave using --enable-logging=stderr --rewards=staging=true
- restore a wallet that currently has an ad grant (document in the shared GDrive) and claim Ad grant
- claim the UGP grant
- send 1 BAT to https://duckduckgo.com/ and verify it goes thru/displays in UI as expected
- install 1.5.27 CR: 79.0.3945.117 or the latest Nightly (use the same profile as above)
- send 1 BAT to https://duckduckgo.com/ and ensure it goes through without any issues
- send 5 BAT to https://laurenwags.github.io/ and ensure it goes through without any issues
- ensured that the correct amount of BAT has been deducted from Brave

Other checks performed:

Verified able to tip using 1.5.27 and an Ad grant only (no UGP/VG BAT)
Verified able to tip using 1.5.27 and a KYC'd user wallet to a KYC'd publisher (no UGP/VG BAT)

Verification PASSED on Win 10 x64 using the following build:

Brave 1.5.30	Chromium: 79.0.3945.117 (Official Build) nightly (64-bit)
Revision	04f0a055010adab4484f7497fbfdbf312c307f1d-refs/branch-heads/3945@{#1019}
OS	Windows 10 OS Version 1909 (Build 18363.535)

went through the cases outlined under Fixes contribution with unblinded tokens #4317 (comment)

NejcZdovc added the feature/rewards label Jan 7, 2020

NejcZdovc added this to the 1.5.x - Nightly milestone Jan 7, 2020

NejcZdovc self-assigned this Jan 7, 2020

NejcZdovc commented Jan 7, 2020

View reviewed changes

NejcZdovc force-pushed the tip-vg branch 2 times, most recently from 53a8b73 to f81c80d Compare January 8, 2020 16:00

NejcZdovc commented Jan 8, 2020

View reviewed changes

NejcZdovc force-pushed the tip-vg branch from f81c80d to 1ab365e Compare January 8, 2020 16:05

Fixes contribution with unblinded tokens

60cae44

Resolves brave/brave-browser#7608

NejcZdovc force-pushed the tip-vg branch from 1ab365e to 60cae44 Compare January 8, 2020 17:00

NejcZdovc added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Jan 8, 2020

ryanml self-requested a review January 8, 2020 20:36

gdregalo self-requested a review January 8, 2020 20:38

gdregalo approved these changes Jan 8, 2020

View reviewed changes

ryanml approved these changes Jan 8, 2020

View reviewed changes

NejcZdovc merged commit d562836 into master Jan 8, 2020

NejcZdovc deleted the tip-vg branch January 8, 2020 23:32

This was referenced Jan 9, 2020

Fixes contribution with unblinded tokens (1.4.x) #4341

Merged

Fixes contribution with unblinded tokens (1.3.x) #4342

Merged

LaurenWags mentioned this pull request Jan 9, 2020

tips not going thru when tokens are not standardized to 0.25 value brave/brave-browser#7608

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes contribution with unblinded tokens #4317

Fixes contribution with unblinded tokens #4317

NejcZdovc commented Jan 7, 2020 •

edited

Loading

NejcZdovc Jan 7, 2020

NejcZdovc Jan 7, 2020 •

edited

Loading

NejcZdovc Jan 8, 2020

NejcZdovc commented Jan 8, 2020 •

edited

Loading

gdregalo left a comment

ryanml left a comment

kjozwiak commented Jan 9, 2020 •

edited

Loading

kjozwiak commented Jan 9, 2020

kjozwiak commented Jan 13, 2020

kjozwiak commented Jan 13, 2020 •

edited

Loading

Fixes contribution with unblinded tokens #4317

Fixes contribution with unblinded tokens #4317

Conversation

NejcZdovc commented Jan 7, 2020 • edited Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

After-merge Checklist:

NejcZdovc Jan 7, 2020

Choose a reason for hiding this comment

NejcZdovc Jan 7, 2020 • edited Loading

Choose a reason for hiding this comment

NejcZdovc Jan 8, 2020

Choose a reason for hiding this comment

NejcZdovc commented Jan 8, 2020 • edited Loading

gdregalo left a comment

Choose a reason for hiding this comment

ryanml left a comment

Choose a reason for hiding this comment

kjozwiak commented Jan 9, 2020 • edited Loading

kjozwiak commented Jan 9, 2020

kjozwiak commented Jan 13, 2020

kjozwiak commented Jan 13, 2020 • edited Loading

NejcZdovc commented Jan 7, 2020 •

edited

Loading

NejcZdovc Jan 7, 2020 •

edited

Loading

NejcZdovc commented Jan 8, 2020 •

edited

Loading

kjozwiak commented Jan 9, 2020 •

edited

Loading

kjozwiak commented Jan 13, 2020 •

edited

Loading