Skip to content

Commit c14a923

Browse files
committed
fix: zaps locking
1 parent b859c04 commit c14a923

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

src/libs/LibAdmin.sol

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@ library LibAdmin {
148148
s.locked[IDiamondProxy.createSimplePolicy.selector] = true;
149149
s.locked[IDiamondProxy.createEntity.selector] = true;
150150
s.locked[IDiamondProxy.compoundRewards.selector] = true;
151+
s.locked[IDiamondProxy.zapStake.selector] = true;
152+
s.locked[IDiamondProxy.zapOrder.selector] = true;
151153

152-
bytes4[] memory lockedFunctions = new bytes4[](23);
154+
bytes4[] memory lockedFunctions = new bytes4[](25);
153155
lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
154156
lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
155157
lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
@@ -173,6 +175,8 @@ library LibAdmin {
173175
lockedFunctions[20] = IDiamondProxy.createEntity.selector;
174176
lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
175177
lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
178+
lockedFunctions[23] = IDiamondProxy.zapStake.selector;
179+
lockedFunctions[24] = IDiamondProxy.zapOrder.selector;
176180

177181
emit FunctionsLocked(lockedFunctions);
178182
}
@@ -202,8 +206,10 @@ library LibAdmin {
202206
s.locked[IDiamondProxy.createEntity.selector] = false;
203207
s.locked[IDiamondProxy.collectRewardsToInterval.selector] = false;
204208
s.locked[IDiamondProxy.compoundRewards.selector] = false;
209+
s.locked[IDiamondProxy.zapStake.selector] = false;
210+
s.locked[IDiamondProxy.zapOrder.selector] = false;
205211

206-
bytes4[] memory lockedFunctions = new bytes4[](23);
212+
bytes4[] memory lockedFunctions = new bytes4[](25);
207213
lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
208214
lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
209215
lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
@@ -227,6 +233,8 @@ library LibAdmin {
227233
lockedFunctions[20] = IDiamondProxy.createEntity.selector;
228234
lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
229235
lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
236+
lockedFunctions[23] = IDiamondProxy.zapStake.selector;
237+
lockedFunctions[24] = IDiamondProxy.zapOrder.selector;
230238

231239
emit FunctionsUnlocked(lockedFunctions);
232240
}

test/T02Admin.t.sol

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.20;
33

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

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

244-
bytes4[] memory lockedFunctions = new bytes4[](23);
244+
bytes4[] memory lockedFunctions = new bytes4[](25);
245245
lockedFunctions[0] = IDiamondProxy.startTokenSale.selector;
246246
lockedFunctions[1] = IDiamondProxy.paySimpleClaim.selector;
247247
lockedFunctions[2] = IDiamondProxy.paySimplePremium.selector;
@@ -265,6 +265,8 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
265265
lockedFunctions[20] = IDiamondProxy.createEntity.selector;
266266
lockedFunctions[21] = IDiamondProxy.collectRewardsToInterval.selector;
267267
lockedFunctions[22] = IDiamondProxy.compoundRewards.selector;
268+
lockedFunctions[23] = IDiamondProxy.zapStake.selector;
269+
lockedFunctions[24] = IDiamondProxy.zapOrder.selector;
268270

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

332+
PermitSignature memory permSig;
333+
OnboardingApproval memory onboardingApproval;
334+
335+
vm.expectRevert("function is locked");
336+
nayms.zapStake(address(0), bytes32(0), 0, 0, permSig, onboardingApproval);
337+
338+
vm.expectRevert("function is locked");
339+
nayms.zapOrder(address(0), 0, bytes32(0), 0, bytes32(0), 0, permSig, onboardingApproval);
340+
330341
vm.expectRevert("function is locked");
331342
nayms.collectRewardsToInterval(bytes32(0), 5);
332343

@@ -367,5 +378,7 @@ contract T02AdminTest is D03ProtocolDefaults, MockAccounts {
367378
assertFalse(nayms.isFunctionLocked(IDiamondProxy.cancelSimplePolicy.selector), "function cancelSimplePolicy locked");
368379
assertFalse(nayms.isFunctionLocked(IDiamondProxy.createSimplePolicy.selector), "function createSimplePolicy locked");
369380
assertFalse(nayms.isFunctionLocked(IDiamondProxy.createEntity.selector), "function createEntity locked");
381+
assertFalse(nayms.isFunctionLocked(IDiamondProxy.zapStake.selector), "function zapStake locked");
382+
assertFalse(nayms.isFunctionLocked(IDiamondProxy.zapOrder.selector), "function zapOrder locked");
370383
}
371384
}

0 commit comments

Comments
 (0)