Merge pull request #86 from Folks-Finance/feat/rewards-v2

add on chain rewards v2 contracts

Author: gidonkatten

README.md

@@ -19,12 +19,14 @@ To build:
 
 ## Smart Contracts
 
-The smart contracts are split into 4 distinct folders:
+The smart contracts are split into 6 distinct folders:
 
 - `contracts/bridge` contains all the smart contracts relating to sending messages (data and token) between the spoke chains and hub chain. Unless named specifically, they are deployed both in the spoke chains and hub chain.
 - `contracts/hub` contains the smart contracts relating to the core business logic of the protocol. They are deployed only in the hub chain.
+- `contracts/hub-rewards` contains the smart contracts relating to the core business logic of the on-chain rewards. They are deployed only in the hub chain.
 - `contracts/oracle` contains the smart contracts relating to the oracle for token price information. They are deployed only in the hub chain.
 - `contracts/spoke` contains the smart contracts relating to the user entry point into the protocol. They are deployed only in the spoke chains (the hub chain may also be a spoke chain).
+- `contracts/spoke-rewards` contains the smart contracts relating to the user entry point into the on-chain rewards. They are deployed only in the spoke chains (the hub chain may also be a spoke chain).
 
 Within each you can also find `test` folder which contains smart contracts used for testing. These are not part of the protocol and won't be deployed.
 

contracts/bridge/libraries/Messages.sol

@@ -84,7 +84,53 @@ library Messages {
         Liquidate,
         SwitchBorrowType,
         // HUB -> SPOKE
-        SendToken
+        SendToken,
+        // ADDITIONAL
+        ClaimRewardsV2,
+        P20,
+        P21,
+        P22,
+        P23,
+        P24,
+        P25,
+        P26,
+        P27,
+        P28,
+        P29,
+        P30,
+        P31,
+        P32,
+        P33,
+        P34,
+        P35,
+        P36,
+        P37,
+        P38,
+        P39,
+        P40,
+        P41,
+        P42,
+        P43,
+        P44,
+        P45,
+        P46,
+        P47,
+        P48,
+        P49,
+        P50,
+        P51,
+        P52,
+        P53,
+        P54,
+        P55,
+        P56,
+        P57,
+        P58,
+        P59,
+        P60,
+        P61,
+        P62,
+        P63
     }
 
     struct MessagePayload {

contracts/hub/RewardsV1.sol renamed to contracts/hub-rewards/HubRewardsV1.sol

@@ -5,8 +5,8 @@ import "@openzeppelin/contracts/access/extensions/AccessControlDefaultAdminRules
 import "@openzeppelin/contracts/utils/math/Math.sol";
 
 import "../bridge/libraries/Messages.sol";
-import "./interfaces/IAccountManager.sol";
-import "./LoanManager.sol";
+import "../hub/interfaces/IAccountManager.sol";
+import "../hub/LoanManager.sol";
 
 contract RewardsV1 is AccessControlDefaultAdminRules {
     struct PoolEpoch {