diff --git a/contracts/multisigs/APTeamMultiSig.sol b/contracts/multisigs/APTeamMultiSig.sol index 86c5141d9..48944ec1f 100644 --- a/contracts/multisigs/APTeamMultiSig.sol +++ b/contracts/multisigs/APTeamMultiSig.sol @@ -4,12 +4,17 @@ pragma solidity ^0.8.19; import {MultiSigGeneric} from "./MultiSigGeneric.sol"; contract APTeamMultiSig is MultiSigGeneric { + /// @dev Initializes MultiSig's state variables. + /// @param owners List of initial owners. + /// @param _approvalsRequired Number of required confirmations. + /// @param _requireExecution setting for if an explicit execution call is required + /// @param _transactionExpiry Proposal expiry time in seconds function initializeAPTeam( address[] memory owners, uint256 _approvalsRequired, bool _requireExecution, uint256 _transactionExpiry - ) public initializer { + ) external initializer { super.initialize(owners, _approvalsRequired, _requireExecution, _transactionExpiry); } } diff --git a/contracts/multisigs/CharityApplications.sol b/contracts/multisigs/CharityApplications.sol index a9f12d3cc..20de85eeb 100644 --- a/contracts/multisigs/CharityApplications.sol +++ b/contracts/multisigs/CharityApplications.sol @@ -89,7 +89,7 @@ contract CharityApplications is MultiSigGeneric, StorageApplications, ICharityAp uint256 _seedSplitToLiquid, address _seedAsset, uint256 _seedAmount - ) public override initializer { + ) external override initializer { require(Validator.addressChecker(_accountsContract), "Invalid Accounts contract"); require(Validator.addressChecker(_seedAsset), "Invalid seed asset"); require( diff --git a/contracts/multisigs/MultiSigGeneric.sol b/contracts/multisigs/MultiSigGeneric.sol index aefae1c94..e4517d278 100644 --- a/contracts/multisigs/MultiSigGeneric.sol +++ b/contracts/multisigs/MultiSigGeneric.sol @@ -312,7 +312,7 @@ contract MultiSigGeneric is uint256 _approvalsRequired, bool _requireExecution, uint256 _transactionExpiry - ) internal initializer validApprovalsRequirement(owners.length, _approvalsRequired) { + ) internal onlyInitializing validApprovalsRequirement(owners.length, _approvalsRequired) { require(owners.length > 0, "Must pass at least one owner address"); for (uint256 i = 0; i < owners.length; i++) { require( diff --git a/contracts/multisigs/endowment-multisig/EndowmentMultiSig.sol b/contracts/multisigs/endowment-multisig/EndowmentMultiSig.sol index f2bfd81e8..055719b81 100644 --- a/contracts/multisigs/endowment-multisig/EndowmentMultiSig.sol +++ b/contracts/multisigs/endowment-multisig/EndowmentMultiSig.sol @@ -32,7 +32,7 @@ contract EndowmentMultiSig is MultiSigGeneric { uint256 _required, bool _requireExecution, uint256 _transactionExpiry - ) public initializer { + ) external initializer { require(Validator.addressChecker(_emitter), "Invalid Emitter Address"); ENDOWMENT_ID = _endowmentId; EMITTER_ADDRESS = _emitter; diff --git a/contracts/multisigs/interfaces/ICharityApplications.sol b/contracts/multisigs/interfaces/ICharityApplications.sol index a2e6c1670..774a538de 100644 --- a/contracts/multisigs/interfaces/ICharityApplications.sol +++ b/contracts/multisigs/interfaces/ICharityApplications.sol @@ -48,7 +48,7 @@ abstract contract ICharityApplications { uint256 _seedSplitToLiquid, address _seedAsset, uint256 _seedAmount - ) public virtual; + ) external virtual; function proposeApplication( AccountMessages.CreateEndowmentRequest memory application,