chore: cleanup/refactor activity and rewards contracts.

contracts/binding/src/lib.rs

@@ -30,6 +30,8 @@ pub mod ownership_facet;
 #[allow(clippy::all)]
 pub mod register_subnet_facet;
 #[allow(clippy::all)]
+pub mod subnet_actor_activity_facet;
+#[allow(clippy::all)]
 pub mod subnet_actor_checkpointing_facet;
 #[allow(clippy::all)]
 pub mod subnet_actor_diamond;
@@ -48,8 +50,6 @@ pub mod subnet_registry_diamond;
 #[allow(clippy::all)]
 pub mod top_down_finality_facet;
 #[allow(clippy::all)]
-pub mod validator_reward_facet;
-#[allow(clippy::all)]
 pub mod xnet_messaging_facet;
 
 // The list of contracts need to convert FvmAddress to fvm_shared::Address

contracts/contracts/SubnetActorDiamond.sol

@@ -15,7 +15,7 @@ import {SubnetIDHelper} from "./lib/SubnetIDHelper.sol";
 import {LibStaking} from "./lib/LibStaking.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {AssetHelper} from "./lib/AssetHelper.sol";
-import {LibValidatorReward} from "./activities/ValidatorRewardFacet.sol";
+import {LibActivity} from "./lib/LibActivity.sol";
 
 error FunctionNotFound(bytes4 _functionSelector);
 
@@ -107,7 +107,7 @@ contract SubnetActorDiamond {
         }
 
         if (params.validatorRewarder != address(0)) {
-            LibValidatorReward.setRewarder(params.validatorRewarder);
+            LibActivity.setRewarder(params.validatorRewarder);
         }
     }
 

contracts/contracts/SubnetRegistryDiamond.sol

@@ -25,7 +25,7 @@ contract SubnetRegistryDiamond {
         address diamondCutFacet;
         address diamondLoupeFacet;
         address ownershipFacet;
-        address validatorRewardFacet;
+        address activityFacet;
         bytes4[] subnetActorGetterSelectors;
         bytes4[] subnetActorManagerSelectors;
         bytes4[] subnetActorRewarderSelectors;
@@ -34,7 +34,7 @@ contract SubnetRegistryDiamond {
         bytes4[] subnetActorDiamondCutSelectors;
         bytes4[] subnetActorDiamondLoupeSelectors;
         bytes4[] subnetActorOwnershipSelectors;
-        bytes4[] validatorRewardSelectors;
+        bytes4[] subnetActorActivitySelectors;
         SubnetCreationPrivileges creationPrivileges;
     }
 
@@ -66,7 +66,7 @@ contract SubnetRegistryDiamond {
         if (params.ownershipFacet == address(0)) {
             revert FacetCannotBeZero();
         }
-        if (params.validatorRewardFacet == address(0)) {
+        if (params.activityFacet == address(0)) {
             revert FacetCannotBeZero();
         }
 
@@ -88,7 +88,7 @@ contract SubnetRegistryDiamond {
         s.SUBNET_ACTOR_DIAMOND_CUT_FACET = params.diamondCutFacet;
         s.SUBNET_ACTOR_LOUPE_FACET = params.diamondLoupeFacet;
         s.SUBNET_ACTOR_OWNERSHIP_FACET = params.ownershipFacet;
-        s.VALIDATOR_REWARD_FACET = params.validatorRewardFacet;
+        s.VALIDATOR_REWARD_FACET = params.activityFacet;
 
         s.subnetActorGetterSelectors = params.subnetActorGetterSelectors;
         s.subnetActorManagerSelectors = params.subnetActorManagerSelectors;
@@ -98,7 +98,7 @@ contract SubnetRegistryDiamond {
         s.subnetActorDiamondCutSelectors = params.subnetActorDiamondCutSelectors;
         s.subnetActorDiamondLoupeSelectors = params.subnetActorDiamondLoupeSelectors;
         s.subnetActorOwnershipSelectors = params.subnetActorOwnershipSelectors;
-        s.validatorRewardSelectors = params.validatorRewardSelectors;
+        s.subnetActorActivitySelectors = params.subnetActorActivitySelectors;
 
         s.creationPrivileges = params.creationPrivileges;
     }