Skip to content

Commit

Permalink
revert: removal of placeholder setup
Browse files Browse the repository at this point in the history
  • Loading branch information
heueristik committed Jan 5, 2024
1 parent 158201f commit 6b1fac9
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import placeholderSetupArtifact from '../../../../artifacts/@aragon/osx-commons-contracts/src/plugin/setup/placeholder/PlaceholderSetup.sol/PlaceholderSetup.json';
import placeholderSetupArtifact from '../../../../artifacts/src/framework/plugin/repo/placeholder/PlaceholderSetup.sol/PlaceholderSetup.json';
import {uploadToIPFS} from '../../../helpers';
import placeholderBuildMetadata from '@aragon/osx-commons-contracts/src/plugin/setup/placeholder/placeholder-build-metadata.json';
import {DeployFunction} from 'hardhat-deploy/types';
Expand Down
21 changes: 7 additions & 14 deletions packages/contracts/npm/artifacts.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,29 @@
// JSON artifacts of the contracts
// core
//// dao
import * as PluginV1Mock from '../artifacts/@aragon/osx-commons-contracts/src/mocks/plugin/Constructable/PluginMock.sol/PluginV1Mock.json';
import * as DAO from '../artifacts/src/core/dao/DAO.sol/DAO.json';
//// Permission
import * as PermissionManager from '../artifacts/src/core/permission/PermissionManager.sol/PermissionManager.json';
// framework
//// dao
import * as DAOFactory from '../artifacts/src/framework/dao/DAOFactory.sol/DAOFactory.json';
import * as DAORegistry from '../artifacts/src/framework/dao/DAORegistry.sol/DAORegistry.json';
//// Plugin
///// Repo
// Plugin
import * as PluginRepo from '../artifacts/src/framework/plugin/repo/PluginRepo.sol/PluginRepo.json';
import * as PluginRepoFactory from '../artifacts/src/framework/plugin/repo/PluginRepoFactory.sol/PluginRepoFactory.json';
import * as PluginRepoRegistry from '../artifacts/src/framework/plugin/repo/PluginRepoRegistry.sol/PluginRepoRegistry.json';
///// Setup
/// Setup
import * as PluginSetupProcessor from '../artifacts/src/framework/plugin/setup/PluginSetupProcessor.sol/PluginSetupProcessor.json';
// Plugins
//// Governance
////// Admin
import * as Admin from '../artifacts/src/plugins/governance/admin/Admin.sol/Admin.json';
import * as AdminSetup from '../artifacts/src/plugins/governance/admin/AdminSetup.sol/AdminSetup.json';
////// MajorityVoting
//////// AddresslistVoting
// MajorityVoting
import * as AddresslistVoting from '../artifacts/src/plugins/governance/majority-voting/addresslist/AddresslistVoting.sol/AddresslistVoting.json';
import * as AddresslistVotingSetup from '../artifacts/src/plugins/governance/majority-voting/addresslist/AddresslistVotingSetup.sol/AddresslistVotingSetup.json';
//////// TokenVoting
import * as TokenVoting from '../artifacts/src/plugins/governance/majority-voting/token/TokenVoting.sol/TokenVoting.json';
import * as TokenVotingSetup from '../artifacts/src/plugins/governance/majority-voting/token/TokenVotingSetup.sol/TokenVotingSetup.json';
////// Multisig
// Multisig
import * as Multisig from '../artifacts/src/plugins/governance/multisig/Multisig.sol/Multisig.json';
import * as MultisigSetup from '../artifacts/src/plugins/governance/multisig/MultisigSetup.sol/MultisigSetup.json';
// Token
//// ERC20
////// Governance
import * as GovernanceERC20 from '../artifacts/src/token/ERC20/governance/GovernanceERC20.sol/GovernanceERC20.json';
import * as GovernanceWrappedERC20 from '../artifacts/src/token/ERC20/governance/GovernanceWrappedERC20.sol/GovernanceWrappedERC20.json';

Expand Down Expand Up @@ -60,4 +51,6 @@ export default {

GovernanceERC20,
GovernanceWrappedERC20,

PluginV1Mock,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// SPDX-License-Identifier: AGPL-3.0-or-later

pragma solidity ^0.8.8;

import {PermissionLib} from "@aragon/osx-commons-contracts/src/permission/PermissionLib.sol";
import {IPluginSetup} from "@aragon/osx-commons-contracts/src/plugin/setup/IPluginSetup.sol";
import {PluginSetup} from "@aragon/osx-commons-contracts/src/plugin/setup/PluginSetup.sol";

/// @title PlaceholderSetup
/// @author Aragon Association - 2023
/// @notice A placeholder setup contract for outdated plugin builds. When moving plugin repos to new chains or layers, where only the latest release and build should be available, this placeholder can be used to populate previous builds.
/// @custom:security-contact [email protected]
contract PlaceholderSetup is PluginSetup {
/// @notice Thrown if the dummy is used.
error PlaceholderSetupCannotBeUsed();

/// @inheritdoc IPluginSetup
function prepareInstallation(
address /*_dao*/,
bytes calldata /*_data*/
) external pure returns (address /*plugin*/, PreparedSetupData memory /*preparedSetupData*/) {
revert PlaceholderSetupCannotBeUsed();
}

/// @inheritdoc IPluginSetup
function prepareUninstallation(
address /*_dao*/,
SetupPayload calldata /*_payload*/
) external pure returns (PermissionLib.MultiTargetPermission[] memory /*permissions*/) {
revert PlaceholderSetupCannotBeUsed();
}

/// @inheritdoc IPluginSetup
function implementation() external pure returns (address) {
return address(0);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ui": "",
"change": "",
"pluginSetup": {
"prepareInstallation": "",
"prepareUpdate": "",
"prepareUninstallation": ""
}
}
1 change: 0 additions & 1 deletion packages/contracts/src/test/Migration.sol
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ pragma solidity ^0.8.8;

// Deploy Script
import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import {PlaceholderSetup} from "@aragon/osx-commons-contracts/src/plugin/setup/placeholder/PlaceholderSetup.sol";

// Regression Testing
import {DAO as DAO_v1_0_0} from "@aragon/osx-v1.0.1/core/dao/DAO.sol";
Expand Down

0 comments on commit 6b1fac9

Please sign in to comment.