From b65fabca435ed97e416dcad6637be0f48581b373 Mon Sep 17 00:00:00 2001 From: Serkan Reis Date: Fri, 21 Oct 2022 22:30:24 +0300 Subject: [PATCH 1/3] Fix: non-functional update_start_trading_time() --- components/collections/actions/actions.ts | 4 ++-- contracts/minter/contract.ts | 8 ++++---- contracts/minter/messages/execute.ts | 4 ++-- pages/contracts/minter/execute.tsx | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/collections/actions/actions.ts b/components/collections/actions/actions.ts index 588e8d8..af174cf 100644 --- a/components/collections/actions/actions.ts +++ b/components/collections/actions/actions.ts @@ -149,7 +149,7 @@ export type DispatchExecuteArgs = { | { type: Select<'batch_mint'>; recipient: string; batchNumber: number } | { type: Select<'set_whitelist'>; whitelist: string } | { type: Select<'update_start_time'>; startTime: string } - | { type: Select<'update_start_trading_time'>; startTime: string } + | { type: Select<'update_start_trading_time'>; startTime?: string } | { type: Select<'update_per_address_limit'>; limit: number } | { type: Select<'shuffle'> } | { type: Select<'withdraw'> } @@ -259,7 +259,7 @@ export const previewExecutePayload = (args: DispatchExecuteArgs) => { return minterMessages(minterContract)?.updateStartTime(args.startTime) } case 'update_start_trading_time': { - return minterMessages(minterContract)?.updateStartTradingTime(args.startTime) + return minterMessages(minterContract)?.updateStartTradingTime(args.startTime as string) } case 'update_per_address_limit': { return minterMessages(minterContract)?.updatePerAddressLimit(args.limit) diff --git a/contracts/minter/contract.ts b/contracts/minter/contract.ts index eb77006..db89d9e 100644 --- a/contracts/minter/contract.ts +++ b/contracts/minter/contract.ts @@ -33,7 +33,7 @@ export interface MinterInstance { updateMintPrice: (senderAddress: string, price: string) => Promise setWhitelist: (senderAddress: string, whitelist: string) => Promise updateStartTime: (senderAddress: string, time: Timestamp) => Promise - updateStartTradingTime: (senderAddress: string, time: Timestamp) => Promise + updateStartTradingTime: (senderAddress: string, time?: Timestamp) => Promise updatePerAddressLimit: (senderAddress: string, perAddressLimit: number) => Promise mintTo: (senderAddress: string, recipient: string) => Promise mintFor: (senderAddress: string, recipient: string, tokenId: number) => Promise @@ -325,7 +325,7 @@ export const minter = (client: SigningCosmWasmClient, txSigner: string): MinterC senderAddress, contractAddress, { - update_start_time: { time }, + update_start_time: time, }, 'auto', '', @@ -334,12 +334,12 @@ export const minter = (client: SigningCosmWasmClient, txSigner: string): MinterC return res.transactionHash } - const updateStartTradingTime = async (senderAddress: string, time: Timestamp): Promise => { + const updateStartTradingTime = async (senderAddress: string, time?: Timestamp): Promise => { const res = await client.execute( senderAddress, contractAddress, { - update_start_trading_time: { time }, + update_start_trading_time: time || null, }, 'auto', '', diff --git a/contracts/minter/messages/execute.ts b/contracts/minter/messages/execute.ts index b57f45b..f2f072f 100644 --- a/contracts/minter/messages/execute.ts +++ b/contracts/minter/messages/execute.ts @@ -101,7 +101,7 @@ export type DispatchExecuteArgs = { | { type: Select<'update_mint_price'>; price: string } | { type: Select<'set_whitelist'>; whitelist: string } | { type: Select<'update_start_time'>; startTime: string } - | { type: Select<'update_start_trading_time'>; startTime: string } + | { type: Select<'update_start_trading_time'>; startTime?: string } | { type: Select<'update_per_address_limit'>; limit: number } | { type: Select<'mint_to'>; recipient: string } | { type: Select<'mint_for'>; recipient: string; tokenId: number } @@ -179,7 +179,7 @@ export const previewExecutePayload = (args: DispatchExecuteArgs) => { return messages(contract)?.updateStartTime(args.startTime) } case 'update_start_trading_time': { - return messages(contract)?.updateStartTradingTime(args.startTime) + return messages(contract)?.updateStartTradingTime(args.startTime as string) } case 'update_per_address_limit': { return messages(contract)?.updatePerAddressLimit(args.limit) diff --git a/pages/contracts/minter/execute.tsx b/pages/contracts/minter/execute.tsx index 15747ec..302854f 100644 --- a/pages/contracts/minter/execute.tsx +++ b/pages/contracts/minter/execute.tsx @@ -80,7 +80,7 @@ const MinterExecutePage: NextPage = () => { }) const showWhitelistField = type === 'set_whitelist' - const showDateField = type === 'update_start_time' + const showDateField = isEitherType(type, ['update_start_time', 'update_start_trading_time']) const showLimitField = type === 'update_per_address_limit' const showTokenIdField = type === 'mint_for' const showRecipientField = isEitherType(type, ['mint_to', 'mint_for']) From 91be311cfe20ff0b44d8a1e12d263de4f3ce68b2 Mon Sep 17 00:00:00 2001 From: Serkan Reis Date: Sat, 22 Oct 2022 08:48:10 +0300 Subject: [PATCH 2/3] Fix: price input for update_mint_price not being displayed --- pages/contracts/minter/execute.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/contracts/minter/execute.tsx b/pages/contracts/minter/execute.tsx index 302854f..57fc627 100644 --- a/pages/contracts/minter/execute.tsx +++ b/pages/contracts/minter/execute.tsx @@ -84,7 +84,7 @@ const MinterExecutePage: NextPage = () => { const showLimitField = type === 'update_per_address_limit' const showTokenIdField = type === 'mint_for' const showRecipientField = isEitherType(type, ['mint_to', 'mint_for']) - const showPriceField = type === 'mint' + const showPriceField = isEitherType(type, ['mint', 'update_mint_price']) const messages = useMemo(() => contract?.use(contractState.value), [contract, wallet.address, contractState.value]) const payload: DispatchExecuteArgs = { From 248c85a5c22beb94f3eea968613d15513e221a40 Mon Sep 17 00:00:00 2001 From: Serkan Reis Date: Sat, 22 Oct 2022 11:06:39 +0300 Subject: [PATCH 3/3] Fix: price input for update_mint_price not being displayed - 2 --- pages/contracts/minter/execute.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/contracts/minter/execute.tsx b/pages/contracts/minter/execute.tsx index 57fc627..5cd0b67 100644 --- a/pages/contracts/minter/execute.tsx +++ b/pages/contracts/minter/execute.tsx @@ -84,7 +84,7 @@ const MinterExecutePage: NextPage = () => { const showLimitField = type === 'update_per_address_limit' const showTokenIdField = type === 'mint_for' const showRecipientField = isEitherType(type, ['mint_to', 'mint_for']) - const showPriceField = isEitherType(type, ['mint', 'update_mint_price']) + const showPriceField = type === 'update_mint_price' const messages = useMemo(() => contract?.use(contractState.value), [contract, wallet.address, contractState.value]) const payload: DispatchExecuteArgs = { @@ -96,7 +96,7 @@ const MinterExecutePage: NextPage = () => { messages, recipient: recipientState.value, txSigner: wallet.address, - price: priceState.value ? (Number(priceState.value) * 1_000_000).toString() : '0', + price: priceState.value ? priceState.value.toString() : '0', type, } const { isLoading, mutate } = useMutation(