From 77882c830f815f06f24eaff46db9e6b3bd4945a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8r=E2=88=82=C2=A1?= Date: Thu, 28 May 2026 14:51:04 +0000 Subject: [PATCH 1/2] Updated OSx version --- .gitmodules | 3 --- lib/osx | 2 +- lib/osx-commons | 1 - remappings.txt | 4 +-- test/fork/upgradeV1_1ToV1_2.t.sol | 4 +-- .../isGranted/isGranted.t.sol | 4 +-- test/utils/AddressCheckConditionMock.sol | 27 +++++++++++++++++++ 7 files changed, 32 insertions(+), 13 deletions(-) delete mode 160000 lib/osx-commons create mode 100644 test/utils/AddressCheckConditionMock.sol diff --git a/.gitmodules b/.gitmodules index 1840e3f..a75ce5a 100644 --- a/.gitmodules +++ b/.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 diff --git a/lib/osx b/lib/osx index 6f35a85..22d6a46 160000 --- a/lib/osx +++ b/lib/osx @@ -1 +1 @@ -Subproject commit 6f35a85f6159ae62c68776c5cff57d4e8cfe1549 +Subproject commit 22d6a46099671f1de8270f0c438fc671b0383972 diff --git a/lib/osx-commons b/lib/osx-commons deleted file mode 160000 index 7a6dc58..0000000 --- a/lib/osx-commons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7a6dc5839772e3b1de3c550fa2f405e11c6dd22b diff --git a/remappings.txt b/remappings.txt index 02de3c9..c3da6b5 100644 --- a/remappings.txt +++ b/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/ diff --git a/test/fork/upgradeV1_1ToV1_2.t.sol b/test/fork/upgradeV1_1ToV1_2.t.sol index 92fe643..7bc83ad 100644 --- a/test/fork/upgradeV1_1ToV1_2.t.sol +++ b/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 diff --git a/test/unit/sppRuleCondition/isGranted/isGranted.t.sol b/test/unit/sppRuleCondition/isGranted/isGranted.t.sol index 5ab3eb2..ab439f9 100644 --- a/test/unit/sppRuleCondition/isGranted/isGranted.t.sol +++ b/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 diff --git a/test/utils/AddressCheckConditionMock.sol b/test/utils/AddressCheckConditionMock.sol new file mode 100644 index 0000000..11c8640 --- /dev/null +++ b/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; + } +} From 5e4cd6a5046f7529e028c80700cecb7cf1e98792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8r=E2=88=82=C2=A1?= Date: Mon, 1 Jun 2026 13:20:15 +0000 Subject: [PATCH 2/2] Up to date OSx commit --- lib/osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/osx b/lib/osx index 22d6a46..1fff7dc 160000 --- a/lib/osx +++ b/lib/osx @@ -1 +1 @@ -Subproject commit 22d6a46099671f1de8270f0c438fc671b0383972 +Subproject commit 1fff7dc4d416d869b5c8c24182125ccd385529ab