Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Zellic-3.3 (safety checks missing) #1462

Merged
merged 8 commits into from
Oct 23, 2023
Merged

Fix: Zellic-3.3 (safety checks missing) #1462

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0750988
Add test with the expected revert:
ChiTimesChi Oct 18, 2023
34a067a
Fix: check origin domain
ChiTimesChi Oct 18, 2023
4527220
Add test with the expected revert:
ChiTimesChi Oct 18, 2023
e55f5f0
Fix: check origin domain in `ExecutionHub`
ChiTimesChi Oct 18, 2023
cb4398a
Add tests with the expected reverts:
ChiTimesChi Oct 18, 2023
5448b42
Fix: revert when message destination is local domain
ChiTimesChi Oct 18, 2023
ed0d6f0
Update "will revert" documentation
ChiTimesChi Oct 18, 2023
4e3d8d0
Merge branch 'master' into fix/zellic/3.3-safety-checks-missing
ChiTimesChi Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/contracts-core/contracts/manager/BondingManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
CallerNotDestination,
CallerNotSummit,
IncorrectAgentDomain,
IncorrectOriginDomain,
IndexOutOfRange,
MerkleTreeFull,
MustBeSynapseDomain,
Expand Down Expand Up @@ -171,8 +172,9 @@ contract BondingManager is AgentManager, InterfaceBondingManager {
// Check that merkle proof is mature enough
// TODO: separate constant for slashing optimistic period
if (proofMaturity < BONDING_OPTIMISTIC_PERIOD) revert SlashAgentOptimisticPeriod();
// TODO: do we need to save this?
msgOrigin;
// TODO: do we need to save domain where the agent was slashed?
// Message needs to be sent from the remote chain
if (msgOrigin == localDomain) revert IncorrectOriginDomain();
// Slash agent and notify local AgentSecured contracts
_slashAgent(domain, agent, prover);
// Magic value to return is selector of the called function
Expand Down
9 changes: 9 additions & 0 deletions packages/contracts-core/test/suite/manager/BondingManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
AgentNotUnstaking,
CallerNotSummit,
MustBeSynapseDomain,
IncorrectOriginDomain,
SlashAgentOptimisticPeriod,
SynapseDomainForbidden
} from "../../../contracts/libs/Errors.sol";
Expand Down Expand Up @@ -248,6 +249,14 @@ contract BondingManagerTest is AgentManagerTest {
managerMsgPrank(msgPayload);
}

function test_remoteSlashAgent_revert_sameOriginDomain() public {
uint32 proofMaturity = BONDING_OPTIMISTIC_PERIOD;
skip(proofMaturity);
bytes memory msgPayload = managerMsgPayload(DOMAIN_SYNAPSE, remoteSlashAgentCalldata(0, address(0), address(0)));
vm.expectRevert(IncorrectOriginDomain.selector);
managerMsgPrank(msgPayload);
}

function test_completeSlashing_active(uint256 domainId, uint256 agentId, address slasher) public {
(uint32 domain, address agent) = getAgent(domainId, agentId);
// Initiate slashing
Expand Down
Loading