Remove setting up fees in migrations

Author: nmlinaric

migrations/2_deploy_contracts.js

@@ -1,8 +1,6 @@
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
-const Ethers = require("ethers");
-
 const Helpers = require("../test/helpers");
 const Utils = require("./utils");
 
@@ -18,7 +16,6 @@ const PermissionedGenericHandlerContract = artifacts.require(
 );
 const FeeRouterContract = artifacts.require("FeeHandlerRouter");
 const BasicFeeHandlerContract = artifacts.require("BasicFeeHandler");
-const DynamicFeeHandlerContract = artifacts.require("DynamicERC20FeeHandlerEVM");
 const PercentageFeeHandler = artifacts.require("PercentageERC20FeeHandlerEVM");
 
 module.exports = async function (deployer, network) {
@@ -68,41 +65,12 @@ module.exports = async function (deployer, network) {
     bridgeInstance.address,
     feeRouterInstance.address
   );
-  const dynamicFeeHandlerInstance = await deployer.deploy(
-    DynamicFeeHandlerContract,
-    bridgeInstance.address,
-    feeRouterInstance.address
-  );
   const percentageFeeHandlerInstance = await deployer.deploy(
     PercentageFeeHandler,
     bridgeInstance.address,
     feeRouterInstance.address
   )
 
-  // setup fee router and fee handlers
-  await bridgeInstance.adminChangeFeeHandler(feeRouterInstance.address);
-  if(Object.keys(currentNetworkConfig.fee.oracle).length != 0){
-    await dynamicFeeHandlerInstance.setFeeOracle(
-      currentNetworkConfig.fee.oracle.address
-    );
-    await dynamicFeeHandlerInstance.setFeeProperties(
-      currentNetworkConfig.fee.oracle.gasUsed,
-      currentNetworkConfig.fee.oracle.feePercentage
-    );
-  }
-
-  if(Object.keys(currentNetworkConfig.fee.basic).length != 0) {
-    await basicFeeHandlerInstance.changeFee(
-      Ethers.utils.parseEther(currentNetworkConfig.fee.basic.fee).toString()
-    );
-  }
-
-  if(Object.keys(currentNetworkConfig.fee.percentage).length != 0) {
-    await percentageFeeHandlerInstance.changeFee(
-      currentNetworkConfig.fee.percentage.fee
-    );
-  }
-
   console.table({
     "Deployer Address": deployerAddress,
     "Domain ID": currentNetworkConfig.domainID,
@@ -111,7 +79,6 @@ module.exports = async function (deployer, network) {
     "ERC721Handler Address": erc721HandlerInstance.address,
     "FeeRouterContract Address": feeRouterInstance.address,
     "BasicFeeHandler Address": basicFeeHandlerInstance.address,
-    "DynamicFeeHandler Address": dynamicFeeHandlerInstance.address,
     "PercentageFeeHandler Address": percentageFeeHandlerInstance.address
   });
 
@@ -123,22 +90,6 @@ module.exports = async function (deployer, network) {
       bridgeInstance,
       erc20HandlerInstance
     );
-    await Utils.setupFee(
-      networksConfig,
-      feeRouterInstance,
-      dynamicFeeHandlerInstance,
-      basicFeeHandlerInstance,
-      percentageFeeHandlerInstance,
-      erc20
-    );
-
-  if(Object.keys(currentNetworkConfig.fee.percentage).length != 0) {
-    await percentageFeeHandlerInstance.changeFeeBounds(
-      erc20.resourceID,
-      Ethers.utils.parseEther(currentNetworkConfig.fee.percentage.lowerBound).toString(),
-      Ethers.utils.parseEther(currentNetworkConfig.fee.percentage.upperBound).toString()
-    );
-  }
 
     console.log(
       "-------------------------------------------------------------------------------"
@@ -159,14 +110,6 @@ module.exports = async function (deployer, network) {
       bridgeInstance,
       erc721HandlerInstance
     );
-    await Utils.setupFee(
-      networksConfig,
-      feeRouterInstance,
-      dynamicFeeHandlerInstance,
-      basicFeeHandlerInstance,
-      percentageFeeHandlerInstance,
-      erc721
-    );
 
     console.log(
       "-------------------------------------------------------------------------------"
@@ -192,14 +135,6 @@ module.exports = async function (deployer, network) {
         bridgeInstance,
         permissionedGenericHandlerInstance
       );
-      await Utils.setupFee(
-        networksConfig,
-        feeRouterInstance,
-        dynamicFeeHandlerInstance,
-        basicFeeHandlerInstance,
-        percentageFeeHandlerInstance,
-        generic
-      );
 
       console.log(
         "-------------------------------------------------------------------------------"

migrations/3_deploy_permissionlessGenericHandler.js

@@ -8,10 +8,6 @@ const BridgeContract = artifacts.require("Bridge");
 const PermissionlessGenericHandlerContract = artifacts.require(
   "PermissionlessGenericHandler"
 );
-const FeeRouterContract = artifacts.require("FeeHandlerRouter");
-const BasicFeeHandlerContract = artifacts.require("BasicFeeHandler");
-const PercentageFeeHandler = artifacts.require("PercentageERC20FeeHandlerEVM");
-const DynamicGenericFeeHandlerEVMContract = artifacts.require("DynamicGenericFeeHandlerEVM");
 
 module.exports = async function (deployer, network) {
   const networksConfig = Utils.getNetworksConfig();
@@ -25,23 +21,13 @@ module.exports = async function (deployer, network) {
   ) {
   // fetch deployed contracts addresses
   const bridgeInstance = await BridgeContract.deployed();
-  const feeRouterInstance = await FeeRouterContract.deployed();
-  const basicFeeHandlerInstance = await BasicFeeHandlerContract.deployed();
-  const percentageFeeHandlerInstance = await PercentageFeeHandler.deployed();
 
   // deploy generic handler
   const permissionlessGenericHandlerInstance = await deployer.deploy(
     PermissionlessGenericHandlerContract,
     bridgeInstance.address
   );
 
-  // deploy generic dynamic fee handler
-  const dynamicFeeHandlerInstance = await deployer.deploy(
-    DynamicGenericFeeHandlerEVMContract,
-    bridgeInstance.address,
-    feeRouterInstance.address
-  )
-
   console.log(
     "-------------------------------------------------------------------------------"
   );
@@ -72,13 +58,5 @@ module.exports = async function (deployer, network) {
       bridgeInstance.address,
       genericHandlerSetResourceData
     );
-    await Utils.setupFee(
-      networksConfig,
-      feeRouterInstance,
-      dynamicFeeHandlerInstance,
-      basicFeeHandlerInstance,
-      percentageFeeHandlerInstance,
-      currentNetworkConfig.permissionlessGeneric
-    );
   }
 };

migrations/4_deploy_xc20_contracts.js

@@ -5,10 +5,6 @@ const Utils = require("./utils");
 
 const BridgeContract = artifacts.require("Bridge");
 const XC20HandlerContract = artifacts.require("XC20Handler");
-const FeeRouterContract = artifacts.require("FeeHandlerRouter");
-const BasicFeeHandlerContract = artifacts.require("BasicFeeHandler");
-const DynamicFeeHandlerContract = artifacts.require("DynamicERC20FeeHandlerEVM");
-const PercentageFeeHandler = artifacts.require("PercentageERC20FeeHandlerEVM");
 
 
 module.exports = async function (deployer, network) {
@@ -27,11 +23,6 @@ module.exports = async function (deployer, network) {
 
   // fetch deployed contracts addresses
   const bridgeInstance = await BridgeContract.deployed();
-  const feeRouterInstance = await FeeRouterContract.deployed();
-  const basicFeeHandlerInstance = await BasicFeeHandlerContract.deployed();
-  const dynamicFeeHandlerInstance =
-    await DynamicFeeHandlerContract.deployed();
-  const percentageFeeHandlerInstance = await PercentageFeeHandler.deployed();
 
   // deploy XC20 contracts
   await deployer.deploy(XC20HandlerContract, bridgeInstance.address);
@@ -40,14 +31,6 @@ module.exports = async function (deployer, network) {
   // setup xc20 tokens
   for (const xc20 of currentNetworkConfig.xc20) {
     await Utils.setupErc20(deployer, xc20, bridgeInstance, xc20HandlerInstance);
-    await Utils.setupFee(
-      networksConfig,
-      feeRouterInstance,
-      dynamicFeeHandlerInstance,
-      basicFeeHandlerInstance,
-      percentageFeeHandlerInstance,
-      xc20
-    );
 
     console.log(
       "-------------------------------------------------------------------------------"

migrations/5_renounceAdmin.js

@@ -8,7 +8,7 @@ const AccessControlSegregatorContract = artifacts.require(
 );
 const FeeRouterContract = artifacts.require("FeeHandlerRouter");
 const BasicFeeHandlerContract = artifacts.require("BasicFeeHandler");
-const DynamicFeeHandlerContract = artifacts.require("DynamicERC20FeeHandlerEVM");
+const PercentageFeeHandlerContract = artifacts.require("PercentageFeeHandler");
 
 module.exports = async function (deployer, network) {
   const networksConfig = Utils.getNetworksConfig();
@@ -21,8 +21,7 @@ module.exports = async function (deployer, network) {
     await AccessControlSegregatorContract.deployed();
   const feeRouterInstance = await FeeRouterContract.deployed();
   const basicFeeHandlerInstance = await BasicFeeHandlerContract.deployed();
-  const dynamicFeeHandlerInstance =
-    await DynamicFeeHandlerContract.deployed();
+  const percentageFeeHandlerInstance = await PercentageFeeHandlerContract.deployed();
 
   if (currentNetworkConfig.access.feeHandlerAdmin) {
     console.log(
@@ -33,7 +32,7 @@ module.exports = async function (deployer, network) {
     await basicFeeHandlerInstance.renounceAdmin(
       currentNetworkConfig.access.feeHandlerAdmin
     );
-    await dynamicFeeHandlerInstance.renounceAdmin(
+    await percentageFeeHandlerInstance.renounceAdmin(
       currentNetworkConfig.access.feeHandlerAdmin
     );
   }

migrations/utils.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 // The Licensed Work is (c) 2022 Sygma
 // SPDX-License-Identifier: LGPL-3.0-only
 
@@ -17,12 +18,6 @@ const DEFAULT_CONFIG_PATH = "./migrations/local.json";
 const emptySetResourceData = "0x";
 const erc20TokenAmount = Ethers.utils.parseUnits("1000", 18);
 
-const FeeType = {
-  ORACLE: "oracle",
-  BASIC: "basic",
-  PERCENTAGE: "PERCENTAGE"
-}
-
 function getNetworksConfig() {
   let path = parseArgs(process.argv.slice(2))["file"];
   if (path == undefined) {
@@ -32,37 +27,6 @@ function getNetworksConfig() {
   return JSON.parse(fs.readFileSync(path));
 }
 
-async function setupFee(
-  networksConfig,
-  feeRouterInstance,
-  dynamicFeeHandlerInstance,
-  basicFeeHandlerInstance,
-  percentageFeeHandlerInstance,
-  token
-) {
-  for await (const network of Object.values(networksConfig)) {
-    if (token.feeType == FeeType.ORACLE) {
-      await feeRouterInstance.adminSetResourceHandler(
-        network.domainID,
-        token.resourceID,
-        dynamicFeeHandlerInstance.address
-      );
-    } else if (token.feeType == FeeType.BASIC) {
-      await feeRouterInstance.adminSetResourceHandler(
-        network.domainID,
-        token.resourceID,
-        basicFeeHandlerInstance.address
-      );
-    } else if (token.feeType == FeeType.PERCENTAGE) {
-      await feeRouterInstance.adminSetResourceHandler(
-        network.domainID,
-        token.resourceID,
-        percentageFeeHandlerInstance.address
-      )
-    }
-  }
-}
-
 async function setupErc20(
   deployer,
   erc20,
@@ -258,13 +222,16 @@ async function getDeployerAddress(deployer) {
   ];
 }
 
+function findMatchingResourceIDs(firstConfig, secondConfig) {
+  return firstConfig.filter((token) => secondConfig.includes(token));
+}
+
 module.exports = {
-  setupFee,
   setupErc20,
   setupErc721,
   setupGeneric,
   getNetworksConfig,
   migrateToNewTokenHandler,
   redeployHandler,
-  getDeployerAddress
-};
+  getDeployerAddress,
+}