GITC-245: Implements the CLR calc in SQL #9348
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d to account for grant.defer_clr_to
… both in production setting)
gdixon
requested review from
chibie,
frankchen07,
octavioamu,
PixelantDesign and
zlsgh
as code owners
gdixon
changed the title
octavioamu
approved these changes
Aug 20, 2021
|
Great work Graham!! |
thelostone-mc
added a commit
that referenced
this pull request
Sep 1, 2021
* fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (#9367) * feat: introduce steward endpoint (#9377) * GITC-276 purge: gitcoin faucet (#9333) * fixes bounty fulfillment data (#9368) * GITC-245: Implements the CLR calc in SQL (#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (#9349) * chore: made defer_clr_to readonly * stale nav (#9382) * GITC-294: show clear cart on loading screen (#9369) * DoingGud interview * Update API.md * GITC-315: Fixes sms verify (#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (#9409) * Fix small bug when click to slack link (#9416) * Updates db.py to always read from replicas (#9403) * GITC-239: Introduces gc-cart-content component Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com>
thelostone-mc
added a commit
that referenced
this pull request
Sep 1, 2021
* fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (#9367) * rough commit * setup polygon: connect/switch/add chain * feat: introduce steward endpoint (#9377) * GITC-276 purge: gitcoin faucet (#9333) * fixes bounty fulfillment data (#9368) * GITC-245: Implements the CLR calc in SQL (#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (#9349) * chore: made defer_clr_to readonly * more utils * upload svg * stale nav (#9382) * GITC-294: show clear cart on loading screen (#9369) * DoingGud interview * Update API.md * implement modal design * checkout recommendation, estimate gas, rootToChildToken * finish checkout + handle unsupported tokens etc. * handle balance check + amount to deposit * GITC-315: Fixes sms verify (#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (#9409) * gas cost estimation * bug fix checkout recommendation * some fixes * Fix small bug when click to slack link (#9416) * Updates db.py to always read from replicas (#9403) * address review comments @thelostone-mc * Add test env to bundle (#9374) * Allow test environment to upload assets to hosted space * Updating pip requirements to deconflict * Fixing issues from PR comments * Fixing issues from PR comments * Changing environment for travis testing to 'travis' * Updating the variable references to be easier to understand. * more review fixes @PixelantDesign * review fix @willsputra * indicate metamask popup * no metamask popup with insufficient balance Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com>
octavioamu
added a commit
that referenced
this pull request
Sep 7, 2021
* Clean up verbiage (#9309) Clean up verbiage on footer * Bump moment from 2.17.1 to 2.19.3 (#9307) Bumps [moment](https://github.com/moment/moment) from 2.17.1 to 2.19.3. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.17.1...2.19.3) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * GITC-223: ignore squelched profiles in clr (#9312) * chore: improve grants search using vector_column * add custom migration * tags/1: add new model + port data * tags/2: remove GrantCategory * fix alert css * add /v1/api/tags endpoint * feat: tweak get_grants to support chain and tagv * re-introduce removed fields * ensure filters work as expected * chore : update old API * add grants layout structure * add clr router * chore: wire in grant tags in create + edit * introduce old filter * backend query applied and basic query * fix tenant query * add filters and parameters logic changes * sort * add grant_region filter * fix broken sort * filters ux * tags router search and filters * collections backend and cache * tab system and collections * chore: move me=true * filter by collection * collections paginatination * remove extra request * update styles * GITC-239: Introduces global nav-cart to replace grants side-cart (#9418) * fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (#9367) * feat: introduce steward endpoint (#9377) * GITC-276 purge: gitcoin faucet (#9333) * fixes bounty fulfillment data (#9368) * GITC-245: Implements the CLR calc in SQL (#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (#9349) * chore: made defer_clr_to readonly * stale nav (#9382) * GITC-294: show clear cart on loading screen (#9369) * DoingGud interview * Update API.md * GITC-315: Fixes sms verify (#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (#9409) * Fix small bug when click to slack link (#9416) * Updates db.py to always read from replicas (#9403) * GITC-239: Introduces gc-cart-content component Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> * feat: polygon l2 checkout (#9372) * fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (#9367) * rough commit * setup polygon: connect/switch/add chain * feat: introduce steward endpoint (#9377) * GITC-276 purge: gitcoin faucet (#9333) * fixes bounty fulfillment data (#9368) * GITC-245: Implements the CLR calc in SQL (#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (#9349) * chore: made defer_clr_to readonly * more utils * upload svg * stale nav (#9382) * GITC-294: show clear cart on loading screen (#9369) * DoingGud interview * Update API.md * implement modal design * checkout recommendation, estimate gas, rootToChildToken * finish checkout + handle unsupported tokens etc. * handle balance check + amount to deposit * GITC-315: Fixes sms verify (#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (#9409) * gas cost estimation * bug fix checkout recommendation * some fixes * Fix small bug when click to slack link (#9416) * Updates db.py to always read from replicas (#9403) * address review comments @thelostone-mc * Add test env to bundle (#9374) * Allow test environment to upload assets to hosted space * Updating pip requirements to deconflict * Fixing issues from PR comments * Fixing issues from PR comments * Changing environment for travis testing to 'travis' * Updating the variable references to be easier to understand. * more review fixes @PixelantDesign * review fix @willsputra * indicate metamask popup * no metamask popup with insufficient balance Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com> * GITC-131: Adds Discover Grants section to grants landing (#9386) * GITC-131: Adds Discover Grants section to grants landing * GITC-131: Replaces svgs * lint fixes + URL * fix default value * Fixes border mixin * Corrects discover section query strings * Adds count to checkout button * reset page when filtering * fix following not removing filter * reset pagination on clr filter * filters dropdown styles * me filter * tweak more filter font-size * disable auto-flip based on viewport * chore: reset page on changing filter + fix pre-filling vue store from URL * show idle grants in collections * merge conflict * change clr banner to black * Purges sidecart and ensures interactions with nav-cart are reflected everywhere * introduce my_collections=true * Switches categories for tags on grant details page * update text color to blak * Adds validation for provided eth address on create grant form * fix filters and load tab by url * Adds nav-cart to sticky filter bar, fixes some filtering behaviour and links/layout * Wrap intersection observer to ensure the ref is present * Ensures static url appending is clean * changing sort change page to 1 * remove add all to cart * fix navbar css * Center align the number of grants * move filters to top * add label to tenant * fix filter styles * hide cats if not options * admin bar to top * fix keyboard navigation filter * fix clr links * fix collections links * collections on landingpage * fix placeholder urls * clean dead code * reset page when switching from collections * add link polygon support * GITC-370: polygon gas cost estimation (#9430) * improve gas cost estimation + add mainnet address * check use has sufficient matic for gas * bug fix * remove log * show neglible currency values * fix align on list view * GITC-358: Reintroduces sort methods * Enables history navigation on filter change * Removes random_shuffle from the available sorts * Ensures params are cleared when filter data is empty * Fixes back button/text on grant details * add reverse pagination * remove blank for grants details * Fixes back button for after user follows an external link to a grants details page * fix zksync errors * polygon behind staff flag * GITC-247: Fixes the stats tab for team_members * Fixes button alignment Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Chibuotu Amadi <chibuotu@gmail.com> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com>
ksolo
pushed a commit
to ksolo/web
that referenced
this pull request
Sep 13, 2021
* Clean up verbiage (gitcoinco#9309) Clean up verbiage on footer * Bump moment from 2.17.1 to 2.19.3 (gitcoinco#9307) Bumps [moment](https://github.com/moment/moment) from 2.17.1 to 2.19.3. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.17.1...2.19.3) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * GITC-223: ignore squelched profiles in clr (gitcoinco#9312) * chore: improve grants search using vector_column * add custom migration * tags/1: add new model + port data * tags/2: remove GrantCategory * fix alert css * add /v1/api/tags endpoint * feat: tweak get_grants to support chain and tagv * re-introduce removed fields * ensure filters work as expected * chore : update old API * add grants layout structure * add clr router * chore: wire in grant tags in create + edit * introduce old filter * backend query applied and basic query * fix tenant query * add filters and parameters logic changes * sort * add grant_region filter * fix broken sort * filters ux * tags router search and filters * collections backend and cache * tab system and collections * chore: move me=true * filter by collection * collections paginatination * remove extra request * update styles * GITC-239: Introduces global nav-cart to replace grants side-cart (gitcoinco#9418) * fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (gitcoinco#9367) * feat: introduce steward endpoint (gitcoinco#9377) * GITC-276 purge: gitcoin faucet (gitcoinco#9333) * fixes bounty fulfillment data (gitcoinco#9368) * GITC-245: Implements the CLR calc in SQL (gitcoinco#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (gitcoinco#9349) * chore: made defer_clr_to readonly * stale nav (gitcoinco#9382) * GITC-294: show clear cart on loading screen (gitcoinco#9369) * DoingGud interview * Update API.md * GITC-315: Fixes sms verify (gitcoinco#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (gitcoinco#9409) * Fix small bug when click to slack link (gitcoinco#9416) * Updates db.py to always read from replicas (gitcoinco#9403) * GITC-239: Introduces gc-cart-content component Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> * feat: polygon l2 checkout (gitcoinco#9372) * fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (gitcoinco#9367) * rough commit * setup polygon: connect/switch/add chain * feat: introduce steward endpoint (gitcoinco#9377) * GITC-276 purge: gitcoin faucet (gitcoinco#9333) * fixes bounty fulfillment data (gitcoinco#9368) * GITC-245: Implements the CLR calc in SQL (gitcoinco#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (gitcoinco#9349) * chore: made defer_clr_to readonly * more utils * upload svg * stale nav (gitcoinco#9382) * GITC-294: show clear cart on loading screen (gitcoinco#9369) * DoingGud interview * Update API.md * implement modal design * checkout recommendation, estimate gas, rootToChildToken * finish checkout + handle unsupported tokens etc. * handle balance check + amount to deposit * GITC-315: Fixes sms verify (gitcoinco#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (gitcoinco#9409) * gas cost estimation * bug fix checkout recommendation * some fixes * Fix small bug when click to slack link (gitcoinco#9416) * Updates db.py to always read from replicas (gitcoinco#9403) * address review comments @thelostone-mc * Add test env to bundle (gitcoinco#9374) * Allow test environment to upload assets to hosted space * Updating pip requirements to deconflict * Fixing issues from PR comments * Fixing issues from PR comments * Changing environment for travis testing to 'travis' * Updating the variable references to be easier to understand. * more review fixes @PixelantDesign * review fix @willsputra * indicate metamask popup * no metamask popup with insufficient balance Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com> * GITC-131: Adds Discover Grants section to grants landing (gitcoinco#9386) * GITC-131: Adds Discover Grants section to grants landing * GITC-131: Replaces svgs * lint fixes + URL * fix default value * Fixes border mixin * Corrects discover section query strings * Adds count to checkout button * reset page when filtering * fix following not removing filter * reset pagination on clr filter * filters dropdown styles * me filter * tweak more filter font-size * disable auto-flip based on viewport * chore: reset page on changing filter + fix pre-filling vue store from URL * show idle grants in collections * merge conflict * change clr banner to black * Purges sidecart and ensures interactions with nav-cart are reflected everywhere * introduce my_collections=true * Switches categories for tags on grant details page * update text color to blak * Adds validation for provided eth address on create grant form * fix filters and load tab by url * Adds nav-cart to sticky filter bar, fixes some filtering behaviour and links/layout * Wrap intersection observer to ensure the ref is present * Ensures static url appending is clean * changing sort change page to 1 * remove add all to cart * fix navbar css * Center align the number of grants * move filters to top * add label to tenant * fix filter styles * hide cats if not options * admin bar to top * fix keyboard navigation filter * fix clr links * fix collections links * collections on landingpage * fix placeholder urls * clean dead code * reset page when switching from collections * add link polygon support * GITC-370: polygon gas cost estimation (gitcoinco#9430) * improve gas cost estimation + add mainnet address * check use has sufficient matic for gas * bug fix * remove log * show neglible currency values * fix align on list view * GITC-358: Reintroduces sort methods * Enables history navigation on filter change * Removes random_shuffle from the available sorts * Ensures params are cleared when filter data is empty * Fixes back button/text on grant details * add reverse pagination * remove blank for grants details * Fixes back button for after user follows an external link to a grants details page * fix zksync errors * polygon behind staff flag * GITC-247: Fixes the stats tab for team_members * Fixes button alignment Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Chibuotu Amadi <chibuotu@gmail.com> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com>
zlsgh
added a commit
that referenced
this pull request
Sep 13, 2021
* moloch svg * Adds missing migrations * chore: allow GET request for CORS * fix form failing if input have comma gitc-355 * Update views.py * feat: sybil data input endpoint for round (#9371) * feat: sybil data input endpoint for round * stale nav (#9382) Co-authored-by: Kevin Owocki <ksowocki@gmail.com> * Fixes grants explorer * Adds method to allow cors on trust-bonus api * remove twitter feed + slack post (#9424) * remove remarket_bounties * feat: toggle sybil/non sybil users (#9431) * Refactor clr3 (#9432) * Refactors clr3.py to reduce time complexity * Restore doc block * Fixes indentation * fix: GITC-383 Editing bounty value is changing the amount to non number * Inlines prediction curve saving * Enqueues prediction curve saving * Back to inline Its too risky offloading this to the queue atm because of how much backlog the queue holds * Ensure we only modify latest on the latest GrantCLRCalculation * feat: GR11 (#9421) * Clean up verbiage (#9309) Clean up verbiage on footer * Bump moment from 2.17.1 to 2.19.3 (#9307) Bumps [moment](https://github.com/moment/moment) from 2.17.1 to 2.19.3. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.17.1...2.19.3) --- updated-dependencies: - dependency-name: moment dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * GITC-223: ignore squelched profiles in clr (#9312) * chore: improve grants search using vector_column * add custom migration * tags/1: add new model + port data * tags/2: remove GrantCategory * fix alert css * add /v1/api/tags endpoint * feat: tweak get_grants to support chain and tagv * re-introduce removed fields * ensure filters work as expected * chore : update old API * add grants layout structure * add clr router * chore: wire in grant tags in create + edit * introduce old filter * backend query applied and basic query * fix tenant query * add filters and parameters logic changes * sort * add grant_region filter * fix broken sort * filters ux * tags router search and filters * collections backend and cache * tab system and collections * chore: move me=true * filter by collection * collections paginatination * remove extra request * update styles * GITC-239: Introduces global nav-cart to replace grants side-cart (#9418) * fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (#9367) * feat: introduce steward endpoint (#9377) * GITC-276 purge: gitcoin faucet (#9333) * fixes bounty fulfillment data (#9368) * GITC-245: Implements the CLR calc in SQL (#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (#9349) * chore: made defer_clr_to readonly * stale nav (#9382) * GITC-294: show clear cart on loading screen (#9369) * DoingGud interview * Update API.md * GITC-315: Fixes sms verify (#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (#9409) * Fix small bug when click to slack link (#9416) * Updates db.py to always read from replicas (#9403) * GITC-239: Introduces gc-cart-content component Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> * feat: polygon l2 checkout (#9372) * fix get_hackathons4 * GITC-321: Sets featured grant to 'grant_id = 1' (#9367) * rough commit * setup polygon: connect/switch/add chain * feat: introduce steward endpoint (#9377) * GITC-276 purge: gitcoin faucet (#9333) * fixes bounty fulfillment data (#9368) * GITC-245: Implements the CLR calc in SQL (#9348) * GITC-245: Implements the CLR calc in SQL * GITC-245: Adds trust_bonus to profiles as_dict to optimise clr query * GITC-245: Inner joins * GITC-245: Fixes update_trust_bonus * GITC-245: Adds prints to clr to enable comparisons * GITC-245: Refactors --call-now version of update to happen inline * GITC-245: Refactors clr2 to avoid checking grants with no contribs and to account for grant.defer_clr_to * GITC-245: Adds a hybrid sql/python version of the calc (need to check both in production setting) * GITC-245: Adds 'defer_clr_to' to grants admin page * GITC-245: Adds to print statement to maintain consistency * Moves the id clause outside of the right join * feat: trust-bonus api (#9349) * chore: made defer_clr_to readonly * more utils * upload svg * stale nav (#9382) * GITC-294: show clear cart on loading screen (#9369) * DoingGud interview * Update API.md * implement modal design * checkout recommendation, estimate gas, rootToChildToken * finish checkout + handle unsupported tokens etc. * handle balance check + amount to deposit * GITC-315: Fixes sms verify (#9390) * GITC-368: Adds skip_cleanup to retain build artefacts (#9409) * gas cost estimation * bug fix checkout recommendation * some fixes * Fix small bug when click to slack link (#9416) * Updates db.py to always read from replicas (#9403) * address review comments @thelostone-mc * Add test env to bundle (#9374) * Allow test environment to upload assets to hosted space * Updating pip requirements to deconflict * Fixing issues from PR comments * Fixing issues from PR comments * Changing environment for travis testing to 'travis' * Updating the variable references to be easier to understand. * more review fixes @PixelantDesign * review fix @willsputra * indicate metamask popup * no metamask popup with insufficient balance Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com> * GITC-131: Adds Discover Grants section to grants landing (#9386) * GITC-131: Adds Discover Grants section to grants landing * GITC-131: Replaces svgs * lint fixes + URL * fix default value * Fixes border mixin * Corrects discover section query strings * Adds count to checkout button * reset page when filtering * fix following not removing filter * reset pagination on clr filter * filters dropdown styles * me filter * tweak more filter font-size * disable auto-flip based on viewport * chore: reset page on changing filter + fix pre-filling vue store from URL * show idle grants in collections * merge conflict * change clr banner to black * Purges sidecart and ensures interactions with nav-cart are reflected everywhere * introduce my_collections=true * Switches categories for tags on grant details page * update text color to blak * Adds validation for provided eth address on create grant form * fix filters and load tab by url * Adds nav-cart to sticky filter bar, fixes some filtering behaviour and links/layout * Wrap intersection observer to ensure the ref is present * Ensures static url appending is clean * changing sort change page to 1 * remove add all to cart * fix navbar css * Center align the number of grants * move filters to top * add label to tenant * fix filter styles * hide cats if not options * admin bar to top * fix keyboard navigation filter * fix clr links * fix collections links * collections on landingpage * fix placeholder urls * clean dead code * reset page when switching from collections * add link polygon support * GITC-370: polygon gas cost estimation (#9430) * improve gas cost estimation + add mainnet address * check use has sufficient matic for gas * bug fix * remove log * show neglible currency values * fix align on list view * GITC-358: Reintroduces sort methods * Enables history navigation on filter change * Removes random_shuffle from the available sorts * Ensures params are cleared when filter data is empty * Fixes back button/text on grant details * add reverse pagination * remove blank for grants details * Fixes back button for after user follows an external link to a grants details page * fix zksync errors * polygon behind staff flag * GITC-247: Fixes the stats tab for team_members * Fixes button alignment Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Kevin Owocki <ksowocki@gmail.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Chibuotu Amadi <chibuotu@gmail.com> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com> * adds new moloch avatar * Updating the version of ipdb to fix docker deployment issue * add updated cypress-run to red-squirrel Co-authored-by: owocki <ksowocki@gmail.com> Co-authored-by: Graham Dixon <graham@gdixon.co.uk> Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com> Co-authored-by: octavioamu <octavioamuchastegui@gmail.com> Co-authored-by: Graham Dixon <graham@gitcoin.co> Co-authored-by: Kyle Weiss <Kweiss@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thien Tran <fcduythien@gmail.com> Co-authored-by: Chibuotu Amadi <chibuotu@gmail.com> Co-authored-by: Zack Schiller <81022539+zacheryschiller@users.noreply.github.com> Co-authored-by: Zachery Schiller <zacheryschiller@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR implements the CLR calc in SQL in an attempt to improve performance.
To test:
please note, once each of the variations have been tested on production - a follow up PR will be raised to remove print statements and move the most effective variation to
clr.pyRefers/Fixes
Fixes: GITC-245
Testing
Tested locally
clr.py
clr2.py
clr3.py
note: I've deferred contributions from 1095 -> 993 - your results will be different to what you see in these screenshots