chore: redeployed MakerToMaker dependencies

contracts/contracts/connectors/ConnectGelatoDataFullMakerToCompound.sol

@@ -27,10 +27,7 @@ import {
 } from "../../functions/InstaDapp/connectors/FInstaPoolV2.sol";
 import {
     _encodePaybackMakerVault,
-    _encodedWithdrawMakerVault,
+    _encodedWithdrawMakerVault
-    _encodeOpenMakerVault,
-    _encodedDepositMakerVault,
-    _encodeBorrowMakerVault
 } from "../../functions/InstaDapp/connectors/FConnectMaker.sol";
 import {
     _encodePayExecutor
@@ -42,7 +39,6 @@ import {
 import {_getGelatoExecutorFees} from "../../functions/gelato/FGelato.sol";
 import {
     _getFlashLoanRoute,
-    _getGasCostMakerToMaker,
     _getGasCostMakerToCompound,
     _getRealisedDebt
 } from "../../functions/gelato/FGelatoDebtBridge.sol";

contracts/contracts/connectors/ConnectGelatoDataFullMakerToMaker.sol

@@ -14,7 +14,6 @@ import {
 import {
     DAI,
     CONNECT_MAKER,
-    CONNECT_COMPOUND,
     INSTA_POOL_V2
 } from "../../constants/CInstaDapp.sol";
 import {
@@ -35,15 +34,10 @@ import {
 import {
     _encodePayExecutor
 } from "../../functions/InstaDapp/connectors/FConnectGelatoExecutorPayment.sol";
-import {
-    _encodeDepositCompound,
-    _encodeBorrowCompound
-} from "../../functions/InstaDapp/connectors/FConnectCompound.sol";
 import {_getGelatoExecutorFees} from "../../functions/gelato/FGelato.sol";
 import {
     _getFlashLoanRoute,
     _getGasCostMakerToMaker,
-    _getGasCostMakerToCompound,
     _getRealisedDebt
 } from "../../functions/gelato/FGelatoDebtBridge.sol";
 import {

deploy/__mocks__/connectors/MockConnectGelatoDataFullMakerToMaker.deploy.js

@@ -6,10 +6,10 @@ const InstaConnector = require("../../../pre-compiles/InstaConnectors.json");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying MockConnectGelatoDataFullMakerToMaker to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying MockConnectGelatoDataFullMakerToMaker to mainnet. Hit ctrl + c to abort"
     );
     console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
-    await sleep(6000);
+    await sleep(10000);
   }
 
   const { deployments } = hre;

deploy/__mocks__/dapps/MockCDAI.deploy.js

@@ -2,7 +2,7 @@ const { sleep } = require("@gelatonetwork/core");
 
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
-    console.log("Deploying MockCDAI to mainnet. Hit ctrl + c to abort");
+    console.log("\n\n Deploying MockCDAI to mainnet. Hit ctrl + c to abort");
     await sleep(10000);
   }
 

deploy/__mocks__/dapps/MockDSR.deploy.js

@@ -2,7 +2,7 @@ const { sleep } = require("@gelatonetwork/core");
 
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
-    console.log("Deploying MockDSR to mainnet. Hit ctrl + c to abort");
+    console.log("\n\n Deploying MockDSR to mainnet. Hit ctrl + c to abort");
     await sleep(10000);
   }
 

deploy/__mocks__/gelato/MockDebtBridgeETHBExecutor.deploy.js

@@ -6,7 +6,7 @@ const GelatoCoreLib = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying MockDebtBridgeETHBExecutor to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying MockDebtBridgeETHBExecutor to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

deploy/__mocks__/gelato/MockFGelatoDebtBridge.deploy.js

@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying FGelatoDebtBridgeMock to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying FGelatoDebtBridgeMock to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

deploy/connectors/ConnectGelatoDataForPartialRefinance.deploy.js

@@ -7,9 +7,10 @@ const InstaConnector = require("../../pre-compiles/InstaConnectors.json");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConnectGelatoDataPartialRefinanceMaker to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConnectGelatoDataPartialRefinanceMaker to mainnet. Hit ctrl + c to abort"
     );
     console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
+    console.log(`Connector Id: ${[parseInt(process.env.CONNECTOR_ID)]}`);
     await sleep(10000);
   }
 
@@ -60,14 +61,14 @@ module.exports = async (hre) => {
       params: [await instaMaster.getAddress()],
     });
   } else {
-    assert(process.env.ConnectGelatoDataPartialRefinanceMakerId);
+    assert(process.env.CONNECTOR_ID);
 
     // the following will only deploy "ConnectGelatoDataPartialRefinanceMaker"
     // if the contract was never deployed or if the code changed since last deployment
     await deploy("ConnectGelatoDataPartialRefinanceMaker", {
       from: deployer,
       args: [
-        parseInt(process.env.ConnectGelatoDataPartialRefinanceMakerId),
+        parseInt(process.env.CONNECTOR_ID),
         (await deployments.get("ConnectGelatoExecutorPayment")).address,
       ],
       gasPrice: hre.network.config.gasPrice,
@@ -79,7 +80,7 @@ module.exports = async (hre) => {
 module.exports.skip = async (hre) => {
   if (hre.network.name === "mainnet") return true;
   if (hre.network.name !== "hardhat")
-    return process.env.ConnectGelatoDataPartialRefinanceMakerId === undefined;
+    return process.env.CONNECTOR_ID === undefined;
   return false;
 };
 module.exports.tags = ["ConnectGelatoDataPartialRefinanceMaker"];

deploy/connectors/ConnectGelatoDataFullMakerToCompound.deploy.js

@@ -2,14 +2,16 @@ const hre = require("hardhat");
 const { ethers } = hre;
 const { sleep } = require("@gelatonetwork/core");
 const InstaConnector = require("../../pre-compiles/InstaConnectors.json");
+const assert = require("assert");
 
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConnectGelatoDataFullMakerToCompound to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConnectGelatoDataFullMakerToCompound to mainnet. Hit ctrl + c to abort"
     );
     console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
-    await sleep(6000);
+    console.log(`Connector Id: ${[parseInt(process.env.CONNECTOR_ID)]}`);
+    await sleep(10000);
   }
 
   const { deployments } = hre;
@@ -59,12 +61,14 @@ module.exports = async (hre) => {
       params: [await instaMaster.getAddress()],
     });
   } else {
+    assert(process.env.CONNECTOR_ID);
+
     // the following will only deploy "ConnectGelatoDataFullMakerToCompound"
     // if the contract was never deployed or if the code changed since last deployment
     await deploy("ConnectGelatoDataFullMakerToCompound", {
       from: deployer,
       args: [
-        parseInt(process.env.ConnectGelatoDataFullMakerToCompoundId),
+        parseInt(process.env.CONNECTOR_ID),
         (await deployments.get("ConnectGelatoExecutorPayment")).address,
       ],
       gasPrice: hre.network.config.gasPrice,
@@ -76,7 +80,7 @@ module.exports = async (hre) => {
 module.exports.skip = async (hre) => {
   if (hre.network.name === "mainnet") return true;
   if (hre.network.name !== "hardhat")
-    return process.env.ConnectGelatoDataFullMakerToCompoundId === undefined;
+    return process.env.CONNECTOR_ID === undefined;
   return false;
 };
 module.exports.dependencies = ["ConnectGelatoExecutorPayment"];

deploy/connectors/ConnectGelatoDataFullMakerToMaker.deploy.js

@@ -1,14 +1,16 @@
 const hre = require("hardhat");
 const { ethers } = hre;
 const { sleep } = require("@gelatonetwork/core");
+const assert = require("assert");
 
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConnectGelatoDataFullMakerToMaker to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConnectGelatoDataFullMakerToMaker to mainnet. Hit ctrl + c to abort"
     );
     console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
-    await sleep(6000);
+    console.log(`Connector Id: ${parseInt(process.env.CONNECTOR_ID)}`);
+    await sleep(10000);
   }
 
   const { deployments } = hre;
@@ -57,12 +59,14 @@ module.exports = async (hre) => {
       params: [await instaMaster.getAddress()],
     });
   } else {
+    assert(process.env.CONNECTOR_ID);
+
     // the following will only deploy "ConnectGelatoDataFullMakerToMaker"
     // if the contract was never deployed or if the code changed since last deployment
     await deploy("ConnectGelatoDataFullMakerToMaker", {
       from: deployer,
       args: [
-        parseInt(process.env.ConnectGelatoDataFullMakerToMakerId),
+        parseInt(process.env.CONNECTOR_ID),
         (await deployments.get("ConnectGelatoExecutorPayment")).address,
       ],
       gasPrice: hre.network.config.gasPrice,
@@ -74,7 +78,7 @@ module.exports = async (hre) => {
 module.exports.skip = async (hre) => {
   if (hre.network.name === "mainnet") return true;
   if (hre.network.name !== "hardhat")
-    return process.env.ConnectGelatoDataFullMakerToMakerId === undefined;
+    return process.env.CONNECTOR_ID === undefined;
   return false;
 };
 module.exports.dependencies = ["ConnectGelatoExecutorPayment"];

deploy/connectors/ConnectGelatoExecutorPayment.deploy.js

@@ -1,13 +1,15 @@
 const hre = require("hardhat");
 const { ethers } = hre;
 const { sleep } = require("@gelatonetwork/core");
+const assert = require("assert");
 
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConnectGelatoExecutorPayment to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConnectGelatoExecutorPayment to mainnet. Hit ctrl + c to abort"
     );
     console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
+    console.log(`Connector Id: ${parseInt(process.env.CONNECTOR_ID)}`);
     await sleep(10000);
   }
   const { deployments } = hre;
@@ -53,11 +55,13 @@ module.exports = async (hre) => {
       params: [await instaMaster.getAddress()],
     });
   } else {
+    assert(process.env.CONNECTOR_ID);
+
     // the following will only deploy "ConnectGelatoExecutorPayment"
     // if the contract was never deployed or if the code changed since last deployment
     await deploy("ConnectGelatoExecutorPayment", {
       from: deployer,
-      args: [parseInt(process.env.ConnectGelatoExecutorPaymentId)],
+      args: [parseInt(process.env.CONNECTOR_ID)],
       gasPrice: hre.network.config.gasPrice,
       log: true,
     });
@@ -67,7 +71,7 @@ module.exports = async (hre) => {
 module.exports.skip = async (hre) => {
   if (hre.network.name === "mainnet") return true;
   if (hre.network.name !== "hardhat")
-    return process.env.ConnectGelatoExecutorPaymentId === undefined;
+    return process.env.CONNECTOR_ID === undefined;
   return false;
 };
 module.exports.tags = ["ConnectGelatoExecutorPayment"];

deploy/gelato/conditions/ConditionCompareUintsFromTwoSources.deploy.js

@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConditionCompareUintsFromTwoSources to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConditionCompareUintsFromTwoSources to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

deploy/gelato/conditions/ConditionDebtBridgeIsAffordable.deploy.js

@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConditionDebtBridgeIsAffordable to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConditionDebtBridgeIsAffordable to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

deploy/gelato/conditions/ConditionDestVaultWillBeSafe.deploy.js

@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConditionDestVaultWillBeSafe to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConditionDestVaultWillBeSafe to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

deploy/gelato/conditions/ConditionMakerVaultUnsafe.deploy.js

@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying ConditionMakerVaultUnsafe to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying ConditionMakerVaultUnsafe to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

deploy/resolvers/MakerResolver.deploy.js

@@ -2,7 +2,9 @@ const { sleep } = require("@gelatonetwork/core");
 
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
-    console.log("Deploying MakerResolver to mainnet. Hit ctrl + c to abort");
+    console.log(
+      "\n\n Deploying MakerResolver to mainnet. Hit ctrl + c to abort"
+    );
     await sleep(10000);
   }
 

deploy/resolvers/PriceOracleResolver.deploy.js

@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log(
-      "Deploying PriceOracleResolver to mainnet. Hit ctrl + c to abort"
+      "\n\n Deploying PriceOracleResolver to mainnet. Hit ctrl + c to abort"
     );
     await sleep(10000);
   }

hardhat.config.js

@@ -21,7 +21,7 @@ require("dotenv").config();
 const ALCHEMY_ID = process.env.ALCHEMY_ID;
 assert.ok(ALCHEMY_ID, "no Alchemy ID in process.env");
 
-const DEPLOYER = "0xe1F076849B781b1395Fd332dC1758Dbc129be6EC"; // Gelato-Luis
+const DEPLOYER = "0x5B753BF02a42bC73B5846dfd16a8F2e082b99a6a"; // Gelato-Dev-Luis
 const DEPLOYER_PK_MAINNET = process.env.DEPLOYER_PK_MAINNET;
 
 // ================================= CONFIG =========================================
@@ -60,7 +60,7 @@ module.exports = {
       accounts: DEPLOYER_PK_MAINNET ? [DEPLOYER_PK_MAINNET] : [],
       chainId: 1,
       url: `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_ID}`,
-      gasPrice: parseInt(utils.parseUnits("50", "gwei")),
+      gasPrice: parseInt(utils.parseUnits("15", "gwei")),
       timeout: 150000,
       // Custom
       ...mainnetDeployments,