Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated connector with setId & getId

Browse Source
This commit is contained in:
Samyak Jain 2021-06-10 16:56:05 +05:30
parent a483299e50
commit dbcf960bf9
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/mainnet/connectors/uniswap_v3_erc20/events.sol
View File

@ -7,7 +7,7 @@ contract Events {
uint256 amtA, uint256 amtA,
uint256 amtB, uint256 amtB,
uint256 mintAmount, uint256 mintAmount,
uint256 getId, uint256[] getIds,
uint256 setId uint256 setId
); );
@ -17,7 +17,7 @@ contract Events {
uint256 amountB, uint256 amountB,
uint256 burnAmount, uint256 burnAmount,
uint256 getId, uint256 getId,
uint256 setId uint256[] setIds
); );
event LogSwapAndDepositLiquidity( event LogSwapAndDepositLiquidity(

28
contracts/mainnet/connectors/uniswap_v3_erc20/main.sol
View File

@ -30,10 +30,13 @@ abstract contract UniswapV3Resolver is Events, Helpers {
uint256 amt0Max, uint256 amt0Max,
uint256 amt1Max, uint256 amt1Max,
uint slippage, uint slippage,
uint256 getId, uint256[] getIds,
uint256 setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
amt0Max = getUint(getIds[0], amt0Max);
amt1Max = getUint(getIds[1], amt1Max);
ERC20WrapperInterface poolContract = ERC20WrapperInterface(pool); ERC20WrapperInterface poolContract = ERC20WrapperInterface(pool);
(uint256 amount0In, uint256 amount1In, uint256 mintAmount) = poolContract.getMintAmounts(amt0Max, amt1Max); (uint256 amount0In, uint256 amount1In, uint256 mintAmount) = poolContract.getMintAmounts(amt0Max, amt1Max);
@ -61,8 +64,10 @@ abstract contract UniswapV3Resolver is Events, Helpers {
require(amount0 == amount0In && amount1 == amount1In, "unexpected amounts deposited"); require(amount0 == amount0In && amount1 == amount1In, "unexpected amounts deposited");
_eventName = "LogDepositLiquidity(address,uint256,uint256,uint256,uint256,uint256)"; setUint(setId, mintAmount);
_eventParam = abi.encode(pool, amount0, amount1, mintAmount, getId, setId);
_eventName = "LogDepositLiquidity(address,uint256,uint256,uint256,uint256[],uint256)";
_eventParam = abi.encode(pool, amount0, amount1, mintAmount, getIds, setId);
} }
@ -82,9 +87,11 @@ abstract contract UniswapV3Resolver is Events, Helpers {
uint256 minAmtA, uint256 minAmtA,
uint256 minAmtB, uint256 minAmtB,
uint256 getId, uint256 getId,
uint256 setId uint256[] setIds
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
liqAmt = getUint(getId, liqAmt);
ERC20WrapperInterface poolContract = ERC20WrapperInterface(pool); ERC20WrapperInterface poolContract = ERC20WrapperInterface(pool);
(uint amount0, uint amount1, uint128 liquidityBurned) = poolContract.burn(liqAmt, address(this)); (uint amount0, uint amount1, uint128 liquidityBurned) = poolContract.burn(liqAmt, address(this));
@ -101,8 +108,11 @@ abstract contract UniswapV3Resolver is Events, Helpers {
require(amount0 >= minAmtA && amount1 >= minAmtB, "received below minimum"); require(amount0 >= minAmtA && amount1 >= minAmtB, "received below minimum");
_eventName = "LogWithdrawLiquidity(address,uint256,uint256,uint256,uint256,uint256)"; setUint(setIds[0], amount0);
_eventParam = abi.encode(pool, amount0, amount1, uint256(liquidityBurned), getId, setId); setUint(setIds[1], amount1);
_eventName = "LogWithdrawLiquidity(address,uint256,uint256,uint256,uint256,uint256[])";
_eventParam = abi.encode(pool, amount0, amount1, uint256(liquidityBurned), getId, setIds);
} }
function swapAndDeposit( function swapAndDeposit(
@ -111,7 +121,9 @@ abstract contract UniswapV3Resolver is Events, Helpers {
uint256 amount1In, uint256 amount1In,
bool zeroForOne, bool zeroForOne,
uint256 swapAmount, uint256 swapAmount,
uint160 swapThreshold uint160 swapThreshold,
uint256 getId,
uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
ERC20WrapperInterface poolContract = ERC20WrapperInterface(pool); ERC20WrapperInterface poolContract = ERC20WrapperInterface(pool);
@ -164,6 +176,8 @@ abstract contract UniswapV3Resolver is Events, Helpers {
); );
} }
setUint(setId, mintAmount);
_eventName = "LogSwapAndDepositLiquidity(address,uint256,uint256,uint256,bool,uint256,uint256,uint256)"; _eventName = "LogSwapAndDepositLiquidity(address,uint256,uint256,uint256,bool,uint256,uint256,uint256)";
_eventParam = abi.encode(pool, amount0, amount1, mintAmount, zeroForOne, swapAmount, getId, setId); _eventParam = abi.encode(pool, amount0, amount1, mintAmount, zeroForOne, swapAmount, getId, setId);