From c2f4a1f1198cb075f88953736e75595da5135f02 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Mon, 15 Mar 2021 22:52:47 +0530 Subject: [PATCH] Update events --- contracts/connectors/1inch/events.sol | 63 -------------------------- contracts/connectors/1inch/main.sol | 60 +++++++++++++++++------- contracts/connectors/chi/main.sol | 10 +++- contracts/connectors/makerdao/main.sol | 4 +- 4 files changed, 53 insertions(+), 84 deletions(-) diff --git a/contracts/connectors/1inch/events.sol b/contracts/connectors/1inch/events.sol index a559793e..1f3bef7a 100644 --- a/contracts/connectors/1inch/events.sol +++ b/contracts/connectors/1inch/events.sol @@ -1,7 +1,5 @@ pragma solidity ^0.7.0; -import { OneProtoData, OneProtoMultiData, OneInchData} from "./interface.sol"; - contract Events { event LogSell( address indexed buyToken, @@ -12,21 +10,6 @@ contract Events { uint256 setId ); - function emitLogSell( - OneProtoData memory oneProtoData, - uint256 getId, - uint256 setId - ) internal { - emit LogSell( - address(oneProtoData.buyToken), - address(oneProtoData.sellToken), - oneProtoData._buyAmt, - oneProtoData._sellAmt, - getId, - setId - ); - } - event LogSellTwo( address indexed buyToken, address indexed sellToken, @@ -36,21 +19,6 @@ contract Events { uint256 setId ); - function emitLogSellTwo( - OneProtoData memory oneProtoData, - uint256 getId, - uint256 setId - ) internal { - emit LogSellTwo( - address(oneProtoData.buyToken), - address(oneProtoData.sellToken), - oneProtoData._buyAmt, - oneProtoData._sellAmt, - getId, - setId - ); - } - event LogSellMulti( address[] tokens, address indexed buyToken, @@ -61,22 +29,6 @@ contract Events { uint256 setId ); - function emitLogSellMulti( - OneProtoMultiData memory oneProtoData, - uint256 getId, - uint256 setId - ) internal { - emit LogSellMulti( - oneProtoData.tokens, - address(oneProtoData.buyToken), - address(oneProtoData.sellToken), - oneProtoData._buyAmt, - oneProtoData._sellAmt, - getId, - setId - ); - } - event LogSellThree( address indexed buyToken, address indexed sellToken, @@ -85,19 +37,4 @@ contract Events { uint256 getId, uint256 setId ); - - - function emitLogSellThree( - OneInchData memory oneInchData, - uint256 setId - ) internal { - emit LogSellThree( - address(oneInchData.buyToken), - address(oneInchData.sellToken), - oneInchData._buyAmt, - oneInchData._sellAmt, - 0, - setId - ); - } } \ No newline at end of file diff --git a/contracts/connectors/1inch/main.sol b/contracts/connectors/1inch/main.sol index cb83c94a..beb16abd 100644 --- a/contracts/connectors/1inch/main.sol +++ b/contracts/connectors/1inch/main.sol @@ -141,7 +141,7 @@ abstract contract OneProtoResolverHelpers is OneInchResolver { OneProtoData memory oneProtoData, uint256 getId, uint256 setId - ) internal { + ) internal returns (OneProtoData memory) { uint _sellAmt = getUint(getId, oneProtoData._sellAmt); oneProtoData._sellAmt = _sellAmt == uint(-1) ? @@ -165,7 +165,7 @@ abstract contract OneProtoResolverHelpers is OneInchResolver { setUint(setId, oneProtoData._buyAmt); - emitLogSell(oneProtoData, getId, setId); + return oneProtoData; } /** @@ -178,7 +178,7 @@ abstract contract OneProtoResolverHelpers is OneInchResolver { OneProtoData memory oneProtoData, uint getId, uint setId - ) internal { + ) internal returns (OneProtoData memory) { uint _sellAmt = getUint(getId, oneProtoData._sellAmt); oneProtoData._sellAmt = _sellAmt == uint(-1) ? @@ -191,7 +191,8 @@ abstract contract OneProtoResolverHelpers is OneInchResolver { ); setUint(setId, oneProtoData._buyAmt); - emitLogSellTwo(oneProtoData, getId, setId); + + return oneProtoData; } /** @@ -204,7 +205,7 @@ abstract contract OneProtoResolverHelpers is OneInchResolver { OneProtoMultiData memory oneProtoData, uint getId, uint setId - ) internal { + ) internal returns (OneProtoMultiData memory) { uint _sellAmt = getUint(getId, oneProtoData._sellAmt); oneProtoData._sellAmt = _sellAmt == uint(-1) ? @@ -214,7 +215,9 @@ abstract contract OneProtoResolverHelpers is OneInchResolver { oneProtoData._buyAmt = oneProtoSwapMulti(oneProtoData); setUint(setId, oneProtoData._buyAmt); - emitLogSellMulti(oneProtoData, getId, setId); + // emitLogSellMulti(oneProtoData, getId, setId); + + return oneProtoData; } } @@ -228,7 +231,7 @@ abstract contract OneInchResolverHelpers is OneProtoResolverHelpers { function _sellThree( OneInchData memory oneInchData, uint setId - ) internal { + ) internal returns (OneInchData memory) { TokenInterface _sellAddr = oneInchData.sellToken; uint ethAmt; @@ -243,7 +246,9 @@ abstract contract OneInchResolverHelpers is OneProtoResolverHelpers { oneInchData._buyAmt = oneInchSwap(oneInchData, ethAmt); setUint(setId, oneInchData._buyAmt); - emitLogSellThree(oneInchData, setId); + return oneInchData; + + // emitLogSellThree(oneInchData, setId); } } @@ -264,7 +269,7 @@ abstract contract OneProto is OneInchResolverHelpers { uint unitAmt, uint getId, uint setId - ) external payable { + ) external payable returns (string memory _eventName, bytes memory _eventParam) { OneProtoData memory oneProtoData = OneProtoData({ buyToken: TokenInterface(buyAddr), sellToken: TokenInterface(sellAddr), @@ -275,7 +280,10 @@ abstract contract OneProto is OneInchResolverHelpers { disableDexes: 0 }); - _sell(oneProtoData, getId, setId); + oneProtoData = _sell(oneProtoData, getId, setId); + + _eventName = "LogSell(address,address,uint256,uint256,uint256,uint256)"; + _eventParam = abi.encode(buyAddr, sellAddr, oneProtoData._buyAmt, oneProtoData._sellAmt, getId, setId); } /** @@ -298,7 +306,7 @@ abstract contract OneProto is OneInchResolverHelpers { uint disableDexes, uint getId, uint setId - ) external payable { + ) external payable returns (string memory _eventName, bytes memory _eventParam) { OneProtoData memory oneProtoData = OneProtoData({ buyToken: TokenInterface(buyAddr), sellToken: TokenInterface(sellAddr), @@ -309,7 +317,10 @@ abstract contract OneProto is OneInchResolverHelpers { _buyAmt: 0 }); - _sellTwo(oneProtoData, getId, setId); + oneProtoData = _sellTwo(oneProtoData, getId, setId); + + _eventName = "LogSellTwo(address,address,uint256,uint256,uint256,uint256)"; + _eventParam = abi.encode(buyAddr, sellAddr, oneProtoData._buyAmt, oneProtoData._sellAmt, getId, setId); } /** @@ -330,10 +341,11 @@ abstract contract OneProto is OneInchResolverHelpers { uint[] calldata disableDexes, uint getId, uint setId - ) external payable { + ) external payable returns (string memory _eventName, bytes memory _eventParam) { + uint _length = tokens.length; OneProtoMultiData memory oneProtoData = OneProtoMultiData({ tokens: tokens, - buyToken: TokenInterface(address(tokens[tokens.length - 1])), + buyToken: TokenInterface(address(tokens[_length - 1])), sellToken: TokenInterface(address(tokens[0])), unitAmt: unitAmt, distribution: distribution, @@ -342,7 +354,18 @@ abstract contract OneProto is OneInchResolverHelpers { _buyAmt: 0 }); - _sellMulti(oneProtoData, getId, setId); + oneProtoData = _sellMulti(oneProtoData, getId, setId); + + _eventName = "LogSellMulti(address[],address,address,uint256,uint256,uint256,uint256)"; + _eventParam = abi.encode( + tokens, + address(oneProtoData.buyToken), + address(oneProtoData.sellToken), + oneProtoData._buyAmt, + oneProtoData._sellAmt, + getId, + setId + ); } } @@ -363,7 +386,7 @@ abstract contract OneInch is OneProto { uint unitAmt, bytes calldata callData, uint setId - ) external payable { + ) external payable returns (string memory _eventName, bytes memory _eventParam) { OneInchData memory oneInchData = OneInchData({ buyToken: TokenInterface(buyAddr), sellToken: TokenInterface(sellAddr), @@ -373,7 +396,10 @@ abstract contract OneInch is OneProto { _buyAmt: 0 }); - _sellThree(oneInchData, setId); + oneInchData = _sellThree(oneInchData, setId); + + _eventName = "LogSellThree(address,address,uint256,uint256,uint256,uint256)"; + _eventParam = abi.encode(buyAddr, sellAddr, oneInchData._buyAmt, oneInchData._sellAmt, 0, setId); } } diff --git a/contracts/connectors/chi/main.sol b/contracts/connectors/chi/main.sol index 155dfbff..b808f9c1 100644 --- a/contracts/connectors/chi/main.sol +++ b/contracts/connectors/chi/main.sol @@ -8,20 +8,26 @@ abstract contract ChiResolver is Events, Helpers { * @dev Mint CHI token. * @param amt token amount to mint. */ - function mint(uint amt) public payable { + function mint(uint amt) public payable returns (string memory _eventName, bytes memory _eventParam) { uint _amt = amt == uint(-1) ? 140 : amt; require(_amt <= 140, "Max minting is 140 chi"); chi.mint(_amt); + + _eventName = "LogMint(uint256)"; + _eventParam = abi.encode(_amt); } /** * @dev burn CHI token. * @param amt token amount to burn. */ - function burn(uint amt) public payable { + function burn(uint amt) public payable returns (string memory _eventName, bytes memory _eventParam) { uint _amt = amt == uint(-1) ? chi.balanceOf(address(this)) : amt; chi.approve(address(chi), _amt); chi.free(_amt); + + _eventName = "LogBurn(uint256)"; + _eventParam = abi.encode(_amt); } } contract ConnectV2CHI is ChiResolver { diff --git a/contracts/connectors/makerdao/main.sol b/contracts/connectors/makerdao/main.sol index 394a6462..1c6a0e18 100644 --- a/contracts/connectors/makerdao/main.sol +++ b/contracts/connectors/makerdao/main.sol @@ -227,7 +227,7 @@ abstract contract MakerResolver is Helpers, Events { setUint(setId, _amt); - _eventName = "LogBorrow(uint256,bytes32,uint256,uint256,uint256)"; + _eventName = "LogPayback(uint256,bytes32,uint256,uint256,uint256)"; _eventParam = abi.encode(_vault, ilk, _amt, getId, setId); } @@ -272,7 +272,7 @@ abstract contract MakerResolver is Helpers, Events { setUint(setId, _amt); - _eventName = "LogBorrow(uint256,bytes32,uint256,uint256,uint256)"; + _eventName = "LogWithdrawLiquidated(uint256,bytes32,uint256,uint256,uint256)"; _eventParam = abi.encode(vault, ilk, _amt, getId, setId); }