From b4be71cd97a750979212ae0ff2810e0dab4e4ea7 Mon Sep 17 00:00:00 2001
From: Joey Santoro <joseph.santoro@duke.edu>
Date: Tue, 11 Jan 2022 20:00:43 -0800
Subject: [PATCH] fuse

---
 contracts/{feirari => fuse}/FuseAdmin.sol                     | 0
 contracts/{feirari => fuse}/FuseGuardian.sol                  | 0
 contracts/{feirari => fuse}/IMasterOracle.sol                 | 0
 .../feirari => fuse/rewards}/AutoRewardsDistributor.sol       | 2 +-
 .../feirari => fuse/rewards}/AutoRewardsDistributorV2.sol     | 4 ++--
 contracts/{staking/feirari => fuse/rewards}/IRewardsAdmin.sol | 0
 .../feirari => fuse/rewards}/IRewardsDistributorAdmin.sol     | 0
 .../feirari => fuse/rewards}/RewardsDistributorAdmin.sol      | 0
 contracts/mock/MockRewardsDistributor.sol                     | 2 +-
 protocol-configuration/mainnetAddresses.ts                    | 4 ++--
 10 files changed, 6 insertions(+), 6 deletions(-)
 rename contracts/{feirari => fuse}/FuseAdmin.sol (100%)
 rename contracts/{feirari => fuse}/FuseGuardian.sol (100%)
 rename contracts/{feirari => fuse}/IMasterOracle.sol (100%)
 rename contracts/{staking/feirari => fuse/rewards}/AutoRewardsDistributor.sol (99%)
 rename contracts/{staking/feirari => fuse/rewards}/AutoRewardsDistributorV2.sol (98%)
 rename contracts/{staking/feirari => fuse/rewards}/IRewardsAdmin.sol (100%)
 rename contracts/{staking/feirari => fuse/rewards}/IRewardsDistributorAdmin.sol (100%)
 rename contracts/{staking/feirari => fuse/rewards}/RewardsDistributorAdmin.sol (100%)

diff --git a/contracts/feirari/FuseAdmin.sol b/contracts/fuse/FuseAdmin.sol
similarity index 100%
rename from contracts/feirari/FuseAdmin.sol
rename to contracts/fuse/FuseAdmin.sol
diff --git a/contracts/feirari/FuseGuardian.sol b/contracts/fuse/FuseGuardian.sol
similarity index 100%
rename from contracts/feirari/FuseGuardian.sol
rename to contracts/fuse/FuseGuardian.sol
diff --git a/contracts/feirari/IMasterOracle.sol b/contracts/fuse/IMasterOracle.sol
similarity index 100%
rename from contracts/feirari/IMasterOracle.sol
rename to contracts/fuse/IMasterOracle.sol
diff --git a/contracts/staking/feirari/AutoRewardsDistributor.sol b/contracts/fuse/rewards/AutoRewardsDistributor.sol
similarity index 99%
rename from contracts/staking/feirari/AutoRewardsDistributor.sol
rename to contracts/fuse/rewards/AutoRewardsDistributor.sol
index 9d0bd1c2e..fddc7ac22 100644
--- a/contracts/staking/feirari/AutoRewardsDistributor.sol
+++ b/contracts/fuse/rewards/AutoRewardsDistributor.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.8.0;
 
-import "./../ITribalChief.sol";
+import "../../staking/ITribalChief.sol";
 import "../../refs/CoreRef.sol";
 import "./IRewardsDistributorAdmin.sol";
 
diff --git a/contracts/staking/feirari/AutoRewardsDistributorV2.sol b/contracts/fuse/rewards/AutoRewardsDistributorV2.sol
similarity index 98%
rename from contracts/staking/feirari/AutoRewardsDistributorV2.sol
rename to contracts/fuse/rewards/AutoRewardsDistributorV2.sol
index a6119294f..d9d6f8d05 100644
--- a/contracts/staking/feirari/AutoRewardsDistributorV2.sol
+++ b/contracts/fuse/rewards/AutoRewardsDistributorV2.sol
@@ -1,9 +1,9 @@
 pragma solidity ^0.8.0;
 
-import "./../ITribalChief.sol";
+import "../../staking/ITribalChief.sol";
 import "../../refs/CoreRef.sol";
 import "../../external/Unitroller.sol";
-import "../StakingTokenWrapper.sol";
+import "../../staking/StakingTokenWrapper.sol";
 import "./IRewardsDistributorAdmin.sol";
 
 /// @notice Controller Contract to set tribe per block in Rewards Distributor Admin on Rari
diff --git a/contracts/staking/feirari/IRewardsAdmin.sol b/contracts/fuse/rewards/IRewardsAdmin.sol
similarity index 100%
rename from contracts/staking/feirari/IRewardsAdmin.sol
rename to contracts/fuse/rewards/IRewardsAdmin.sol
diff --git a/contracts/staking/feirari/IRewardsDistributorAdmin.sol b/contracts/fuse/rewards/IRewardsDistributorAdmin.sol
similarity index 100%
rename from contracts/staking/feirari/IRewardsDistributorAdmin.sol
rename to contracts/fuse/rewards/IRewardsDistributorAdmin.sol
diff --git a/contracts/staking/feirari/RewardsDistributorAdmin.sol b/contracts/fuse/rewards/RewardsDistributorAdmin.sol
similarity index 100%
rename from contracts/staking/feirari/RewardsDistributorAdmin.sol
rename to contracts/fuse/rewards/RewardsDistributorAdmin.sol
diff --git a/contracts/mock/MockRewardsDistributor.sol b/contracts/mock/MockRewardsDistributor.sol
index 6389865c8..f477164d9 100644
--- a/contracts/mock/MockRewardsDistributor.sol
+++ b/contracts/mock/MockRewardsDistributor.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.8.0;
 
 import "./../staking/TribalChief.sol";
 import "../refs/CoreRef.sol";
-import "../staking/feirari/IRewardsDistributorAdmin.sol";
+import "../fuse/rewards/IRewardsDistributorAdmin.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
 contract MockRewardsDistributor is IRewardsDistributorAdmin, Ownable {
diff --git a/protocol-configuration/mainnetAddresses.ts b/protocol-configuration/mainnetAddresses.ts
index d6e2b7673..e4e3461cd 100644
--- a/protocol-configuration/mainnetAddresses.ts
+++ b/protocol-configuration/mainnetAddresses.ts
@@ -1452,7 +1452,7 @@ const MainnetAddresses: MainnetAddresses = {
     category: AddressCategory.Deprecated
   },
   ratioPCVController: {
-    artifactName: 'RatioPCVController',
+    artifactName: 'unknown', // RatioPCVController
     address: '0xB1410aeCe2c65fE9e107c58b5aa32e91B18f0BC7',
     category: AddressCategory.Deprecated
   },
@@ -1467,7 +1467,7 @@ const MainnetAddresses: MainnetAddresses = {
     category: AddressCategory.Deprecated
   },
   oldRatioPCVController: {
-    artifactName: 'RatioPCVController',
+    artifactName: 'unknown', // RatioPCVController
     address: '0xfC1aD6eb84351597cD3b9B65179633697d65B920',
     category: AddressCategory.Deprecated
   },