[CLI] Update base contract constructors (#1389)

kumaryash90 · jnsdls · web-flow · commit 53400858232c · 2023-07-26T19:53:06.000Z
Co-authored-by: Jonas Daniels &lt;jonas.daniels@outlook.com&gt;
diff --git a/.changeset/large-ways-pump.md b/.changeset/large-ways-pump.md
@@ -0,0 +1,7 @@
+---
+"@thirdweb-dev/contracts-js": patch
+"thirdweb": patch
+"@thirdweb-dev/sdk": patch
+---
+
+Add default admin param to base contract constructors
diff --git a/packages/cli/src/cli/index.ts b/packages/cli/src/cli/index.ts
@@ -178,7 +178,7 @@ const main = async () => {
               );
 
               // If the package is installed globally with yarn or pnpm, then npx won't recognize it
-              // So we need to make sure to run the command directly
+              // So we need to make sure to run the command directly.
               const executionCommand =
                 !installation.isGlobal || installation.packageManager === "npm"
                   ? `npx thirdweb`
diff --git a/packages/cli/src/constants/base-contracts.ts b/packages/cli/src/constants/base-contracts.ts
@@ -7,12 +7,14 @@ import "@thirdweb-dev/contracts/base/ERC721Base.sol";
 contract Contract is ERC721Base {
 
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps
     )
         ERC721Base(
+            _defaultAdmin,
             _name,
             _symbol,
             _royaltyRecipient,
@@ -28,13 +30,15 @@ import "@thirdweb-dev/contracts/base/ERC721SignatureMint.sol";
 
 contract Contract is ERC721SignatureMint {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps,
         address _primarySaleRecipient
     )
         ERC721SignatureMint(
+            _defaultAdmin,
             _name,
             _symbol,
             _royaltyRecipient,
@@ -50,11 +54,12 @@ import "@thirdweb-dev/contracts/base/ERC721LazyMint.sol";
 
 contract Contract is ERC721LazyMint {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps
-    ) ERC721LazyMint(_name, _symbol, _royaltyRecipient, _royaltyBps) {}
+    ) ERC721LazyMint(_defaultAdmin, _name, _symbol, _royaltyRecipient, _royaltyBps) {}
 }`,
   ERC721DelayedReveal: `// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
@@ -63,11 +68,12 @@ import "@thirdweb-dev/contracts/base/ERC721DelayedReveal.sol";
 
 contract Contract is ERC721DelayedReveal {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps
-    ) ERC721DelayedReveal(_name, _symbol, _royaltyRecipient, _royaltyBps) {}
+    ) ERC721DelayedReveal(_defaultAdmin, _name, _symbol, _royaltyRecipient, _royaltyBps) {}
 }`,
   ERC721Drop: `// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
@@ -76,13 +82,15 @@ import "@thirdweb-dev/contracts/base/ERC721Drop.sol";
 
 contract Contract is ERC721Drop {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps,
         address _primarySaleRecipient
     )
         ERC721Drop(
+            _defaultAdmin,
             _name,
             _symbol,
             _royaltyRecipient,
@@ -99,12 +107,14 @@ import "@thirdweb-dev/contracts/base/ERC1155Base.sol";
 contract Contract is ERC1155Base {
 
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps
     )
         ERC1155Base(
+            _defaultAdmin,
             _name,
             _symbol,
             _royaltyRecipient,
@@ -120,13 +130,15 @@ import "@thirdweb-dev/contracts/base/Staking721Base.sol";
 
 contract Contract is Staking721Base {
       constructor(
+        address _defaultAdmin,
         uint256 _timeUnit,
         uint256 _rewardsPerUnitTime,
         address _nftCollection,
         address _rewardToken,
         address _nativeTokenWrapper
     )
         Staking721Base(
+            _defaultAdmin,
             _timeUnit,
             _rewardsPerUnitTime,
             _nftCollection,
@@ -142,13 +154,15 @@ import "@thirdweb-dev/contracts/base/ERC1155SignatureMint.sol";
 
 contract Contract is ERC1155SignatureMint {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps,
         address _primarySaleRecipient
     )
         ERC1155SignatureMint(
+            _defaultAdmin,
             _name,
             _symbol,
             _royaltyRecipient,
@@ -164,11 +178,12 @@ import "@thirdweb-dev/contracts/base/ERC1155LazyMint.sol";
 
 contract Contract is ERC1155LazyMint {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps
-    ) ERC1155LazyMint(_name, _symbol, _royaltyRecipient, _royaltyBps) {}
+    ) ERC1155LazyMint(_defaultAdmin, _name, _symbol, _royaltyRecipient, _royaltyBps) {}
 }`,
   ERC1155DelayedReveal: `// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
@@ -177,11 +192,12 @@ import "@thirdweb-dev/contracts/base/ERC1155DelayedReveal.sol";
 
 contract Contract is ERC1155DelayedReveal {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps
-    ) ERC1155DelayedReveal(_name, _symbol, _royaltyRecipient, _royaltyBps) {}
+    ) ERC1155DelayedReveal(_defaultAdmin, _name, _symbol, _royaltyRecipient, _royaltyBps) {}
 }`,
   ERC1155Drop: `// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
@@ -190,13 +206,15 @@ import "@thirdweb-dev/contracts/base/ERC1155Drop.sol";
 
 contract Contract is ERC1155Drop {
     constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _royaltyRecipient,
         uint128 _royaltyBps,
         address _primarySaleRecipient
     )
         ERC1155Drop(
+            _defaultAdmin,
             _name,
             _symbol,
             _royaltyRecipient,
@@ -212,13 +230,15 @@ import "@thirdweb-dev/contracts/base/Staking1155Base.sol";
 
 contract Contract is Staking1155Base {
       constructor(
+        address _defaultAdmin,
         uint256 _defaultTimeUnit,
         uint256 _defaultRewardsPerUnitTime,
         address _stakingToken,
         address _rewardToken,
         address _nativeTokenWrapper
     )
         Staking1155Base(
+            _defaultAdmin,
             _defaultTimeUnit,
             _defaultRewardsPerUnitTime,
             _stakingToken,
@@ -234,10 +254,12 @@ import "@thirdweb-dev/contracts/base/ERC20Base.sol";
 
 contract Contract is ERC20Base {
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol
     )
         ERC20Base(
+            _defaultAdmin,
             _name,
             _symbol
         )
@@ -250,10 +272,12 @@ import "@thirdweb-dev/contracts/base/ERC20Vote.sol";
 
 contract Contract is ERC20Vote {
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol
     )
         ERC20Vote(
+            _defaultAdmin,
             _name,
             _symbol
         )
@@ -266,11 +290,13 @@ import "@thirdweb-dev/contracts/base/ERC20SignatureMint.sol";
 
 contract Contract is ERC20SignatureMint {
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _primarySaleRecipient
     )
         ERC20SignatureMint(
+            _defaultAdmin,
             _name,
             _symbol,
             _primarySaleRecipient
@@ -285,11 +311,13 @@ import "@thirdweb-dev/contracts/base/ERC20SignatureMintVote.sol";
 
 contract Contract is ERC20SignatureMintVote {
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _primarySaleRecipient
     )
         ERC20SignatureMintVote(
+            _defaultAdmin,
             _name,
             _symbol,
             _primarySaleRecipient
@@ -304,11 +332,13 @@ import "@thirdweb-dev/contracts/base/ERC20Drop.sol";
 
 contract Contract is ERC20Drop {
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _primarySaleRecipient
     )
         ERC20Drop(
+            _defaultAdmin,
             _name,
             _symbol,
             _primarySaleRecipient
@@ -322,11 +352,13 @@ import "@thirdweb-dev/contracts/base/ERC20DropVote.sol";
 
 contract Contract is ERC20DropVote {
       constructor(
+        address _defaultAdmin,
         string memory _name,
         string memory _symbol,
         address _primarySaleRecipient
     )
         ERC20DropVote(
+            _defaultAdmin,
             _name,
             _symbol,
             _primarySaleRecipient
@@ -340,6 +372,7 @@ import "@thirdweb-dev/contracts/base/Staking20Base.sol";
 
 contract Contract is Staking20Base {
       constructor(
+        address _defaultAdmin,
         uint256 _timeUnit,
         uint256 _rewardRatioNumerator,
         uint256 _rewardRatioDenominator,
@@ -348,6 +381,7 @@ contract Contract is Staking20Base {
         address _nativeTokenWrapper
     )
         Staking20Base(
+            _defaultAdmin,
             _timeUnit,
             _rewardRatioNumerator,
             _rewardRatioDenominator,
diff --git a/packages/contracts-js/package.json b/packages/contracts-js/package.json
@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js",
   "dependencies": {
-    "@thirdweb-dev/contracts": "3.7.0-0"
+    "@thirdweb-dev/contracts": "3.8.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.22.5",
diff --git a/packages/sdk/test/evm/new-publish-deploy.test.ts b/packages/sdk/test/evm/new-publish-deploy.test.ts
@@ -117,7 +117,7 @@ describe("New Publish Flow", async () => {
       const admin = await adminWallet.getAddress();
       const contractAddress = await sdk.deployer.deployContractFromUri(
         mockPublishUri,
-        ["Direct Deploy ERC721Base", "DDE", admin, 5],
+        [admin, "Direct Deploy ERC721Base", "DDE", admin, 5],
       );
       const contract = await sdk.getContract(contractAddress);
 
@@ -266,7 +266,7 @@ describe("New Publish Flow", async () => {
       const admin = await adminWallet.getAddress();
       const contractAddress = await sdk.deployer.deployContractFromUri(
         mockPublishUri,
-        ["Direct Deploy ERC721Base", "DDE", admin, 5],
+        [admin, "Direct Deploy ERC721Base", "DDE", admin, 5],
       );
       const contract = await sdk.getContract(contractAddress);
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
