diff --git a/contracts/src/DataHavenServiceManager.sol b/contracts/src/DataHavenServiceManager.sol index 3de06a45..0ea74f5e 100644 --- a/contracts/src/DataHavenServiceManager.sol +++ b/contracts/src/DataHavenServiceManager.sol @@ -180,7 +180,7 @@ contract DataHavenServiceManager is OwnableUpgradeable, IAVSRegistrar, IDataHave __Ownable_init(); _transferOwnership(initialOwner); snowbridgeInitiator = _snowbridgeInitiator; - emit RewardsInitiatorSet(address(0), _snowbridgeInitiator); + emit SnowbridgeInitiatorSet(address(0), _snowbridgeInitiator); // Set version from parameter (allows flexibility per deployment environment) _version = initialVersion; @@ -567,13 +567,13 @@ contract DataHavenServiceManager is OwnableUpgradeable, IAVSRegistrar, IDataHave } /// @inheritdoc IDataHavenServiceManager - function setRewardsInitiator( - address newRewardsInitiator + function setSnowbridgeInitiator( + address newSnowbridgeInitiator ) external override onlyOwner { - require(newRewardsInitiator != address(0), ZeroAddress()); + require(newSnowbridgeInitiator != address(0), ZeroAddress()); address oldInitiator = snowbridgeInitiator; - snowbridgeInitiator = newRewardsInitiator; - emit RewardsInitiatorSet(oldInitiator, newRewardsInitiator); + snowbridgeInitiator = newSnowbridgeInitiator; + emit SnowbridgeInitiatorSet(oldInitiator, newSnowbridgeInitiator); } // ============ AVS Management Functions ============ diff --git a/contracts/src/interfaces/IDataHavenServiceManager.sol b/contracts/src/interfaces/IDataHavenServiceManager.sol index c5ef1134..dc4af9bb 100644 --- a/contracts/src/interfaces/IDataHavenServiceManager.sol +++ b/contracts/src/interfaces/IDataHavenServiceManager.sol @@ -91,10 +91,10 @@ interface IDataHavenServiceManagerEvents { /// @param operatorCount The number of operators that received rewards event RewardsSubmitted(uint256 totalAmount, uint256 operatorCount); - /// @notice Emitted when the rewards initiator address is updated - /// @param oldInitiator The previous rewards initiator address - /// @param newInitiator The new rewards initiator address - event RewardsInitiatorSet(address indexed oldInitiator, address indexed newInitiator); + /// @notice Emitted when the snowbridge initiator address is updated + /// @param oldInitiator The previous snowbridge initiator address + /// @param newInitiator The new snowbridge initiator address + event SnowbridgeInitiatorSet(address indexed oldInitiator, address indexed newInitiator); /// @notice Emitted when a validator updates their solochain address /// @param validator Address of the validator @@ -343,11 +343,11 @@ interface IDataHavenServiceManager is ) external; /** - * @notice Set the rewards initiator address authorized to submit rewards - * @param initiator The address of the rewards initiator (Snowbridge Agent) + * @notice Set the snowbridge initiator address authorized to submit rewards + * @param initiator The address of the snowbridge initiator (Snowbridge Agent) * @dev Only callable by the owner */ - function setRewardsInitiator( + function setSnowbridgeInitiator( address initiator ) external; diff --git a/contracts/test/OperatorAddressMappings.t.sol b/contracts/test/OperatorAddressMappings.t.sol index 6600c3f5..f2168733 100644 --- a/contracts/test/OperatorAddressMappings.t.sol +++ b/contracts/test/OperatorAddressMappings.t.sol @@ -20,7 +20,7 @@ contract OperatorAddressMappingsTest is AVSDeployer { // Configure the rewards initiator (not strictly needed for these tests, // but keeps setup consistent with other suites). vm.prank(avsOwner); - serviceManager.setRewardsInitiator(snowbridgeAgent); + serviceManager.setSnowbridgeInitiator(snowbridgeAgent); } function _registerOperator( diff --git a/contracts/test/RewardsSubmitter.t.sol b/contracts/test/RewardsSubmitter.t.sol index 4796f0cb..4a95dc32 100644 --- a/contracts/test/RewardsSubmitter.t.sol +++ b/contracts/test/RewardsSubmitter.t.sol @@ -40,7 +40,7 @@ contract RewardsSubmitterTest is AVSDeployer { // Configure the rewards initiator vm.prank(avsOwner); - serviceManager.setRewardsInitiator(snowbridgeAgent); + serviceManager.setSnowbridgeInitiator(snowbridgeAgent); // Fund the service manager with reward tokens IERC20(address(rewardToken)).safeTransfer(address(serviceManager), 100000e18); @@ -100,21 +100,21 @@ contract RewardsSubmitterTest is AVSDeployer { // ============ Configuration Tests ============ - function test_setRewardsInitiator() public { + function test_setSnowbridgeInitiator() public { address newInitiator = address(0x123); vm.prank(avsOwner); vm.expectEmit(true, true, false, false); - emit IDataHavenServiceManagerEvents.RewardsInitiatorSet(snowbridgeAgent, newInitiator); - serviceManager.setRewardsInitiator(newInitiator); + emit IDataHavenServiceManagerEvents.SnowbridgeInitiatorSet(snowbridgeAgent, newInitiator); + serviceManager.setSnowbridgeInitiator(newInitiator); assertEq(serviceManager.snowbridgeInitiator(), newInitiator); } - function test_setRewardsInitiator_revertsIfNotOwner() public { + function test_setSnowbridgeInitiator_revertsIfNotOwner() public { vm.prank(operator1); vm.expectRevert(bytes("Ownable: caller is not the owner")); - serviceManager.setRewardsInitiator(address(0x123)); + serviceManager.setSnowbridgeInitiator(address(0x123)); } // ============ Access Control Tests ============ diff --git a/contracts/test/Slashing.t.sol b/contracts/test/Slashing.t.sol index 7c73f1dd..ebb88978 100644 --- a/contracts/test/Slashing.t.sol +++ b/contracts/test/Slashing.t.sol @@ -34,7 +34,7 @@ contract SlashingTest is AVSDeployer { // Configure the rewards initiator (because only the reward agent can submit slashing request) vm.prank(avsOwner); - serviceManager.setRewardsInitiator(snowbridgeAgent); + serviceManager.setSnowbridgeInitiator(snowbridgeAgent); vm.prank(operator); delegationManager.registerAsOperator(address(0), 0, ""); @@ -93,7 +93,7 @@ contract SlashingTest is AVSDeployer { // Configure the rewards initiator (because only the reward agent can submit slashing request) vm.prank(avsOwner); - serviceManager.setRewardsInitiator(snowbridgeAgent); + serviceManager.setSnowbridgeInitiator(snowbridgeAgent); vm.prank(operator); delegationManager.registerAsOperator(address(0), 0, ""); @@ -147,7 +147,7 @@ contract SlashingTest is AVSDeployer { function test_fulfilSlashingRequest_skipsUnknownSolochainAddress() public { // Configure the rewards initiator (because only the reward agent can submit slashing request) vm.prank(avsOwner); - serviceManager.setRewardsInitiator(snowbridgeAgent); + serviceManager.setSnowbridgeInitiator(snowbridgeAgent); address unknownSolochainOperator = address(0xDEAD); DataHavenServiceManager.SlashingRequest[] memory slashings = diff --git a/contracts/test/storage/StorageLayout.t.sol b/contracts/test/storage/StorageLayout.t.sol index e93671a1..c0b4f540 100644 --- a/contracts/test/storage/StorageLayout.t.sol +++ b/contracts/test/storage/StorageLayout.t.sol @@ -20,12 +20,12 @@ contract StorageLayoutTest is AVSDeployer { function test_upgradePreservesState() public { // 1. Populate state address testValidator = address(0x1234); - address newRewardsInitiator = address(0x9999); + address newSnowbridgeInitiator = address(0x9999); address testSubmitter = address(0x5678); vm.startPrank(avsOwner); serviceManager.addValidatorToAllowlist(testValidator); - serviceManager.setRewardsInitiator(newRewardsInitiator); + serviceManager.setSnowbridgeInitiator(newSnowbridgeInitiator); serviceManager.setValidatorSetSubmitter(testSubmitter); vm.stopPrank(); diff --git a/test/contract-bindings/generated.ts b/test/contract-bindings/generated.ts index 5d09e2ae..4772a517 100644 --- a/test/contract-bindings/generated.ts +++ b/test/contract-bindings/generated.ts @@ -2245,7 +2245,7 @@ export const dataHavenServiceManagerAbi = [ inputs: [ { name: 'newRewardsInitiator', internalType: 'address', type: 'address' }, ], - name: 'setRewardsInitiator', + name: 'setSnowbridgeInitiator', outputs: [], stateMutability: 'nonpayable', }, @@ -2535,7 +2535,7 @@ export const dataHavenServiceManagerAbi = [ indexed: true, }, ], - name: 'RewardsInitiatorSet', + name: 'SnowbridgeInitiatorSet', }, { type: 'event', @@ -11204,12 +11204,12 @@ export const writeDataHavenServiceManagerSendNewValidatorSetForEra = }) /** - * Wraps __{@link writeContract}__ with `abi` set to __{@link dataHavenServiceManagerAbi}__ and `functionName` set to `"setRewardsInitiator"` + * Wraps __{@link writeContract}__ with `abi` set to __{@link dataHavenServiceManagerAbi}__ and `functionName` set to `"setSnowbridgeInitiator"` */ export const writeDataHavenServiceManagerSetRewardsInitiator = /*#__PURE__*/ createWriteContract({ abi: dataHavenServiceManagerAbi, - functionName: 'setRewardsInitiator', + functionName: 'setSnowbridgeInitiator', }) /** @@ -11390,12 +11390,12 @@ export const simulateDataHavenServiceManagerSendNewValidatorSetForEra = }) /** - * Wraps __{@link simulateContract}__ with `abi` set to __{@link dataHavenServiceManagerAbi}__ and `functionName` set to `"setRewardsInitiator"` + * Wraps __{@link simulateContract}__ with `abi` set to __{@link dataHavenServiceManagerAbi}__ and `functionName` set to `"setSnowbridgeInitiator"` */ export const simulateDataHavenServiceManagerSetRewardsInitiator = /*#__PURE__*/ createSimulateContract({ abi: dataHavenServiceManagerAbi, - functionName: 'setRewardsInitiator', + functionName: 'setSnowbridgeInitiator', }) /** @@ -11522,12 +11522,12 @@ export const watchDataHavenServiceManagerOwnershipTransferredEvent = }) /** - * Wraps __{@link watchContractEvent}__ with `abi` set to __{@link dataHavenServiceManagerAbi}__ and `eventName` set to `"RewardsInitiatorSet"` + * Wraps __{@link watchContractEvent}__ with `abi` set to __{@link dataHavenServiceManagerAbi}__ and `eventName` set to `"SnowbridgeInitiatorSet"` */ -export const watchDataHavenServiceManagerRewardsInitiatorSetEvent = +export const watchDataHavenServiceManagerSnowbridgeInitiatorSetEvent = /*#__PURE__*/ createWatchContractEvent({ abi: dataHavenServiceManagerAbi, - eventName: 'RewardsInitiatorSet', + eventName: 'SnowbridgeInitiatorSet', }) /**