Sync OSx version

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "lib/osx"]
 	path = lib/osx
 	url = https://github.com/aragon/osx
-[submodule "lib/osx-commons"]
-	path = lib/osx-commons
-	url = https://github.com/aragon/osx-commons
 [submodule "lib/ens-contracts"]
 	path = lib/ens-contracts
 	url = https://github.com/ensdomains/ens-contracts

remappings.txt

@@ -3,7 +3,7 @@
 
 @ensdomains/ens-contracts/=lib/ens-contracts/
 
-@aragon/osx/=lib/osx/packages/contracts/src/
-@aragon/osx-commons-contracts/=lib/osx-commons/contracts/
+@aragon/osx/=lib/osx/src/
+@aragon/osx-commons-contracts/src/=lib/osx/src/common/
 
 forge-std/=lib/forge-std/src/

test/fork/upgradeV1_1ToV1_2.t.sol

@@ -19,9 +19,7 @@ import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSet
 import {
     RuledCondition
 } from "@aragon/osx-commons-contracts/src/permission/condition/extensions/RuledCondition.sol";
-import {
-    AddressCheckConditionMock
-} from "@aragon/osx-commons-contracts/src/mocks/permission/condition/AddressCheckConditionMock.sol";
+import {AddressCheckConditionMock} from "../utils/AddressCheckConditionMock.sol";
 
 /// @notice Forks a network where v1.1 is deployed (set RPC_URL accordingly), installs the SPP at
 /// build 1, exercises the v1.1 → v1.2 upgrade through the PSP, and asserts that the helper has

test/unit/sppRuleCondition/isGranted/isGranted.t.sol

@@ -9,9 +9,7 @@ import {PluginACondition} from "../../../utils/dummy-plugins/PluginA/PluginACond
 import {
     RuledCondition
 } from "@aragon/osx-commons-contracts/src/permission/condition/extensions/RuledCondition.sol";
-import {
-    AddressCheckConditionMock
-} from "@aragon/osx-commons-contracts/src/mocks/permission/condition/AddressCheckConditionMock.sol";
+import {AddressCheckConditionMock} from "../../../utils/AddressCheckConditionMock.sol";
 
 contract IsGranted_SPPRuleCondition_UnitTest is RuleConditionConfiguredTest {
     // Rule IDs not exposed via the SPP test Constants

test/utils/AddressCheckConditionMock.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+pragma solidity ^0.8.8;
+
+import {PermissionCondition} from "@aragon/osx-commons-contracts/src/permission/condition/PermissionCondition.sol";
+
+/// @notice A mock that returns true only when both `_where` and `_who` match the configured addresses.
+/// @dev DO NOT USE IN PRODUCTION!
+contract AddressCheckConditionMock is PermissionCondition {
+    address public expectedWhere;
+    address public expectedWho;
+
+    function setExpected(address _expectedWhere, address _expectedWho) external {
+        expectedWhere = _expectedWhere;
+        expectedWho = _expectedWho;
+    }
+
+    function isGranted(
+        address _where,
+        address _who,
+        bytes32 _permissionId,
+        bytes memory _data
+    ) external view returns (bool) {
+        (_permissionId, _data);
+        return _where == expectedWhere && _who == expectedWho;
+    }
+}