Instadapp/yield-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/yield-contract.git synced 2024-07-29 21:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor bug fixes

Browse Source
This commit is contained in:
Samyak Jain 2020-09-26 03:27:10 +10:00
parent f3e2e5d8fd
commit 7a5b127225
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/logics/settle/eth/basic.sol
View File

@ -22,6 +22,10 @@ contract LogicOne {
return 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; // ETH Address return 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; // ETH Address
} }
function getOriginAddress() private pure returns(address) {
return 0xB7fA44c2E964B6EB24893f7082Ecc08c8d0c0F87; // DSA address
}
function deploy(address _dsa, address _token, uint amt) public { function deploy(address _dsa, address _token, uint amt) public {
// check if DSA is authorised // check if DSA is authorised
if (_token == getEthAddr()) { if (_token == getEthAddr()) {
@ -34,6 +38,7 @@ contract LogicOne {
amt = amt > _bal ? _bal : amt; amt = amt > _bal ? _bal : amt;
token.safeTransfer(_dsa, amt); token.safeTransfer(_dsa, amt);
} }
// emit event?
} }
// withdraw assets from DSA // withdraw assets from DSA
@ -44,7 +49,7 @@ contract LogicOne {
_targets[0] = address(0); // Check9898 - address of basic connector _targets[0] = address(0); // Check9898 - address of basic connector
bytes[] memory _data = new bytes[](1); bytes[] memory _data = new bytes[](1);
_data[0] = abi.encodeWithSignature("withdraw(address,uint256,address,uint256,uint256)", _token, amt, address(this), uint(0), uint(0)); _data[0] = abi.encodeWithSignature("withdraw(address,uint256,address,uint256,uint256)", _token, amt, address(this), uint(0), uint(0));
DSAInterface(_dsa).cast(_targets, _data, address(0)); // Check9898 - address of origin DSAInterface(_dsa).cast(_targets, _data, getOriginAddress());
} }
constructor () public {} constructor () public {}

20
contracts/logics/settle/eth/crvMining.sol
View File

@ -19,7 +19,7 @@ contract LogicOne {
} }
function getOriginAddress() private pure returns(address) { function getOriginAddress() private pure returns(address) {
return 0xB7fA44c2E964B6EB24893f7082Ecc08c8d0c0F87; // Origin address return 0xB7fA44c2E964B6EB24893f7082Ecc08c8d0c0F87;
} }
function getDsaAddress() private pure returns(address) { function getDsaAddress() private pure returns(address) {
@ -27,11 +27,11 @@ contract LogicOne {
} }
function getGuageAddress() private pure returns(address) { function getGuageAddress() private pure returns(address) {
return 0xAf615b36Db171fD5A369A0060b9bCB88fFf0190d; // DSA address return 0xAf615b36Db171fD5A369A0060b9bCB88fFf0190d;
} }
function getGuageName() private pure returns(string memory) { function getGuageName() private pure returns(string memory) {
return "guage-3"; // Curve Guage name return "guage-3";
} }
function getCurveConnectAddress() private pure returns(address) { function getCurveConnectAddress() private pure returns(address) {
@ -49,9 +49,9 @@ contract LogicOne {
function mineCrv(address token, uint amt, uint unitAmt) external { function mineCrv(address token, uint amt, uint unitAmt) external {
address[] memory _targets = new address[](2); address[] memory _targets = new address[](2);
bytes[] memory _data = new bytes[](2); bytes[] memory _data = new bytes[](2);
_targets[1] = address(0); // Check9898 - address of curve 3pool connector _targets[1] = getCurveConnectAddress();
_data[1] = abi.encodeWithSignature("deposit(address,uint256,uint256,uint256,uint256)", token, amt, unitAmt, uint(0), uint(0)); _data[1] = abi.encodeWithSignature("deposit(address,uint256,uint256,uint256,uint256)", token, amt, unitAmt, uint(0), uint(0));
_targets[2] = address(0); // Check9898 - address of curve 3pool guage connector _targets[2] = getCurveGuageConnectAddress();
_data[2] = abi.encodeWithSignature("deposit(string,uint256,uint256,uint256)", getGuageName(), uint(-1), uint(0), uint(0)); _data[2] = abi.encodeWithSignature("deposit(string,uint256,uint256,uint256)", getGuageName(), uint(-1), uint(0), uint(0));
DSAInterface(getDsaAddress()).cast(_targets, _data, getOriginAddress()); DSAInterface(getDsaAddress()).cast(_targets, _data, getOriginAddress());
} }
@ -66,12 +66,12 @@ contract LogicOne {
_targets = new address[](3); _targets = new address[](3);
_data = new bytes[](3); _data = new bytes[](3);
} }
_targets[0] = address(0); // Check9898 - address of curve 3pool guage connector _targets[0] = getCurveGuageConnectAddress();
_data[0] = abi.encodeWithSignature("withdraw(string,uint256,uint256,uint256,uint256,uint256)", getGuageName(), uint(-1), uint(0), uint(0), uint(0), uint(0)); _data[0] = abi.encodeWithSignature("withdraw(string,uint256,uint256,uint256,uint256,uint256)", getGuageName(), uint(-1), uint(0), uint(0), uint(0), uint(0));
_targets[1] = address(0); // Check9898 - address of curve 3pool connector _targets[1] = getCurveConnectAddress();
_data[1] = abi.encodeWithSignature("withdraw(address,uint256,uint256,uint256,uint256)", token, amt, unitAmt, uint(0), uint(0)); _data[1] = abi.encodeWithSignature("withdraw(address,uint256,uint256,uint256,uint256)", token, amt, unitAmt, uint(0), uint(0));
if (amt != uint(-1)) { if (amt != uint(-1)) {
_targets[2] = address(0); // Check9898 - address of curve 3pool guage connector _targets[2] = getCurveGuageConnectAddress();
_data[2] = abi.encodeWithSignature("deposit(string,uint256,uint256,uint256)", getGuageName(), uint(-1), uint(0), uint(0)); _data[2] = abi.encodeWithSignature("deposit(string,uint256,uint256,uint256)", getGuageName(), uint(-1), uint(0), uint(0));
} }
DSAInterface(getDsaAddress()).cast(_targets, _data, getOriginAddress()); DSAInterface(getDsaAddress()).cast(_targets, _data, getOriginAddress());
@ -80,7 +80,7 @@ contract LogicOne {
function claimCrv() external { function claimCrv() external {
address[] memory _target = new address[](1); address[] memory _target = new address[](1);
bytes[] memory _data = new bytes[](1); bytes[] memory _data = new bytes[](1);
_target[0] = 0xAf615b36Db171fD5A369A0060b9bCB88fFf0190d; // Curve guage connector _target[0] = getCurveGuageConnectAddress();
_data[0] = abi.encodeWithSignature("claimReward(string,uint256,uint256)", getGuageName(), 0, 0); _data[0] = abi.encodeWithSignature("claimReward(string,uint256,uint256)", getGuageName(), 0, 0);
DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress()); DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress());
} }
@ -90,7 +90,7 @@ contract LogicOne {
address eth = getEthAddress(); address eth = getEthAddress();
address[] memory _target = new address[](1); address[] memory _target = new address[](1);
bytes[] memory _data = new bytes[](1); bytes[] memory _data = new bytes[](1);
_target[0] = getUniswapConnectAddress(); // Uniswap Connector _target[0] = getUniswapConnectAddress();
_data[0] = abi.encodeWithSignature("sell(address,address,unit256,unit256,unit256,unit256)", eth, crv, amt, unitAmt, 0, 0); _data[0] = abi.encodeWithSignature("sell(address,address,unit256,unit256,unit256,unit256)", eth, crv, amt, unitAmt, 0, 0);
DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress()); DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress());
} }

4
contracts/logics/settle/eth/maxComp.sol
View File

@ -117,7 +117,7 @@ contract LogicOne is DSMath {
function claimComp(address[] calldata tokens) external { function claimComp(address[] calldata tokens) external {
address[] memory _target = new address[](1); address[] memory _target = new address[](1);
bytes[] memory _data = new bytes[](1); bytes[] memory _data = new bytes[](1);
_target[0] = getCompConnectAddress(); // Comp connector _target[0] = getCompConnectAddress();
_data[0] = abi.encodeWithSignature("ClaimCompTwo(address[],uint256)", tokens, 0); _data[0] = abi.encodeWithSignature("ClaimCompTwo(address[],uint256)", tokens, 0);
DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress()); DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress());
} }
@ -125,7 +125,7 @@ contract LogicOne is DSMath {
function swapComp(uint amt, uint unitAmt) external { function swapComp(uint amt, uint unitAmt) external {
address[] memory _target = new address[](1); address[] memory _target = new address[](1);
bytes[] memory _data = new bytes[](1); bytes[] memory _data = new bytes[](1);
_target[0] = getUniswapConnectAddress(); // Uniswap Connector _target[0] = getUniswapConnectAddress();
_data[0] = abi.encodeWithSignature("sell(address,address,unit256,unit256,unit256,unit256)", getEthAddress(), getCompAddress(), amt, unitAmt, 0, 0); _data[0] = abi.encodeWithSignature("sell(address,address,unit256,unit256,unit256,unit256)", getEthAddress(), getCompAddress(), amt, unitAmt, 0, 0);
DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress()); DSAInterface(getDsaAddress()).cast(_target, _data, getOriginAddress());
} }