From 9014b88fbed9c58eee4849a47064b0d63f63b696 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Tue, 20 Aug 2019 00:38:56 +0530
Subject: [PATCH 01/36] feat: add clr label to grant

---
 app/assets/v2/css/grants/card.css           |  8 ++++++
 app/assets/v2/css/grants/fund.css           |  8 ++++++
 app/assets/v2/js/grants/fund.js             | 32 +++++++++++++++++++++
 app/grants/templates/grants/card/front.html |  4 +++
 app/grants/templates/grants/fund.html       |  9 ++++--
 5 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/app/assets/v2/css/grants/card.css b/app/assets/v2/css/grants/card.css
index ab11710ce76..0c63d50e16d 100644
--- a/app/assets/v2/css/grants/card.css
+++ b/app/assets/v2/css/grants/card.css
@@ -30,6 +30,14 @@
   display: flex;
 }
 
+.clr {
+  right: 1.25rem;
+}
+
+.clr h2 {
+  color: #f6851b;
+}
+
 .grant-item__img {
   height: 11rem;
   overflow: hidden;
diff --git a/app/assets/v2/css/grants/fund.css b/app/assets/v2/css/grants/fund.css
index 2702bfc24f1..387df35ce81 100644
--- a/app/assets/v2/css/grants/fund.css
+++ b/app/assets/v2/css/grants/fund.css
@@ -4,6 +4,14 @@
   }
 }
 
+.popover-body .clr-popover h1 {
+  color: #f6851b
+}
+
+.popover-body .clr-popover p {
+  font-weight: 500;
+}
+
 .admin_profile a,
 #grant-link {
   color: #0D0764;
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 37d7082f95e..76f5660b069 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -10,6 +10,17 @@ let gitcoinDonationAddress;
 
 
 $(document).ready(function() {
+
+  showCLRPopover();
+
+  $('#amount').on('input', () => {
+    showCLRPopover();
+  });
+
+  $('.popover').on('click', () => {
+    $('#amount-container').popover('hide');
+  });
+
   gitcoinDonationAddress = $('#gitcoin_donation_address').val();
   splitterAddress = $('#splitter_contract_address').val();
 
@@ -492,3 +503,24 @@ const splitGrantAmount = () => {
   $('.summary-gitcoin-amount').html(gitcoin_grant_amount);
   $('#summary-amount').html(grant_amount);
 };
+
+const showCLRPopover = () => {
+  // TODO: Check if grant has CLR else return
+
+  const clr_amount = 0; // TODO: trigger CLR calculation
+  const total_clr = 0; // TODO: fetch CLR
+  const random = 0; // TODO: figure out what this is
+  const html = `
+    <div class="mx-3 clr-popover text-center">
+      <h1 class="mt-3 mb-0 font-title">CLR MATCH ${clr_amount} DAI</h1>
+      <h2 class="font-body mt-0 mb-2">( out of ${total_clr} DAI )</h2>
+      <p class="font-caption">
+        This is how much your contribution at this moment would
+        increase the CLR Match amount for the grant by ${random} amount
+      </p>
+    </div>
+  `;
+
+  $('#amount-container').attr('data-content', html);
+  $('#amount-container').popover('show');
+};
\ No newline at end of file
diff --git a/app/grants/templates/grants/card/front.html b/app/grants/templates/grants/card/front.html
index 356a691a681..f6840cf2292 100644
--- a/app/grants/templates/grants/card/front.html
+++ b/app/grants/templates/grants/card/front.html
@@ -37,6 +37,10 @@ <h2 class="grant-item__title font-subheader"><a href="{% url 'grants:details' gr
             </div>
           </div>
         </a>
+        <div class="clr position-absolute text-center"> <!-- TODO: Check if clr is enabled + update values -->
+          <h2 class="font-body font-weight-semibold my-0">CLR MATCH <span id="clr-grant-match">0</span> DAI</h2>
+          <p class="font-caption my-0">( out of <span id="clr-total">0</span> DAI )</p>
+        </div>
       </div>
 
       <div class="row progress-container mb-4">
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index dc9291374aa..9ab7b2824c9 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -54,7 +54,6 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
 
       {% include 'grants/banner.html' %}
 
-
       {% if can_phantom_fund %}
         <div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-6 mt-5 font-subheader mx-0 mx-md-auto row">
           <ul class="nav">
@@ -102,7 +101,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
         </div>
       </div>
       <div id="original_fund" class="tab_target {% if active_tab == "phantom" %} hidden {% endif %}">
-        <div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-6 mt-5 font-subheader mx-0 mx-md-auto row">
+        <div class="col-12 offset-md-2 col-md-10 offset-xl-3 col-xl-6 mt-5 font-subheader mx-0 mx-md-auto row">
           <p class="col-12 font-weight-semibold my-4 text-center">
             {{ grant.admin_profile }} {% trans "is accepting contributions in "%}
             {% if grant_has_no_token %}
@@ -120,7 +119,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
 
                   <div class="form__group-horizontal">
                     <div class="row">
-                      <div class="col-6 col-sm-8">
+                      <div id="amount-container" class="col-6 col-sm-8" data-container="body" data-toggle="popover" data-html="true" data-placement="left">
                         <label class="form__label" id="amount_label">{% trans "Amount Per Period" %}</label>
                         <input type="number" min="0.001" id="amount" name="amount_per_period" class="form__input" value="5" required />
                       </div>
@@ -349,6 +348,10 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
 
   </body>
 
+  <script>
+    $('[data-toggle="popover"]').popover();
+  </script>
+
   <script src="{% static "v2/js/pages/wallet_estimate.js" %}"></script>
   <script src="{% static "v2/js/grants/compiledSplitter.js" %}"></script>
   <script src="{% static "v2/js/grants/compiledSubscriptionContract0.js" %}"></script>

From 6e185669f637cfd84415055a9d017417ea5d500e Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Thu, 12 Sep 2019 17:46:48 +0530
Subject: [PATCH 02/36] add clr logoc

---
 app/grants/clr.py | 245 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 245 insertions(+)
 create mode 100644 app/grants/clr.py

diff --git a/app/grants/clr.py b/app/grants/clr.py
new file mode 100644
index 00000000000..65b30173bcd
--- /dev/null
+++ b/app/grants/clr.py
@@ -0,0 +1,245 @@
+# -*- coding: utf-8 -*-
+"""Define the Grants application configuration.
+
+Copyright (C) 2018 Gitcoin Core
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""
+import json
+import math
+from itertools import combinations
+
+grant_contributions = [
+    {
+        'id': '1',
+        'contributions': [
+            { '1': 5 },
+            { '2': 10 },
+            { '3': 25 }
+        ]
+    },
+    {
+        'id': '2',
+        'contributions': [
+            { '3': 20 },
+            { '1': 2 },
+            { '4': 2 },
+            { '5': 5 },
+            { '1': 15 }
+        ]
+    }
+]
+
+'''
+    Helper function that generates all combinations of pair of grant
+    contributions and the corresponding sqrt of the product pair
+
+    Args:
+        {
+            'id': (string) ,
+            'contibutions' : [
+                {
+                    contributor_profile (str) : contribution_amount (int)
+                }
+            ]
+        }
+
+    Returns:
+        {
+            'id': (str),
+            'profile_pairs': [tuples],
+            'contribution_pairs': [tuples],
+            'sqrt_of_product_pairs':  array
+        }
+'''
+def generate_grant_pair(grant):
+    grant_id = grant.get('id')
+    grant_contributions = grant.get('contributions')
+    unique_contributions = {}
+
+    for contribution in grant_contributions:
+        for profile, amount in contribution.items():
+            if unique_contributions.get(profile):
+                donation = unique_contributions[profile] + amount
+                unique_contributions[profile] = donation
+            else:
+                unique_contributions[profile] = amount
+
+    print(f'Grant Contributions: {grant_contributions}')
+    print(f'Unique Contributions: {unique_contributions}')
+
+    profile_pairs = list(combinations(unique_contributions.keys(), 2))
+    contribution_pairs = list(combinations(unique_contributions.values(), 2))
+
+    sqrt_of_product_pairs = []
+    for contribution_1, contribution_2 in contribution_pairs:
+        sqrt_of_product = round(math.sqrt(contribution_1 * contribution_2))
+        sqrt_of_product_pairs.append(sqrt_of_product)
+
+
+    grant = {
+        'id': grant_id,
+        'profile_pairs': profile_pairs,
+        'contribution_pairs': contribution_pairs,
+        'sqrt_of_product_pairs': sqrt_of_product_pairs
+    }
+
+    print(f'Grant ID: {grant["id"]}')
+    print(f'Profile Pairs: {grant["profile_pairs"]}')
+    print(f'Contribution Pairs: {grant["contribution_pairs"]}')
+    print(f'Sqrt Of Product Pairs: {grant["sqrt_of_product_pairs"]}')
+
+    print('=================\n')
+
+    return grant
+
+
+'''
+    Given a threshold and grant conributions, it calculates the
+    total clr and how that would be split amongst the grants
+
+    Args:
+        threshold: (int),
+        grant: {
+            'id': (string),
+            'contibutions' : [
+                {
+                    contributor_profile (str) : contribution_amount (int)
+                }
+            ]
+        }
+
+    Returns:
+        {
+            'total_clr': (int),
+            '_clrs': [
+                {
+                    'id': (str),
+                    'clr_amount': (int)
+                }
+            ]
+        }
+'''
+def calculate_clr(threshold, grant_contributions):
+    grants = []
+    group_by_pair = {}
+
+    total_clr = 0
+
+    for grant_contribution in grant_contributions:
+        grant = generate_grant_pair(grant_contribution)
+
+        grants.append(grant)
+
+        for index, profile_pair in enumerate(grant['profile_pairs']):
+            pair = str('&'.join(profile_pair))
+            pair_reversed = str('&'.join(profile_pair[::-1]))
+
+            if group_by_pair.get(pair):
+                group_by_pair[pair] += grant['sqrt_of_product_pairs'][index]
+            elif group_by_pair.get(pair_reversed):
+                group_by_pair[pair_reversed] += grant['sqrt_of_product_pairs'][index]
+            else:
+                group_by_pair[pair] = grant['sqrt_of_product_pairs'][index]
+
+    print(f'SUM OF GROUPED BY PAIRS {group_by_pair} \n=================\n')
+
+    _clrs = []
+
+    for grant in grants:
+        grant_clr = 0
+        lr_contributions = []
+        print(grant['profile_pairs'])
+        for index, profile_pair in enumerate(grant['profile_pairs']):
+            pair = str('&'.join(profile_pair))
+            pair_reversed = str('&'.join(profile_pair[::-1]))
+            _pair = None
+            if group_by_pair.get(pair):
+                _pair = pair
+            elif group_by_pair.get(pair_reversed):
+                _pair = pair_reversed
+
+            lr_contribution = 0
+            sqrt_of_product_pair = grant["sqrt_of_product_pairs"][index]
+
+            if threshold >= sqrt_of_product_pair:
+                lr_contribution = sqrt_of_product_pair
+            else:
+                lr_contribution = threshold * (sqrt_of_product_pair / group_by_pair.get(_pair))
+
+            lr_contributions.append(lr_contribution)
+            grant_clr += lr_contribution
+            total_clr += lr_contribution
+            print(f'LR CONTRIBUTION {lr_contribution} | PAIR {profile_pair}')
+
+        print(f'\n+++++\nGRANT {grant["id"]} - CLR CONTRIBUTION {grant_clr} \n+++++')
+        _clrs.append({
+            'id': grant["id"],
+            'clr_amount': grant_clr
+        })
+    print(f'\n\n============ \nTOTAL CLR {total_clr} \n=============')
+
+    return total_clr, _clrs
+
+
+'''
+    Given the total pot and grants and it's contirbutions,
+    it uses binary search to find out the threshold so
+    that the entire pot can be distributed based on it's contributions
+
+    Args:
+        total_pot:      (int),
+        grant_contributions: object,
+        min_threshold:  (int)
+        max_threshold:  (int)
+        iterations:     (int)
+
+    Returns:
+        grants_clr (object)
+        total_clr  (int)
+        threshold  (int)
+        iterations (int)
+'''
+def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_threshold, iterations = 0):
+    iterations += 1
+    threshold = (max_threshold + min_threshold) / 2
+    total_clr, grants_clrs = calculate_clr(threshold, grant_contributions)
+
+    print(f'\n\n\n************ \nPOT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations}')
+    print(f'\nMIN {min_threshold} MAX {max_threshold} threshold {threshold}')
+
+    if total_clr > total_pot:
+        max_threshold = threshold
+        print(f'\n++ MIN {min_threshold} NEW MAX {max_threshold}\n************\n\n')
+    elif total_clr < total_pot:
+        min_threshold = threshold
+        print(f'\n-- NEW MIN {min_threshold} MAX {max_threshold}\n************\n\n')
+    else:
+        return grants_clrs, total_clr, threshold, iterations
+
+    return grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold, iterations)
+
+total_pot = 50
+max_threshold = total_pot
+min_threshold= 0
+
+grants_clr, total_clr, threshold, iterations = grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold)
+print(f'\n\n\n=============== \nFINAL \nPOT:  {total_pot} \nCalculated CLR:  {total_clr} \nThreshold {threshold} \nIterations {iterations} \nCLR Breakup\n')
+print(json.dumps(grants_clr, indent=2))
+print('===============')
+
+# Test 1 iteration 
+# threshold = 10
+# calculate_clr(threshold, grant_contributions)

From 7bdb4e6598c040bd16e96ba072f1b6dac6496f12 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Fri, 13 Sep 2019 19:23:08 +0900
Subject: [PATCH 03/36] initial setup and starting per-grant calculation

---
 app/grants/clr.py    | 15 ++++++++++++++-
 app/grants/models.py | 18 ++++++++++++++++++
 scripts/crontab      |  2 ++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 65b30173bcd..b83606a105a 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -17,10 +17,13 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """
+import datetime as dt
 import json
 import math
 from itertools import combinations
 
+from grants.models import Grant, Contribution
+
 grant_contributions = [
     {
         'id': '1',
@@ -240,6 +243,16 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print(json.dumps(grants_clr, indent=2))
 print('===============')
 
-# Test 1 iteration 
+def predict_clr(grant):
+    clr_start_date = dt.datetime(2019, 9, 15, 0, 0)
+    contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
+    sum_contributions = sum([c.subscription.amount_per_period_usdt for c in contributions])
+    potential_donations = [1, 10, 100, 1000, 10000]
+    potential_clr = []
+    for donation in potential_donations:
+        
+
+
+# Test 1 iteration
 # threshold = 10
 # calculate_clr(threshold, grant_contributions)
diff --git a/app/grants/models.py b/app/grants/models.py
index 457c797b3c9..0fef99c9be8 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -20,6 +20,7 @@
 import logging
 from datetime import timedelta
 from decimal import Decimal
+import math
 
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField, JSONField
@@ -189,6 +190,11 @@ class Meta:
         max_digits=20,
         help_text=_('The TOTAL CLR matching amount across all rounds'),
     )
+    clr_prediction_curve = ArrayField(
+        ArrayField(
+            models.FloatField(),
+            size=2,
+        ), blank=True, default=list, help_text=_('5 point curve to predict CLR donations.'))
     activeSubscriptions = ArrayField(models.CharField(max_length=200), blank=True, default=list)
     hidden = models.BooleanField(default=False, help_text=_('Hide the grant from the /grants page?'))
 
@@ -199,6 +205,18 @@ def __str__(self):
         """Return the string representation of a Grant."""
         return f"id: {self.pk}, active: {self.active}, title: {self.title}"
 
+
+    def clr_prediction(self, donation):
+        """Linear interpolation between 5 point curve"""
+        curve = self.clr_prediction_curve
+        for i in range(1, length(curve)):
+            if curve[i-1][0] <= donation and donation <= curve[i][0]:
+                break
+        m = (curve[i-1][0] - curve[i-1][1]) / (curve[i][0] - curve[i][1])
+        prediction = (donation - curve[i][1]) * m + curve[i-1][1]
+        return prediction
+
+
     def percentage_done(self):
         """Return the percentage of token received based on the token goal."""
         if not self.amount_goal:
diff --git a/scripts/crontab b/scripts/crontab
index 2a3eff46563..abb3e765116 100644
--- a/scripts/crontab
+++ b/scripts/crontab
@@ -40,6 +40,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
 ## REPORTING
 1 1 1 * * cd gitcoin/coin; bash scripts/run_management_command.bash activity_report $(date --date='-1 month' +%Y/%m/%d) $(date +%Y/%m/%d)  >> /var/log/gitcoin/activity_report.log  2>&1
 
+## CLR
+0 */4 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash generate_clr_predictions  >> /var/log/gitcoin/generate_clr_predictions.log  2>&1
 
 ## GITCOIN MARKETING
 30 */12 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash sync_mail  >> /var/log/gitcoin/sync_mail.log  2>&1

From e1032d76828e334314134d8769bcf9a892de35bd Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Fri, 13 Sep 2019 19:52:29 +0900
Subject: [PATCH 04/36] one function left

---
 app/grants/clr.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index b83606a105a..3b2bcae0505 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -243,6 +243,10 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print(json.dumps(grants_clr, indent=2))
 print('===============')
 
+def calculate_clr_for_donation(donation):
+    # TODO - actually do something here
+    pass
+
 def predict_clr(grant):
     clr_start_date = dt.datetime(2019, 9, 15, 0, 0)
     contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
@@ -250,7 +254,9 @@ def predict_clr(grant):
     potential_donations = [1, 10, 100, 1000, 10000]
     potential_clr = []
     for donation in potential_donations:
-        
+        potential_clr.append(calculate_clr_for_donation(donation))
+    grant.clr_prediction_curve = zip(potential_donations, potential_clr)
+    grant.save()
 
 
 # Test 1 iteration

From cb07934f19c3e2531a4bf6fe58a8b1af0aa06a2b Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Fri, 13 Sep 2019 20:05:20 +0900
Subject: [PATCH 05/36] add url and view

---
 app/grants/urls.py  |  3 ++-
 app/grants/views.py | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/grants/urls.py b/app/grants/urls.py
index eec6b0036a0..41ac81dcba8 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -21,7 +21,7 @@
 
 from grants.views import (
     grant_details, grant_fund, grant_new, grant_new_v0, grants, leaderboard, milestones, new_matching_partner, profile,
-    quickstart, subscription_cancel,
+    quickstart, subscription_cancel, potential_clr,
 )
 
 app_name = 'grants'
@@ -29,6 +29,7 @@
     path('', grants, name='grants'),
     path('<int:grant_id>/<slug:grant_slug>', grant_details, name='details'),
     path('<int:grant_id>/<slug:grant_slug>/', grant_details, name='details2'),
+    path('<int:grant_id>/potential_clr', potential_clr, name='potential_clr'),
     re_path(r'^new', grant_new, name='new'),
     re_path(r'^old', grant_new_v0, name='old'),
     path('<int:grant_id>/<slug:grant_slug>/milestones', milestones, name='milestones'),
diff --git a/app/grants/views.py b/app/grants/views.py
index 438feda7466..085baee48f4 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -239,6 +239,20 @@ def grant_details(request, grant_id, grant_slug):
     return TemplateResponse(request, 'grants/detail/index.html', params)
 
 
+def potential_clr(request, grant_id):
+    donation = request.GET.get('donation')
+    if not donation:
+        return JsonResponse({
+            'success': False,
+            'info': 'no donation amount',
+        })
+    grant = Grant.objects.get(pk=grant_id)
+    return JsonResponse({
+        'success': True,
+        'matching': grant.clr_prediction(donation)
+    })
+
+
 @login_required
 def grant_new(request):
     """Handle new grant."""
@@ -549,7 +563,7 @@ def grant_fund(request, grant_id, grant_slug):
             })
 
     splitter_contract_address = settings.SPLITTER_CONTRACT_ADDRESS
-    
+
     # handle phantom funding
     active_tab = 'normal'
     fund_reward = None

From d479d09a046f85c4690bf80274dcdc79079a010c Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Tue, 17 Sep 2019 18:33:10 +0900
Subject: [PATCH 06/36] getting closer to per-donation clr prediction and
 adding comments

---
 app/grants/clr.py | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 3b2bcae0505..15011381cb6 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -243,20 +243,28 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print(json.dumps(grants_clr, indent=2))
 print('===============')
 
-def calculate_clr_for_donation(donation):
-    # TODO - actually do something here
-    pass
+def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, grant_contributions):
+    for grant_contribution in grant_contributions:
+        if grant_contribution['id'] = donation_grant.id:
+            grant_contribution['contributions'].append({'999999999999': donation_amount})
+    grants_clr, _, _, _ = grants_clr_calculate(total_pot + donation_amount, grant_contributions, 0, total_pot)
+    return something?
 
 def predict_clr(grant):
     clr_start_date = dt.datetime(2019, 9, 15, 0, 0)
     contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
     sum_contributions = sum([c.subscription.amount_per_period_usdt for c in contributions])
-    potential_donations = [1, 10, 100, 1000, 10000]
-    potential_clr = []
-    for donation in potential_donations:
-        potential_clr.append(calculate_clr_for_donation(donation))
-    grant.clr_prediction_curve = zip(potential_donations, potential_clr)
-    grant.save()
+    grants = Grants.objects.all()
+    c_data = []
+    for grant in grants:
+        g_contributions = contributions.filter(subscription__grant_id=grant.id).all()
+        c_data.append({'id': grant.id, 'contributions': [{str(c.id): c.subscription.get_converted_monthly_amount} for c in g_contributions]}
+        potential_donations = [1, 10, 100, 1000, 10000]
+        potential_clr = []
+        for donation_amount in potential_donations:
+            potential_clr.append(calculate_clr_for_donation(grant, donation_amount, sum_contributions, g_contributions))
+        grant.clr_prediction_curve = zip(potential_donations, potential_clr)
+        grant.save()
 
 
 # Test 1 iteration

From 1f97743a49947baa8dbef8a107d486a5342e9874 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Tue, 17 Sep 2019 23:23:39 +0900
Subject: [PATCH 07/36] add base level clr and store raw data

---
 app/grants/clr.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 15011381cb6..d6905e92d1c 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -22,7 +22,7 @@
 import math
 from itertools import combinations
 
-from grants.models import Grant, Contribution
+# from grants.models import Grant, Contribution
 
 grant_contributions = [
     {
@@ -244,29 +244,41 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print('===============')
 
 def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, grant_contributions):
-    for grant_contribution in grant_contributions:
-        if grant_contribution['id'] = donation_grant.id:
-            grant_contribution['contributions'].append({'999999999999': donation_amount})
+    # find grant in contributions list
+    if donation_amount != 0:
+        for grant_contribution in grant_contributions:
+            if grant_contribution['id'] == donation_grant.id:
+                # add this donation with a new profile to get impact
+                grant_contribution['contributions'].append({'999999999999': donation_amount})
     grants_clr, _, _, _ = grants_clr_calculate(total_pot + donation_amount, grant_contributions, 0, total_pot)
-    return something?
+    for grant_clr in grants_clr:
+        if grant_clr['id'] == donation.grant.id:
+            return grant_clr['clr_amount']
+    print('error: could not find grant in final grants_clr data')
+    return None
 
 def predict_clr(grant):
     clr_start_date = dt.datetime(2019, 9, 15, 0, 0)
+    # get all the eligible contributions and calculate total
     contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
     sum_contributions = sum([c.subscription.amount_per_period_usdt for c in contributions])
     grants = Grants.objects.all()
     c_data = []
+
     for grant in grants:
+        # go through all the individual contributions for each grant
         g_contributions = contributions.filter(subscription__grant_id=grant.id).all()
+        # put in correct format
         c_data.append({'id': grant.id, 'contributions': [{str(c.id): c.subscription.get_converted_monthly_amount} for c in g_contributions]}
-        potential_donations = [1, 10, 100, 1000, 10000]
+        # five potential additional donations
+        potential_donations = [0, 1, 10, 100, 1000, 10000]
         potential_clr = []
         for donation_amount in potential_donations:
+            # calculate impact for each additional donation and save as number to display
             potential_clr.append(calculate_clr_for_donation(grant, donation_amount, sum_contributions, g_contributions))
         grant.clr_prediction_curve = zip(potential_donations, potential_clr)
         grant.save()
 
-
 # Test 1 iteration
 # threshold = 10
 # calculate_clr(threshold, grant_contributions)

From 6662b7b7bedae6bea8c7b262aea417ba50e3cf28 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Wed, 18 Sep 2019 01:37:16 +0900
Subject: [PATCH 08/36] WIP

---
 app/grants/clr.py | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index d6905e92d1c..ff15a55f8af 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -22,7 +22,7 @@
 import math
 from itertools import combinations
 
-# from grants.models import Grant, Contribution
+from grants.models import Grant, Contribution
 
 grant_contributions = [
     {
@@ -157,7 +157,7 @@ def calculate_clr(threshold, grant_contributions):
             else:
                 group_by_pair[pair] = grant['sqrt_of_product_pairs'][index]
 
-    print(f'SUM OF GROUPED BY PAIRS {group_by_pair} \n=================\n')
+    # print(f'SUM OF GROUPED BY PAIRS {group_by_pair} \n=================\n')
 
     _clrs = []
 
@@ -185,14 +185,14 @@ def calculate_clr(threshold, grant_contributions):
             lr_contributions.append(lr_contribution)
             grant_clr += lr_contribution
             total_clr += lr_contribution
-            print(f'LR CONTRIBUTION {lr_contribution} | PAIR {profile_pair}')
+            # print(f'LR CONTRIBUTION {lr_contribution} | PAIR {profile_pair}')
 
-        print(f'\n+++++\nGRANT {grant["id"]} - CLR CONTRIBUTION {grant_clr} \n+++++')
+        # print(f'\n+++++\nGRANT {grant["id"]} - CLR CONTRIBUTION {grant_clr} \n+++++')
         _clrs.append({
             'id': grant["id"],
             'clr_amount': grant_clr
         })
-    print(f'\n\n============ \nTOTAL CLR {total_clr} \n=============')
+    # print(f'\n\n============ \nTOTAL CLR {total_clr} \n=============')
 
     return total_clr, _clrs
 
@@ -216,24 +216,28 @@ def calculate_clr(threshold, grant_contributions):
         iterations (int)
 '''
 def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_threshold, iterations = 0):
+    print("seeing {} contributions".format(len(grant_contributions)))
+    if len(grant_contributions) == 0:
+        return 0, 0, 0, 0
     iterations += 1
     threshold = (max_threshold + min_threshold) / 2
     total_clr, grants_clrs = calculate_clr(threshold, grant_contributions)
 
-    print(f'\n\n\n************ \nPOT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations}')
-    print(f'\nMIN {min_threshold} MAX {max_threshold} threshold {threshold}')
+    print(f'************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations}')
+    # print(f'MIN {min_threshold} MAX {max_threshold} threshold {threshold}')
 
     if total_clr > total_pot:
         max_threshold = threshold
-        print(f'\n++ MIN {min_threshold} NEW MAX {max_threshold}\n************\n\n')
+        print(f'++ MIN {min_threshold} NEW MAX {max_threshold}')
     elif total_clr < total_pot:
         min_threshold = threshold
-        print(f'\n-- NEW MIN {min_threshold} MAX {max_threshold}\n************\n\n')
+        print(f'-- NEW MIN {min_threshold} MAX {max_threshold}')
     else:
         return grants_clrs, total_clr, threshold, iterations
 
     return grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold, iterations)
 
+'''
 total_pot = 50
 max_threshold = total_pot
 min_threshold= 0
@@ -242,6 +246,7 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print(f'\n\n\n=============== \nFINAL \nPOT:  {total_pot} \nCalculated CLR:  {total_clr} \nThreshold {threshold} \nIterations {iterations} \nCLR Breakup\n')
 print(json.dumps(grants_clr, indent=2))
 print('===============')
+'''
 
 def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, grant_contributions):
     # find grant in contributions list
@@ -251,6 +256,9 @@ def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, grant
                 # add this donation with a new profile to get impact
                 grant_contribution['contributions'].append({'999999999999': donation_amount})
     grants_clr, _, _, _ = grants_clr_calculate(total_pot + donation_amount, grant_contributions, 0, total_pot)
+    print(grants_clr)
+    if grants_clr == 0:
+        return 0
     for grant_clr in grants_clr:
         if grant_clr['id'] == donation.grant.id:
             return grant_clr['clr_amount']
@@ -258,27 +266,27 @@ def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, grant
     return None
 
 def predict_clr(grant):
-    clr_start_date = dt.datetime(2019, 9, 15, 0, 0)
+    clr_start_date = dt.datetime(2019, 1, 15, 0, 0)
     # get all the eligible contributions and calculate total
     contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
     sum_contributions = sum([c.subscription.amount_per_period_usdt for c in contributions])
-    grants = Grants.objects.all()
-    c_data = []
+    grants = Grant.objects.all()
 
     for grant in grants:
+        contrib_data = []
         # go through all the individual contributions for each grant
         g_contributions = contributions.filter(subscription__grant_id=grant.id).all()
         # put in correct format
-        c_data.append({'id': grant.id, 'contributions': [{str(c.id): c.subscription.get_converted_monthly_amount} for c in g_contributions]}
+        contrib_data.append({'id': grant.id, 'contributions': [{str(c.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
         # five potential additional donations
         potential_donations = [0, 1, 10, 100, 1000, 10000]
         potential_clr = []
         for donation_amount in potential_donations:
             # calculate impact for each additional donation and save as number to display
-            potential_clr.append(calculate_clr_for_donation(grant, donation_amount, sum_contributions, g_contributions))
-        grant.clr_prediction_curve = zip(potential_donations, potential_clr)
-        grant.save()
-
+            potential_clr.append(calculate_clr_for_donation(grant, donation_amount, 50000, contrib_data))
+        # grant.clr_prediction_curve = zip(potential_donations, potential_clr)
+        # grant.save()
+        print("grant: {} potential_clr: {}".format(grant.id, potential_clr))
 # Test 1 iteration
 # threshold = 10
 # calculate_clr(threshold, grant_contributions)

From 580cd60ee77004f9cb93208ae24f37168e9dfba3 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Wed, 18 Sep 2019 00:55:27 +0530
Subject: [PATCH 09/36] edge case fix

---
 app/grants/clr.py    | 9 ++++++---
 app/grants/models.py | 2 +-
 app/grants/urls.py   | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index ff15a55f8af..ab1708eb2c8 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -22,7 +22,7 @@
 import math
 from itertools import combinations
 
-from grants.models import Grant, Contribution
+from grants.models import Contribution, Grant
 
 grant_contributions = [
     {
@@ -223,8 +223,11 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
     threshold = (max_threshold + min_threshold) / 2
     total_clr, grants_clrs = calculate_clr(threshold, grant_contributions)
 
-    print(f'************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations}')
-    # print(f'MIN {min_threshold} MAX {max_threshold} threshold {threshold}')
+    print(f'************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
+
+    if total_pot == threshold:
+        # EDGE CASE: when total_pot !== total_clr for any threshold
+        return grants_clrs, total_clr, threshold, iterations
 
     if total_clr > total_pot:
         max_threshold = threshold
diff --git a/app/grants/models.py b/app/grants/models.py
index 0fef99c9be8..5af4ec5cb37 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -18,9 +18,9 @@
 
 """
 import logging
+import math
 from datetime import timedelta
 from decimal import Decimal
-import math
 
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField, JSONField
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 41ac81dcba8..025461cb21c 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -20,8 +20,8 @@
 from django.urls import path, re_path
 
 from grants.views import (
-    grant_details, grant_fund, grant_new, grant_new_v0, grants, leaderboard, milestones, new_matching_partner, profile,
-    quickstart, subscription_cancel, potential_clr,
+    grant_details, grant_fund, grant_new, grant_new_v0, grants, leaderboard, milestones, new_matching_partner,
+    potential_clr, profile, quickstart, subscription_cancel,
 )
 
 app_name = 'grants'

From 583d9493926b41030bf64b6a80d887964d6bc3eb Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Wed, 18 Sep 2019 16:45:51 +0900
Subject: [PATCH 10/36] fix various bugs

---
 app/grants/clr.py | 73 +++++++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index ab1708eb2c8..caaa0fdd5b1 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -17,6 +17,7 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """
+import copy
 import datetime as dt
 import json
 import math
@@ -24,6 +25,8 @@
 
 from grants.models import Contribution, Grant
 
+CLR_DISTRIBUTION_AMOUNT = 100000
+
 grant_contributions = [
     {
         'id': '1',
@@ -80,8 +83,8 @@ def generate_grant_pair(grant):
             else:
                 unique_contributions[profile] = amount
 
-    print(f'Grant Contributions: {grant_contributions}')
-    print(f'Unique Contributions: {unique_contributions}')
+    #print(f'Grant Contributions: {grant_contributions}')
+    #print(f'Unique Contributions: {unique_contributions}')
 
     profile_pairs = list(combinations(unique_contributions.keys(), 2))
     contribution_pairs = list(combinations(unique_contributions.values(), 2))
@@ -99,12 +102,12 @@ def generate_grant_pair(grant):
         'sqrt_of_product_pairs': sqrt_of_product_pairs
     }
 
-    print(f'Grant ID: {grant["id"]}')
-    print(f'Profile Pairs: {grant["profile_pairs"]}')
-    print(f'Contribution Pairs: {grant["contribution_pairs"]}')
-    print(f'Sqrt Of Product Pairs: {grant["sqrt_of_product_pairs"]}')
+    #print(f'Grant ID: {grant["id"]}')
+    #print(f'Profile Pairs: {grant["profile_pairs"]}')
+    #print(f'Contribution Pairs: {grant["contribution_pairs"]}')
+    #print(f'Sqrt Of Product Pairs: {grant["sqrt_of_product_pairs"]}')
 
-    print('=================\n')
+    #print('=================\n')
 
     return grant
 
@@ -164,7 +167,7 @@ def calculate_clr(threshold, grant_contributions):
     for grant in grants:
         grant_clr = 0
         lr_contributions = []
-        print(grant['profile_pairs'])
+        #print(grant['profile_pairs'])
         for index, profile_pair in enumerate(grant['profile_pairs']):
             pair = str('&'.join(profile_pair))
             pair_reversed = str('&'.join(profile_pair[::-1]))
@@ -216,25 +219,28 @@ def calculate_clr(threshold, grant_contributions):
         iterations (int)
 '''
 def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_threshold, iterations = 0):
-    print("seeing {} contributions".format(len(grant_contributions)))
+    # print("seeing {} contributions".format(len(grant_contributions)))
+    # print("calculating CLR for contributions:{}".format(grant_contributions))
     if len(grant_contributions) == 0:
         return 0, 0, 0, 0
     iterations += 1
     threshold = (max_threshold + min_threshold) / 2
     total_clr, grants_clrs = calculate_clr(threshold, grant_contributions)
 
-    print(f'************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
+    # print(f'************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
+
+    if iterations == 100:
+        return grants_clrs, total_clr, threshold, iterations
 
     if total_pot == threshold:
         # EDGE CASE: when total_pot !== total_clr for any threshold
         return grants_clrs, total_clr, threshold, iterations
-
     if total_clr > total_pot:
         max_threshold = threshold
-        print(f'++ MIN {min_threshold} NEW MAX {max_threshold}')
+        # print(f'++ MIN {min_threshold} NEW MAX {max_threshold}')
     elif total_clr < total_pot:
         min_threshold = threshold
-        print(f'-- NEW MIN {min_threshold} MAX {max_threshold}')
+        #print(f'-- NEW MIN {min_threshold} MAX {max_threshold}')
     else:
         return grants_clrs, total_clr, threshold, iterations
 
@@ -251,45 +257,56 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print('===============')
 '''
 
-def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, grant_contributions):
+def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, base_grant_contributions):
+    grant_contributions = copy.deepcopy(base_grant_contributions)
     # find grant in contributions list
     if donation_amount != 0:
         for grant_contribution in grant_contributions:
             if grant_contribution['id'] == donation_grant.id:
                 # add this donation with a new profile to get impact
                 grant_contribution['contributions'].append({'999999999999': donation_amount})
-    grants_clr, _, _, _ = grants_clr_calculate(total_pot + donation_amount, grant_contributions, 0, total_pot)
-    print(grants_clr)
-    if grants_clr == 0:
-        return 0
+    grants_clr, _, _, _ = grants_clr_calculate(CLR_DISTRIBUTION_AMOUNT, grant_contributions, 0, CLR_DISTRIBUTION_AMOUNT)
+    # print("GRANTS CLR: {}".format(grants_clr))
+    # print("TOTAL CLR: {}".format(total_clr))
+    # if grants_clr == 0:
+    #    return 0
     for grant_clr in grants_clr:
-        if grant_clr['id'] == donation.grant.id:
-            return grant_clr['clr_amount']
+        if grant_clr['id'] == donation_grant.id:
+            return (grant_clr['clr_amount'], grants_clr)
     print('error: could not find grant in final grants_clr data')
-    return None
+    return (None, None)
 
-def predict_clr(grant):
+def predict_clr():
     clr_start_date = dt.datetime(2019, 1, 15, 0, 0)
     # get all the eligible contributions and calculate total
     contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
-    sum_contributions = sum([c.subscription.amount_per_period_usdt for c in contributions])
     grants = Grant.objects.all()
+    final_output = []
+    contrib_data = []
 
+    # set up data to load contributions for each grant
     for grant in grants:
-        contrib_data = []
         # go through all the individual contributions for each grant
-        g_contributions = contributions.filter(subscription__grant_id=grant.id).all()
+        g_contributions = copy.deepcopy(contributions).filter(subscription__grant_id=grant.id).all()
         # put in correct format
-        contrib_data.append({'id': grant.id, 'contributions': [{str(c.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
+        contrib_data.append({'id': grant.id, 'contributions': [{str(c.subscription.contributor_profile.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
+
+    print('\n\ncontributions data:\n\n')
+    print(contrib_data)
+    # apply potential donations for each grant
+    for grant in grants:
         # five potential additional donations
         potential_donations = [0, 1, 10, 100, 1000, 10000]
         potential_clr = []
         for donation_amount in potential_donations:
             # calculate impact for each additional donation and save as number to display
-            potential_clr.append(calculate_clr_for_donation(grant, donation_amount, 50000, contrib_data))
+            predicted_clr, grants_clr = calculate_clr_for_donation(grant, donation_amount, CLR_DISTRIBUTION_AMOUNT, contrib_data)
+            potential_clr.append(predicted_clr)
         # grant.clr_prediction_curve = zip(potential_donations, potential_clr)
         # grant.save()
-        print("grant: {} potential_clr: {}".format(grant.id, potential_clr))
+        # print("grant: {} potential_clr: {}".format(grant.id, potential_clr))
+        final_output.append({'grant': grant.id, "clr_prediction_curve": (potential_donations, potential_clr), "grants_clr": grants_clr})
+    return final_output
 # Test 1 iteration
 # threshold = 10
 # calculate_clr(threshold, grant_contributions)

From 4a80f368043c202b5e3aad6940f37b763d691dc2 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Wed, 18 Sep 2019 20:41:15 +0900
Subject: [PATCH 11/36] working w/ test data, add mgmt command and migration

---
 app/grants/clr.py                             | 12 ++++-
 .../management/commands/estimate_clr.py       | 44 +++++++++++++++++++
 .../0030_grant_clr_prediction_curve.py        | 19 ++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 app/grants/management/commands/estimate_clr.py
 create mode 100644 app/grants/migrations/0030_grant_clr_prediction_curve.py

diff --git a/app/grants/clr.py b/app/grants/clr.py
index caaa0fdd5b1..9f7131a1e17 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -257,6 +257,14 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 print('===============')
 '''
 
+def generate_random_contribution_data():
+    import random
+    contrib_data = []
+    for grant_id in range(30):
+        contrib_data.append({'id': grant_id, 'contributions': [{str(profile_id): random.randint(1,1000)} for profile_id in range(random.randint(0,10))]})
+    return contrib_data
+
+
 def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, base_grant_contributions):
     grant_contributions = copy.deepcopy(base_grant_contributions)
     # find grant in contributions list
@@ -285,12 +293,14 @@ def predict_clr():
     contrib_data = []
 
     # set up data to load contributions for each grant
+    '''
     for grant in grants:
         # go through all the individual contributions for each grant
         g_contributions = copy.deepcopy(contributions).filter(subscription__grant_id=grant.id).all()
         # put in correct format
         contrib_data.append({'id': grant.id, 'contributions': [{str(c.subscription.contributor_profile.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
-
+    '''
+    contrib_data = generate_random_contribution_data()
     print('\n\ncontributions data:\n\n')
     print(contrib_data)
     # apply potential donations for each grant
diff --git a/app/grants/management/commands/estimate_clr.py b/app/grants/management/commands/estimate_clr.py
new file mode 100644
index 00000000000..0266f165447
--- /dev/null
+++ b/app/grants/management/commands/estimate_clr.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+"""Define the Grant subminer management command.
+
+Copyright (C) 2018 Gitcoin Core
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+from dashboard.utils import get_tx_status, has_tx_mined
+from grants.clr import predict_clr
+from grants.models import Contribution, Grant
+from marketing.mails import warn_subscription_failed
+
+
+class Command(BaseCommand):
+
+    help = 'calculate CLR estimates for all grants'
+
+    def handle(self, *args, **options):
+        clr_prediction_curves = predict_clr()
+        for grant in clr_prediction_curves:
+            print("CLR predictions for grant {}".format(grant['grant']))
+            print("All grants: {}".format(grant['grants_clr']))
+            print("prediction curve: {}\n\n".format(grant['clr_prediction_curve']))
+        #sanity check: sum all the estimated clr distributions - should equal 100000
+        clr_data = [g['grants_clr'] for g in clr_prediction_curves]
+        print(clr_data)
+        total_clr_funds = sum([each_grant['clr_amount'] for each_grant in clr_data[0]])
+        print("allocated CLR funds:{}".format(total_clr_funds))
diff --git a/app/grants/migrations/0030_grant_clr_prediction_curve.py b/app/grants/migrations/0030_grant_clr_prediction_curve.py
new file mode 100644
index 00000000000..bba0e8319b0
--- /dev/null
+++ b/app/grants/migrations/0030_grant_clr_prediction_curve.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2019-09-17 14:37
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('grants', '0029_auto_20190830_1613'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='grant',
+            name='clr_prediction_curve',
+            field=django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=2), blank=True, default=list, help_text='5 point curve to predict CLR donations.', size=None),
+        ),
+    ]

From a463e01c6406ae299a05b53320a0deab2bb2ede7 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Wed, 18 Sep 2019 21:24:57 +0900
Subject: [PATCH 12/36] add easy testing, fix contrib data setup

---
 app/grants/clr.py                             | 32 ++++++++++++-------
 .../management/commands/estimate_clr.py       | 12 +++----
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 9f7131a1e17..18979b4b022 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -260,8 +260,8 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 def generate_random_contribution_data():
     import random
     contrib_data = []
-    for grant_id in range(30):
-        contrib_data.append({'id': grant_id, 'contributions': [{str(profile_id): random.randint(1,1000)} for profile_id in range(random.randint(0,10))]})
+    for grant_id in range(33):
+        contrib_data.append({'id': grant_id, 'contributions': [{str(profile_id): random.randint(3000,6890)} for profile_id in range(random.randint(0,17))]})
     return contrib_data
 
 
@@ -284,7 +284,7 @@ def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, base_
     print('error: could not find grant in final grants_clr data')
     return (None, None)
 
-def predict_clr():
+def predict_clr(random_data=False):
     clr_start_date = dt.datetime(2019, 1, 15, 0, 0)
     # get all the eligible contributions and calculate total
     contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
@@ -293,14 +293,24 @@ def predict_clr():
     contrib_data = []
 
     # set up data to load contributions for each grant
-    '''
-    for grant in grants:
-        # go through all the individual contributions for each grant
-        g_contributions = copy.deepcopy(contributions).filter(subscription__grant_id=grant.id).all()
-        # put in correct format
-        contrib_data.append({'id': grant.id, 'contributions': [{str(c.subscription.contributor_profile.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
-    '''
-    contrib_data = generate_random_contribution_data()
+    if not random_data:
+        for grant in grants:
+            # go through all the individual contributions for each grant
+            g_contributions = copy.deepcopy(contributions).filter(subscription__grant_id=grant.id)
+
+            # put in correct format
+            all_contributing_profile_ids = list(set([c.subscription.contributor_profile.id for c in g_contributions]))
+            all_summed_contributions = []
+            print("*** grant id:{} has contributions from profiles: {}".format(grant.id, all_contributing_profile_ids))
+            for profile_id in all_contributing_profile_ids:
+                profile_g_contributions = g_contributions.filter(subscription__contributor_profile_id=profile_id)
+                sum_of_each_profiles_contributions = float(sum([c.subscription.get_converted_monthly_amount() for c in profile_g_contributions]))
+                print("*** profile id:{} contributed total:{}".format(profile_id, sum_of_each_profiles_contributions))
+                all_summed_contributions.append({str(profile_id): sum_of_each_profiles_contributions})
+            #contrib_data.append({'id': grant.id, 'contributions': [{str(c.subscription.contributor_profile.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
+            contrib_data.append({'id': grant.id, 'contributions': all_summed_contributions})
+    else:
+        contrib_data = generate_random_contribution_data()
     print('\n\ncontributions data:\n\n')
     print(contrib_data)
     # apply potential donations for each grant
diff --git a/app/grants/management/commands/estimate_clr.py b/app/grants/management/commands/estimate_clr.py
index 0266f165447..0654c29a042 100644
--- a/app/grants/management/commands/estimate_clr.py
+++ b/app/grants/management/commands/estimate_clr.py
@@ -32,13 +32,13 @@ class Command(BaseCommand):
     help = 'calculate CLR estimates for all grants'
 
     def handle(self, *args, **options):
-        clr_prediction_curves = predict_clr()
-        for grant in clr_prediction_curves:
-            print("CLR predictions for grant {}".format(grant['grant']))
-            print("All grants: {}".format(grant['grants_clr']))
-            print("prediction curve: {}\n\n".format(grant['clr_prediction_curve']))
+        clr_prediction_curves = predict_clr(random_data=False)
+        # for grant in clr_prediction_curves:
+            #print("CLR predictions for grant {}".format(grant['grant']))
+            #print("All grants: {}".format(grant['grants_clr']))
+            #print("prediction curve: {}\n\n".format(grant['clr_prediction_curve']))
         #sanity check: sum all the estimated clr distributions - should equal 100000
         clr_data = [g['grants_clr'] for g in clr_prediction_curves]
-        print(clr_data)
+        #print(clr_data)
         total_clr_funds = sum([each_grant['clr_amount'] for each_grant in clr_data[0]])
         print("allocated CLR funds:{}".format(total_clr_funds))

From dfc1be00fc5ea16ae94751c5160b31cec846d6ad Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Wed, 18 Sep 2019 19:06:44 +0530
Subject: [PATCH 13/36] isort fix

---
 app/grants/clr.py | 52 +++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 18979b4b022..d3de37e5fa2 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -83,8 +83,8 @@ def generate_grant_pair(grant):
             else:
                 unique_contributions[profile] = amount
 
-    #print(f'Grant Contributions: {grant_contributions}')
-    #print(f'Unique Contributions: {unique_contributions}')
+    # print(f'Grant Contributions: {grant_contributions}')
+    # print(f'Unique Contributions: {unique_contributions}')
 
     profile_pairs = list(combinations(unique_contributions.keys(), 2))
     contribution_pairs = list(combinations(unique_contributions.values(), 2))
@@ -102,12 +102,12 @@ def generate_grant_pair(grant):
         'sqrt_of_product_pairs': sqrt_of_product_pairs
     }
 
-    #print(f'Grant ID: {grant["id"]}')
-    #print(f'Profile Pairs: {grant["profile_pairs"]}')
-    #print(f'Contribution Pairs: {grant["contribution_pairs"]}')
-    #print(f'Sqrt Of Product Pairs: {grant["sqrt_of_product_pairs"]}')
+    # print(f'Grant ID: {grant["id"]}')
+    # print(f'Profile Pairs: {grant["profile_pairs"]}')
+    # print(f'Contribution Pairs: {grant["contribution_pairs"]}')
+    # print(f'Sqrt Of Product Pairs: {grant["sqrt_of_product_pairs"]}')
 
-    #print('=================\n')
+    # print('=================\n')
 
     return grant
 
@@ -167,7 +167,7 @@ def calculate_clr(threshold, grant_contributions):
     for grant in grants:
         grant_clr = 0
         lr_contributions = []
-        #print(grant['profile_pairs'])
+        # print(grant['profile_pairs'])
         for index, profile_pair in enumerate(grant['profile_pairs']):
             pair = str('&'.join(profile_pair))
             pair_reversed = str('&'.join(profile_pair[::-1]))
@@ -206,33 +206,30 @@ def calculate_clr(threshold, grant_contributions):
     that the entire pot can be distributed based on it's contributions
 
     Args:
-        total_pot:      (int),
+        total_pot:          (int),
         grant_contributions: object,
-        min_threshold:  (int)
-        max_threshold:  (int)
-        iterations:     (int)
+        min_threshold:      (int)
+        max_threshold:      (int)
+        iterations:         (int)
+        previous_threshold: (int)
 
     Returns:
-        grants_clr (object)
-        total_clr  (int)
-        threshold  (int)
-        iterations (int)
+        grants_clr         (object)
+        total_clr          (int)
+        threshold          (int)
+        iterations         (int)
 '''
-def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_threshold, iterations = 0):
-    # print("seeing {} contributions".format(len(grant_contributions)))
-    # print("calculating CLR for contributions:{}".format(grant_contributions))
+def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_threshold, iterations = 0, previous_threshold=None):
     if len(grant_contributions) == 0:
         return 0, 0, 0, 0
+
     iterations += 1
     threshold = (max_threshold + min_threshold) / 2
     total_clr, grants_clrs = calculate_clr(threshold, grant_contributions)
 
-    # print(f'************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
-
-    if iterations == 100:
-        return grants_clrs, total_clr, threshold, iterations
+    print(f'\n\n************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
 
-    if total_pot == threshold:
+    if total_pot == threshold or previous_threshold == threshold:
         # EDGE CASE: when total_pot !== total_clr for any threshold
         return grants_clrs, total_clr, threshold, iterations
     if total_clr > total_pot:
@@ -240,11 +237,11 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
         # print(f'++ MIN {min_threshold} NEW MAX {max_threshold}')
     elif total_clr < total_pot:
         min_threshold = threshold
-        #print(f'-- NEW MIN {min_threshold} MAX {max_threshold}')
+        # print(f'-- NEW MIN {min_threshold} MAX {max_threshold}')
     else:
         return grants_clrs, total_clr, threshold, iterations
 
-    return grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold, iterations)
+    return grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold, iterations, threshold)
 
 '''
 total_pot = 50
@@ -327,6 +324,3 @@ def predict_clr(random_data=False):
         # print("grant: {} potential_clr: {}".format(grant.id, potential_clr))
         final_output.append({'grant': grant.id, "clr_prediction_curve": (potential_donations, potential_clr), "grants_clr": grants_clr})
     return final_output
-# Test 1 iteration
-# threshold = 10
-# calculate_clr(threshold, grant_contributions)

From 4b9a444f8c5086aec220802a2c8ce456f749ac61 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Wed, 18 Sep 2019 23:10:29 +0900
Subject: [PATCH 14/36] add iterations check

---
 app/grants/clr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index d3de37e5fa2..4e112bcf524 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -229,8 +229,8 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
 
     print(f'\n\n************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
 
-    if total_pot == threshold or previous_threshold == threshold:
-        # EDGE CASE: when total_pot !== total_clr for any threshold
+    if iterations == 100 or total_pot == threshold or previous_threshold == threshold:
+        # No more accuracy to be had
         return grants_clrs, total_clr, threshold, iterations
     if total_clr > total_pot:
         max_threshold = threshold

From 245223c78ee180740a3d434aefbb9bf77ded6a90 Mon Sep 17 00:00:00 2001
From: Owocki <ksowocki@gmail.com>
Date: Mon, 16 Sep 2019 12:40:46 -0600
Subject: [PATCH 15/36] clr estimates frontend

---
 app/assets/v2/css/grants/fund.css             |  58 ++++++++++++++++++
 app/assets/v2/images/diamonds_high_fiving.gif | Bin 0 -> 4276 bytes
 app/grants/models.py                          |   4 ++
 app/grants/templates/grants/clr_estimate.html |  10 +++
 app/grants/templates/grants/fund.html         |   4 +-
 app/grants/views.py                           |   1 +
 6 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/v2/images/diamonds_high_fiving.gif
 create mode 100644 app/grants/templates/grants/clr_estimate.html

diff --git a/app/assets/v2/css/grants/fund.css b/app/assets/v2/css/grants/fund.css
index 387df35ce81..da2f8d81f08 100644
--- a/app/assets/v2/css/grants/fund.css
+++ b/app/assets/v2/css/grants/fund.css
@@ -169,6 +169,64 @@
 .nav-item.active{
   text-decoration: underline;
 }
+.clr_estimate{
+  background-color: white;
+  border-radius: 5px;
+  border: 2px solid #10cd7a;
+  text-align: left;
+  width: 250px;
+  padding: 10px 15px;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+}
+.clr_estimate.extraleft{
+  left: -270px;
+}
+.clr_estimate:after {
+  content: '';
+  position: absolute;
+  right: 0;
+  top: 30%;
+  width: 0;
+  height: 0;
+  border: 20px solid transparent;
+  border-left-color: #10cd7a;
+  border-right: 0;
+  border-bottom: 0;
+  margin-top: -10px;
+  margin-right: -20px;
+}
+.clr_estimate img{
+  float: right;
+  width: 50px;
+}
+.clr_estimate h3{
+  text-align: left;
+  background-color: #10cd7a;
+  color: white;
+  border-radius: 3px;
+  font-size: 12px;
+  padding: 4px 6px;
+  text-transform: uppercase;
+  width: 150px;
+}
+.clr_estimate h4{
+  padding-top: 0px;
+  text-align: left;
+  color: #10cd7a;
+  font-size: 10px;
+}
+.clr_estimate h4 span{
+  font-size: 16px;
+  font-weight: bold;
+}
+.clr_estimate p{
+  text-align: left;
+  color: #10cd7a;
+  font-size: 10px;
+  color: #959595;
+}
 
 @media (min-width:1140px) and (max-width: 1600px) {
 
diff --git a/app/assets/v2/images/diamonds_high_fiving.gif b/app/assets/v2/images/diamonds_high_fiving.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2afc92748399c8999805c87dea23ed528460be9f
GIT binary patch
literal 4276
zcmW-j`(Mk8!@xhguWhx@*0!#+bx~@uYLP<QteO(*BB5BssobVJr^{~LnA%F$6P9xC
zWD$mVwr)aL=pvWz3Q3%=5lW?=^E~gr;Qh<{^?C=b4fI(NcL0b1CIR5V#K@kK^7n5)
zPRvfV8i&e0cAWY2m~0bJc&(}Bzx`Ivq;qp~l(muBDP=_6;oe7s6m~cXShefT#eY5<
zIm{j7(-WD)E$+h#>`>15$A6MyrFebT@SFFqhDM}^tG9(8#sc2>Ct2@*eYL@?@qJZs
z>5PUFADjRFPTRNFQDbMpele+Z59vtamRD!!eR9X=MK32mflqT%hOgjXip?8Sf?w1=
z=z3-mz4?gv#N!8j<iqiKmG#qevySG$EBed8LGkSDEU`Hi|2&7{8A>`W#1Dwb&%`Gx
znn1vJ;O7{AAcwMO?f&@uedEo+s}kGp^hCU>W7<b;4oyEfet+kt?3M1Z)6+BR3wMmO
zld3B9^WK-kzrM6IX&e7}N_d!caCgz|YhC!hT>R6VrgOJzl$R!dPW}8b`RvKiKEq`*
zz=!ZSd(+yK7ybV+ACN=_9>lh1P@m<K06+HyVc)(^gtGRQjJKsH6=&`*K|VcHdZYoo
zllj#+!5cnVe(c;G&3!8r`}h3Zh~WcypCIS0=3cvgZ1fY$BTjq!L6`0cDen*b(`?0u
zHZtJvYPErkSj8Qzruc0z2mB~+^2m7h<nI~6y+4W1L|qexsi|LSN%Elq!@#rG4JWQ%
zQ|o?BO@q%x-cHfezov`x>U6CSXXbvJJ<rZfFDIM$yOKjIi_hDc1yp|QQWn+|&j>}m
zEw@@a&2MFF>Z{Axd+f>gcd3bTi?@XXpGLj=l@)K=B!?<%+HX5stcw!o@mBm%_xFuN
zUHv)Lbt)m~?5P&J7e(P~4k!vvJ0$K7U$uwSlCkurj8>CMf~^c(zU%h&d!#2h#xLKN
z+C{Yg&m(+q_RP$ziT?2K-@j*PX8!s1ZOsxv)%S-J-+r{-xL1(#*VgqJ%j}|5WljEr
z6}|HxYs(sMU+=81y^_91K07n}YVz~s<P>>8iXF^mF$5P+YfPWzY<PJJKbY(1Eol8P
zc;~}F^S6GlzLIO-1~pgOHCH<bfDdI*w!(F5mEyu-p;9yTa{m9J{enXPU>=|Y|MGuL
z0O)yO-o%!tR_UZ@b64AFQOC_Z&>^^%*Sw<*UNQ8`QqWv~uY_u9HcjA!mMUB#E^-s<
zx{-f4Z+cLBNJzmf#BRMSzreWfRLhhGuM=<su)&zLwirz?+r|nj3*P9H5LjpzTY4*|
zMh&&4arP@~g8QjJ2(9h8<-=sRC(=ttWG<fP8()jDNwOCLIE!=U0QQ@a7B7`(GtOD_
zJuDt=zhPpc@~-jmpjbR@&=JJyailkccwI2NnEk%P;WCAlY4RB7!o#1806B#vgXbPD
z3RBa%_Q}?cALM3A-jxL0G%qnDNLlwDdN5Pg@2>>j+84WT!GB%i_v6Y+N78(l$C;f(
zAO9HY+>+y{BO!Au7gaAmap(8U)Wm<5ivn`lbmY6`A->(eQ_yCU!-fLZ(FU)F*$tYB
zcI?*Z_8z;x)Hm*<d!ny)V*NGk{TWCZL4paj)uA22x#cn5;f<MG^W<!zA%m=;2JY)#
z*T#d(W7x0B{(&IQ^Nfs|k0oafgrj>rz#w>}<lDOaPehzua3uqT9e0gpy`~551tml`
z`c)^z!gm!R%E%>GB}AI#PeWqEbL}9qoK6UGjD%i1LMcB{hpF7NB&>+(+?2MZh)<z)
zpURz`3UZV;hCPbyYt-=^bAdyNwvz6&kz*O}HTCxFb<m6ShYj=WywyC0XIJb_hD5eH
zvY}Z{uUt=**#~=8SK;IyD7Gz?@fA*_R<#9K6SyAi&E{MJ+d8HS%CW9zKsdHw7V!cu
z1EPIdooL@H1qxVu3jFtrw1tazd27+={ZkQ-Zxo>QFe0H*V81;_*(u#d<2`e}nmq-}
zZ=GAo;5a(edX#q(<VKNyb(UYTf42P6`RXKyQy=O6-JKlUL_R;?{}KOl$ql&%BIC0(
z&6gL?iDum`=Z>@4)(5Kuu7@Hv8rv#4dc(M90X)_VJuzLj@9)p(&f=zi<bq^t?o3Lz
zr*a)<P3ewSeFNW9(Lldy4G+EgXily~I_P8O{UWZvERLHT+%;3L(|}nkEN-!5!$+&>
zbZN&D@nCjZ|6FR)0T}b^)yrq4_<b4F+hC6*CM%X>jxVV?UkJ;Qs7qdF><qn4vG|i-
z)@iwi?Kj-=1=i+?qSr*3x?W=DT?lBcMS6K{EzZ#291Q7Ux`wXlxqDN;g!!VSz8&{;
zQ7dfsA-5u9TXEPaVv$2{X70_&&Hr_m2e&aw^UL4BHq4k87j`U8pu$I6RjXatu<;%0
z#@+6$oM+e}@_EEDoXQcVAM7W$PTpyI5gPL@+%`Q@BDqHvBMw&80zN+eUv%BuGFbN)
z{OmiHB-H1&n6o~P2ygjXvD0XE+)wk?qaqj`1|Km9{$T{&4m}SwaZp2edxahw_i~DS
z8cz6hr2!}~1YM#%78Ipy9Mv^iRPje#RB0%uX{pW6(^B%v9SGmgM{V}E!nDW7inb{Z
zBwhlFrY-yKPSQ9<cm<TG05D6UrP3!VvP1VUA$e?r-4g>9)Br~Uf`@n7a=8F%uo!e1
z5!r>QtgB!qyR*g8zXWY)7R$-8L2R}VXKjIARKSUD0Fw&=qDISR=xL_#qX2qND|0*i
z1^ZSaWA-rHijOO5=-_ULsDvA4-5fGiy~}-Hk<5FgI2}7Bx|0y6T=)4CY+1`zX1^dL
zKHQ|5%Fm<wD(2e*sp0~Z7ZgKpg9%B-G?XBU@_7*u0e7gSjzK(RH;Y|asaAGs@#{eq
zhQIcp{W8sQS7zLDn=C`2{$iUiI#9ll#k4$YIO~4}knmE&tdpkTJ{^`y4fnyJ^=gT~
zr$`#hN`-GXXsy{={J!rHYcNfQWEH{wL~OK=61LqHf-R^7Edk66v}@6o95{9w)>7rv
zk}j6wrrK@SQ@2}f@>1fPFO&c4*9kkRM6F<b$6Fg;6Qvc9Fy_elbpk25zxf88=ZKx&
zT0kD8h7>O2koNz6(>+^<Fr9^*PVR2^daM|T(iC&dmD-aHy$_fPB6F2y43*5fO_@iA
z0yl+=TO#8yp0)PSW5)L!Om88&R)RYVIJX>DV5`#==_`B|bJ;o*(^+$(jp{7i(Y~7J
zv?KVT(RsyykcS?6{HLu(n(T1cBQOhMzkR9~o%+`kKcON2^u$8@v7#O(lM{N72OpOk
zYV&Yf)mi#TMfX~izoz&4oBGBr5VF{x%Apma$(1T^NyjaZqb(D#1>I}U_@sV4YOs79
zFvQndz7hn-OiRr*;07m7mGloiE9gQ88j}E{4XId4`#Owit?t;4hnI<$bO`4dSN?KQ
z4Q5?E80;v5`x`lKdlCyD&<?4$Z_`?o-beEjptJ=*fKp-1L*-b_ci7@&v{EY+FLM}W
z-~k&5o+95?mbEYMJflvT$EW`4dUG`29NmT9n5jL0t`?ypzt;17XgR$6tFJjqL;~2;
z;fvNWC^~|L6Bi!2I*6WBS71|XpGVbvmpUXYH)H4s&v$g7&_D3&s2v0I`ZiR~abyr<
z_-=G$^63-cV;`Rp<l*xH^o8F_;8Y`3<O3mbA|!wUfc>4Y%kfC|Udq!UTsFg1^<9S$
zC(!Wzs|%M!>pra?lZH?S1MGT4+l_UT{m(C^xG`7~Ak`G<?gODxIVM6}Jusk>l5!40
zRyx|(DZ3}{?y=Er;;UYiG4kE##AZ=U35c1eaUG(?#kqrRmSrMuL~?aN>ZO+*MXD}D
z4h`WOQxCKcUf}Mo6ImG{klZmgu!UN*yox%iuetgC@hAK;zOLe5SI;Y7OPm=}!f8>V
zi=|HPJnLZ7En>k1`EXY?Ep@J9@ZS6i6Z2L!u^A1x28w{yvn)tPX}A3mV^LNs&aP+d
zwr_&!=e__5#_<QN^Q2f>5NK}}60O6BD<E4UkC@eo3Y|Ysp|+6h5nj>aQ=SWPw(;M#
zCkoYz&I`G&Y!PzY$Jfg!#+$!$zy-MIxfBXAF;ll8QE=963Cpx^-UO}_bXuwcuzwCP
z&B{Qo({7b$0e3h^*Ug{jE+gQm0dc6N3o@$844R!Pp$yx?+~_60$cABPlc3G+{27<T
zh93J5!?|4JR;v%DepFcKjhx(4<SMPx`vT@eEzr$?ePO}ZsGZ~r45=9}^n`PbFfS1f
zXFxM{Iz~Q)b<46P!i)qp><ufVD*zs>vij5;AtxZq!b6m5<Shks9E9UQHxk99aydN3
z6J{oaId<>d&j>P)L#&S2aZU&`V~O1u@LW#Zb&{B^GFz;|?h)Zrqg<VdyoC@nUj?->
zAfh!+zurMK{DThw{7-n&HU`W?3k_^pv`P=5^g>KEPK&yr9t_wvFd<?`h*5=`EWnn{
z2f8~ggKrbs^BMLFATXgJH?wo+Q8;wafK3C<b{S3Q(_m_&*%xhQQK7iFkD$0F*c=4=
z!iTF>vSUWmG0-f{fE@(a-zP!J^carHs*XUUds&om;=|RsiJ*zK7J}8|?^ESpR5_o6
zP+@$x*J`f?5cq3gSt^h`G-(#6$K2QB=d=)O!0Wy<VnKlGXgkw|jj8`?6+O14P>Z9A
z@QET!s{t{tg8Lh?tZrc6vCN8r7+Zj7tHu%xXw;#UKy=o)0nsYLfSov*3c~Y(C#fNU
z&BDcBX&#`rM<sF-h?%fhpJ)(Y)8IH$@;tt;9Kg9iaJS~KVDmt9KSF#qLA<mRQ^#N@
zu3_!FitvmBM#JI03eNF}G&?n~i=1M$2{8#W!v#wt1xa?zK%{zUILQ1d2&-Ifa``&X
z&Y0dXvB6icdYPyB9ChKT-e4+!4Ux1}RJ!4n8pTe5w>YApDk2nIM-{@^UZ_{V`Y9yF
z=J<-&VCbdDe+R47lLqy*hyQ)W9ZP1K>w#0(kU<n?4T!sz?B>RH<bgOxGV>2LGEs;z
zWkAx)5YO%D91wP%M2b}(5B<1gHh#H`5B1)S=nyQmW|>>7mxd-R@8d&dEI(0q#pq6x
z%{1~zFXLe;azDeASAqE%&SokhL-SDR1yTGn{!&`1{mVY)5)gJogfl@v;|+mZj9j_i
zgwtzs%hP2)7umuzQLE4%0(!idkf=nrk#cO`ne>cqiy&;LvQUZdR=u0t0KE>WVC~u^
zM#>4WaAMs_!>ZG)5EYQf_JAZIp{EV2>cHZI1}7UM>`fRYnuX_3k!tW%BM@sbfqKcO
zJQ6N;U~Nq=L$#y=5NpbT6pPYki1T;nh33rNjMZ{*O}fXLC+!EwDINr&Z&sL~JPzVm
z2M;er-eGtNJJ1`|sElURMqyCE+n}XeSOL^UH^m5<nExOWw?eo$7c?y=nC8^LI<*1Y
z;%$B_Z3jrmL?tKwWct#ZahO|B(*;h>!CDL0j|EbyMSu`y(}m6l50uxL=BwN)Ghp(s
zur%F5R1_RT#dG>S?8<E-;f^FK9>a$(PPYRTX3j>ui~*HvO+V{Q<qW7x2K1MLF{uRF
zdx3mD@^ct6U$k_d0a%aQrKlA@b&wQ;ox!?k#JB0)mZs6eO=C4p<I{Ku1n~P`tX(av

literal 0
HcmV?d00001

diff --git a/app/grants/models.py b/app/grants/models.py
index 0da4c16a180..f7a46545f90 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -957,6 +957,10 @@ def competing_phantum_funds(self):
     def value(self):
         return 5/(self.competing_phantum_funds().count())
 
+    @property
+    def estimated_matching_value(self):
+        return 'TODO'
+
     def to_mock_contribution(self):
         context = self.to_standard_dict()
         context['subscription'] = { 
diff --git a/app/grants/templates/grants/clr_estimate.html b/app/grants/templates/grants/clr_estimate.html
new file mode 100644
index 00000000000..492a922683f
--- /dev/null
+++ b/app/grants/templates/grants/clr_estimate.html
@@ -0,0 +1,10 @@
+{% load static%}
+{% if clr_contributoin_estimate %}
+  <div class="clr_estimate {{class}}">
+    <img src="{% static "v2/images/diamonds_high_fiving.gif" %}" >
+    <h3>Clr Match Round 3</h3>
+
+    <h4><span>{{clr_contributoin_estimate}} DAI</span> of 100,000 DAI</h4>
+    <p>Your contribution at this moment would increase the CLR Match amount for this grant by {{clr_contributoin_estimate}} DAI.<strong></strong></p>
+  </div>
+{% endif %}
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index efb33592245..04a591266a9 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -92,7 +92,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
                     {% if grant.pk == ele.grant.pk %}
                     (this grant)
                     {% endif %}
-                     for <strong>${{ele.value|floatformat:2}}</strong>
+                     for <strong>${{ele.value|floatformat:2}}</strong> + $<strong>{{ele.estimated_matching_value}}</strong> in matching.
                   </li>
                 {% endfor %}
                 </ol>
@@ -104,6 +104,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
                 <br>
                 <form method=POST>
                   {%csrf_token%}
+                  {% include './clr_estimate.html' %}
                   <input type=hidden name=toggle_phantom_fund value=1 />
                   <input class="btn btn-gc-blue" type=submit name=submit value="
                 {% if is_phantom_funding_this_grant %}
@@ -312,6 +313,7 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
 
                   <div class="form__group-horizontal">
                     <div class="row">
+                      {% include './clr_estimate.html' with class='extraleft' %}
                       <div class="col-12 form__footer text-center">
                         <button class="button button--primary button--full" id='js-fundGrant-button'>{% trans "Contribute to Grant" %}</button>
                       </div>
diff --git a/app/grants/views.py b/app/grants/views.py
index b9eac8a7cc8..42b74e1ba18 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -619,6 +619,7 @@ def grant_fund(request, grant_id, grant_slug):
         'active_tab': active_tab,
         'fund_reward': fund_reward,
         'phantom_funds': phantom_funds,
+        'clr_contributoin_estimate': 750, # TODO - fill this in dynamicaly.
     }
     return TemplateResponse(request, 'grants/fund.html', params)
 

From 25a9a12f642ff2fe0645861babe5ba9853eb7e11 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Wed, 18 Sep 2019 20:38:57 +0530
Subject: [PATCH 16/36] merged clr frontend code

---
 app/assets/v2/css/grants/card.css             |  8 ++-
 app/assets/v2/css/grants/fund.css             | 64 +++++++++++--------
 app/assets/v2/js/grants/fund.js               | 31 ---------
 app/grants/templates/grants/card/front.html   | 12 ++--
 app/grants/templates/grants/clr_estimate.html | 16 +++--
 app/grants/templates/grants/fund.html         | 16 ++---
 app/grants/views.py                           | 11 +++-
 7 files changed, 82 insertions(+), 76 deletions(-)

diff --git a/app/assets/v2/css/grants/card.css b/app/assets/v2/css/grants/card.css
index 0c63d50e16d..3e63ac13d85 100644
--- a/app/assets/v2/css/grants/card.css
+++ b/app/assets/v2/css/grants/card.css
@@ -35,7 +35,13 @@
 }
 
 .clr h2 {
-  color: #f6851b;
+  background: #10cd7a;
+  color: #fff;
+  border-radius: 3px;
+}
+
+.clr p {
+  font-size: 10px;
 }
 
 .grant-item__img {
diff --git a/app/assets/v2/css/grants/fund.css b/app/assets/v2/css/grants/fund.css
index da2f8d81f08..b41ef0da35a 100644
--- a/app/assets/v2/css/grants/fund.css
+++ b/app/assets/v2/css/grants/fund.css
@@ -4,18 +4,11 @@
   }
 }
 
-.popover-body .clr-popover h1 {
-  color: #f6851b
-}
-
-.popover-body .clr-popover p {
-  font-weight: 500;
-}
-
 .admin_profile a,
 #grant-link {
   color: #0D0764;
 }
+
 .tab_target{
   width: 100%;
 }
@@ -154,35 +147,41 @@
   bottom: -1.2rem;
 }
 
-.nav{
+.nav {
   text-align: center;
 }
-.nav-link{
+
+.nav-link {
   border-right: 1px solid black;
   border-top: 1px solid black;
   border-left: 1px solid black;
   margin-right: 10px;
 }
-.nav-link:visited{
+
+.nav-link:visited {
   color: black;
 }
-.nav-item.active{
+
+.nav-item.active {
   text-decoration: underline;
 }
-.clr_estimate{
+
+.clr_estimate {
   background-color: white;
   border-radius: 5px;
   border: 2px solid #10cd7a;
   text-align: left;
   width: 250px;
-  padding: 10px 15px;
+  padding: 1rem 15px;
   position: absolute;
   top: 0px;
   left: 0px;
 }
-.clr_estimate.extraleft{
+
+.clr_estimate.extraleft {
   left: -270px;
 }
+
 .clr_estimate:after {
   content: '';
   position: absolute;
@@ -197,34 +196,43 @@
   margin-top: -10px;
   margin-right: -20px;
 }
-.clr_estimate img{
+
+.clr_estimate img {
   float: right;
   width: 50px;
 }
-.clr_estimate h3{
+
+.clr_estimate h3 {
   text-align: left;
-  background-color: #10cd7a;
   color: white;
-  border-radius: 3px;
   font-size: 12px;
-  padding: 4px 6px;
   text-transform: uppercase;
   width: 150px;
 }
-.clr_estimate h4{
+
+.clr_estimate h3 span {
+  background-color: #10cd7a;
+  border-radius: 3px;
+  padding: 4px 6px;
+
+}
+
+.clr_estimate h4 {
   padding-top: 0px;
   text-align: left;
   color: #10cd7a;
   font-size: 10px;
+  font-weight: bold;
 }
-.clr_estimate h4 span{
+
+.clr_estimate h4 span {
   font-size: 16px;
-  font-weight: bold;
 }
-.clr_estimate p{
+
+.clr_estimate p {
   text-align: left;
   color: #10cd7a;
-  font-size: 10px;
+  font-size: 12px;
   color: #959595;
 }
 
@@ -254,3 +262,9 @@
     max-width: 100%;
   }
 }
+
+@media (max-width: 1199.98px) {
+  .clr_estimate {
+    display: none;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 76f5660b069..78a5c1d38ba 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -11,16 +11,6 @@ let gitcoinDonationAddress;
 
 $(document).ready(function() {
 
-  showCLRPopover();
-
-  $('#amount').on('input', () => {
-    showCLRPopover();
-  });
-
-  $('.popover').on('click', () => {
-    $('#amount-container').popover('hide');
-  });
-
   gitcoinDonationAddress = $('#gitcoin_donation_address').val();
   splitterAddress = $('#splitter_contract_address').val();
 
@@ -502,25 +492,4 @@ const splitGrantAmount = () => {
   $('.gitcoin-grant-percent').html(percent);
   $('.summary-gitcoin-amount').html(gitcoin_grant_amount);
   $('#summary-amount').html(grant_amount);
-};
-
-const showCLRPopover = () => {
-  // TODO: Check if grant has CLR else return
-
-  const clr_amount = 0; // TODO: trigger CLR calculation
-  const total_clr = 0; // TODO: fetch CLR
-  const random = 0; // TODO: figure out what this is
-  const html = `
-    <div class="mx-3 clr-popover text-center">
-      <h1 class="mt-3 mb-0 font-title">CLR MATCH ${clr_amount} DAI</h1>
-      <h2 class="font-body mt-0 mb-2">( out of ${total_clr} DAI )</h2>
-      <p class="font-caption">
-        This is how much your contribution at this moment would
-        increase the CLR Match amount for the grant by ${random} amount
-      </p>
-    </div>
-  `;
-
-  $('#amount-container').attr('data-content', html);
-  $('#amount-container').popover('show');
 };
\ No newline at end of file
diff --git a/app/grants/templates/grants/card/front.html b/app/grants/templates/grants/card/front.html
index 2aaf4d98cdf..5a35a2cdba9 100644
--- a/app/grants/templates/grants/card/front.html
+++ b/app/grants/templates/grants/card/front.html
@@ -37,10 +37,14 @@ <h2 class="grant-item__title font-subheader"><a href="{% url 'grants:details' gr
             </div>
           </div>
         </a>
-        <div class="clr position-absolute text-center"> <!-- TODO: Check if clr is enabled + update values -->
-          <h2 class="font-body font-weight-semibold my-0">CLR MATCH <span id="clr-grant-match">0</span> DAI</h2>
-          <p class="font-caption my-0">( out of <span id="clr-total">0</span> DAI )</p>
-        </div>
+        {% if clr_active %}
+          <div class="clr position-absolute text-center">
+            <h2 class="font-caption font-weight-bold my-0 p-1">
+              CLR MATCH <span id="clr-grant-match">0</span> DAI
+            </h2>
+            <p class="my-0">( out of <span id="clr-total">{{ total_clr_pot }}</span> DAI )</p>
+          </div>
+        {% endif %}
       </div>
 
       <div class="row progress-container mb-4">
diff --git a/app/grants/templates/grants/clr_estimate.html b/app/grants/templates/grants/clr_estimate.html
index 492a922683f..e8c3a31c0ac 100644
--- a/app/grants/templates/grants/clr_estimate.html
+++ b/app/grants/templates/grants/clr_estimate.html
@@ -1,10 +1,18 @@
 {% load static%}
-{% if clr_contributoin_estimate %}
+{% if clr_contribution_estimate and clr_active %}
   <div class="clr_estimate {{class}}">
     <img src="{% static "v2/images/diamonds_high_fiving.gif" %}" >
-    <h3>Clr Match Round 3</h3>
+    <h3>
+      <span>Clr Match Round {{ clr_round }}</span>
+    </h3>
 
-    <h4><span>{{clr_contributoin_estimate}} DAI</span> of 100,000 DAI</h4>
-    <p>Your contribution at this moment would increase the CLR Match amount for this grant by {{clr_contributoin_estimate}} DAI.<strong></strong></p>
+    <h4>
+      <span>{{ clr_contribution_estimate }} DAI</span>
+      of {{ total_clr_pot }} DAI
+    </h4>
+    <p class="mb-0">
+      Your contribution at this moment would increase the CLR Match amount
+      for this grant by <strong>{{clr_contribution_estimate}} DAI</strong>.
+    </p>
   </div>
 {% endif %}
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index 04a591266a9..2b489674a9f 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -107,11 +107,11 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
                   {% include './clr_estimate.html' %}
                   <input type=hidden name=toggle_phantom_fund value=1 />
                   <input class="btn btn-gc-blue" type=submit name=submit value="
-                {% if is_phantom_funding_this_grant %}
-                  {% trans "STOP using voucher for this Grant" %}
-                {% else %}
-                  {% trans "Use Voucher for this Grant" %}
-                {% endif %}
+                  {% if is_phantom_funding_this_grant %}
+                    {% trans "STOP using voucher for this Grant" %}
+                  {% else %}
+                    {% trans "Use Voucher for this Grant" %}
+                  {% endif %}
                 " />
                 </form> 
                 </a>
@@ -139,7 +139,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
 
                   <div class="form__group-horizontal">
                     <div class="row">
-                      <div id="amount-container" class="col-6 col-sm-8" data-container="body" data-toggle="popover" data-html="true" data-placement="left">
+                      <div class="col-6 col-sm-8">
                         <label class="form__label" id="amount_label">{% trans "Amount Per Period" %}</label>
                         <input type="number" min="0.001" id="amount" name="amount_per_period" class="form__input" value="5" required />
                       </div>
@@ -369,10 +369,6 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
 
   </body>
 
-  <script>
-    $('[data-toggle="popover"]').popover();
-  </script>
-
   <script src="{% static "v2/js/pages/wallet_estimate.js" %}"></script>
   <script src="{% static "v2/js/grants/compiledSplitter.js" %}"></script>
   <script src="{% static "v2/js/grants/compiledSubscriptionContract0.js" %}"></script>
diff --git a/app/grants/views.py b/app/grants/views.py
index 42b74e1ba18..84cc4bc65f1 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -57,6 +57,10 @@
 
 clr_matching_banners_style = 'pledging'
 matching_live = '($50K matching live now!) '
+total_clr_pot = 10000
+clr_round = 3
+clr_active = True
+
 if True:
     clr_matching_banners_style = 'results'
     matching_live = ''
@@ -125,6 +129,8 @@ def grants(request):
         'grants_count': _grants.count(),
         'keywords': get_keywords(),
         'grant_amount': grant_amount,
+        'total_clr_pot': total_clr_pot,
+        'clr_active': True
     }
 
     # log this search, it might be useful for matching purposes down the line
@@ -619,7 +625,10 @@ def grant_fund(request, grant_id, grant_slug):
         'active_tab': active_tab,
         'fund_reward': fund_reward,
         'phantom_funds': phantom_funds,
-        'clr_contributoin_estimate': 750, # TODO - fill this in dynamicaly.
+        'clr_round': clr_round,
+        'clr_contribution_estimate': 750, # TODO - fill this in dynamicaly.
+        'total_clr_pot': total_clr_pot,
+        'clr_active': True
     }
     return TemplateResponse(request, 'grants/fund.html', params)
 

From 36ec03a794220f240c6d5aeab2d8a281366ee599 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 00:26:47 +0900
Subject: [PATCH 17/36] cleanup and small tweaks

---
 app/grants/clr.py                             | 118 ++++++------------
 .../management/commands/estimate_clr.py       |  13 +-
 2 files changed, 51 insertions(+), 80 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 4e112bcf524..b11b6c7fa4f 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -26,27 +26,8 @@
 from grants.models import Contribution, Grant
 
 CLR_DISTRIBUTION_AMOUNT = 100000
+CLR_START_DATE = dt.datetime(2019, 1, 16, 0, 0)
 
-grant_contributions = [
-    {
-        'id': '1',
-        'contributions': [
-            { '1': 5 },
-            { '2': 10 },
-            { '3': 25 }
-        ]
-    },
-    {
-        'id': '2',
-        'contributions': [
-            { '3': 20 },
-            { '1': 2 },
-            { '4': 2 },
-            { '5': 5 },
-            { '1': 15 }
-        ]
-    }
-]
 
 '''
     Helper function that generates all combinations of pair of grant
@@ -83,9 +64,6 @@ def generate_grant_pair(grant):
             else:
                 unique_contributions[profile] = amount
 
-    # print(f'Grant Contributions: {grant_contributions}')
-    # print(f'Unique Contributions: {unique_contributions}')
-
     profile_pairs = list(combinations(unique_contributions.keys(), 2))
     contribution_pairs = list(combinations(unique_contributions.values(), 2))
 
@@ -94,7 +72,6 @@ def generate_grant_pair(grant):
         sqrt_of_product = round(math.sqrt(contribution_1 * contribution_2))
         sqrt_of_product_pairs.append(sqrt_of_product)
 
-
     grant = {
         'id': grant_id,
         'profile_pairs': profile_pairs,
@@ -102,13 +79,6 @@ def generate_grant_pair(grant):
         'sqrt_of_product_pairs': sqrt_of_product_pairs
     }
 
-    # print(f'Grant ID: {grant["id"]}')
-    # print(f'Profile Pairs: {grant["profile_pairs"]}')
-    # print(f'Contribution Pairs: {grant["contribution_pairs"]}')
-    # print(f'Sqrt Of Product Pairs: {grant["sqrt_of_product_pairs"]}')
-
-    # print('=================\n')
-
     return grant
 
 
@@ -160,14 +130,11 @@ def calculate_clr(threshold, grant_contributions):
             else:
                 group_by_pair[pair] = grant['sqrt_of_product_pairs'][index]
 
-    # print(f'SUM OF GROUPED BY PAIRS {group_by_pair} \n=================\n')
-
     _clrs = []
 
     for grant in grants:
         grant_clr = 0
         lr_contributions = []
-        # print(grant['profile_pairs'])
         for index, profile_pair in enumerate(grant['profile_pairs']):
             pair = str('&'.join(profile_pair))
             pair_reversed = str('&'.join(profile_pair[::-1]))
@@ -188,14 +155,11 @@ def calculate_clr(threshold, grant_contributions):
             lr_contributions.append(lr_contribution)
             grant_clr += lr_contribution
             total_clr += lr_contribution
-            # print(f'LR CONTRIBUTION {lr_contribution} | PAIR {profile_pair}')
 
-        # print(f'\n+++++\nGRANT {grant["id"]} - CLR CONTRIBUTION {grant_clr} \n+++++')
         _clrs.append({
             'id': grant["id"],
             'clr_amount': grant_clr
         })
-    # print(f'\n\n============ \nTOTAL CLR {total_clr} \n=============')
 
     return total_clr, _clrs
 
@@ -227,70 +191,63 @@ def grants_clr_calculate (total_pot, grant_contributions, min_threshold, max_thr
     threshold = (max_threshold + min_threshold) / 2
     total_clr, grants_clrs = calculate_clr(threshold, grant_contributions)
 
-    print(f'\n\n************ POT:  {total_pot} | Calculated CLR:  {total_clr} | Threshold {threshold} | Iterations {iterations} | GRANT SPLIT {grants_clrs}')
-
     if iterations == 100 or total_pot == threshold or previous_threshold == threshold:
         # No more accuracy to be had
         return grants_clrs, total_clr, threshold, iterations
     if total_clr > total_pot:
         max_threshold = threshold
-        # print(f'++ MIN {min_threshold} NEW MAX {max_threshold}')
     elif total_clr < total_pot:
         min_threshold = threshold
-        # print(f'-- NEW MIN {min_threshold} MAX {max_threshold}')
     else:
         return grants_clrs, total_clr, threshold, iterations
 
     return grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold, iterations, threshold)
 
-'''
-total_pot = 50
-max_threshold = total_pot
-min_threshold= 0
-
-grants_clr, total_clr, threshold, iterations = grants_clr_calculate(total_pot, grant_contributions, min_threshold, max_threshold)
-print(f'\n\n\n=============== \nFINAL \nPOT:  {total_pot} \nCalculated CLR:  {total_clr} \nThreshold {threshold} \nIterations {iterations} \nCLR Breakup\n')
-print(json.dumps(grants_clr, indent=2))
-print('===============')
-'''
-
 def generate_random_contribution_data():
     import random
     contrib_data = []
-    for grant_id in range(33):
-        contrib_data.append({'id': grant_id, 'contributions': [{str(profile_id): random.randint(3000,6890)} for profile_id in range(random.randint(0,17))]})
+    # whatever the range is here, you should have that many grants locally to test with
+    # this function generates fake contribution data, but assumes the grants are in the db
+
+    grants_to_use = 33
+    low_donation = 3000
+    high_donation = 6890
+    number_of_profiles = 17
+    for grant_id in range(grants_to_use):
+        contrib_data.append({'id': grant_id,
+                             'contributions': [{str(profile_id): random.randint(low_donation, high_donation)} for profile_id in range(random.randint(1, number_of_profiles))]})
     return contrib_data
 
 
 def calculate_clr_for_donation(donation_grant, donation_amount, total_pot, base_grant_contributions):
     grant_contributions = copy.deepcopy(base_grant_contributions)
-    # find grant in contributions list
+    # find grant in contributions list and add donation
     if donation_amount != 0:
         for grant_contribution in grant_contributions:
             if grant_contribution['id'] == donation_grant.id:
-                # add this donation with a new profile to get impact
+                # add this donation with a new profile (id 99999999999) to get impact
                 grant_contribution['contributions'].append({'999999999999': donation_amount})
+
     grants_clr, _, _, _ = grants_clr_calculate(CLR_DISTRIBUTION_AMOUNT, grant_contributions, 0, CLR_DISTRIBUTION_AMOUNT)
-    # print("GRANTS CLR: {}".format(grants_clr))
-    # print("TOTAL CLR: {}".format(total_clr))
-    # if grants_clr == 0:
-    #    return 0
+
+    # find grant we added the contribution to and get the new clr amount
     for grant_clr in grants_clr:
         if grant_clr['id'] == donation_grant.id:
             return (grant_clr['clr_amount'], grants_clr)
+
     print('error: could not find grant in final grants_clr data')
     return (None, None)
 
-def predict_clr(random_data=False):
-    clr_start_date = dt.datetime(2019, 1, 15, 0, 0)
+def predict_clr(random_data=False, save_to_db=False):
     # get all the eligible contributions and calculate total
-    contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=clr_start_date)
+    contributions = Contribution.objects.prefetch_related('subscription').filter(created_on__gte=CLR_START_DATE)
+    debug_output = []
     grants = Grant.objects.all()
-    final_output = []
-    contrib_data = []
 
     # set up data to load contributions for each grant
     if not random_data:
+        contrib_data = []
+
         for grant in grants:
             # go through all the individual contributions for each grant
             g_contributions = copy.deepcopy(contributions).filter(subscription__grant_id=grant.id)
@@ -298,29 +255,36 @@ def predict_clr(random_data=False):
             # put in correct format
             all_contributing_profile_ids = list(set([c.subscription.contributor_profile.id for c in g_contributions]))
             all_summed_contributions = []
-            print("*** grant id:{} has contributions from profiles: {}".format(grant.id, all_contributing_profile_ids))
+
             for profile_id in all_contributing_profile_ids:
+                # get sum of contributions per grant for each profile
                 profile_g_contributions = g_contributions.filter(subscription__contributor_profile_id=profile_id)
                 sum_of_each_profiles_contributions = float(sum([c.subscription.get_converted_monthly_amount() for c in profile_g_contributions]))
-                print("*** profile id:{} contributed total:{}".format(profile_id, sum_of_each_profiles_contributions))
                 all_summed_contributions.append({str(profile_id): sum_of_each_profiles_contributions})
-            #contrib_data.append({'id': grant.id, 'contributions': [{str(c.subscription.contributor_profile.id): c.subscription.get_converted_monthly_amount()} for c in g_contributions]})
+
+            # for each grant, list the contributions in key value pairs like {'profile id': sum of contributions}
             contrib_data.append({'id': grant.id, 'contributions': all_summed_contributions})
     else:
+        # use random contribution data for testing
         contrib_data = generate_random_contribution_data()
-    print('\n\ncontributions data:\n\n')
+
+    print('\n\ncontributions data:')
     print(contrib_data)
-    # apply potential donations for each grant
+
+    # calculate clr given additional donations
     for grant in grants:
-        # five potential additional donations
+        # five potential additional donations plus the base case of 0
         potential_donations = [0, 1, 10, 100, 1000, 10000]
         potential_clr = []
+
         for donation_amount in potential_donations:
-            # calculate impact for each additional donation and save as number to display
+            # calculate clr with each additional donation and save to grants model
             predicted_clr, grants_clr = calculate_clr_for_donation(grant, donation_amount, CLR_DISTRIBUTION_AMOUNT, contrib_data)
             potential_clr.append(predicted_clr)
-        # grant.clr_prediction_curve = zip(potential_donations, potential_clr)
-        # grant.save()
-        # print("grant: {} potential_clr: {}".format(grant.id, potential_clr))
-        final_output.append({'grant': grant.id, "clr_prediction_curve": (potential_donations, potential_clr), "grants_clr": grants_clr})
-    return final_output
+
+        if save_to_db:
+            grant.clr_prediction_curve = list(zip(potential_donations, potential_clr))
+            grant.save()
+
+        debug_output.append({'grant': grant.id, "clr_prediction_curve": (potential_donations, potential_clr), "grants_clr": grants_clr})
+    return debug_output
diff --git a/app/grants/management/commands/estimate_clr.py b/app/grants/management/commands/estimate_clr.py
index 0654c29a042..40ddda54e10 100644
--- a/app/grants/management/commands/estimate_clr.py
+++ b/app/grants/management/commands/estimate_clr.py
@@ -32,13 +32,20 @@ class Command(BaseCommand):
     help = 'calculate CLR estimates for all grants'
 
     def handle(self, *args, **options):
-        clr_prediction_curves = predict_clr(random_data=False)
+        clr_prediction_curves = predict_clr(random_data=False, save_to_db=False)
+
+        # Uncomment these for debugging and sanity checking
         # for grant in clr_prediction_curves:
             #print("CLR predictions for grant {}".format(grant['grant']))
             #print("All grants: {}".format(grant['grants_clr']))
             #print("prediction curve: {}\n\n".format(grant['clr_prediction_curve']))
-        #sanity check: sum all the estimated clr distributions - should equal 100000
+
+        # sanity check: sum all the estimated clr distributions - should be close to CLR_DISTRIBUTION_AMOUNT
         clr_data = [g['grants_clr'] for g in clr_prediction_curves]
-        #print(clr_data)
+
+        # print(clr_data)
+
         total_clr_funds = sum([each_grant['clr_amount'] for each_grant in clr_data[0]])
         print("allocated CLR funds:{}".format(total_clr_funds))
+
+        print("finished CLR estimates")

From c74582074fd2945b0155509a834e7721eccf6587 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Wed, 18 Sep 2019 21:23:01 +0530
Subject: [PATCH 18/36] wiring UI to BE

---
 app/assets/v2/js/grants/fund.js               | 31 ++++++++++++++++++-
 app/grants/templates/grants/clr_estimate.html | 10 ++++--
 app/grants/templates/grants/fund.html         | 12 ++++---
 app/grants/views.py                           |  2 +-
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 78a5c1d38ba..ed6a3d58300 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -11,6 +11,10 @@ let gitcoinDonationAddress;
 
 $(document).ready(function() {
 
+  $('#amount').on('input', () => {
+    predictCLRMatch();
+  });
+
   gitcoinDonationAddress = $('#gitcoin_donation_address').val();
   splitterAddress = $('#splitter_contract_address').val();
 
@@ -490,6 +494,31 @@ const splitGrantAmount = () => {
   }
 
   $('.gitcoin-grant-percent').html(percent);
-  $('.summary-gitcoin-amount').html(gitcoin_grant_amount);
+  $('.summary-gitcoin-amount').html(gitcoin_grant_amount.toFixed(2));
   $('#summary-amount').html(grant_amount);
+};
+
+const predictCLRMatch = () => {
+
+  const amount = Number.parseFloat($('#amount').val());
+  let predicted_clr = 0;
+
+  if (amount == 0) {
+    predicted_clr = prediction_curve[0];
+  } else if (amount <= 1) {
+    predicted_clr = (prediction_curve[0] + prediction_curve[1]) / 2;
+  } else if (amount <= 10) {
+    predicted_clr = (prediction_curve[1] + prediction_curve[2]) / 2;
+  } else if (amount <= 100) {
+    predicted_clr = (prediction_curve[2] + prediction_curve[3]) / 2;
+  } else if (amount <= 1000) {
+    predicted_clr = (prediction_curve[3] + prediction_curve[4]) / 2;
+  } else if (amount <= 10000) {
+    predicted_clr = (prediction_curve[4] + prediction_curve[5]) / 2;
+  } else {
+    predicted_clr = prediction_curve[5];
+  }
+
+  $('.clr_match_prediction').html(predicted_clr);
+  $('.clr_increase').html(predicted_clr - prediction_curve[0]);
 };
\ No newline at end of file
diff --git a/app/grants/templates/grants/clr_estimate.html b/app/grants/templates/grants/clr_estimate.html
index e8c3a31c0ac..122e1bf9f7b 100644
--- a/app/grants/templates/grants/clr_estimate.html
+++ b/app/grants/templates/grants/clr_estimate.html
@@ -1,5 +1,5 @@
 {% load static%}
-{% if clr_contribution_estimate and clr_active %}
+{% if clr_active %}
   <div class="clr_estimate {{class}}">
     <img src="{% static "v2/images/diamonds_high_fiving.gif" %}" >
     <h3>
@@ -7,12 +7,16 @@ <h3>
     </h3>
 
     <h4>
-      <span>{{ clr_contribution_estimate }} DAI</span>
+      <span class="clr_match_prediction">{{ prediction_curve.0 }}</span>
+      <span>DAI</span>
       of {{ total_clr_pot }} DAI
     </h4>
     <p class="mb-0">
       Your contribution at this moment would increase the CLR Match amount
-      for this grant by <strong>{{clr_contribution_estimate}} DAI</strong>.
+      for this grant by
+      <strong>
+        <span class="clr_increase">0</span> DAI
+      </strong>.
     </p>
   </div>
 {% endif %}
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index 2b489674a9f..e3903507aab 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -359,13 +359,15 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
     {% include 'shared/footer.html' %}
     {% include 'grants/shared/shared_scripts.html' %}
 
-    {% if show_tweet_modal %}
-      <script>
+    <script>
+      {% if show_tweet_modal %}
         $(document).ready(function(){
-           $('#tweetModal').css('display', 'block');
+          $('#tweetModal').css('display', 'block');
         });
-      </script>
-    {% endif %}
+      {% endif %}
+
+      const prediction_curve = {{ prediction_curve }};
+    </script>
 
   </body>
 
diff --git a/app/grants/views.py b/app/grants/views.py
index 84cc4bc65f1..37610a1dad5 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -626,7 +626,7 @@ def grant_fund(request, grant_id, grant_slug):
         'fund_reward': fund_reward,
         'phantom_funds': phantom_funds,
         'clr_round': clr_round,
-        'clr_contribution_estimate': 750, # TODO - fill this in dynamicaly.
+        'prediction_curve': [5, 10, 15, 20, 25, 30], # grant.clr_prediction_curve
         'total_clr_pot': total_clr_pot,
         'clr_active': True
     }

From e0e62430a4a27426e3a861bb94a643717419da33 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 00:58:18 +0900
Subject: [PATCH 19/36] add admin, fix url conf, etc.

---
 app/grants/admin.py                            | 6 +++---
 app/grants/clr.py                              | 1 +
 app/grants/management/commands/estimate_clr.py | 2 +-
 app/grants/models.py                           | 4 +++-
 app/grants/urls.py                             | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/grants/admin.py b/app/grants/admin.py
index 869cbfa574f..77b531f8996 100644
--- a/app/grants/admin.py
+++ b/app/grants/admin.py
@@ -47,12 +47,12 @@ class GrantAdmin(GeneralAdmin):
         'token_address', 'contract_address', 'contract_version', 'network', 'required_gas_price', 'logo_svg_asset',
         'logo_asset', 'created_on', 'modified_on', 'team_member_list',
         'subscriptions_links', 'contributions_links', 'logo', 'logo_svg', 'image_css',
-         'link', 'clr_matching', 'hidden'
+         'link', 'clr_matching', 'clr_prediction_curve', 'hidden'
     ]
     readonly_fields = [
         'logo_svg_asset', 'logo_asset',
         'team_member_list',
-        'subscriptions_links', 'contributions_links', 'link', 
+        'subscriptions_links', 'contributions_links', 'link',
     ]
     raw_id_fields = ['admin_profile']
 
@@ -179,7 +179,7 @@ class ContributionAdmin(GeneralAdmin):
     """Define the Contribution administration layout."""
     raw_id_fields = ['subscription']
 
-    
+
 admin.site.register(PhantomFunding, GeneralAdmin)
 admin.site.register(MatchPledge, MatchPledgeAdmin)
 admin.site.register(Grant, GrantAdmin)
diff --git a/app/grants/clr.py b/app/grants/clr.py
index b11b6c7fa4f..7d011d6c2d6 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -213,6 +213,7 @@ def generate_random_contribution_data():
     low_donation = 3000
     high_donation = 6890
     number_of_profiles = 17
+
     for grant_id in range(grants_to_use):
         contrib_data.append({'id': grant_id,
                              'contributions': [{str(profile_id): random.randint(low_donation, high_donation)} for profile_id in range(random.randint(1, number_of_profiles))]})
diff --git a/app/grants/management/commands/estimate_clr.py b/app/grants/management/commands/estimate_clr.py
index 40ddda54e10..613f5a3ef73 100644
--- a/app/grants/management/commands/estimate_clr.py
+++ b/app/grants/management/commands/estimate_clr.py
@@ -32,7 +32,7 @@ class Command(BaseCommand):
     help = 'calculate CLR estimates for all grants'
 
     def handle(self, *args, **options):
-        clr_prediction_curves = predict_clr(random_data=False, save_to_db=False)
+        clr_prediction_curves = predict_clr(random_data=False, save_to_db=True)
 
         # Uncomment these for debugging and sanity checking
         # for grant in clr_prediction_curves:
diff --git a/app/grants/models.py b/app/grants/models.py
index 5af4ec5cb37..1c3c01814b1 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -209,8 +209,10 @@ def __str__(self):
     def clr_prediction(self, donation):
         """Linear interpolation between 5 point curve"""
         curve = self.clr_prediction_curve
-        for i in range(1, length(curve)):
+        donation = float(donation)
+        for i in range(1, len(curve)):
             if curve[i-1][0] <= donation and donation <= curve[i][0]:
+                print('value between {} and {}'.format(curve[i-1][0], curve[i][0]))
                 break
         m = (curve[i-1][0] - curve[i-1][1]) / (curve[i][0] - curve[i][1])
         prediction = (donation - curve[i][1]) * m + curve[i-1][1]
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 025461cb21c..864be358720 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -27,9 +27,9 @@
 app_name = 'grants'
 urlpatterns = [
     path('', grants, name='grants'),
+    path('<int:grant_id>/potential_clr', potential_clr, name='potential_clr'),
     path('<int:grant_id>/<slug:grant_slug>', grant_details, name='details'),
     path('<int:grant_id>/<slug:grant_slug>/', grant_details, name='details2'),
-    path('<int:grant_id>/potential_clr', potential_clr, name='potential_clr'),
     re_path(r'^new', grant_new, name='new'),
     re_path(r'^old', grant_new_v0, name='old'),
     path('<int:grant_id>/<slug:grant_slug>/milestones', milestones, name='milestones'),

From 3a5d80634454d2d2fed4aa33f32c419cf330dc54 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 01:14:01 +0900
Subject: [PATCH 20/36] remove backend lerp

---
 app/grants/models.py | 15 +--------------
 app/grants/urls.py   |  1 -
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index 028172887c3..0998d50990b 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -206,19 +206,6 @@ def __str__(self):
         return f"id: {self.pk}, active: {self.active}, title: {self.title}"
 
 
-    def clr_prediction(self, donation):
-        """Linear interpolation between 5 point curve"""
-        curve = self.clr_prediction_curve
-        donation = float(donation)
-        for i in range(1, len(curve)):
-            if curve[i-1][0] <= donation and donation <= curve[i][0]:
-                print('value between {} and {}'.format(curve[i-1][0], curve[i][0]))
-                break
-        m = (curve[i-1][0] - curve[i-1][1]) / (curve[i][0] - curve[i][1])
-        prediction = (donation - curve[i][1]) * m + curve[i-1][1]
-        return prediction
-
-
     def percentage_done(self):
         """Return the percentage of token received based on the token goal."""
         if not self.amount_goal:
@@ -965,7 +952,7 @@ def estimated_matching_value(self):
 
     def to_mock_contribution(self):
         context = self.to_standard_dict()
-        context['subscription'] = { 
+        context['subscription'] = {
             'contributor_profile': self.profile,
             'amount_per_period': self.value,
             'token_symbol': 'DAI',
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 864be358720..fa60b8a60c0 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -27,7 +27,6 @@
 app_name = 'grants'
 urlpatterns = [
     path('', grants, name='grants'),
-    path('<int:grant_id>/potential_clr', potential_clr, name='potential_clr'),
     path('<int:grant_id>/<slug:grant_slug>', grant_details, name='details'),
     path('<int:grant_id>/<slug:grant_slug>/', grant_details, name='details2'),
     re_path(r'^new', grant_new, name='new'),

From d4402b915bb7480de04cbc79f6bc07e151d97cc1 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Wed, 18 Sep 2019 23:12:34 +0530
Subject: [PATCH 21/36] added lerp

---
 app/assets/v2/js/grants/fund.js               | 70 +++++++++++++++----
 app/grants/templates/grants/card/front.html   |  2 +-
 app/grants/templates/grants/clr_estimate.html |  4 +-
 app/grants/templates/grants/fund.html         |  3 +-
 app/grants/views.py                           |  3 +-
 5 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index ed6a3d58300..6866ab179cf 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -498,27 +498,67 @@ const splitGrantAmount = () => {
   $('#summary-amount').html(grant_amount);
 };
 
+const lerp = (x_lower, x_upper, y_lower, y_upper, x) => {
+  console.log(x_lower, x_upper, y_lower, y_upper, x);
+  return y_lower + (((y_upper - y_lower) * (x - x_lower)) / (x_upper - x_lower));
+};
+
 const predictCLRMatch = () => {
 
   const amount = Number.parseFloat($('#amount').val());
   let predicted_clr = 0;
 
-  if (amount == 0) {
-    predicted_clr = prediction_curve[0];
-  } else if (amount <= 1) {
-    predicted_clr = (prediction_curve[0] + prediction_curve[1]) / 2;
-  } else if (amount <= 10) {
-    predicted_clr = (prediction_curve[1] + prediction_curve[2]) / 2;
-  } else if (amount <= 100) {
-    predicted_clr = (prediction_curve[2] + prediction_curve[3]) / 2;
-  } else if (amount <= 1000) {
-    predicted_clr = (prediction_curve[3] + prediction_curve[4]) / 2;
-  } else if (amount <= 10000) {
-    predicted_clr = (prediction_curve[4] + prediction_curve[5]) / 2;
+  const contributions_axis = [ 0, 1, 10, 100, 1000, 10000 ];
+
+  if (isNaN(amount)) {
+    predicted_clr = clr_prediction_curve[index];
+  } else if (contributions_axis.indexOf(amount) >= 0) {
+    index = contributions_axis.indexOf(amount);
+    predicted_clr = clr_prediction_curve[index];
   } else {
-    predicted_clr = prediction_curve[5];
+    let x_lower = 0;
+    let x_upper = 0;
+    let y_lower = 0;
+    let y_upper = 0;
+
+    if (0 < amount && amount < 1) {
+      x_lower = 0;
+      x_upper = 1;
+      y_lower = clr_prediction_curve[0];
+      y_upper = clr_prediction_curve[1];
+    } else if (1 < amount && amount < 10) {
+      x_lower = 1;
+      x_upper = 10;
+      y_lower = clr_prediction_curve[1];
+      y_upper = clr_prediction_curve[2];
+    } else if (10 < amount && amount < 100) {
+      x_lower = 10;
+      x_upper = 100;
+      y_lower = prediction_curve[2];
+      y_upper = prediction_curve[3];
+    } else if (100 < amount && amount < 1000) {
+      x_lower = 100;
+      x_upper = 1000;
+      y_lower = clr_prediction_curve[3];
+      y_upper = clr_prediction_curve[4];
+    } else if (1000 < amount && amount <= 10000) {
+      x_lower = 1000;
+      x_upper = 10000;
+      y_lower = clr_prediction_curve[4];
+      y_upper = clr_prediction_curve[5];
+    } else {
+      // NOT SURE WHAT TO DO HERE
+      // NEED TO ESTIMATE ONE WITH MAX CONTRIBUTION
+      // CAN WE ASSUME MAX AMOUNT IS 10000 ?
+      x_lower = 10000;
+      x_upper = 0; // WHAT ?
+      y_lower = clr_prediction_curve[5];
+      y_upper = 0; // WHAT ?
+    }
+
+    predicted_clr = lerp(x_lower, x_upper, y_lower, y_upper, amount);
   }
 
-  $('.clr_match_prediction').html(predicted_clr);
-  $('.clr_increase').html(predicted_clr - prediction_curve[0]);
+  $('.clr_match_prediction').html(predicted_clr.toFixed(2));
+  $('.clr_increase').html((predicted_clr - clr_prediction_curve[0]).toFixed(2));
 };
\ No newline at end of file
diff --git a/app/grants/templates/grants/card/front.html b/app/grants/templates/grants/card/front.html
index 5a35a2cdba9..f8662e60f91 100644
--- a/app/grants/templates/grants/card/front.html
+++ b/app/grants/templates/grants/card/front.html
@@ -40,7 +40,7 @@ <h2 class="grant-item__title font-subheader"><a href="{% url 'grants:details' gr
         {% if clr_active %}
           <div class="clr position-absolute text-center">
             <h2 class="font-caption font-weight-bold my-0 p-1">
-              CLR MATCH <span id="clr-grant-match">0</span> DAI
+              CLR MATCH <span id="clr-grant-match">{{ grant.clr_prediction_curve.0}}</span> DAI
             </h2>
             <p class="my-0">( out of <span id="clr-total">{{ total_clr_pot }}</span> DAI )</p>
           </div>
diff --git a/app/grants/templates/grants/clr_estimate.html b/app/grants/templates/grants/clr_estimate.html
index 122e1bf9f7b..c6a91b515b7 100644
--- a/app/grants/templates/grants/clr_estimate.html
+++ b/app/grants/templates/grants/clr_estimate.html
@@ -7,7 +7,7 @@ <h3>
     </h3>
 
     <h4>
-      <span class="clr_match_prediction">{{ prediction_curve.0 }}</span>
+      <span class="clr_match_prediction">{{ grant.clr_prediction_curve.0|floatformat:2 }}</span>
       <span>DAI</span>
       of {{ total_clr_pot }} DAI
     </h4>
@@ -15,7 +15,7 @@ <h4>
       Your contribution at this moment would increase the CLR Match amount
       for this grant by
       <strong>
-        <span class="clr_increase">0</span> DAI
+        <span class="clr_increase">0.00</span> DAI
       </strong>.
     </p>
   </div>
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index e3903507aab..44646d66fd0 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -366,7 +366,8 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
         });
       {% endif %}
 
-      const prediction_curve = {{ prediction_curve }};
+      let clr_prediction_curve = {{ grant.clr_prediction_curve }};
+      clr_prediction_curve = [5, 10, 15, 20, 25, 30]; // TODO: REMOVE
     </script>
 
   </body>
diff --git a/app/grants/views.py b/app/grants/views.py
index 37610a1dad5..4a6ea78a55a 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -57,7 +57,7 @@
 
 clr_matching_banners_style = 'pledging'
 matching_live = '($50K matching live now!) '
-total_clr_pot = 10000
+total_clr_pot = 100000
 clr_round = 3
 clr_active = True
 
@@ -626,7 +626,6 @@ def grant_fund(request, grant_id, grant_slug):
         'fund_reward': fund_reward,
         'phantom_funds': phantom_funds,
         'clr_round': clr_round,
-        'prediction_curve': [5, 10, 15, 20, 25, 30], # grant.clr_prediction_curve
         'total_clr_pot': total_clr_pot,
         'clr_active': True
     }

From 4c0c59812368cc104719edda02bee35d671c6c92 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 19:03:14 +0900
Subject: [PATCH 22/36] fix bugs and edge case

---
 app/assets/v2/js/grants/fund.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 6866ab179cf..0a79aa9c553 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -505,7 +505,12 @@ const lerp = (x_lower, x_upper, y_lower, y_upper, x) => {
 
 const predictCLRMatch = () => {
 
-  const amount = Number.parseFloat($('#amount').val());
+  let amount = Number.parseFloat($('#amount').val());
+
+  if (amount > 10000) {
+    amount = 10000
+  }
+
   let predicted_clr = 0;
 
   const contributions_axis = [ 0, 1, 10, 100, 1000, 10000 ];
@@ -534,8 +539,8 @@ const predictCLRMatch = () => {
     } else if (10 < amount && amount < 100) {
       x_lower = 10;
       x_upper = 100;
-      y_lower = prediction_curve[2];
-      y_upper = prediction_curve[3];
+      y_lower = clr_prediction_curve[2];
+      y_upper = clr_prediction_curve[3];
     } else if (100 < amount && amount < 1000) {
       x_lower = 100;
       x_upper = 1000;
@@ -561,4 +566,4 @@ const predictCLRMatch = () => {
 
   $('.clr_match_prediction').html(predicted_clr.toFixed(2));
   $('.clr_increase').html((predicted_clr - clr_prediction_curve[0]).toFixed(2));
-};
\ No newline at end of file
+};

From 0708ab340234ef4d1860ad75db1d21b737932ab4 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 19:04:37 +0900
Subject: [PATCH 23/36] fix crontab name

---
 scripts/crontab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/crontab b/scripts/crontab
index abb3e765116..40fa6042308 100644
--- a/scripts/crontab
+++ b/scripts/crontab
@@ -41,7 +41,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/us
 1 1 1 * * cd gitcoin/coin; bash scripts/run_management_command.bash activity_report $(date --date='-1 month' +%Y/%m/%d) $(date +%Y/%m/%d)  >> /var/log/gitcoin/activity_report.log  2>&1
 
 ## CLR
-0 */4 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash generate_clr_predictions  >> /var/log/gitcoin/generate_clr_predictions.log  2>&1
+0 */4 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash estimate_clr  >> /var/log/gitcoin/estimate_clr.log  2>&1
 
 ## GITCOIN MARKETING
 30 */12 * * * cd gitcoin/coin; bash scripts/run_management_command_if_not_already_running.bash sync_mail  >> /var/log/gitcoin/sync_mail.log  2>&1

From 3e6c16f3811ef3250004e337effa603c520d4bd6 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 20:12:46 +0900
Subject: [PATCH 24/36] fix migration?

---
 app/grants/migrations/0030_grant_clr_prediction_curve.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/grants/migrations/0030_grant_clr_prediction_curve.py b/app/grants/migrations/0030_grant_clr_prediction_curve.py
index bba0e8319b0..415b713e509 100644
--- a/app/grants/migrations/0030_grant_clr_prediction_curve.py
+++ b/app/grants/migrations/0030_grant_clr_prediction_curve.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.4 on 2019-09-17 14:37
+# Generated by Django 2.2.4 on 2019-09-19 11:09
 
 import django.contrib.postgres.fields
 from django.db import migrations, models

From 274a2cf8eda5ae5156229f4029dda876a2000cbf Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 20:14:19 +0900
Subject: [PATCH 25/36] fix eslint

---
 app/assets/v2/js/grants/fund.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 0a79aa9c553..708b197a318 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -508,7 +508,7 @@ const predictCLRMatch = () => {
   let amount = Number.parseFloat($('#amount').val());
 
   if (amount > 10000) {
-    amount = 10000
+    amount = 10000;
   }
 
   let predicted_clr = 0;

From 2ef653095fc50c733d43e8dc82a74a4c98ced24d Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 20:15:55 +0900
Subject: [PATCH 26/36] cleanup unused imports

---
 app/grants/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/grants/models.py b/app/grants/models.py
index 0998d50990b..39943826787 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -18,7 +18,6 @@
 
 """
 import logging
-import math
 from datetime import timedelta
 from decimal import Decimal
 

From 053c7ae4c03afb1be4f7e91a9badf630d6fb7a98 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 21:42:36 +0900
Subject: [PATCH 27/36] remove bad migration

---
 app/grants/migrations/0022_auto_20190604_1547.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/grants/migrations/0022_auto_20190604_1547.py b/app/grants/migrations/0022_auto_20190604_1547.py
index efc7cec36eb..552b227694c 100644
--- a/app/grants/migrations/0022_auto_20190604_1547.py
+++ b/app/grants/migrations/0022_auto_20190604_1547.py
@@ -7,14 +7,7 @@
 logger = logging.getLogger(__name__)
 
 def forwards(apps, schema_editor):
-    from grants.models import CLRMatch
-    for grant in Grant.objects.all():
-        if grant.clr_matching:
-            CLRMatch.objects.create(
-                grant=grant,
-                round_number=1,
-                amount=grant.clr_matching,
-                )
+    pass
 
 def backwards(apps, schema_editor):
     pass

From 90cd3ee5925d7b9213ddc1dc7611fdfc5231f259 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 21:50:13 +0900
Subject: [PATCH 28/36] remove another bad migration

---
 app/grants/migrations/0023_auto_20190604_1552.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/grants/migrations/0023_auto_20190604_1552.py b/app/grants/migrations/0023_auto_20190604_1552.py
index fc262ef140e..f5e00720f6d 100644
--- a/app/grants/migrations/0023_auto_20190604_1552.py
+++ b/app/grants/migrations/0023_auto_20190604_1552.py
@@ -8,6 +8,7 @@
 
 def forwards(apps, schema_editor):
     ## ROUND 2 CLR Match Amounts
+    '''
     from grants.models import CLRMatch
     # array of [grant_id, amount]
     try:
@@ -27,6 +28,8 @@ def forwards(apps, schema_editor):
                         )
     except Exception as e:
         logger.info(e)
+    '''
+    pass
 
 def backwards(apps, schema_editor):
     pass

From 81b8f2449480d565467550666096069b574d1192 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Thu, 19 Sep 2019 19:04:56 +0530
Subject: [PATCH 29/36] final fixes

---
 app/app/settings.py                   |  2 +-
 app/assets/v2/css/grants/fund.css     | 12 ++++++++++
 app/assets/v2/js/grants/fund.js       | 13 +++--------
 app/grants/models.py                  |  4 ----
 app/grants/templates/grants/fund.html | 33 +++++++++++----------------
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/app/app/settings.py b/app/app/settings.py
index f5eb52aa893..503e2beb8a2 100644
--- a/app/app/settings.py
+++ b/app/app/settings.py
@@ -120,7 +120,7 @@
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'app.middleware.drop_accept_langauge',
-    'app.middleware.bleach_requests',
+    # 'app.middleware.bleach_requests',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
diff --git a/app/assets/v2/css/grants/fund.css b/app/assets/v2/css/grants/fund.css
index b41ef0da35a..d14cb9e08dc 100644
--- a/app/assets/v2/css/grants/fund.css
+++ b/app/assets/v2/css/grants/fund.css
@@ -24,6 +24,12 @@
   object-fit: cover;
 }
 
+#grants_form .nav-link {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  color: #000;
+}
+
 #grants_form .form__input.valid,
 #grants_form .form__input.error {
   background-position: top 0.5rem right 0.5rem;
@@ -236,6 +242,12 @@
   color: #959595;
 }
 
+#phantom_fund .description i {
+  font-size: 10px;
+  position: relative;
+  top: -1px;
+}
+
 @media (min-width:1140px) and (max-width: 1600px) {
 
   #gitcoin-grant-section .fee-slider,
diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 708b197a318..4ed8f74e6a7 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -11,6 +11,8 @@ let gitcoinDonationAddress;
 
 $(document).ready(function() {
 
+  predictCLRMatch();
+
   $('#amount').on('input', () => {
     predictCLRMatch();
   });
@@ -499,7 +501,6 @@ const splitGrantAmount = () => {
 };
 
 const lerp = (x_lower, x_upper, y_lower, y_upper, x) => {
-  console.log(x_lower, x_upper, y_lower, y_upper, x);
   return y_lower + (((y_upper - y_lower) * (x - x_lower)) / (x_upper - x_lower));
 };
 
@@ -546,19 +547,11 @@ const predictCLRMatch = () => {
       x_upper = 1000;
       y_lower = clr_prediction_curve[3];
       y_upper = clr_prediction_curve[4];
-    } else if (1000 < amount && amount <= 10000) {
+    } else {
       x_lower = 1000;
       x_upper = 10000;
       y_lower = clr_prediction_curve[4];
       y_upper = clr_prediction_curve[5];
-    } else {
-      // NOT SURE WHAT TO DO HERE
-      // NEED TO ESTIMATE ONE WITH MAX CONTRIBUTION
-      // CAN WE ASSUME MAX AMOUNT IS 10000 ?
-      x_lower = 10000;
-      x_upper = 0; // WHAT ?
-      y_lower = clr_prediction_curve[5];
-      y_upper = 0; // WHAT ?
     }
 
     predicted_clr = lerp(x_lower, x_upper, y_lower, y_upper, amount);
diff --git a/app/grants/models.py b/app/grants/models.py
index 39943826787..5d31b6447d0 100644
--- a/app/grants/models.py
+++ b/app/grants/models.py
@@ -945,10 +945,6 @@ def competing_phantum_funds(self):
     def value(self):
         return 5/(self.competing_phantum_funds().count())
 
-    @property
-    def estimated_matching_value(self):
-        return 'TODO'
-
     def to_mock_contribution(self):
         context = self.to_standard_dict()
         context['subscription'] = {
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index 44646d66fd0..b251864c4eb 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -69,42 +69,35 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
       <div id="phantom_fund" class="tab_target {% if active_tab == "normal" %} hidden {% endif %} ">
         <div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-6 mt-5 font-subheader mx-0 mx-md-auto row">
           <div class="form__group-horizontal">
-            <div class="row">
-              <p>
-                <i class="fas fa-circle mr-2"></i>
+            <div class="row description">
+              <p class="mb-2">
+                <i class="fas fa-plus mr-1"></i>
                 {% trans "Voucher Funding is a lightweight way to signal that you'd like to support this grant during the active CLR Round." %}
               </p>
-              <p>
-                <i class="fas fa-circle mr-2"></i>
+              <p class="mb-2">
+                <i class="fas fa-plus mr-1"></i>
                 {% trans "By clicking 'Use Voucher for this Grant', you are signaling your support of this grant with the $5 that has been allocated to you from Gitcoin." %}
               </p>
-              <p>
-                <i class="fas fa-circle mr-2"></i>
+              <p class="mb-2">
+                <i class="fas fa-plus mr-1"></i>
                 {% trans "You may support as many grants as you'd like, per round, with this $5 voucher.  The more the better :)" %}
               </p>
 
               <div>
                 So far, you are supporting <strong>{{phantom_funds.count}}</strong> projects.
                 <ol>
-                {% for ele in phantom_funds %}
+                {% for phantom_fund in phantom_funds %}
                   <li style="padding: 5px; {% cycle 'background-color: #eeeeee;' '' %}">
-                    <a href={{ele.grant.url}}>{{ele.grant.title}}</a>
-                    {% if grant.pk == ele.grant.pk %}
-                    (this grant)
-                    {% endif %}
-                     for <strong>${{ele.value|floatformat:2}}</strong> + $<strong>{{ele.estimated_matching_value}}</strong> in matching.
+                    <a href={{ele.grant.url}}>{{phantom_fund.grant.title}}</a>
                   </li>
                 {% endfor %}
                 </ol>
               </div>  
 
-              <div class="col-12 form__footer text-center">
-                <img src="{% static "v2/images/grants/signal.png" %}" style="max-width:40rem; height: 7rem">
-                <br>
-                <br>
+              <div class="col-12 form__footer pt-2 text-center">
+                <img class="mb-4" src="{% static "v2/images/grants/signal.png" %}" style="max-width:40rem; height: 7rem">
                 <form method=POST>
                   {%csrf_token%}
-                  {% include './clr_estimate.html' %}
                   <input type=hidden name=toggle_phantom_fund value=1 />
                   <input class="btn btn-gc-blue" type=submit name=submit value="
                   {% if is_phantom_funding_this_grant %}
@@ -366,8 +359,8 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
         });
       {% endif %}
 
-      let clr_prediction_curve = {{ grant.clr_prediction_curve }};
-      clr_prediction_curve = [5, 10, 15, 20, 25, 30]; // TODO: REMOVE
+      const clr_prediction_curve = {{ grant.clr_prediction_curve }};
+      // clr_prediction_curve = [5, 10, 15, 20, 25, 30]; TODO : REMOVE
     </script>
 
   </body>

From ce54f3fdc4d3cfa71e9ca255373145465a9cd36c Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Thu, 19 Sep 2019 19:09:29 +0530
Subject: [PATCH 30/36] fixed navbar color

---
 app/assets/v2/js/grants/fund.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 4ed8f74e6a7..b9783c8c7fd 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -30,7 +30,7 @@ $(document).ready(function() {
 
   updateSummary();
 
-  $('.nav-item').click(function(e) {
+  $('#grants_form .nav-item').click(function(e) {
     $('.nav-item a').removeClass('active');
     $(this).find('a').addClass('active');
     var targetid = $(this).find('a').data('target');

From 7073a2a1ef871ae563dd48d371db30b318d3d4dd Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 22:55:23 +0900
Subject: [PATCH 31/36] fix date

---
 app/grants/clr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 7d011d6c2d6..81b8416f7b0 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -26,7 +26,7 @@
 from grants.models import Contribution, Grant
 
 CLR_DISTRIBUTION_AMOUNT = 100000
-CLR_START_DATE = dt.datetime(2019, 1, 16, 0, 0)
+CLR_START_DATE = dt.datetime(2019, 9, 15, 0, 0)
 
 
 '''

From 0155cce6914b8255ec849fce2d9cb962f4b3ea47 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Thu, 19 Sep 2019 23:40:35 +0900
Subject: [PATCH 32/36] fix bug in fund.js, fix templates

---
 app/assets/v2/js/grants/fund.js               |  2 ++
 app/grants/templates/grants/card/front.html   |  2 +-
 app/grants/templates/grants/clr_estimate.html |  2 +-
 app/grants/templates/grants/fund.html         |  3 +--
 app/grants/urls.py                            |  2 +-
 app/grants/views.py                           | 15 +--------------
 6 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index b9783c8c7fd..2a120f4ac4b 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -516,6 +516,8 @@ const predictCLRMatch = () => {
 
   const contributions_axis = [ 0, 1, 10, 100, 1000, 10000 ];
 
+  let index = 0
+
   if (isNaN(amount)) {
     predicted_clr = clr_prediction_curve[index];
   } else if (contributions_axis.indexOf(amount) >= 0) {
diff --git a/app/grants/templates/grants/card/front.html b/app/grants/templates/grants/card/front.html
index f8662e60f91..90aaa17d4d3 100644
--- a/app/grants/templates/grants/card/front.html
+++ b/app/grants/templates/grants/card/front.html
@@ -40,7 +40,7 @@ <h2 class="grant-item__title font-subheader"><a href="{% url 'grants:details' gr
         {% if clr_active %}
           <div class="clr position-absolute text-center">
             <h2 class="font-caption font-weight-bold my-0 p-1">
-              CLR MATCH <span id="clr-grant-match">{{ grant.clr_prediction_curve.0}}</span> DAI
+              CLR MATCH <span id="clr-grant-match">{{ grant.clr_prediction_curve.0.1|floatformat:2 }}</span> DAI
             </h2>
             <p class="my-0">( out of <span id="clr-total">{{ total_clr_pot }}</span> DAI )</p>
           </div>
diff --git a/app/grants/templates/grants/clr_estimate.html b/app/grants/templates/grants/clr_estimate.html
index c6a91b515b7..89d0ffcb6ce 100644
--- a/app/grants/templates/grants/clr_estimate.html
+++ b/app/grants/templates/grants/clr_estimate.html
@@ -7,7 +7,7 @@ <h3>
     </h3>
 
     <h4>
-      <span class="clr_match_prediction">{{ grant.clr_prediction_curve.0|floatformat:2 }}</span>
+      <span class="clr_match_prediction">{{ clr_prediction_curve.0|floatformat:2 }}</span>
       <span>DAI</span>
       of {{ total_clr_pot }} DAI
     </h4>
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index b251864c4eb..ee3a4543a51 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -359,8 +359,7 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
         });
       {% endif %}
 
-      const clr_prediction_curve = {{ grant.clr_prediction_curve }};
-      // clr_prediction_curve = [5, 10, 15, 20, 25, 30]; TODO : REMOVE
+      const clr_prediction_curve = {{ clr_prediction_curve }};
     </script>
 
   </body>
diff --git a/app/grants/urls.py b/app/grants/urls.py
index fa60b8a60c0..74e62f849a0 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -21,7 +21,7 @@
 
 from grants.views import (
     grant_details, grant_fund, grant_new, grant_new_v0, grants, leaderboard, milestones, new_matching_partner,
-    potential_clr, profile, quickstart, subscription_cancel,
+    profile, quickstart, subscription_cancel,
 )
 
 app_name = 'grants'
diff --git a/app/grants/views.py b/app/grants/views.py
index 4a6ea78a55a..ae0cf79d403 100644
--- a/app/grants/views.py
+++ b/app/grants/views.py
@@ -251,20 +251,6 @@ def grant_details(request, grant_id, grant_slug):
     return TemplateResponse(request, 'grants/detail/index.html', params)
 
 
-def potential_clr(request, grant_id):
-    donation = request.GET.get('donation')
-    if not donation:
-        return JsonResponse({
-            'success': False,
-            'info': 'no donation amount',
-        })
-    grant = Grant.objects.get(pk=grant_id)
-    return JsonResponse({
-        'success': True,
-        'matching': grant.clr_prediction(donation)
-    })
-
-
 @login_required
 def grant_new(request):
     """Handle new grant."""
@@ -610,6 +596,7 @@ def grant_fund(request, grant_id, grant_slug):
         'show_tweet_modal': show_tweet_modal,
         'grant_has_no_token': True if grant.token_address == '0x0000000000000000000000000000000000000000' else False,
         'grant': grant,
+        'clr_prediction_curve': [c[1] for c in grant.clr_prediction_curve] if grant.clr_prediction_curve else [0, 0, 0, 0, 0, 0],
         'keywords': get_keywords(),
         'recommend_gas_price': recommend_min_gas_price_to_confirm_in_time(4),
         'recommend_gas_price_slow': recommend_min_gas_price_to_confirm_in_time(120),

From 1720998508b60f4ee4c9acbcdbfca838b1dc3333 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Fri, 20 Sep 2019 01:23:44 +0900
Subject: [PATCH 33/36] add phantom funding

---
 app/grants/clr.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/grants/clr.py b/app/grants/clr.py
index 81b8416f7b0..9ea0fb4b093 100644
--- a/app/grants/clr.py
+++ b/app/grants/clr.py
@@ -23,10 +23,10 @@
 import math
 from itertools import combinations
 
-from grants.models import Contribution, Grant
+from grants.models import Contribution, Grant, PhantomFunding
 
 CLR_DISTRIBUTION_AMOUNT = 100000
-CLR_START_DATE = dt.datetime(2019, 9, 15, 0, 0)
+CLR_START_DATE = dt.datetime(2019, 1, 15, 0, 0)
 
 
 '''
@@ -254,17 +254,24 @@ def predict_clr(random_data=False, save_to_db=False):
             g_contributions = copy.deepcopy(contributions).filter(subscription__grant_id=grant.id)
 
             # put in correct format
-            all_contributing_profile_ids = list(set([c.subscription.contributor_profile.id for c in g_contributions]))
+            phantom_funding_profiles = PhantomFunding.objects.filter(grant_id=grant.id, created_on__gte=CLR_START_DATE)
+            all_contributing_profile_ids = list(set([c.subscription.contributor_profile.id for c in g_contributions] + [p.profile_id for p in phantom_funding_profiles]))
             all_summed_contributions = []
 
             for profile_id in all_contributing_profile_ids:
                 # get sum of contributions per grant for each profile
                 profile_g_contributions = g_contributions.filter(subscription__contributor_profile_id=profile_id)
                 sum_of_each_profiles_contributions = float(sum([c.subscription.get_converted_monthly_amount() for c in profile_g_contributions]))
+
+                phantom_funding = PhantomFunding.objects.filter(created_on__gte=CLR_START_DATE, grant_id=grant.id, profile_id=profile_id)
+                if phantom_funding.exists():
+                    sum_of_each_profiles_contributions = sum_of_each_profiles_contributions + phantom_funding.first().value
+
                 all_summed_contributions.append({str(profile_id): sum_of_each_profiles_contributions})
 
             # for each grant, list the contributions in key value pairs like {'profile id': sum of contributions}
             contrib_data.append({'id': grant.id, 'contributions': all_summed_contributions})
+
     else:
         # use random contribution data for testing
         contrib_data = generate_random_contribution_data()

From 68952a78b34cf62ffa3aea3ed8236ce02945157a Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Fri, 20 Sep 2019 15:46:33 +0900
Subject: [PATCH 34/36] add phantom funding clr estimates

---
 app/assets/v2/js/grants/fund.js       | 23 +++++++++++++++++++++++
 app/grants/templates/grants/fund.html | 16 +++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index 2a120f4ac4b..d9628d70f50 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -11,6 +11,7 @@ let gitcoinDonationAddress;
 
 $(document).ready(function() {
 
+  predictPhantomCLRMatch();
   predictCLRMatch();
 
   $('#amount').on('input', () => {
@@ -504,6 +505,26 @@ const lerp = (x_lower, x_upper, y_lower, y_upper, x) => {
   return y_lower + (((y_upper - y_lower) * (x - x_lower)) / (x_upper - x_lower));
 };
 
+const predictPhantomCLRMatch = () => {
+
+  let amount = phantom_value;
+
+  if (0 < amount && amount < 1) {
+    x_lower = 0;
+    x_upper = 1;
+    y_lower = clr_prediction_curve[0];
+    y_upper = clr_prediction_curve[1];
+  } else if (1 < amount && amount < 10) {
+    x_lower = 1;
+    x_upper = 10;
+    y_lower = clr_prediction_curve[1];
+    y_upper = clr_prediction_curve[2];
+  }
+
+  let predicted_clr = lerp(x_lower, x_upper, y_lower, y_upper, amount);
+  $('.phantom_clr_increase').html((predicted_clr - clr_prediction_curve[0]).toFixed(2));
+};
+
 const predictCLRMatch = () => {
 
   let amount = Number.parseFloat($('#amount').val());
@@ -518,6 +539,8 @@ const predictCLRMatch = () => {
 
   let index = 0
 
+
+
   if (isNaN(amount)) {
     predicted_clr = clr_prediction_curve[index];
   } else if (contributions_axis.indexOf(amount) >= 0) {
diff --git a/app/grants/templates/grants/fund.html b/app/grants/templates/grants/fund.html
index ee3a4543a51..6bfd8a20525 100644
--- a/app/grants/templates/grants/fund.html
+++ b/app/grants/templates/grants/fund.html
@@ -63,8 +63,8 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
             <li class="nav-item">
               <a class="nav-link" href="#" data-target="phantom_fund">$5 Voucher Funding</a>
             </li>
-          </ul>  
-        </div>    
+          </ul>
+        </div>
       {% endif %}
       <div id="phantom_fund" class="tab_target {% if active_tab == "normal" %} hidden {% endif %} ">
         <div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-6 mt-5 font-subheader mx-0 mx-md-auto row">
@@ -88,11 +88,11 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
                 <ol>
                 {% for phantom_fund in phantom_funds %}
                   <li style="padding: 5px; {% cycle 'background-color: #eeeeee;' '' %}">
-                    <a href={{ele.grant.url}}>{{phantom_fund.grant.title}}</a>
+                    <a href={{ele.grant.url}}>{{phantom_fund.grant.title}}</a> for <strong>${{phantom_fund.value|floatformat:2}}</strong> + $<strong><span class="phantom_clr_increase">0</span></strong> in matching.
                   </li>
                 {% endfor %}
                 </ol>
-              </div>  
+              </div>
 
               <div class="col-12 form__footer pt-2 text-center">
                 <img class="mb-4" src="{% static "v2/images/grants/signal.png" %}" style="max-width:40rem; height: 7rem">
@@ -106,7 +106,7 @@ <h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
                     {% trans "Use Voucher for this Grant" %}
                   {% endif %}
                 " />
-                </form> 
+                </form>
                 </a>
               </div>
             </div>
@@ -360,6 +360,12 @@ <h5 class="form__label">{% trans "Gas Settings" %}</h5>
       {% endif %}
 
       const clr_prediction_curve = {{ clr_prediction_curve }};
+
+      {% if phantom_funds %}
+        const phantom_value = {{ phantom_funds.0.value }};
+      {% else %}
+        const phantom_value = 5;
+      {% endif %}
     </script>
 
   </body>

From a9761b6fcf4828f2c895e230e00319f340289901 Mon Sep 17 00:00:00 2001
From: Dan Lipert <danlipert@gmail.com>
Date: Fri, 20 Sep 2019 21:26:46 +0900
Subject: [PATCH 35/36] fix eslint and isort

---
 app/assets/v2/js/grants/fund.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/v2/js/grants/fund.js b/app/assets/v2/js/grants/fund.js
index d9628d70f50..5c8aa3e5701 100644
--- a/app/assets/v2/js/grants/fund.js
+++ b/app/assets/v2/js/grants/fund.js
@@ -522,6 +522,7 @@ const predictPhantomCLRMatch = () => {
   }
 
   let predicted_clr = lerp(x_lower, x_upper, y_lower, y_upper, amount);
+
   $('.phantom_clr_increase').html((predicted_clr - clr_prediction_curve[0]).toFixed(2));
 };
 
@@ -537,9 +538,7 @@ const predictCLRMatch = () => {
 
   const contributions_axis = [ 0, 1, 10, 100, 1000, 10000 ];
 
-  let index = 0
-
-
+  let index = 0;
 
   if (isNaN(amount)) {
     predicted_clr = clr_prediction_curve[index];

From dcdfe9bc985fe367599f04b665ae102f8a429b59 Mon Sep 17 00:00:00 2001
From: Aditya Anand M C <aditya.anandmc@gmail.com>
Date: Fri, 20 Sep 2019 18:07:45 +0530
Subject: [PATCH 36/36] isort fix

---
 app/app/urls.py    | 2 +-
 app/grants/urls.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/app/urls.py b/app/app/urls.py
index 3f3ddcf1bab..6d66542c9df 100644
--- a/app/app/urls.py
+++ b/app/app/urls.py
@@ -486,7 +486,7 @@
         retail.emails.no_applicant_reminder,
         name='no_applicant_reminder'
     ),
-
+ 
     # settings
     re_path(r'^settings/email/(.*)', marketing.views.email_settings, name='email_settings'),
     re_path(r'^settings/privacy/?', marketing.views.privacy_settings, name='privacy_settings'),
diff --git a/app/grants/urls.py b/app/grants/urls.py
index 74e62f849a0..eec6b0036a0 100644
--- a/app/grants/urls.py
+++ b/app/grants/urls.py
@@ -20,8 +20,8 @@
 from django.urls import path, re_path
 
 from grants.views import (
-    grant_details, grant_fund, grant_new, grant_new_v0, grants, leaderboard, milestones, new_matching_partner,
-    profile, quickstart, subscription_cancel,
+    grant_details, grant_fund, grant_new, grant_new_v0, grants, leaderboard, milestones, new_matching_partner, profile,
+    quickstart, subscription_cancel,
 )
 
 app_name = 'grants'