Update migrations for percentage fee handler

Author: nmlinaric

migrations/2_deploy_contracts.js

@@ -19,6 +19,7 @@ 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) {
   const networksConfig = Utils.getNetworksConfig();
@@ -76,6 +77,11 @@ module.exports = async function (deployer, network) {
     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);
@@ -89,6 +95,9 @@ module.exports = async function (deployer, network) {
   await basicFeeHandlerInstance.changeFee(
     Ethers.utils.parseEther(currentNetworkConfig.fee.basic.fee).toString()
   );
+  await percentageFeeHandlerInstance.changeFee(
+    currentNetworkConfig.fee.percentage.fee
+  )
 
   console.table({
     "Deployer Address": deployerAddress,
@@ -101,6 +110,7 @@ module.exports = async function (deployer, network) {
     "FeeRouterContract Address": feeRouterInstance.address,
     "BasicFeeHandler Address": basicFeeHandlerInstance.address,
     "DynamicFeeHandler Address": dynamicFeeHandlerInstance.address,
+    "PercentageFeeHandler Address": percentageFeeHandlerInstance.address
   });
 
   // setup erc20 tokens
@@ -116,8 +126,14 @@ module.exports = async function (deployer, network) {
       feeRouterInstance,
       dynamicFeeHandlerInstance,
       basicFeeHandlerInstance,
+      percentageFeeHandlerInstance,
       erc20
     );
+    await percentageFeeHandlerInstance.changeFeeBounds(
+      erc20.resourceID,
+      Ethers.utils.parseEther(currentNetworkConfig.fee.percentage.lowerBound).toString(),
+      Ethers.utils.parseEther(currentNetworkConfig.fee.percentage.upperBound).toString()
+    )
 
     console.log(
       "-------------------------------------------------------------------------------"
@@ -143,6 +159,7 @@ module.exports = async function (deployer, network) {
       feeRouterInstance,
       dynamicFeeHandlerInstance,
       basicFeeHandlerInstance,
+      percentageFeeHandlerInstance,
       erc721
     );
 
@@ -168,6 +185,7 @@ module.exports = async function (deployer, network) {
       feeRouterInstance,
       dynamicFeeHandlerInstance,
       basicFeeHandlerInstance,
+      percentageFeeHandlerInstance,
       generic
     );
 

migrations/3_deploy_permissionlessGenericHandler.js

@@ -11,6 +11,7 @@ const PermissionlessGenericHandlerContract = 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) {
   const networksConfig = Utils.getNetworksConfig();
@@ -23,6 +24,7 @@ module.exports = async function (deployer, network) {
   const bridgeInstance = await BridgeContract.deployed();
   const feeRouterInstance = await FeeRouterContract.deployed();
   const basicFeeHandlerInstance = await BasicFeeHandlerContract.deployed();
+  const percentageFeeHandlerInstance = await PercentageFeeHandler.deployed();
   const dynamicFeeHandlerInstance =
     await DynamicFeeHandlerContract.deployed();
 
@@ -71,6 +73,7 @@ module.exports = async function (deployer, network) {
       feeRouterInstance,
       dynamicFeeHandlerInstance,
       basicFeeHandlerInstance,
+      percentageFeeHandlerInstance,
       currentNetworkConfig.permissionlessGeneric
     );
   }

migrations/4_deploy_xc20_contracts.js

@@ -8,6 +8,8 @@ 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) {
   // trim suffix from network name and fetch current network config
@@ -29,6 +31,7 @@ module.exports = async function (deployer, network) {
   const basicFeeHandlerInstance = await BasicFeeHandlerContract.deployed();
   const dynamicFeeHandlerInstance =
     await DynamicFeeHandlerContract.deployed();
+  const percentageFeeHandlerInstance = await PercentageFeeHandler.deployed();
 
   // deploy XC20 contracts
   await deployer.deploy(XC20HandlerContract, bridgeInstance.address);
@@ -42,6 +45,7 @@ module.exports = async function (deployer, network) {
       feeRouterInstance,
       dynamicFeeHandlerInstance,
       basicFeeHandlerInstance,
+      percentageFeeHandlerInstance,
       xc20
     );
 

migrations/local.json

@@ -10,6 +10,11 @@
       },
       "basic": {
         "fee": "0.001"
+      },
+      "percentage":{
+        "fee": "10000",
+        "lowerBound": "10",
+        "upperBound": "30"
       }
     },
     "access": {

migrations/utils.js

@@ -31,6 +31,7 @@ async function setupFee(
   feeRouterInstance,
   dynamicFeeHandlerInstance,
   basicFeeHandlerInstance,
+  percentageFeeHandlerInstance,
   token
 ) {
   for await (const network of Object.values(networksConfig)) {
@@ -40,12 +41,18 @@ async function setupFee(
         token.resourceID,
         dynamicFeeHandlerInstance.address
       );
-    } else {
+    } else if (token.feeType == "basic") {
       await feeRouterInstance.adminSetResourceHandler(
         network.domainID,
         token.resourceID,
         basicFeeHandlerInstance.address
       );
+    } else {
+      await feeRouterInstance.adminSetResourceHandler(
+        network.domainID,
+        token.resourceID,
+        percentageFeeHandlerInstance.address
+      )
     }
   }
 }