refactor: staking factory to check mech and requester staking instances #38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
kupermind
commented
Aug 26, 2024
kupermind
commented
- Staking factory to check mech and requester staking instances.
kupermind
commented
Aug 26, 2024
| /// @dev Performs actions before the delivery of a request. | ||
| /// @param data Self-descriptive opaque data-blob. | ||
| /// @return requestData Data for the request processing. | ||
| function _preDeliver(address, uint256, bytes memory data) internal virtual returns (bytes memory requestData) { |
There was a problem hiding this comment.
Not deleting, just moving around to have a better contract visibility.
kupermind
commented
Aug 26, 2024
| /// @dev Checks agent mech for contract validity. | ||
| /// @param mech Agent mech address. | ||
| /// @param mechServiceId Mech operator service Id. | ||
| function checkMech(address mech, uint256 mechServiceId) public view { |
There was a problem hiding this comment.
These are changed to ones below
kupermind
commented
Aug 26, 2024
contracts/MechMarketplace.sol
Outdated
Comment on lines
315
to
299
|
|
||
| // Check if the requester service is staked | ||
| IStaking.StakingState state = IStaking(requesterStakingInstance).getStakingState(requesterServiceId); | ||
| if (state != IStaking.StakingState.Staked) { | ||
| revert ServiceNotStaked(requesterStakingInstance, requesterServiceId); | ||
| } | ||
| checkMech(priorityMech, priorityMechStakingInstance, priorityMechServiceId); | ||
|
|
||
| // Get the staked service info | ||
| IStaking.ServiceInfo memory serviceInfo = IStaking(requesterStakingInstance).getServiceInfo(requesterServiceId); | ||
| // Check staked service multisig | ||
| if (serviceInfo.multisig != msg.sender) { | ||
| revert OwnerOnly(msg.sender, serviceInfo.multisig); | ||
| } | ||
| // Check requester |
There was a problem hiding this comment.
Mechs and requester services are verified in these functions
kupermind
commented
Aug 26, 2024
| /// @dev Checks for staking instance contract validity. | ||
| /// @param stakingInstance Staking instance address. | ||
| /// @param serviceId Service Id. | ||
| function checkStakingInstance(address stakingInstance, uint256 serviceId) public view { |
There was a problem hiding this comment.
This function verifies that the staking contract of either requester / mech is valid and that the corresponding service is staked.
| /// @dev mech Agent mech contract address. | ||
| /// @param mechStakingInstance Agent mech staking instance address. | ||
| /// @param mechServiceId Agent mech service Id. | ||
| function checkMech(address mech, address mechStakingInstance, uint256 mechServiceId) public view { |
There was a problem hiding this comment.
This function then additionally checks that the mech is correct
kupermind
commented
Aug 26, 2024
| /// @dev requester Requester contract address. | ||
| /// @param requesterStakingInstance Requester staking instance address. | ||
| /// @param requesterServiceId Requester service Id. | ||
| function checkRequester(address requester, address requesterStakingInstance, uint256 requesterServiceId) public view { |
There was a problem hiding this comment.
This function is additionally checkin that the requester is correct.
77ph
approved these changes
Aug 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.