Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standard proposal condition #3

Closed
wants to merge 5 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Parameterized approval thresholds
Jør∂¡ committed Mar 22, 2024
commit 07ad2d9b0f55960d28293eec833d9114b1683607
14 changes: 9 additions & 5 deletions script/Deploy.sol
Original file line number Diff line number Diff line change
@@ -19,9 +19,6 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
import {DAO} from "@aragon/osx/core/dao/DAO.sol";
import {createERC1967Proxy} from "@aragon/osx/utils/Proxy.sol";

uint16 constant MIN_EMERGENCY_APPROVALS = 11;
uint16 constant MIN_STD_APPROVALS = 7;

contract Deploy is Script {
DAO daoImplementation;
Multisig multisigImplementation;
@@ -33,6 +30,9 @@ contract Deploy is Script {
address tokenAddress;
address[] multisigMembers;

uint16 minStdApprovals;
uint16 minEmergencyApprovals;

address lzAppEndpoint;

constructor() {
@@ -50,6 +50,10 @@ contract Deploy is Script {
pluginRepoFactory = vm.envAddress("PLUGIN_REPO_FACTORY");
tokenAddress = vm.envAddress("TOKEN_ADDRESS");

minStdApprovals = uint16(vm.envUint("MIN_STD_APPROVALS"));
minEmergencyApprovals = uint16(vm.envUint("MIN_EMERGENCY_APPROVALS"));

// JSON list of members
string memory root = vm.projectRoot();
string memory path = string.concat(root, "/utils/members.json");
string memory json = vm.readFile(path);
@@ -174,7 +178,7 @@ contract Deploy is Script {
multisigMembers,
Multisig.MultisigSettings(
true, // onlyListed
MIN_STD_APPROVALS // minAppovals
minStdApprovals // minAppovals
),
lzAppEndpoint
);
@@ -221,7 +225,7 @@ contract Deploy is Script {
multisigMembers,
Multisig.MultisigSettings(
true, // onlyListed
MIN_EMERGENCY_APPROVALS // minAppovals
minEmergencyApprovals // minAppovals
),
lzAppEndpoint
);