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.

Sign up for GitHub

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

fix: set optimal default value for auctionReservePrice #830

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −19
Open

fix: set optimal default value for auctionReservePrice #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion packages/nouns-contracts/tasks/deploy-and-configure-short-times-dao-v3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { task, types } from 'hardhat/config';
import { parseEther } from 'ethers/lib/utils';
import { printContractsTable } from './utils';

task(
Expand All @@ -19,7 +20,7 @@ task(
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 Ether */,
types.int,
)
.addOptionalParam(
Expand Down
3 changes: 2 additions & 1 deletion packages/nouns-contracts/tasks/deploy-and-configure-short-times-daov1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { task, types } from 'hardhat/config';
import { parseEther } from 'ethers/lib/utils';
import { printContractsTable } from './utils';

task(
Expand All @@ -19,7 +20,7 @@ task(
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 Ether */,
types.int,
)
.addOptionalParam(
Expand Down
3 changes: 2 additions & 1 deletion packages/nouns-contracts/tasks/deploy-and-configure-short-times.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { task, types } from 'hardhat/config';
import { parseEther } from 'ethers/lib/utils';
import { printContractsTable } from './utils';

task(
Expand All @@ -19,7 +20,7 @@ task(
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 Ether */,
types.int,
)
.addOptionalParam(
Expand Down
13 changes: 9 additions & 4 deletions packages/nouns-contracts/tasks/deploy-local-dao-v3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHo
import { default as NounsDaoDataABI } from '../abi/contracts/governance/data/NounsDAOData.sol/NounsDAOData.json';
import { default as NounsDAOExecutorV2ABI } from '../abi/contracts/governance/NounsDAOExecutorV2.sol/NounsDAOExecutorV2.json';
import { task, types } from 'hardhat/config';
import { Interface, parseUnits } from 'ethers/lib/utils';
import { Interface, parseUnits, parseEther } from 'ethers/lib/utils';
import { Contract as EthersContract } from 'ethers';
import { ContractName } from './types';

Expand Down Expand Up @@ -40,11 +40,16 @@ interface Contract {
task('deploy-local-dao-v3', 'Deploy contracts to hardhat')
.addOptionalParam('noundersdao', 'The nounders DAO contract address')
.addOptionalParam('auctionTimeBuffer', 'The auction time buffer (seconds)', 30, types.int) // Default: 30 seconds
.addOptionalParam('auctionReservePrice', 'The auction reserve price (wei)', 1, types.int) // Default: 1 wei
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
Number(parseEther('68')), // Default: 68 Ether
types.int
)
.addOptionalParam(
'auctionMinIncrementBidPercentage',
'The auction min increment bid percentage (out of 100)', // Default: 5%
5,
'The auction min increment bid percentage (out of 100)',
5, // Default: 5%
types.int,
)
.addOptionalParam('auctionDuration', 'The auction duration (seconds)', 60 * 2, types.int) // Default: 2 minutes
Expand Down
13 changes: 9 additions & 4 deletions packages/nouns-contracts/tasks/deploy-local.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHouse.sol/NounsAuctionHouse.json';
import { task, types } from 'hardhat/config';
import { Interface, parseUnits } from 'ethers/lib/utils';
import { Interface, parseUnits, parseEther } from 'ethers/lib/utils';
import { Contract as EthersContract } from 'ethers';
import { ContractName } from './types';

Expand All @@ -21,11 +21,16 @@ interface Contract {
task('deploy-local', 'Deploy contracts to hardhat')
.addOptionalParam('noundersdao', 'The nounders DAO contract address')
.addOptionalParam('auctionTimeBuffer', 'The auction time buffer (seconds)', 30, types.int) // Default: 30 seconds
.addOptionalParam('auctionReservePrice', 'The auction reserve price (wei)', 1, types.int) // Default: 1 wei
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
Number(parseEther('68')), // Default: 68 Ether
types.int
)
.addOptionalParam(
'auctionMinIncrementBidPercentage',
'The auction min increment bid percentage (out of 100)', // Default: 5%
5,
'The auction min increment bid percentage (out of 100)',
5, // Default: 5%
types.int,
)
.addOptionalParam('auctionDuration', 'The auction duration (seconds)', 60 * 2, types.int) // Default: 2 minutes
Expand Down
4 changes: 2 additions & 2 deletions packages/nouns-contracts/tasks/deploy-short-times-dao-v3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHo
import { default as NounsDAOExecutorV2ABI } from '../abi/contracts/governance/NounsDAOExecutorV2.sol/NounsDAOExecutorV2.json';
import { default as NounsDaoDataABI } from '../abi/contracts/governance/data/NounsDAOData.sol/NounsDAOData.json';
import { ChainId, ContractDeployment, ContractNamesDAOV3, DeployedContract } from './types';
import { Interface, parseUnits } from 'ethers/lib/utils';
import { Interface, parseUnits, parseEther } from 'ethers/lib/utils';
import { task, types } from 'hardhat/config';
import { constants } from 'ethers';
import promptjs from 'prompt';
Expand Down Expand Up @@ -41,7 +41,7 @@ task('deploy-short-times-dao-v3', 'Deploy all Nouns contracts with short gov tim
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 ether */,
types.int,
)
.addOptionalParam(
Expand Down
4 changes: 2 additions & 2 deletions packages/nouns-contracts/tasks/deploy-short-times-daov1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHouse.sol/NounsAuctionHouse.json';
import { ChainId, ContractDeployment, ContractName, DeployedContract } from './types';
import { Interface } from 'ethers/lib/utils';
import { Interface, parseEther} from 'ethers/lib/utils';
import { task, types } from 'hardhat/config';
import { constants } from 'ethers';
import promptjs from 'prompt';
Expand Down Expand Up @@ -36,7 +36,7 @@ task('deploy-short-times-daov1', 'Deploy all Nouns contracts with short gov time
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 ether */,
types.int,
)
.addOptionalParam(
Expand Down
4 changes: 2 additions & 2 deletions packages/nouns-contracts/tasks/deploy-short-times.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHouse.sol/NounsAuctionHouse.json';
import { ChainId, ContractDeployment, ContractNamesDAOV2, DeployedContract } from './types';
import { Interface, parseUnits } from 'ethers/lib/utils';
import { Interface, parseUnits, parseEther} from 'ethers/lib/utils';
import { task, types } from 'hardhat/config';
import { constants } from 'ethers';
import promptjs from 'prompt';
Expand Down Expand Up @@ -39,7 +39,7 @@ task('deploy-short-times', 'Deploy all Nouns contracts with short gov times for
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 ether */,
types.int,
)
.addOptionalParam(
Expand Down
4 changes: 2 additions & 2 deletions packages/nouns-contracts/tasks/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHouse.sol/NounsAuctionHouse.json';
import { ChainId, ContractDeployment, ContractName, DeployedContract } from './types';
import { Interface } from 'ethers/lib/utils';
import { Interface, parseEther } from 'ethers/lib/utils';
import { task, types } from 'hardhat/config';
import { constants } from 'ethers';
import promptjs from 'prompt';
Expand Down Expand Up @@ -36,7 +36,7 @@ task('deploy', 'Deploys NFTDescriptor, NounsDescriptor, NounsSeeder, and NounsTo
.addOptionalParam(
'auctionReservePrice',
'The auction reserve price (wei)',
1 /* 1 wei */,
Number(parseEther('68')) /* 68 ether */,
types.int,
)
.addOptionalParam(
Expand Down