Skip to content

Commit 0d3b885

Browse files
authored
Default admin param in base contract constructors (#435)
* remove msg.sender from base contract constructors * v3.8.0-0
1 parent 10e06b5 commit 0d3b885

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+88
-49
lines changed

contracts/base/ERC1155Base.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,13 @@ contract ERC1155Base is
6464
//////////////////////////////////////////////////////////////*/
6565

6666
constructor(
67+
address _defaultAdmin,
6768
string memory _name,
6869
string memory _symbol,
6970
address _royaltyRecipient,
7071
uint128 _royaltyBps
7172
) ERC1155(_name, _symbol) {
72-
_setupOwner(msg.sender);
73+
_setupOwner(_defaultAdmin);
7374
_setupDefaultRoyaltyInfo(_royaltyRecipient, _royaltyBps);
7475
_setOperatorRestriction(true);
7576
}

contracts/base/ERC1155DelayedReveal.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ contract ERC1155DelayedReveal is ERC1155LazyMint, DelayedReveal {
3232
//////////////////////////////////////////////////////////////*/
3333

3434
constructor(
35+
address _defaultAdmin,
3536
string memory _name,
3637
string memory _symbol,
3738
address _royaltyRecipient,
3839
uint128 _royaltyBps
39-
) ERC1155LazyMint(_name, _symbol, _royaltyRecipient, _royaltyBps) {}
40+
) ERC1155LazyMint(_defaultAdmin, _name, _symbol, _royaltyRecipient, _royaltyBps) {}
4041

4142
/*//////////////////////////////////////////////////////////////
4243
Overriden Metadata logic

contracts/base/ERC1155Drop.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,14 @@ contract ERC1155Drop is
7272
//////////////////////////////////////////////////////////////*/
7373

7474
constructor(
75+
address _defaultAdmin,
7576
string memory _name,
7677
string memory _symbol,
7778
address _royaltyRecipient,
7879
uint128 _royaltyBps,
7980
address _primarySaleRecipient
8081
) ERC1155(_name, _symbol) {
81-
_setupOwner(msg.sender);
82+
_setupOwner(_defaultAdmin);
8283
_setupDefaultRoyaltyInfo(_royaltyRecipient, _royaltyBps);
8384
_setupPrimarySaleRecipient(_primarySaleRecipient);
8485
_setOperatorRestriction(true);

contracts/base/ERC1155LazyMint.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ contract ERC1155LazyMint is
7878
//////////////////////////////////////////////////////////////*/
7979

8080
constructor(
81+
address _defaultAdmin,
8182
string memory _name,
8283
string memory _symbol,
8384
address _royaltyRecipient,
8485
uint128 _royaltyBps
8586
) ERC1155(_name, _symbol) {
86-
_setupOwner(msg.sender);
87+
_setupOwner(_defaultAdmin);
8788
_setupDefaultRoyaltyInfo(_royaltyRecipient, _royaltyBps);
8889
_setOperatorRestriction(true);
8990
}

contracts/base/ERC1155SignatureMint.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ contract ERC1155SignatureMint is ERC1155Base, PrimarySale, SignatureMintERC1155
2929
//////////////////////////////////////////////////////////////*/
3030

3131
constructor(
32+
address _defaultAdmin,
3233
string memory _name,
3334
string memory _symbol,
3435
address _royaltyRecipient,
3536
uint128 _royaltyBps,
3637
address _primarySaleRecipient
37-
) ERC1155Base(_name, _symbol, _royaltyRecipient, _royaltyBps) {
38+
) ERC1155Base(_defaultAdmin, _name, _symbol, _royaltyRecipient, _royaltyBps) {
3839
_setupPrimarySaleRecipient(_primarySaleRecipient);
3940
}
4041

contracts/base/ERC20Base.sol

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ contract ERC20Base is ContractMetadata, Multicall, Ownable, ERC20Permit, IMintab
3131
Constructor
3232
//////////////////////////////////////////////////////////////*/
3333

34-
constructor(string memory _name, string memory _symbol) ERC20Permit(_name, _symbol) {
35-
_setupOwner(msg.sender);
34+
constructor(
35+
address _defaultAdmin,
36+
string memory _name,
37+
string memory _symbol
38+
) ERC20Permit(_name, _symbol) {
39+
_setupOwner(_defaultAdmin);
3640
}
3741

3842
/*//////////////////////////////////////////////////////////////

contracts/base/ERC20Drop.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ contract ERC20Drop is ContractMetadata, Multicall, Ownable, ERC20Permit, Primary
4040
//////////////////////////////////////////////////////////////*/
4141

4242
constructor(
43+
address _defaultAdmin,
4344
string memory _name,
4445
string memory _symbol,
4546
address _primarySaleRecipient
4647
) ERC20Permit(_name, _symbol) {
47-
_setupOwner(msg.sender);
48+
_setupOwner(_defaultAdmin);
4849
_setupPrimarySaleRecipient(_primarySaleRecipient);
4950
}
5051

contracts/base/ERC20DropVote.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ contract ERC20DropVote is ContractMetadata, Multicall, Ownable, ERC20Votes, Prim
3939
//////////////////////////////////////////////////////////////*/
4040

4141
constructor(
42+
address _defaultAdmin,
4243
string memory _name,
4344
string memory _symbol,
4445
address _primarySaleRecipient
4546
) ERC20Permit(_name, _symbol) {
46-
_setupOwner(msg.sender);
47+
_setupOwner(_defaultAdmin);
4748
_setupPrimarySaleRecipient(_primarySaleRecipient);
4849
}
4950

contracts/base/ERC20SignatureMint.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ contract ERC20SignatureMint is ERC20Base, PrimarySale, SignatureMintERC20 {
2929
//////////////////////////////////////////////////////////////*/
3030

3131
constructor(
32+
address _defaultAdmin,
3233
string memory _name,
3334
string memory _symbol,
3435
address _primarySaleRecipient
35-
) ERC20Base(_name, _symbol) {
36+
) ERC20Base(_defaultAdmin, _name, _symbol) {
3637
_setupPrimarySaleRecipient(_primarySaleRecipient);
3738
}
3839

contracts/base/ERC20SignatureMintVote.sol

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ contract ERC20SignatureMintVote is ERC20Vote, PrimarySale, SignatureMintERC20 {
2929
//////////////////////////////////////////////////////////////*/
3030

3131
constructor(
32+
address _defaultAdmin,
3233
string memory _name,
3334
string memory _symbol,
3435
address _primarySaleRecipient
35-
) ERC20Vote(_name, _symbol) {
36+
) ERC20Vote(_defaultAdmin, _name, _symbol) {
3637
_setupPrimarySaleRecipient(_primarySaleRecipient);
3738
}
3839

0 commit comments

Comments
 (0)