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.

Sign up for GitHub

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: adds uniswapv3 auto-comound #324

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

feat: adds uniswapv3 auto-comound #324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
93395a6
feat: adds uniswapv3 auto-comound
WalidOfNow Jan 20, 2023
64fdaab
chore: adds erc20 approvals for uniswap token manager
WalidOfNow Jan 21, 2023
05a7833
chore: refactor interface
WalidOfNow Jan 21, 2023
5e32045
chore: lint
WalidOfNow Jan 21, 2023
035b421
chore: adds a test
WalidOfNow Jan 21, 2023
d32c5de
chore: adds uniswap dependencies
WalidOfNow Jan 24, 2023
4d747c5
chore: adds event for uniV3 compounding
WalidOfNow Jan 24, 2023
1b2b2bb
chore: lint
WalidOfNow Jan 24, 2023
413cfe7
chore: adds supply from xtoken and re-entrancy
WalidOfNow Jan 24, 2023
c10a8aa
chore: removes logs
WalidOfNow Jan 24, 2023
4334295
chore: fix typo
WalidOfNow Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: refactor interface
  • Loading branch information
@WalidOfNow
WalidOfNow committed Jan 21, 2023
commit 05a7833ce64437d287e1c5d30d3c491249ba4ce0
6 changes: 2 additions & 4 deletions contracts/interfaces/IPoolCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,9 @@ interface IPoolCore {
bool receiveEthAsWeth
) external;

function collectSupplyUniswapV3Fees(
function collectCompoundAndSupplyUniswapV3Fees(
address asset,
uint256 tokenId,
uint256 amount0Min,
uint256 amount1Min
uint256 tokenId
) external;

/**
Expand Down
2 changes: 0 additions & 2 deletions contracts/protocol/libraries/types/DataTypes.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ library DataTypes {
address asset;
uint256 tokenId;
uint256 reservesCount;
uint256 amount0;
uint256 amount1;
address oracle;
}

Expand Down
8 changes: 2 additions & 6 deletions contracts/protocol/pool/PoolCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,9 @@ contract PoolCore is
);
}

function collectSupplyUniswapV3Fees(
function collectCompoundAndSupplyUniswapV3Fees(
address asset,
uint256 tokenId,
uint256 amount0Min,
uint256 amount1Min
uint256 tokenId
) external virtual override {
DataTypes.PoolStorage storage ps = poolStorage();

Expand All @@ -251,8 +249,6 @@ contract PoolCore is
asset: asset,
tokenId: tokenId,
reservesCount: ps._reservesCount,
amount0: amount0Min,
amount1: amount1Min,
oracle: ADDRESSES_PROVIDER.getPriceOracle()
})
);
Expand Down