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

Review's fix

Browse Source
This commit is contained in:
Shivva 2020-11-03 08:57:10 +01:00 committed by Luis Schliesske
parent f98dc798da
commit 4f6b16b7da
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/contracts/connectors/ConnectGelatoDataForFullRefinance.sol
View File

@ -68,7 +68,7 @@ contract ConnectGelatoDataForFullRefinance is ConnectorInterface {
function getDataAndCastForFromMakerToMaker( function getDataAndCastForFromMakerToMaker(
uint256 _vaultId, uint256 _vaultId,
address _token, address _token,
string memory _colType, string calldata _colType,
address _provider address _provider
) public payable { ) public payable {
( (
@ -188,7 +188,7 @@ contract ConnectGelatoDataForFullRefinance is ConnectorInterface {
function _execPayloadForFullRefinanceFromMakerToMaker( function _execPayloadForFullRefinanceFromMakerToMaker(
uint256 _vaultId, uint256 _vaultId,
address _token, address _token,
string memory _colType, string calldata _colType,
address _provider address _provider
) internal view returns (address[] memory targets, bytes[] memory datas) { ) internal view returns (address[] memory targets, bytes[] memory datas) {
targets = new address[](1); targets = new address[](1);

12
contracts/contracts/connectors/ConnectGelatoDataForPartialRefinance.sol
View File

@ -81,7 +81,7 @@ contract ConnectGelatoDataForPartialRefinance is ConnectorInterface {
function getDataAndCastForFromMakerToMaker( function getDataAndCastForFromMakerToMaker(
PartialDebtBridgePayload calldata _payload, PartialDebtBridgePayload calldata _payload,
string memory _colType string calldata _colType
) public payable { ) public payable {
( (
address[] memory targets, address[] memory targets,
@ -145,7 +145,7 @@ contract ConnectGelatoDataForPartialRefinance is ConnectorInterface {
uint256 wDaiDebtToMove, uint256 wDaiDebtToMove,
uint256 wColToWithdrawFromMaker, uint256 wColToWithdrawFromMaker,
uint256 gasFeesPaidFromCol uint256 gasFeesPaidFromCol
) = _computeDebtBridge( ) = computeDebtBridge(
_payload.vaultId, _payload.vaultId,
_payload.wMinColRatioMaker, _payload.wMinColRatioMaker,
_payload.wMinColRatioB, _payload.wMinColRatioB,
@ -216,7 +216,7 @@ contract ConnectGelatoDataForPartialRefinance is ConnectorInterface {
/// @return datas : calldata for flashloan /// @return datas : calldata for flashloan
function _execPayloadForPartialRefinanceFromMakerToMaker( function _execPayloadForPartialRefinanceFromMakerToMaker(
PartialDebtBridgePayload calldata _payload, PartialDebtBridgePayload calldata _payload,
string memory _colType string calldata _colType
) internal view returns (address[] memory targets, bytes[] memory datas) { ) internal view returns (address[] memory targets, bytes[] memory datas) {
targets = new address[](1); targets = new address[](1);
targets[0] = INSTA_POOL_V2; targets[0] = INSTA_POOL_V2;
@ -225,7 +225,7 @@ contract ConnectGelatoDataForPartialRefinance is ConnectorInterface {
uint256 wDaiDebtToMove, uint256 wDaiDebtToMove,
uint256 wColToWithdrawFromMaker, uint256 wColToWithdrawFromMaker,
uint256 gasFeesPaidFromCol uint256 gasFeesPaidFromCol
) = _computeDebtBridge( ) = computeDebtBridge(
_payload.vaultId, _payload.vaultId,
_payload.wMinColRatioMaker, _payload.wMinColRatioMaker,
_payload.wMinColRatioB, _payload.wMinColRatioB,
@ -296,14 +296,14 @@ contract ConnectGelatoDataForPartialRefinance is ConnectorInterface {
/// @return wColToWithdrawFromMaker (wad) to: withdraw from Maker and deposit on B. /// @return wColToWithdrawFromMaker (wad) to: withdraw from Maker and deposit on B.
/// @return gasFeesPaidFromCol Gelato automation-gas-fees paid from user's collateral /// @return gasFeesPaidFromCol Gelato automation-gas-fees paid from user's collateral
// solhint-disable function-max-lines // solhint-disable function-max-lines
function _computeDebtBridge( function computeDebtBridge(
uint256 _vaultId, uint256 _vaultId,
uint256 _wMinColRatioMaker, uint256 _wMinColRatioMaker,
uint256 _wMinColRatioB, uint256 _wMinColRatioB,
address _priceOracle, address _priceOracle,
bytes calldata _oraclePayload bytes calldata _oraclePayload
) )
internal public
view view
returns ( returns (
uint256 wDaiDebtToMove, uint256 wDaiDebtToMove,

4
test/helpers/Full-Refinance-Maker-To-Compound.helper.js
View File

@ -15,7 +15,7 @@ const getABI = require("./setups/ABI.helper");
const getAllContracts = require("./setups/Contracts-For-Full-Refinancing-Maker-To-Compound.helper"); const getAllContracts = require("./setups/Contracts-For-Full-Refinancing-Maker-To-Compound.helper");
const enableGelatoConnectorsForFromMaker = require("./setups/Enabling-New-Connectors-For-Full-Refinance.helper"); const enableGelatoConnectorsForFromMaker = require("./setups/Enabling-New-Connectors-For-Full-Refinance.helper");
const ConnectGelatoDataForFullRefinance = require("../../artifacts/contracts/contracts/connectors/ConnectGelatoDataForFullRefinance.sol/ConnectGelatoDataForFullRefinance.json") const ConnectGelatoDataForFullRefinanceABI = require("../../artifacts/contracts/contracts/connectors/ConnectGelatoDataForFullRefinance.sol/ConnectGelatoDataForFullRefinance.json")
.abi; .abi;
async function makerToCompoundSetup() { async function makerToCompoundSetup() {
@ -101,7 +101,7 @@ async function providerWhiteListTaskForMakerToCompound(
const debtBridgeCalculationForFullRefinance = new GelatoCoreLib.Action({ const debtBridgeCalculationForFullRefinance = new GelatoCoreLib.Action({
addr: contracts.connectGelatoData.address, addr: contracts.connectGelatoData.address,
data: await hre.run("abi-encode-withselector", { data: await hre.run("abi-encode-withselector", {
abi: ConnectGelatoDataForFullRefinance, abi: ConnectGelatoDataForFullRefinanceABI,
functionname: "getDataAndCastForFromMakerToCompound", functionname: "getDataAndCastForFromMakerToCompound",
inputs: [vaultId, constants.ETH, wallets.providerAddress], inputs: [vaultId, constants.ETH, wallets.providerAddress],
}), }),

4
test/helpers/Full-Refinance-Maker-To-Maker.helper.js
View File

@ -16,7 +16,7 @@ const getABI = require("./setups/ABI.helper");
const getAllContracts = require("./setups/Contracts-For-Full-Refinancing-Maker-To-Maker.helper"); const getAllContracts = require("./setups/Contracts-For-Full-Refinancing-Maker-To-Maker.helper");
const enableGelatoConnectorsForFromMaker = require("./setups/Enabling-New-Connectors-For-Full-Refinance.helper"); const enableGelatoConnectorsForFromMaker = require("./setups/Enabling-New-Connectors-For-Full-Refinance.helper");
const ConnectGelatoDataForFullRefinance = require("../../artifacts/contracts/contracts/connectors/ConnectGelatoDataForFullRefinance.sol/ConnectGelatoDataForFullRefinance.json") const ConnectGelatoDataForFullRefinanceABI = require("../../artifacts/contracts/contracts/connectors/ConnectGelatoDataForFullRefinance.sol/ConnectGelatoDataForFullRefinance.json")
.abi; .abi;
async function makerETHAToMakerETHBSetup() { async function makerETHAToMakerETHBSetup() {
@ -107,7 +107,7 @@ async function providerWhiteListTaskForMakerETHAToMakerETHB(
const debtBridgeCalculationForFullRefinance = new GelatoCoreLib.Action({ const debtBridgeCalculationForFullRefinance = new GelatoCoreLib.Action({
addr: contracts.connectGelatoData.address, addr: contracts.connectGelatoData.address,
data: await hre.run("abi-encode-withselector", { data: await hre.run("abi-encode-withselector", {
abi: ConnectGelatoDataForFullRefinance, abi: ConnectGelatoDataForFullRefinanceABI,
functionname: "getDataAndCastForFromMakerToMaker", functionname: "getDataAndCastForFromMakerToMaker",
inputs: [vaultId, constants.ETH, "ETH-B", wallets.providerAddress], inputs: [vaultId, constants.ETH, "ETH-B", wallets.providerAddress],
}), }),