Skip to content

Commit

Permalink
fix: zaps locking
Browse files Browse the repository at this point in the history
  • Loading branch information
@amarinkovic
amarinkovic committed Dec 30, 2024
1 parent b859c04 commit c14a923
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
12 changes: 10 additions & 2 deletions src/libs/LibAdmin.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,10 @@ library LibAdmin {
s.locked[IDiamondProxy.createSimplePolicy.selector] = true;
s.locked[IDiamondProxy.createEntity.selector] = true;
s.locked[IDiamondProxy.compoundRewards.selector] = true;
s.locked[IDiamondProxy.zapStake.selector] = true;
s.locked[IDiamondProxy.zapOrder.selector] = true;

bytes4[] memory lockedFunctions = new bytes4[](23);
bytes4[] memory lockedFunctions = new bytes4[](25);
lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
Expand All @@ -173,6 +175,8 @@ library LibAdmin {
lockedFunctions[20] = IDiamondProxy.createEntity.selector;
lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
lockedFunctions[23] = IDiamondProxy.zapStake.selector;
lockedFunctions[24] = IDiamondProxy.zapOrder.selector;

emit FunctionsLocked(lockedFunctions);
}
Expand Down Expand Up @@ -202,8 +206,10 @@ library LibAdmin {
s.locked[IDiamondProxy.createEntity.selector] = false;
s.locked[IDiamondProxy.collectRewardsToInterval.selector] = false;
s.locked[IDiamondProxy.compoundRewards.selector] = false;
s.locked[IDiamondProxy.zapStake.selector] = false;
s.locked[IDiamondProxy.zapOrder.selector] = false;

bytes4[] memory lockedFunctions = new bytes4[](23);
bytes4[] memory lockedFunctions = new bytes4[](25);
lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
Expand All @@ -227,6 +233,8 @@ library LibAdmin {
lockedFunctions[20] = IDiamondProxy.createEntity.selector;
lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
lockedFunctions[23] = IDiamondProxy.zapStake.selector;
lockedFunctions[24] = IDiamondProxy.zapOrder.selector;

emit FunctionsUnlocked(lockedFunctions);
}
Expand Down
17 changes: 15 additions & 2 deletions test/T02Admin.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity 0.8.20;

import { D03ProtocolDefaults, LibHelpers, LC } from "./defaults/D03ProtocolDefaults.sol";

import { Entity, Stakeholders, SimplePolicy } from "../src/shared/FreeStructs.sol";
import { Entity, Stakeholders, SimplePolicy, PermitSignature, OnboardingApproval } from "../src/shared/FreeStructs.sol";
import { MockAccounts } from "test/utils/users/MockAccounts.sol";
import { Vm } from "forge-std/Vm.sol";
import { IDiamondProxy } from "../src/generated/IDiamondProxy.sol";
Expand Down Expand Up @@ -241,7 +241,7 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
assertEq(entries[0].topics[0], keccak256("FunctionsLocked(bytes4[])"));
(s_functionSelectors) = abi.decode(entries[0].data, (bytes4[]));

bytes4[] memory lockedFunctions = new bytes4[](23);
bytes4[] memory lockedFunctions = new bytes4[](25);
lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
Expand All @@ -265,6 +265,8 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
lockedFunctions[20] = IDiamondProxy.createEntity.selector;
lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
lockedFunctions[23] = IDiamondProxy.zapStake.selector;
lockedFunctions[24] = IDiamondProxy.zapOrder.selector;

for (uint256 i = 0; i < lockedFunctions.length; i++) {
assertTrue(nayms.isFunctionLocked(lockedFunctions[i]));
Expand Down Expand Up @@ -327,6 +329,15 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
vm.expectRevert("function is locked");
nayms.compoundRewards(bytes32(0));

PermitSignature memory permSig;
OnboardingApproval memory onboardingApproval;

vm.expectRevert("function is locked");
nayms.zapStake(address(0), bytes32(0), 0, 0, permSig, onboardingApproval);

vm.expectRevert("function is locked");
nayms.zapOrder(address(0), 0, bytes32(0), 0, bytes32(0), 0, permSig, onboardingApproval);

vm.expectRevert("function is locked");
nayms.collectRewardsToInterval(bytes32(0), 5);

Expand Down Expand Up @@ -367,5 +378,7 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
assertFalse(nayms.isFunctionLocked(IDiamondProxy.cancelSimplePolicy.selector), "function cancelSimplePolicy locked");
assertFalse(nayms.isFunctionLocked(IDiamondProxy.createSimplePolicy.selector), "function createSimplePolicy locked");
assertFalse(nayms.isFunctionLocked(IDiamondProxy.createEntity.selector), "function createEntity locked");
assertFalse(nayms.isFunctionLocked(IDiamondProxy.zapStake.selector), "function zapStake locked");
assertFalse(nayms.isFunctionLocked(IDiamondProxy.zapOrder.selector), "function zapOrder locked");
}
}

0 comments on commit c14a923

Please sign in to comment.