Cleanup GTM code. #1428
Merged
Cleanup GTM code. #1428
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
smitch88
suggested changes
May 6, 2023
smitch88
approved these changes
May 6, 2023
HrikB
added a commit
that referenced
this pull request
Jun 9, 2023
* Start of VaultTwo * No vault Two * Extract units conversion to method * Exchange rate supporting Vault * Remove unneeded memory array * Change to using enums for exchange rate types * Documentation on _toUnits * OETH - Allow initialize time control of OUSD resolution (#1273) * Allow initialize time control of OUSD resolution * Remove debugging * Correct mint / redeem with oracle * add the main deploy file for OETH * make it possible for the 5/8 multisig to be the governor of deployments * prettier * Gas efficiency * add frax eth deployment * basic sfraxETH strategy implementation * add brownie env to git ignore * prettier * Remove unused code * add the infrastructure for fork tests * hardcode oracle price * finish up the fraxETH strategy fork tests and fix a bug * lint and some minor fixes * deployment file fix * Slither db update for false positives * add a test that checks we can withdraw what the checkBalance returns * minor fix * Correct license for new contracts * Deploy is ready * Add redeem fee variable * add slither exceptions * fix tests (#1317) * OETH - Oracle router changes (#1314) * start oracle separation * add slither ignores * create a suggestion of how to check for prices in the Vault * remove logs * better name * minor refactor * minor refactor v2 * move unit pricing to a separate function * refactor * better comment * refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions * add range checks * Prettier and address cleanup * Small cleanup * Add back in missing constant --------- Co-authored-by: Daniel Von Fange <[email protected]> * fix oracle tests * fix tests * more fixes * fix slither * ETH / sfrxeth zapper (#1316) * Initial draft zapper * Initial draft zapper * Add deploy file for zapper * Remove WETH partial support, out of scope in this PR * Happy Slither * WETH support * move decimals cache to asset struct (#1319) * WOETH deployment (#1320) * add WOETH deployment * deploy separate files * Let’s just call them decimals * add decimalsCache to existing Vault * prettier * deployment numbering * fork test fix * run decimals cache only in forked environment * prettier * Remove unused buyback trigger * rETH support * support oracles reporting feeds with different decimal format (#1321) * support oracles reporting feeds with different decimal format * lint * gas optimisation * Add support for stETH * Use default strat for frxETH * harvester & unit tests (#1331) * Start of VaultTwo * No vault Two * Extract units conversion to method * Exchange rate supporting Vault * Remove unneeded memory array * Change to using enums for exchange rate types * Documentation on _toUnits * OETH - Allow initialize time control of OUSD resolution (#1273) * Allow initialize time control of OUSD resolution * Remove debugging * Correct mint / redeem with oracle * add the main deploy file for OETH * make it possible for the 5/8 multisig to be the governor of deployments * prettier * Gas efficiency * add frax eth deployment * basic sfraxETH strategy implementation * add brownie env to git ignore * prettier * Remove unused code * add the infrastructure for fork tests * hardcode oracle price * finish up the fraxETH strategy fork tests and fix a bug * lint and some minor fixes * deployment file fix * Slither db update for false positives * add a test that checks we can withdraw what the checkBalance returns * minor fix * Correct license for new contracts * Deploy is ready * Add redeem fee variable * add slither exceptions * fix tests (#1317) * OETH - Oracle router changes (#1314) * start oracle separation * add slither ignores * create a suggestion of how to check for prices in the Vault * remove logs * better name * minor refactor * minor refactor v2 * move unit pricing to a separate function * refactor * better comment * refactor Vault contract and correct price calculation in priceUnit(Mint/Redeem) functions * add range checks * Prettier and address cleanup * Small cleanup * Add back in missing constant --------- Co-authored-by: Daniel Von Fange <[email protected]> * fix oracle tests * fix tests * more fixes * fix slither * ETH / sfrxeth zapper (#1316) * Initial draft zapper * Initial draft zapper * Add deploy file for zapper * Remove WETH partial support, out of scope in this PR * Happy Slither * WETH support * move decimals cache to asset struct (#1319) * WOETH deployment (#1320) * add WOETH deployment * deploy separate files * Let’s just call them decimals * add decimalsCache to existing Vault * prettier * deployment numbering * fork test fix * run decimals cache only in forked environment * prettier * Remove unused buyback trigger * rETH support * support oracles reporting feeds with different decimal format (#1321) * support oracles reporting feeds with different decimal format * lint * gas optimisation * harvester now considers different oracle decimals. Fixing unit tests --------- Co-authored-by: Daniel Von Fange <[email protected]> * add some addresses * fix bug * Deploy 53 OETH and 54 WOETH (#1334) * deploy of OETH 053 * add remaining deployment files * add guardian actions helper * use updated ABI in brownie --------- Co-authored-by: Daniel Von Fange <[email protected]> * Prettier * Merge cleanup * Zapper cleanup * remove console.log * Zapper: Better event name * Add slither excludes to triage file * Remove inline slither comments and add docstrings * cleaner wording * Explicity access levels on vars * Zapper redeploy * Lint: cleanup extra variable * Deploy 56 - OUSD Zapper Redeploy (#1364) * Deploy 56 Zapper * Remove forceDeploy * Don't show zapper no return checks * Direct clone * Fix package.json * Fix build for oeth * Add build scripts * Fix scripts * Fix bash script * Fix build scripts * Update scripts * Update scripts * Try expression again * Add hashbang * Use bash instead * Add ABI * Fix deps * Fix start script * checkpoint * Update more services * checkpoint * checkpoint * Minting * Add Zapper * Cleanup balances * Fix approval bug * Fix animation balance * Update Zapper address * Update swap estimator * Update gas for redeem * Display OETH balance instead of OUSD * Add wrap/unwrap * Fix allowances on wrap/unwrap * UI tweaks * Fix circle graphics * sfrxETH Zapper allowance * Fix sfrxETH balance * Switch to Analytics API v2 * Fix keys * Fix lifetime earnings * Add curve * Fix broken code * more precise inputs/outputs * apy and oeth portfolio dapp reskin * Cleanup tx history page * In progress commit * Fix path refs * Fix menu * Fix modal * Fix rendering issue * Adjust * Add estimtes * Fix estimate view * Fix balances display * Fix redeem * Fix effective price * Remove welcome * Fix wrap view * fix gfnosis safe * Update the manifest * Fix eth price with fallback, banner, add fonts * Fix tx activity * Fix swap routes pill styling * Remove relative path * Add activity * Add activity count * Fix font face inclusion * Fix gas estimate * wrap and history page * Fix broken vault est * Try fonts in images dir just for static files check * header restyle * Add swap routes styling * Fix confirmation modal color * Fix diff percentage visibility * Fix arrow aplit * Fix eth redeem * Fix redeem * Fix mix on pill * responsive nav and data section * Hide history nav item * Fix IPFS DApp link * Fix IPFS link * Update meta description * Fix wrap, curve redeem for eth * Add in wrap/unwrap events * Support multiple txs taking place * Fix defaults, ordering, and mobile * Fix effective price * Cleanup GTM code. (#1428) * Cleanup GTM code. * Fix var. * Make changes to correct folder. * Fix various p2/p3 issues across the board. Sticky nav, decimals, images, and other various style fixes * Fix first tx pending view * Fix approvals when below max int provided * Fix curve allowance issue * Fix currency ordering * Update contract name * Hide irrelevant APY measures, change default to one week * Gtm tracking updates (#1467) * Start updating events. * Tracking updates. * Revert deployment file changes * Swap Route (#1449) * header-fix * header fix * heading padding fix * remove double ipfs link on fleek * swap responsiveness * routes responsiveness * merge fix * btn fix * swap route header on all browsers * show links * mobile responsiveness on wrap route * Fix rate display wOETH -> OETH (#1473) * Fix wOETH to oeth rate conversion * Fix styling of wrap * Fix sfrxeth -> oeth receive amount estimate (#1471) * Add conversion rate * Fix redeem and activity values * Fix comment * Fix address HEX and add in wrap events. (#1478) * Fix address HEX and add in wrap events. * Small fix for slice * swap routes section in the swap route (#1489) * swap routes section in the swap route * padding * desktop fixes * add ledger live connector (#1454) * add ledger live connector * update manifest * edit display name * add csp header * Oeth dapp UI style fixes (#1511) * Many UI fixes * Address background color discrepancy * Revert contracts folder changes * Fix padding on selectable pills, fix default swap mode to mint vs redeem * Add inputMode to wrapped side * Remove OETH from redeem * Fix scrollbar styling * Add drop shadow to apy, remove console log, remove value from redeem in modal * Add drop shadow across menus and code cleanup * fix: remove double IPFS and pull the logic to env variables (#1529) * fix: remove double IPFS and pull the logic to env variables * Revert "fix: remove double IPFS and pull the logic to env variables" This reverts commit 81822e6. * fix: remove IPFS link if deploy mode is IPFS * refactor: clean up * oeth dapp merge fix (#1530) * Fix merge issue * Remove yarn changes * Fix url reference for learn more * Fix icons and transition speed * Revert dapp changes * OETH Dapp, curve swap support for stETH, WETH, rETH, and frxETH (#1538) * Add in curve routes * Remove console log * Set node engine to 16 * Run prettier on the fileset * Add different approvals for oeth to LSD and oeth to eth pool * Fix approval route * Fix reth * fix dapp crash from undefined (#1571) * Undefined dapp crash (#1573) * fix dapp crash from undefined * fix get * History route (#1567) * bugs * history route bug fixes and styling * disconnected state * history route style fixes * disable export button * Restore history nav link * Add OETH DApp Linter to CI (#1616) --------- Co-authored-by: Daniel Von Fange <[email protected]> Co-authored-by: Domen Grabec <[email protected]> Co-authored-by: Shahul Hameed <[email protected]> Co-authored-by: Hrik Bhowal <[email protected]> Co-authored-by: Micah Alcorn <[email protected]> Co-authored-by: Jonathan Snow <[email protected]> Co-authored-by: roland <[email protected]> Co-authored-by: Rafael Ugolini <[email protected]>
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.
Cleaning up some of the GTM code and retiring old conflicts on the OETH Dapp.