Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: round 7 changes #7349

Merged
merged 50 commits into from
Sep 14, 2020
Merged

feat: round 7 changes #7349

merged 50 commits into from
Sep 14, 2020

Conversation

thelostone-mc
Copy link
Member

Description
Refers/Fixes
Testing

mds1 and others added 4 commits September 9, 2020 21:40
* Integrate minimal working ETH-only zkSync checkout

* Refactor L1 checkout a bit to enable more code re-use with zkSync

* Adds full working checkout flow using localstorage, supports ERC20 + ETH

* Improve checkout UX by adding modal whehn using zkSync

* Warn user before closing or reloading if they started zkSync checkout

* Switch to deterministic from ephemeral wallet, fix allowance bug

Allowance bug info: If user already had sufficient allowance, tokens were not transferred

* Pull out logic into functions to facilitate re-sending on interrupted deposits

* zkSync checkout now POSTs to database and shows success message on completion

* Handle zkSync checkout interruptions

* Fix ESLint errors, add some try/catch blocks

* Fix bug in tx validator that prevented testing on rinkeby

Also some prep and cleanup for tx validator update

* Update tx validator to handle zkSync transfers

* Tweak: Show metamask popup on zkSync checkout prompts

* Only allow zkSync modal to be closed with a button to prevent accidental closures when checking out

* zkSync checkout can now be resumed if interrupted

Adds endpoint to look for dropped and replaced transactions to help with this

* Various UI/UX updates based on Figma mockups

- Update tx processing section of zkSync checkout modal
- Update grant detauls page to show Etherscan and zkScan links
- Add note about supported L2 account types on new grant page

* Update address of batch deposit contract

* Reduce gas by only using batch deposit contract when necessary, regular zkSync contract otherwise

* Now throws error if user tries to use zkSync checkout with unsupported token
* add list view for grants and migrate to vue

* hide idle grants by default

* Add contributions on grants

* add my grants

* Minor fix

* Implement follow in vuejs

* remove duplicated ids

Co-authored-by: Aditya Anand M C <[email protected]>
* Checks and validates cart amounts to ensure they are packable

* Add support for additional deposits. After donations are complete, all leftover balances are sent to user's web3 address

* Update appearance of zkSync modal to match new designs

* Add additional checkout flow to support users who already have a zkSync balance

* Update detail.js

Co-authored-by: Aditya Anand M C <[email protected]>
@codecov
Copy link

codecov bot commented Sep 10, 2020

Codecov Report

Merging #7349 into master will decrease coverage by 0.09%.
The diff coverage is 13.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7349      +/-   ##
==========================================
- Coverage   26.41%   26.31%   -0.10%     
==========================================
  Files         306      306              
  Lines       30136    30330     +194     
  Branches     4455     4479      +24     
==========================================
+ Hits         7959     7981      +22     
- Misses      21902    22079     +177     
+ Partials      275      270       -5     
Impacted Files Coverage Δ
app/app/context.py 0.00% <ø> (ø)
app/dashboard/views.py 10.49% <0.00%> (-0.01%) ⬇️
app/grants/admin.py 47.05% <ø> (ø)
app/grants/urls.py 100.00% <ø> (ø)
app/retail/emails.py 20.92% <0.00%> (-0.03%) ⬇️
app/townsquare/views.py 10.62% <0.00%> (ø)
app/grants/models.py 42.26% <7.35%> (-3.27%) ⬇️
app/dashboard/models.py 49.70% <8.33%> (-0.15%) ⬇️
app/economy/tx.py 17.39% <11.11%> (-0.44%) ⬇️
app/grants/views.py 14.63% <12.42%> (-0.81%) ⬇️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 55c416b...61ed312. Read the comment docs.

octavioamu and others added 21 commits September 11, 2020 12:43
* Update tx validator to support zkSync transfers when user already has funds on L2

* Add loading screen to zkSync modal

* Improve gas estimates, recommend checkout approach to user, limit zkSync to 100 contributions

* Change zkSync fees to be additive, show which tokens in cart don't support zkSync

* Fix so all zksync gas limit estimtes are strings

* Bug fixes to cart and tx validator

* Update cart copy and add zkSync details to GRANTS.md

* Update GRANTS.md
* Fix zkScan URLs

* Ensure default network is mainnet

* Impove how tokens are fetched, close zksync modal on 'insufficient balance' errors

* Bug fix: prevents users from checking out when donation amounts + fees exceed their L1 wallet balance
* Add gas estimation for approval txs

* Fixes for Argent and BN, CSS tweak for mobile
@thelostone-mc thelostone-mc marked this pull request as ready for review September 14, 2020 19:18
@thelostone-mc thelostone-mc merged commit 0b5db3b into master Sep 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants