feat: eip1559 fees by kaladinlight · Pull Request #4324 · shapeshift/web

kaladinlight · 2023-04-20T22:22:21Z

Description

Update to use EIP-1559 fee where possible in swapper

approvals (zrx, thorswap, cowswap, lifi, univ2, fox-farming)
sends/swaps (zrx, thorswap, cowswap, univ2, fox-farming)

using average eip1559 gas price and fast legacy gas price

Lifi will be a follow up for the rest of the flow outside of approval.

Pull Request Type

🐛 Bug fix (Non-breaking Change: Fixes an issue)
🛠️ Chore (Non-breaking Change: Doc updates, pkg upgrades, typos, etc..)
💅 New Feature (Breaking/Non-breaking Change)

Issue (if applicable)

Risk

high - this touches a lot of the gas logic which is very fragmented across the code base with possibility of a missed edge case

Testing

zrx full functionality
thorswap full functionality
cowswap full functionality
lifi full functionality
uniV2 full functionality
fox-farming full functionality

Engineering

☝️

Operations

☝️

Screenshots (if applicable)

ZRX:

Thor:

FoxFarming:

UniV2:

package.json

packages/chain-adapters/src/evm/EvmBaseAdapter.ts

src/features/defi/helpers/utils.ts

gomesalexandre

Untested but conceptually looks excellent so far

src/features/defi/helpers/utils.ts

src/features/defi/providers/fox-farming/components/FoxFarmingManager/Claim/ClaimConfirm.tsx

src/lib/swapper/swappers/CowSwapper/cowApprove/cowApprove.ts

src/lib/swapper/swappers/CowSwapper/getCowSwapTradeQuote/getCowSwapTradeQuote.ts

src/lib/swapper/swappers/ThorchainSwapper/utils/txFeeHelpers/evmTxFees/getEvmTxFees.ts

src/lib/swapper/swappers/ZrxSwapper/ZrxSwapper.ts

src/features/defi/helpers/utils.ts

src/features/defi/providers/univ2/components/UniV2Manager/Deposit/components/Deposit.tsx

src/features/defi/providers/univ2/hooks/useUniV2LiquidityPool.ts

gomesalexandre

Tested with a lil help from Tenderly:

UNI-V2 approvals

FOX

UNI (More logic in their `approve()` method which makes us require a bit of buffer currently, see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L151-L155)

FOX Farming

https://etherscan.io/tx/0xbb33a4111850fda35d3811fc9d9d483081e47332b3eca09494de34d0561d8fcb

ZRX Swapper using the 100000 default `APPROVAL_GAS_LIMIT`

Not for this PR, but we may want to not hardcode a gas limit for approvals anymore in the future, now that we have more sane estimations

CoW swapper using the default `APPROVAL_GAS_LIMIT`

THOR Swapper

Sends/swaps

THOR Swapper using the 100000 `THOR_EVM_GAS_LIMIT`

CoW swapper

Unable to test with Tenderly since this uses signatures and would imply broadcasting an actual Tx - this diff should produce no changes here

ZRX

Unable to test without testing funds, though running through the gas limit / usage of previous similar calls over the last minutes for the sellToUniswap() method, our gasLimit has enough buffer here ✅ will obviously need to be tested by ops

Didn't notice any regressions here, according to Tenderly which gives us the same actual deterministic guarantees as broadcasting Txs.
Will obviously need some ops love of legacy/EIP-1559 after this goes in, and ideally shapeshift/hdwallet#614 to go in and be bumped here as well to ensure MM uses EIP-1559 fees, but conceptually looks good to me functionally so far!

gomesalexandre · 2023-04-25T17:48:29Z

Current dependencies on/for this PR:

develop
- PR feat: eip1559 fees #4324 👈
  - PR feat: switch FOXy from web3 to ethers and JsonRpcBatchProvider #3508

This comment was auto-generated by Graphite.

gomesalexandre

LGTM after the latest changes and the UNI-V2 addLiquidityEth ETH value fix - re-tested in a poile

kaladinlight added 10 commits April 20, 2023 12:13

update types

0f8b883

update types and add top level asset check

1b3d516

add fee and build/broadcast helpers and improve approve helper

8e0d76f

update zrx to use new helpers (eip1559 fees)

4a8ecd4

updated thorchain swapper to use new helpers (eip1559)

4a150ff

use updated approve helper

3333f67

remove requirement to pass in hex number to buildCustomTx

1d72155

Merge branch 'develop' into eip1559-fees

e128062

cleanup

6ecdf28

pass back eip1559 fees for thorchain

d606eee

0xdef1cafe changed the title ~~Eip1559 fees~~ feat: eip1559 fees Apr 21, 2023

kaladinlight added 5 commits April 21, 2023 11:32

add fee and build/broadcast helpers

fc835f7

update fox-farming to use new helpers

f57a6de

pass back eip1559 fees for cowswap quote and use bn for const

17f8805

cleanup naming and types

1d7e4fa

update univ2 to use new helpers

1145778

kaladinlight force-pushed the eip1559-fees branch from 33ca9c6 to 1145778 Compare April 21, 2023 18:34

kaladinlight added 2 commits April 21, 2023 12:39

update naming changes

a48710f

jesus fucking tits tests

ab22c75

kaladinlight commented Apr 21, 2023

View reviewed changes

package.json Show resolved Hide resolved

format

6a70be9

gomesalexandre reviewed Apr 24, 2023

View reviewed changes

packages/chain-adapters/src/evm/EvmBaseAdapter.ts Show resolved Hide resolved

gomesalexandre reviewed Apr 24, 2023

View reviewed changes

src/features/defi/helpers/utils.ts Show resolved Hide resolved

gomesalexandre reviewed Apr 24, 2023

View reviewed changes

kaladinlight added 4 commits April 24, 2023 12:33

additional cowswap cleanup

3840e65

additional zrx swapper cleanup

38f6f65

additional thorchain swapper cleanup

89455ef

review feedback

33859cb

kaladinlight force-pushed the eip1559-fees branch from d751850 to 33859cb Compare April 24, 2023 18:34

explicit data

eea80a8

kaladinlight force-pushed the eip1559-fees branch from b976bfd to eea80a8 Compare April 24, 2023 18:50

kaladinlight added 3 commits April 24, 2023 13:25

fix tests again

52e0151

fee data helper to pull average eip1559 and fast legacy fees

0f0d47d

Merge branch 'develop' into eip1559-fees

0c42599

gomesalexandre reviewed Apr 25, 2023

View reviewed changes

src/features/defi/helpers/utils.ts Outdated Show resolved Hide resolved

gomesalexandre reviewed Apr 25, 2023

View reviewed changes

src/features/defi/providers/univ2/components/UniV2Manager/Deposit/components/Deposit.tsx Outdated Show resolved Hide resolved

gomesalexandre reviewed Apr 25, 2023

View reviewed changes

src/features/defi/providers/univ2/hooks/useUniV2LiquidityPool.ts Show resolved Hide resolved

gomesalexandre reviewed Apr 25, 2023

View reviewed changes

kaladinlight added 4 commits April 25, 2023 10:09

average eip1559 vs fast legacy with updated comment

967fcf2

small cleanup approval fee

cb00807

fix tests

4c9bfde

remove parser log

63140b5

kaladinlight marked this pull request as ready for review April 25, 2023 17:18

kaladinlight requested a review from a team as a code owner April 25, 2023 17:18

kaladinlight force-pushed the eip1559-fees branch from 642f9d7 to 63140b5 Compare April 25, 2023 17:24

Merge branch 'develop' into eip1559-fees

f369882

gomesalexandre mentioned this pull request Apr 25, 2023

feat: switch FOXy from web3 to ethers and JsonRpcBatchProvider #3508

Merged

9 tasks

fix: pass value for deposit

e1af646

gomesalexandre approved these changes Apr 25, 2023

View reviewed changes

gomesalexandre merged commit 1047a1a into develop Apr 25, 2023

gomesalexandre deleted the eip1559-fees branch April 25, 2023 18:33

gomesalexandre mentioned this pull request Apr 25, 2023

chore: release v1.287.0 #4348

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: eip1559 fees#4324

feat: eip1559 fees#4324
gomesalexandre merged 32 commits intodevelopfrom
eip1559-fees

kaladinlight commented Apr 20, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gomesalexandre left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gomesalexandre left a comment

Uh oh!

gomesalexandre commented Apr 25, 2023

Uh oh!

gomesalexandre left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

kaladinlight commented Apr 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull Request Type

Issue (if applicable)

Risk

Testing

Engineering

Operations

Screenshots (if applicable)

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gomesalexandre left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gomesalexandre left a comment

Choose a reason for hiding this comment

UNI-V2 approvals

FOX

UNI (More logic in their approve() method which makes us require a bit of buffer currently, see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L151-L155)

FOX Farming

ZRX Swapper using the 100000 default APPROVAL_GAS_LIMIT

CoW swapper using the default APPROVAL_GAS_LIMIT

THOR Swapper

Sends/swaps

THOR Swapper using the 100000 THOR_EVM_GAS_LIMIT

CoW swapper

ZRX

Uh oh!

gomesalexandre commented Apr 25, 2023

Uh oh!

gomesalexandre left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kaladinlight commented Apr 20, 2023 •

edited

Loading

UNI (More logic in their `approve()` method which makes us require a bit of buffer currently, see https://github.com/Uniswap/governance/blob/eabd8c71ad01f61fb54ed6945162021ee419998e/contracts/Uni.sol#L151-L155)

ZRX Swapper using the 100000 default `APPROVAL_GAS_LIMIT`

CoW swapper using the default `APPROVAL_GAS_LIMIT`

THOR Swapper using the 100000 `THOR_EVM_GAS_LIMIT`