refactor(contracts): switched to pragma for compatibility; minor fix

0xjei · 0xjei · commit 3e595b828e4e · 2024-12-03T15:32:42.000+01:00
diff --git a/packages/contracts/contracts/src/AdvancedChecker.sol b/packages/contracts/contracts/src/AdvancedChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {IAdvancedChecker, Check} from "./interfaces/IAdvancedChecker.sol";
 
diff --git a/packages/contracts/contracts/src/AdvancedPolicy.sol b/packages/contracts/contracts/src/AdvancedPolicy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {Policy} from "./Policy.sol";
 import {IAdvancedPolicy, Check} from "./interfaces/IAdvancedPolicy.sol";
diff --git a/packages/contracts/contracts/src/BaseChecker.sol b/packages/contracts/contracts/src/BaseChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {IBaseChecker} from "./interfaces/IBaseChecker.sol";
 
diff --git a/packages/contracts/contracts/src/BasePolicy.sol b/packages/contracts/contracts/src/BasePolicy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {IBasePolicy} from "./interfaces/IBasePolicy.sol";
 import {Policy} from "./Policy.sol";
diff --git a/packages/contracts/contracts/src/Policy.sol b/packages/contracts/contracts/src/Policy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {IPolicy} from "./interfaces/IPolicy.sol";
diff --git a/packages/contracts/contracts/src/interfaces/IAdvancedChecker.sol b/packages/contracts/contracts/src/interfaces/IAdvancedChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 /// @title Check.
 /// @notice Defines validation phases in the AdvancedChecker system.
diff --git a/packages/contracts/contracts/src/interfaces/IAdvancedPolicy.sol b/packages/contracts/contracts/src/interfaces/IAdvancedPolicy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {IPolicy} from "./IPolicy.sol";
 import {Check} from "./IAdvancedChecker.sol";
diff --git a/packages/contracts/contracts/src/interfaces/IBaseChecker.sol b/packages/contracts/contracts/src/interfaces/IBaseChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 /// @title IBaseChecker.
 /// @notice Defines base validation functionality.
diff --git a/packages/contracts/contracts/src/interfaces/IBasePolicy.sol b/packages/contracts/contracts/src/interfaces/IBasePolicy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {IPolicy} from "./IPolicy.sol";
 
diff --git a/packages/contracts/contracts/src/interfaces/IPolicy.sol b/packages/contracts/contracts/src/interfaces/IPolicy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 /// @title IPolicy.
 /// @notice Core policy interface for protected contract management.
diff --git a/packages/contracts/contracts/src/test/Advanced.t.sol b/packages/contracts/contracts/src/test/Advanced.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/src/Test.sol";
 import {NFT} from "./utils/NFT.sol";
@@ -12,7 +12,7 @@ import {IPolicy} from "../interfaces/IPolicy.sol";
 import {IAdvancedPolicy} from "../interfaces/IAdvancedPolicy.sol";
 import {IERC721Errors} from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {Check, IAdvancedChecker} from "../interfaces/IAdvancedChecker.sol";
+import {Check} from "../interfaces/IAdvancedChecker.sol";
 
 contract AdvancedChecker is Test {
     NFT internal nft;
@@ -270,6 +270,9 @@ contract AdvancedChecker is Test {
 }
 
 contract AdvancedPolicy is Test {
+    event TargetSet(address indexed target);
+    event Enforced(address indexed subject, address indexed target, bytes evidence, Check checkType);
+
     NFT internal nft;
     AdvancedERC721Checker internal checker;
     AdvancedERC721Checker internal checkerSkipped;
@@ -323,7 +326,7 @@ contract AdvancedPolicy is Test {
         vm.startPrank(deployer);
 
         vm.expectEmit(true, true, true, true);
-        emit IPolicy.TargetSet(target);
+        emit TargetSet(target);
 
         policy.setTarget(target);
 
@@ -414,7 +417,7 @@ contract AdvancedPolicy is Test {
         vm.startPrank(target);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.PRE);
+        emit Enforced(subject, target, abi.encode(0x0), Check.PRE);
 
         policy.enforce(subject, abi.encode(0x0), Check.PRE);
 
@@ -498,7 +501,7 @@ contract AdvancedPolicy is Test {
         policy.enforce(subject, abi.encode(0x0), Check.PRE);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
+        emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
 
         policy.enforce(subject, abi.encode(0x0), Check.MAIN);
 
@@ -518,12 +521,12 @@ contract AdvancedPolicy is Test {
         policy.enforce(subject, abi.encode(0x0), Check.PRE);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
+        emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
 
         policy.enforce(subject, abi.encode(0x0), Check.MAIN);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
+        emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
 
         policy.enforce(subject, abi.encode(0x0), Check.MAIN);
 
@@ -649,7 +652,7 @@ contract AdvancedPolicy is Test {
         policy.enforce(subject, abi.encode(0x0), Check.MAIN);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.POST);
+        emit Enforced(subject, target, abi.encode(0x0), Check.POST);
 
         policy.enforce(subject, abi.encode(0x0), Check.POST);
 
@@ -749,7 +752,7 @@ contract AdvancedPolicy is Test {
         vm.startPrank(target);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.PRE);
+        emit Enforced(subject, target, abi.encode(0x0), Check.PRE);
 
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.PRE);
 
@@ -833,7 +836,7 @@ contract AdvancedPolicy is Test {
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.PRE);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
+        emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
 
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
 
@@ -853,12 +856,12 @@ contract AdvancedPolicy is Test {
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.PRE);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
+        emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
 
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.MAIN);
+        emit Enforced(subject, target, abi.encode(0x0), Check.MAIN);
 
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
 
@@ -984,7 +987,7 @@ contract AdvancedPolicy is Test {
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.MAIN);
 
         vm.expectEmit(true, true, true, true);
-        emit IAdvancedPolicy.Enforced(subject, target, abi.encode(0x0), Check.POST);
+        emit Enforced(subject, target, abi.encode(0x0), Check.POST);
 
         policyHarness.exposed__enforce(subject, abi.encode(0x0), Check.POST);
 
@@ -1013,6 +1016,10 @@ contract AdvancedPolicy is Test {
 }
 
 contract Voting is Test {
+    event Registered(address voter);
+    event Voted(address voter, uint8 option);
+    event RewardClaimed(address voter, uint256 rewardId);
+
     NFT internal nft;
     AdvancedERC721Checker internal checker;
     AdvancedERC721Policy internal policy;
@@ -1092,7 +1099,7 @@ contract Voting is Test {
         vm.startPrank(subject);
 
         vm.expectEmit(true, true, true, true);
-        emit AdvancedVoting.Registered(subject);
+        emit Registered(subject);
 
         voting.register(0);
 
@@ -1162,7 +1169,7 @@ contract Voting is Test {
         voting.register(0);
 
         vm.expectEmit(true, true, true, true);
-        emit AdvancedVoting.Voted(subject, 0);
+        emit Voted(subject, 0);
 
         voting.vote(0);
 
@@ -1183,7 +1190,7 @@ contract Voting is Test {
         voting.vote(0);
 
         vm.expectEmit(true, true, true, true);
-        emit AdvancedVoting.Voted(subject, 0);
+        emit Voted(subject, 0);
         voting.vote(0);
 
         vm.stopPrank();
@@ -1280,7 +1287,7 @@ contract Voting is Test {
         voting.vote(0);
 
         vm.expectEmit(true, true, true, true);
-        emit AdvancedVoting.RewardClaimed(subject, 0);
+        emit RewardClaimed(subject, 0);
 
         voting.reward(0);
 
diff --git a/packages/contracts/contracts/src/test/Base.t.sol b/packages/contracts/contracts/src/test/Base.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/src/Test.sol";
 import {NFT} from "./utils/NFT.sol";
@@ -9,7 +9,6 @@ import {BaseVoting} from "./base/BaseVoting.sol";
 import {BaseERC721CheckerHarness} from "./wrappers/BaseERC721CheckerHarness.sol";
 import {BaseERC721PolicyHarness} from "./wrappers/BaseERC721PolicyHarness.sol";
 import {IPolicy} from "../interfaces/IPolicy.sol";
-import {IBasePolicy} from "../interfaces/IBasePolicy.sol";
 import {IERC721Errors} from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
@@ -93,6 +92,9 @@ contract BaseChecker is Test {
 }
 
 contract BasePolicy is Test {
+    event TargetSet(address indexed target);
+    event Enforced(address indexed subject, address indexed target, bytes evidence);
+
     NFT internal nft;
     BaseERC721Checker internal checker;
     BaseERC721Policy internal policy;
@@ -150,7 +152,7 @@ contract BasePolicy is Test {
         vm.startPrank(deployer);
 
         vm.expectEmit(true, true, true, true);
-        emit IPolicy.TargetSet(target);
+        emit TargetSet(target);
 
         policy.setTarget(target);
 
@@ -225,7 +227,7 @@ contract BasePolicy is Test {
         vm.startPrank(target);
 
         vm.expectEmit(true, true, true, true);
-        emit IBasePolicy.Enforced(subject, target, abi.encode(0x0));
+        emit Enforced(subject, target, abi.encode(0x0));
 
         policy.enforce(subject, abi.encode(0x0));
 
@@ -307,7 +309,7 @@ contract BasePolicy is Test {
         vm.startPrank(target);
 
         vm.expectEmit(true, true, true, true);
-        emit IBasePolicy.Enforced(subject, target, abi.encode(0x0));
+        emit Enforced(subject, target, abi.encode(0x0));
 
         policyHarness.exposed__enforce(subject, abi.encode(0x0));
 
@@ -334,6 +336,9 @@ contract BasePolicy is Test {
 }
 
 contract Voting is Test {
+    event Registered(address voter);
+    event Voted(address voter, uint8 option);
+
     NFT internal nft;
     BaseERC721Checker internal checker;
     BaseERC721Policy internal policy;
@@ -413,7 +418,7 @@ contract Voting is Test {
         vm.startPrank(subject);
 
         vm.expectEmit(true, true, true, true);
-        emit BaseVoting.Registered(subject);
+        emit Registered(subject);
 
         voting.register(0);
 
@@ -483,7 +488,7 @@ contract Voting is Test {
         voting.register(0);
 
         vm.expectEmit(true, true, true, true);
-        emit BaseVoting.Voted(subject, 0);
+        emit Voted(subject, 0);
 
         voting.vote(0);
 
diff --git a/packages/contracts/contracts/src/test/advanced/AdvancedERC721Checker.sol b/packages/contracts/contracts/src/test/advanced/AdvancedERC721Checker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {AdvancedChecker} from "../../AdvancedChecker.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
diff --git a/packages/contracts/contracts/src/test/advanced/AdvancedERC721Policy.sol b/packages/contracts/contracts/src/test/advanced/AdvancedERC721Policy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {AdvancedPolicy} from "../../AdvancedPolicy.sol";
 import {AdvancedERC721Checker} from "./AdvancedERC721Checker.sol";
@@ -14,9 +14,7 @@ contract AdvancedERC721Policy is AdvancedPolicy {
         bool _skipPre,
         bool _skipPost,
         bool _allowMultipleMain
-    ) AdvancedPolicy(_checker, _skipPre, _skipPost, _allowMultipleMain) {
-        ADVANCED_CHECKER = _checker;
-    }
+    ) AdvancedPolicy(_checker, _skipPre, _skipPost, _allowMultipleMain) {}
 
     /// @notice Returns policy identifier.
     function trait() external pure returns (string memory) {
diff --git a/packages/contracts/contracts/src/test/advanced/AdvancedVoting.sol b/packages/contracts/contracts/src/test/advanced/AdvancedVoting.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {AdvancedPolicy} from "../../AdvancedPolicy.sol";
 import {Check} from "../../interfaces/IAdvancedPolicy.sol";
diff --git a/packages/contracts/contracts/src/test/base/BaseERC721Checker.sol b/packages/contracts/contracts/src/test/base/BaseERC721Checker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {BaseChecker} from "../../../src/BaseChecker.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
diff --git a/packages/contracts/contracts/src/test/base/BaseERC721Policy.sol b/packages/contracts/contracts/src/test/base/BaseERC721Policy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {BasePolicy} from "../../../src/BasePolicy.sol";
 import {BaseERC721Checker} from "./BaseERC721Checker.sol";
diff --git a/packages/contracts/contracts/src/test/base/BaseVoting.sol b/packages/contracts/contracts/src/test/base/BaseVoting.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {BaseERC721Policy} from "./BaseERC721Policy.sol";
 
diff --git a/packages/contracts/contracts/src/test/wrappers/AdvancedERC721CheckerHarness.sol b/packages/contracts/contracts/src/test/wrappers/AdvancedERC721CheckerHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {AdvancedERC721Checker} from "../advanced/AdvancedERC721Checker.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
diff --git a/packages/contracts/contracts/src/test/wrappers/AdvancedERC721PolicyHarness.sol b/packages/contracts/contracts/src/test/wrappers/AdvancedERC721PolicyHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {AdvancedERC721Policy} from "../advanced/AdvancedERC721Policy.sol";
 import {AdvancedERC721Checker} from "../advanced/AdvancedERC721Checker.sol";
diff --git a/packages/contracts/contracts/src/test/wrappers/BaseERC721CheckerHarness.sol b/packages/contracts/contracts/src/test/wrappers/BaseERC721CheckerHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";
 import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
diff --git a/packages/contracts/contracts/src/test/wrappers/BaseERC721PolicyHarness.sol b/packages/contracts/contracts/src/test/wrappers/BaseERC721PolicyHarness.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity ^0.8.20;
 
 import {BaseERC721Policy} from "../base/BaseERC721Policy.sol";
 import {BaseERC721Checker} from "../base/BaseERC721Checker.sol";
diff --git a/packages/contracts/foundry.toml b/packages/contracts/foundry.toml
diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
