refactor: imports

aragon · Jan 4, 2024 · 3301197 · 3301197
1 parent d7636b1
commit 3301197
Show file tree

Hide file tree

Showing 39 changed files with 69 additions and 75 deletions.
diff --git a/packages/contracts/deploy/helpers.ts b/packages/contracts/deploy/helpers.ts
@@ -7,11 +7,8 @@ import {
 } from '../typechain';
 import {VersionCreatedEvent} from '../typechain/PluginRepo';
 import {PluginRepoRegisteredEvent} from '../typechain/PluginRepoRegistry';
-import {
-  findEvent,
-  findEventTopicLog,
-} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {findEvent, findEventTopicLog} from '@aragon/osx-commons-sdk';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {Contract} from 'ethers';
 import {promises as fs} from 'fs';

diff --git a/packages/contracts/deploy/new/00_managing-dao/01_managing-dao-permissions.ts b/packages/contracts/deploy/new/00_managing-dao/01_managing-dao-permissions.ts
@@ -1,6 +1,6 @@
 import {DAO__factory} from '../../../typechain';
 import {getContractAddress, managePermissions} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/00_managing-dao/20_set-dao-permission.ts b/packages/contracts/deploy/new/00_managing-dao/20_set-dao-permission.ts
@@ -4,7 +4,7 @@ import {
   getContractAddress,
   managePermissions,
 } from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/00_managing-dao/99_verify_step.ts b/packages/contracts/deploy/new/00_managing-dao/99_verify_step.ts
@@ -4,7 +4,7 @@ import {
   DAO_PERMISSIONS,
   getContractAddress,
 } from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/20_permissions/00_ens-permissions.ts b/packages/contracts/deploy/new/20_permissions/00_ens-permissions.ts
@@ -1,6 +1,6 @@
 import {DAO__factory} from '../../../typechain';
 import {getContractAddress, managePermissions} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/20_permissions/10_dao-registry-permissions.ts b/packages/contracts/deploy/new/20_permissions/10_dao-registry-permissions.ts
@@ -1,6 +1,6 @@
 import {DAO__factory} from '../../../typechain';
 import {getContractAddress, managePermissions} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/20_permissions/20_plugin-registrty-permissions.ts b/packages/contracts/deploy/new/20_permissions/20_plugin-registrty-permissions.ts
@@ -1,6 +1,6 @@
 import {DAO__factory} from '../../../typechain';
 import {getContractAddress, managePermissions} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/20_permissions/99_verify.ts b/packages/contracts/deploy/new/20_permissions/99_verify.ts
@@ -1,6 +1,6 @@
 import {DAO__factory} from '../../../typechain';
 import {checkPermission, getContractAddress} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/00_grant-permissions.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/00_grant-permissions.ts
@@ -1,6 +1,6 @@
 import {DAO__factory, PluginRepo__factory} from '../../../typechain';
 import {getContractAddress, managePermissions, Permission} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/...ages/contracts/deploy/new/40_finalize-managing-dao/30_install-multisig-on-managing-dao.ts b/...ages/contracts/deploy/new/40_finalize-managing-dao/30_install-multisig-on-managing-dao.ts
@@ -8,9 +8,9 @@ import {
 import {InstallationPreparedEvent} from '../../../typechain/PluginSetupProcessor';
 import {hashHelpers} from '../../../utils/psp';
 import {checkPermission, getContractAddress} from '../../helpers';
-import {findEvent} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk/src/metadata';
+import {findEvent} from '@aragon/osx-commons-sdk';
+import {Operation} from '@aragon/osx-commons-sdk';
+import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/40_revoke-permissions.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/40_revoke-permissions.ts
@@ -1,6 +1,6 @@
 import {DAO__factory, PluginRepo__factory} from '../../../typechain';
 import {getContractAddress, managePermissions, Permission} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/99_verify_step.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/99_verify_step.ts
@@ -1,6 +1,6 @@
 import {DAO__factory} from '../../../typechain';
 import {checkPermission, getContractAddress} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/update/to_v1.3.0/10_DAOFactory.ts b/packages/contracts/deploy/update/to_v1.3.0/10_DAOFactory.ts
@@ -1,7 +1,7 @@
 import daoFactoryArtifact from '../../../artifacts/src/framework/dao/DAOFactory.sol/DAOFactory.json';
 import {DAO__factory} from '../../../typechain';
 import {getActiveContractAddress} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/packages/contracts/deploy/update/to_v1.3.0/20_PluginRepoFactory.ts b/packages/contracts/deploy/update/to_v1.3.0/20_PluginRepoFactory.ts
@@ -1,7 +1,7 @@
 import pluginRepoFactoryArtifact from '../../../artifacts/src/framework/plugin/repo/PluginRepoFactory.sol/PluginRepoFactory.json';
 import {PluginRepo__factory} from '../../../typechain';
 import {getActiveContractAddress} from '../../helpers';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 

diff --git a/...developer-portal/02-how-to-guides/02-plugin-development/07-publication/index.md b/...developer-portal/02-how-to-guides/02-plugin-development/07-publication/index.md
@@ -48,7 +48,7 @@ import releaseMetadata1 from '../../contracts/release1/release-metadata.json';
 import {networkNameMapping, osxContracts, addDeployedContract} from '../../utils/helpers';
 import {toHex} from '../../utils/ipfs-upload';
 import {uploadToIPFS} from '../../utils/ipfs-upload';
-import {findEventTopicLog} from '@aragon/osx-commons-sdk/src/from_osx/events';
+import {findEventTopicLog} from '@aragon/osx-commons-sdk';
 import {
   PluginRepoFactory__factory,
   PluginRepoRegistry__factory,

diff --git a/packages/contracts/src/package.json b/packages/contracts/src/package.json
@@ -16,7 +16,7 @@
   },
   "homepage": "https://github.com/aragon/osx#readme",
   "dependencies": {
-    "@aragon/osx-commons-contracts": "0.0.1-alpha.0",
+    "@aragon/osx-commons-contracts": "0.0.1-alpha.2",
     "@ensdomains/ens-contracts": "0.0.11",
     "@openzeppelin/contracts": "4.9.5",
     "@openzeppelin/contracts-upgradeable": "4.9.5"

diff --git a/packages/contracts/test/core/dao/dao.ts b/packages/contracts/test/core/dao/dao.ts
@@ -41,12 +41,9 @@ import {
   IMPLICIT_INITIAL_PROTOCOL_VERSION,
 } from '@aragon/osx-commons-contracts/protocol-version';
 import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
-import {flipBit} from '@aragon/osx-commons-sdk/src/from_osx/bitmap';
-import {
-  IDAO_EVENTS,
-  findEvent,
-} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {IDAO_EVENTS, findEvent} from '@aragon/osx-commons-sdk';
+import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {flipBit} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {smock} from '@defi-wonderland/smock';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';

diff --git a/packages/contracts/test/core/permission/permission-manager.ts b/packages/contracts/test/core/permission/permission-manager.ts
@@ -5,8 +5,8 @@ import {
   PermissionConditionMock__factory,
   TestPlugin__factory,
 } from '../../../typechain';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
+import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ethers} from 'hardhat';

diff --git a/packages/contracts/test/deploy/managing-dao.ts b/packages/contracts/test/deploy/managing-dao.ts
@@ -19,7 +19,7 @@ import {
   ENS_REGISTRAR_PERMISSIONS,
   PLUGIN_REGISTRY_PERMISSIONS,
   PLUGIN_REPO_PERMISSIONS,
-} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+} from '@aragon/osx-commons-sdk';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import hre, {ethers, deployments} from 'hardhat';

diff --git a/packages/contracts/test/framework/dao/dao-factory.ts b/packages/contracts/test/framework/dao/dao-factory.ts
@@ -49,14 +49,14 @@ import {
 } from '../../test-utils/repo';
 import {CURRENT_PROTOCOL_VERSION} from '@aragon/osx-commons-contracts/protocol-version';
 import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
-import {findEventTopicLog} from '@aragon/osx-commons-sdk/src/from_osx/events';
+import {findEventTopicLog} from '@aragon/osx-commons-sdk';
 import {
   DAO_PERMISSIONS,
   DAO_REGISTRY_PERMISSIONS,
   PLUGIN_REGISTRY_PERMISSIONS,
   PLUGIN_REPO_PERMISSIONS,
   PLUGIN_SETUP_PROCESSOR_PERMISSIONS,
-} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {anyValue} from '@nomicfoundation/hardhat-chai-matchers/withArgs';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';

diff --git a/packages/contracts/test/framework/dao/dao-registry.ts b/packages/contracts/test/framework/dao/dao-registry.ts
@@ -22,7 +22,7 @@ import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
 import {
   DAO_REGISTRY_PERMISSIONS,
   ENS_REGISTRAR_PERMISSIONS,
-} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+} from '@aragon/osx-commons-sdk';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ContractFactory} from 'ethers';

diff --git a/packages/contracts/test/framework/plugin/plugin-repo-factory.ts b/packages/contracts/test/framework/plugin/plugin-repo-factory.ts
@@ -14,7 +14,7 @@ import {
   deployPluginRepoRegistry,
 } from '../../test-utils/repo';
 import {CURRENT_PROTOCOL_VERSION} from '@aragon/osx-commons-contracts/protocol-version';
-import {PLUGIN_REGISTRY_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {PLUGIN_REGISTRY_PERMISSIONS} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';

diff --git a/packages/contracts/test/framework/plugin/plugin-repo-registry.ts b/packages/contracts/test/framework/plugin/plugin-repo-registry.ts
@@ -21,7 +21,7 @@ import {
   IMPLICIT_INITIAL_PROTOCOL_VERSION,
 } from '@aragon/osx-commons-contracts/protocol-version';
 import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
-import {PLUGIN_REGISTRY_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {PLUGIN_REGISTRY_PERMISSIONS} from '@aragon/osx-commons-sdk';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ContractFactory} from 'ethers';

diff --git a/packages/contracts/test/framework/plugin/plugin-repo.ts b/packages/contracts/test/framework/plugin/plugin-repo.ts
@@ -27,7 +27,7 @@ import {
   CURRENT_PROTOCOL_VERSION,
   IMPLICIT_INITIAL_PROTOCOL_VERSION,
 } from '@aragon/osx-commons-contracts/protocol-version';
-import {PLUGIN_REPO_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {PLUGIN_REPO_PERMISSIONS} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';

diff --git a/packages/contracts/test/framework/plugin/plugin-setup-processor.ts b/packages/contracts/test/framework/plugin/plugin-setup-processor.ts
@@ -72,15 +72,15 @@ import {
   deployPluginRepoRegistry,
 } from '../../test-utils/repo';
 import {CURRENT_PROTOCOL_VERSION} from '@aragon/osx-commons-contracts/protocol-version';
-import {findEventTopicLog} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {findEventTopicLog} from '@aragon/osx-commons-sdk';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {
   DAO_PERMISSIONS,
   ENS_REGISTRAR_PERMISSIONS,
   PLUGIN_REGISTRY_PERMISSIONS,
   PLUGIN_SETUP_PROCESSOR_PERMISSIONS,
   PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS,
-} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+} from '@aragon/osx-commons-sdk';
 import {MockContract, smock} from '@defi-wonderland/smock';
 import {anyValue} from '@nomicfoundation/hardhat-chai-matchers/withArgs';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';

diff --git a/packages/contracts/test/framework/utils/ens/ens-subdomain-registry.ts b/packages/contracts/test/framework/utils/ens/ens-subdomain-registry.ts
@@ -22,7 +22,7 @@ import {
   IMPLICIT_INITIAL_PROTOCOL_VERSION,
 } from '@aragon/osx-commons-contracts/protocol-version';
 import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
-import {ENS_REGISTRAR_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {ENS_REGISTRAR_PERMISSIONS} from '@aragon/osx-commons-sdk';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ContractFactory} from 'ethers';

diff --git a/packages/contracts/test/plugins/governance/admin/admin-setup.ts b/packages/contracts/test/plugins/governance/admin/admin-setup.ts
@@ -9,10 +9,10 @@ import {
   ADMIN_INTERFACE,
   EXECUTE_PROPOSAL_PERMISSION_ID,
 } from './admin-constants';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
+import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
-import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk/src/metadata';
 import {expect} from 'chai';
 import {ethers} from 'hardhat';
 

diff --git a/packages/contracts/test/plugins/governance/admin/admin.ts b/packages/contracts/test/plugins/governance/admin/admin.ts
@@ -23,9 +23,9 @@ import {
   IPROPOSAL_EVENTS,
   findEvent,
   findEventTopicLog,
-} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {proposalIdToBytes32} from '@aragon/osx-commons-sdk/src/from_osx/proposal';
+} from '@aragon/osx-commons-sdk';
+import {DAO_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {proposalIdToBytes32} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';

diff --git a/...contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting-setup.ts b/...contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting-setup.ts
@@ -7,11 +7,11 @@ import {
 import {deployNewDAO} from '../../../../test-utils/dao';
 import {VotingSettings, VotingMode} from '../voting-helpers';
 import {ADDRESSLIST_VOTING_INTERFACE} from './addresslist-voting-constants';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {TIME} from '@aragon/osx-commons-sdk/src/from_osx/time';
+import {Operation} from '@aragon/osx-commons-sdk';
+import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk';
+import {TIME} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {pctToRatio} from '@aragon/osx-commons-sdk/src/math';
-import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk/src/metadata';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ethers} from 'hardhat';

diff --git a/packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts b/packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts
@@ -47,10 +47,10 @@ import {
   IPROPOSAL_EVENTS,
   findEvent,
   findEventTopicLog,
-} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {proposalIdToBytes32} from '@aragon/osx-commons-sdk/src/from_osx/proposal';
-import {TIME} from '@aragon/osx-commons-sdk/src/from_osx/time';
+} from '@aragon/osx-commons-sdk';
+import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {proposalIdToBytes32} from '@aragon/osx-commons-sdk';
+import {TIME} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {pctToRatio} from '@aragon/osx-commons-sdk/src/math';
 import {time} from '@nomicfoundation/hardhat-network-helpers';

diff --git a/packages/contracts/test/plugins/governance/majority-voting/majority-voting.ts b/packages/contracts/test/plugins/governance/majority-voting/majority-voting.ts
@@ -12,7 +12,7 @@ import {
 import {MAJORITY_VOTING_BASE_INTERFACE} from './majority-voting-constants';
 import {VotingSettings, VotingMode} from './voting-helpers';
 import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
-import {TIME} from '@aragon/osx-commons-sdk/src/from_osx/time';
+import {TIME} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {pctToRatio} from '@aragon/osx-commons-sdk/src/math';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';

diff --git a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup.ts b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup.ts
@@ -13,11 +13,11 @@ import {
 import {deployNewDAO} from '../../../../test-utils/dao';
 import {VotingMode, VotingSettings} from '../voting-helpers';
 import {TOKEN_VOTING_INTERFACE} from './token-voting-constants';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {TIME} from '@aragon/osx-commons-sdk/src/from_osx/time';
+import {Operation} from '@aragon/osx-commons-sdk';
+import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk';
+import {TIME} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {pctToRatio} from '@aragon/osx-commons-sdk/src/math';
-import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk/src/metadata';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ethers} from 'hardhat';

diff --git a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts
@@ -48,11 +48,11 @@ import {
   IPROPOSAL_EVENTS,
   findEvent,
   findEventTopicLog,
-} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {proposalIdToBytes32} from '@aragon/osx-commons-sdk/src/from_osx/proposal';
-import {TIME} from '@aragon/osx-commons-sdk/src/from_osx/time';
+} from '@aragon/osx-commons-sdk';
+import '@aragon/osx-commons-sdk';
+import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {proposalIdToBytes32} from '@aragon/osx-commons-sdk';
+import {TIME} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {RATIO_BASE, pctToRatio} from '@aragon/osx-commons-sdk/src/math';
 import {time} from '@nomicfoundation/hardhat-network-helpers';

diff --git a/packages/contracts/test/plugins/governance/multisig/multisig-setup.ts b/packages/contracts/test/plugins/governance/multisig/multisig-setup.ts
@@ -26,14 +26,14 @@ import {
   UPDATE_MULTISIG_SETTINGS_PERMISSION_ID,
 } from './multisig-constants';
 import {deployWithProxy} from '@aragon/osx-commons-contracts/utils/proxy';
-import {findEvent} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {findEvent} from '@aragon/osx-commons-sdk';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {
   DAO_PERMISSIONS,
   PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS,
-} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+} from '@aragon/osx-commons-sdk';
+import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
-import {getNamedTypesFromMetadata} from '@aragon/osx-commons-sdk/src/metadata';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';
 import {expect} from 'chai';
 import {ethers} from 'hardhat';

diff --git a/packages/contracts/test/plugins/governance/multisig/multisig.ts b/packages/contracts/test/plugins/governance/multisig/multisig.ts
@@ -38,9 +38,9 @@ import {
   IPROPOSAL_EVENTS,
   findEvent,
   findEventTopicLog,
-} from '@aragon/osx-commons-sdk/src/from_osx/events';
-import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk/src/from_osx/permission';
-import {proposalIdToBytes32} from '@aragon/osx-commons-sdk/src/from_osx/proposal';
+} from '@aragon/osx-commons-sdk';
+import {PLUGIN_UUPS_UPGRADEABLE_PERMISSIONS} from '@aragon/osx-commons-sdk';
+import {proposalIdToBytes32} from '@aragon/osx-commons-sdk';
 import {getInterfaceId} from '@aragon/osx-commons-sdk/src/interfaces';
 import {time} from '@nomicfoundation/hardhat-network-helpers';
 import {SignerWithAddress} from '@nomiclabs/hardhat-ethers/signers';

diff --git a/packages/contracts/test/test-utils/psp/mock-helpers.ts b/packages/contracts/test/test-utils/psp/mock-helpers.ts
@@ -1,4 +1,4 @@
-import {Operation} from '@aragon/osx-commons-sdk/src/from_osx/permission';
+import {Operation} from '@aragon/osx-commons-sdk';
 import {utils, constants} from 'ethers';
 import {ethers} from 'hardhat';