Skip to content

Commit 3e595b8

Browse files
0xjei0xjei
committed
refactor(contracts): switched to pragma for compatibility; minor fix
1 parent 2eb2033 commit 3e595b8

24 files changed

+59
-49
lines changed

‎packages/contracts/contracts/src/AdvancedChecker.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {IAdvancedChecker, Check} from "./interfaces/IAdvancedChecker.sol";
55

‎packages/contracts/contracts/src/AdvancedPolicy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {Policy} from "./Policy.sol";
55
import {IAdvancedPolicy, Check} from "./interfaces/IAdvancedPolicy.sol";

‎packages/contracts/contracts/src/BaseChecker.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {IBaseChecker} from "./interfaces/IBaseChecker.sol";
55

‎packages/contracts/contracts/src/BasePolicy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {IBasePolicy} from "./interfaces/IBasePolicy.sol";
55
import {Policy} from "./Policy.sol";

‎packages/contracts/contracts/src/Policy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
55
import {IPolicy} from "./interfaces/IPolicy.sol";

‎packages/contracts/contracts/src/interfaces/IAdvancedChecker.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
/// @title Check.
55
/// @notice Defines validation phases in the AdvancedChecker system.

‎packages/contracts/contracts/src/interfaces/IAdvancedPolicy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {IPolicy} from "./IPolicy.sol";
55
import {Check} from "./IAdvancedChecker.sol";

‎packages/contracts/contracts/src/interfaces/IBaseChecker.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
/// @title IBaseChecker.
55
/// @notice Defines base validation functionality.

‎packages/contracts/contracts/src/interfaces/IBasePolicy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {IPolicy} from "./IPolicy.sol";
55

‎packages/contracts/contracts/src/interfaces/IPolicy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
/// @title IPolicy.
55
/// @notice Core policy interface for protected contract management.

‎packages/contracts/contracts/src/test/Advanced.t.sol

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/src/Test.sol";
55
import {NFT} from "./utils/NFT.sol";
@@ -12,7 +12,7 @@ import {IPolicy} from "../interfaces/IPolicy.sol";
1212
import {IAdvancedPolicy} from "../interfaces/IAdvancedPolicy.sol";
1313
import {IERC721Errors} from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
1414
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
15-
import {Check, IAdvancedChecker} from "../interfaces/IAdvancedChecker.sol";
15+
import {Check} from "../interfaces/IAdvancedChecker.sol";
1616

1717
contract AdvancedChecker is Test {
1818
NFT internal nft;
@@ -270,6 +270,9 @@ contract AdvancedChecker is Test {
270270
}
271271

272272
contract AdvancedPolicy is Test {
273+
event TargetSet(address indexed target);
274+
event Enforced(address indexed subject, address indexed target, bytes evidence, Check checkType);
275+
273276
NFT internal nft;
274277
AdvancedERC721Checker internal checker;
275278
AdvancedERC721Checker internal checkerSkipped;
@@ -323,7 +326,7 @@ contract AdvancedPolicy is Test {
323326
vm.startPrank(deployer);
324327

325328
vm.expectEmit(true, true, true, true);
326-
emit IPolicy.TargetSet(target);
329+
emit TargetSet(target);
327330

328331
policy.setTarget(target);
329332

@@ -414,7 +417,7 @@ contract AdvancedPolicy is Test {
414417
vm.startPrank(target);
415418

416419
vm.expectEmit(true, true, true, true);
417-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.PRE);
420+
emit Enforced(subject, target, abi.encode(0x0), Check.PRE);
418421

419422
policy.enforce(subject, abi.encode(0x0), Check.PRE);
420423

@@ -498,7 +501,7 @@ contract AdvancedPolicy is Test {
498501
policy.enforce(subject, abi.encode(0x0), Check.PRE);
499502

500503
vm.expectEmit(true, true, true, true);
501-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
504+
emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
502505

503506
policy.enforce(subject, abi.encode(0x0), Check.MAIN);
504507

@@ -518,12 +521,12 @@ contract AdvancedPolicy is Test {
518521
policy.enforce(subject, abi.encode(0x0), Check.PRE);
519522

520523
vm.expectEmit(true, true, true, true);
521-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
524+
emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
522525

523526
policy.enforce(subject, abi.encode(0x0), Check.MAIN);
524527

525528
vm.expectEmit(true, true, true, true);
526-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
529+
emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
527530

528531
policy.enforce(subject, abi.encode(0x0), Check.MAIN);
529532

@@ -649,7 +652,7 @@ contract AdvancedPolicy is Test {
649652
policy.enforce(subject, abi.encode(0x0), Check.MAIN);
650653

651654
vm.expectEmit(true, true, true, true);
652-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.POST);
655+
emit Enforced(subject, target, abi.encode(0x0), Check.POST);
653656

654657
policy.enforce(subject, abi.encode(0x0), Check.POST);
655658

@@ -749,7 +752,7 @@ contract AdvancedPolicy is Test {
749752
vm.startPrank(target);
750753

751754
vm.expectEmit(true, true, true, true);
752-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.PRE);
755+
emit Enforced(subject, target, abi.encode(0x0), Check.PRE);
753756

754757
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.PRE);
755758

@@ -833,7 +836,7 @@ contract AdvancedPolicy is Test {
833836
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.PRE);
834837

835838
vm.expectEmit(true, true, true, true);
836-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
839+
emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
837840

838841
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
839842

@@ -853,12 +856,12 @@ contract AdvancedPolicy is Test {
853856
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.PRE);
854857

855858
vm.expectEmit(true, true, true, true);
856-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
859+
emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
857860

858861
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
859862

860863
vm.expectEmit(true, true, true, true);
861-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
864+
emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
862865

863866
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
864867

@@ -984,7 +987,7 @@ contract AdvancedPolicy is Test {
984987
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
985988

986989
vm.expectEmit(true, true, true, true);
987-
emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.POST);
990+
emit Enforced(subject, target, abi.encode(0x0), Check.POST);
988991

989992
policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.POST);
990993

@@ -1013,6 +1016,10 @@ contract AdvancedPolicy is Test {
10131016
}
10141017

10151018
contract Voting is Test {
1019+
event Registered(address voter);
1020+
event Voted(address voter, uint8 option);
1021+
event RewardClaimed(address voter, uint256 rewardId);
1022+
10161023
NFT internal nft;
10171024
AdvancedERC721Checker internal checker;
10181025
AdvancedERC721Policy internal policy;
@@ -1092,7 +1099,7 @@ contract Voting is Test {
10921099
vm.startPrank(subject);
10931100

10941101
vm.expectEmit(true, true, true, true);
1095-
emit AdvancedVoting.Registered(subject);
1102+
emit Registered(subject);
10961103

10971104
voting.register(0);
10981105

@@ -1162,7 +1169,7 @@ contract Voting is Test {
11621169
voting.register(0);
11631170

11641171
vm.expectEmit(true, true, true, true);
1165-
emit AdvancedVoting.Voted(subject, 0);
1172+
emit Voted(subject, 0);
11661173

11671174
voting.vote(0);
11681175

@@ -1183,7 +1190,7 @@ contract Voting is Test {
11831190
voting.vote(0);
11841191

11851192
vm.expectEmit(true, true, true, true);
1186-
emit AdvancedVoting.Voted(subject, 0);
1193+
emit Voted(subject, 0);
11871194
voting.vote(0);
11881195

11891196
vm.stopPrank();
@@ -1280,7 +1287,7 @@ contract Voting is Test {
12801287
voting.vote(0);
12811288

12821289
vm.expectEmit(true, true, true, true);
1283-
emit AdvancedVoting.RewardClaimed(subject, 0);
1290+
emit RewardClaimed(subject, 0);
12841291

12851292
voting.reward(0);
12861293

‎packages/contracts/contracts/src/test/Base.t.sol

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {Test} from "forge-std/src/Test.sol";
55
import {NFT} from "./utils/NFT.sol";
@@ -9,7 +9,6 @@ import {BaseVoting} from "./base/BaseVoting.sol";
99
import {BaseERC721CheckerHarness} from "./wrappers/BaseERC721CheckerHarness.sol";
1010
import {BaseERC721PolicyHarness} from "./wrappers/BaseERC721PolicyHarness.sol";
1111
import {IPolicy} from "../interfaces/IPolicy.sol";
12-
import {IBasePolicy} from "../interfaces/IBasePolicy.sol";
1312
import {IERC721Errors} from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
1413
import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
1514

@@ -93,6 +92,9 @@ contract BaseChecker is Test {
9392
}
9493

9594
contract BasePolicy is Test {
95+
event TargetSet(address indexed target);
96+
event Enforced(address indexed subject, address indexed target, bytes evidence);
97+
9698
NFT internal nft;
9799
BaseERC721Checker internal checker;
98100
BaseERC721Policy internal policy;
@@ -150,7 +152,7 @@ contract BasePolicy is Test {
150152
vm.startPrank(deployer);
151153

152154
vm.expectEmit(true, true, true, true);
153-
emit IPolicy.TargetSet(target);
155+
emit TargetSet(target);
154156

155157
policy.setTarget(target);
156158

@@ -225,7 +227,7 @@ contract BasePolicy is Test {
225227
vm.startPrank(target);
226228

227229
vm.expectEmit(true, true, true, true);
228-
emit IBasePolicy.Enforced(subject, target, abi.encode(0x0));
230+
emit Enforced(subject, target, abi.encode(0x0));
229231

230232
policy.enforce(subject, abi.encode(0x0));
231233

@@ -307,7 +309,7 @@ contract BasePolicy is Test {
307309
vm.startPrank(target);
308310

309311
vm.expectEmit(true, true, true, true);
310-
emit IBasePolicy.Enforced(subject, target, abi.encode(0x0));
312+
emit Enforced(subject, target, abi.encode(0x0));
311313

312314
policyHarness.exposed__enforce(subject, abi.encode(0x0));
313315

@@ -334,6 +336,9 @@ contract BasePolicy is Test {
334336
}
335337

336338
contract Voting is Test {
339+
event Registered(address voter);
340+
event Voted(address voter, uint8 option);
341+
337342
NFT internal nft;
338343
BaseERC721Checker internal checker;
339344
BaseERC721Policy internal policy;
@@ -413,7 +418,7 @@ contract Voting is Test {
413418
vm.startPrank(subject);
414419

415420
vm.expectEmit(true, true, true, true);
416-
emit BaseVoting.Registered(subject);
421+
emit Registered(subject);
417422

418423
voting.register(0);
419424

@@ -483,7 +488,7 @@ contract Voting is Test {
483488
voting.register(0);
484489

485490
vm.expectEmit(true, true, true, true);
486-
emit BaseVoting.Voted(subject, 0);
491+
emit Voted(subject, 0);
487492

488493
voting.vote(0);
489494

‎packages/contracts/contracts/src/test/advanced/AdvancedERC721Checker.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {AdvancedChecker} from "../../AdvancedChecker.sol";
55
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";

‎packages/contracts/contracts/src/test/advanced/AdvancedERC721Policy.sol

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {AdvancedPolicy} from "../../AdvancedPolicy.sol";
55
import {AdvancedERC721Checker} from "./AdvancedERC721Checker.sol";
@@ -14,9 +14,7 @@ contract AdvancedERC721Policy is AdvancedPolicy {
1414
bool _skipPre,
1515
bool _skipPost,
1616
bool _allowMultipleMain
17-
) AdvancedPolicy(_checker, _skipPre, _skipPost, _allowMultipleMain) {
18-
ADVANCED_CHECKER = _checker;
19-
}
17+
) AdvancedPolicy(_checker, _skipPre, _skipPost, _allowMultipleMain) {}
2018

2119
/// @notice Returns policy identifier.
2220
function trait() external pure returns (string memory) {

‎packages/contracts/contracts/src/test/advanced/AdvancedVoting.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {AdvancedPolicy} from "../../AdvancedPolicy.sol";
55
import {Check} from "../../interfaces/IAdvancedPolicy.sol";

‎packages/contracts/contracts/src/test/base/BaseERC721Checker.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {BaseChecker} from "../../../src/BaseChecker.sol";
55
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";

‎packages/contracts/contracts/src/test/base/BaseERC721Policy.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {BasePolicy} from "../../../src/BasePolicy.sol";
55
import {BaseERC721Checker} from "./BaseERC721Checker.sol";

‎packages/contracts/contracts/src/test/base/BaseVoting.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {BaseERC721Policy} from "./BaseERC721Policy.sol";
55

‎packages/contracts/contracts/src/test/wrappers/AdvancedERC721CheckerHarness.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {AdvancedERC721Checker} from "../advanced/AdvancedERC721Checker.sol";
55
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";

‎packages/contracts/contracts/src/test/wrappers/AdvancedERC721PolicyHarness.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {AdvancedERC721Policy} from "../advanced/AdvancedERC721Policy.sol";
55
import {AdvancedERC721Checker} from "../advanced/AdvancedERC721Checker.sol";

‎packages/contracts/contracts/src/test/wrappers/BaseERC721CheckerHarness.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";
55
import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";

‎packages/contracts/contracts/src/test/wrappers/BaseERC721PolicyHarness.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: MIT
2-
pragma solidity 0.8.27;
2+
pragma solidity ^0.8.20;
33

44
import {BaseERC721Policy} from "../base/BaseERC721Policy.sol";
55
import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";

0 commit comments

Comments
 (0)