diff --git a/contracts/whitelist/contract.ts b/contracts/whitelist/contract.ts index 4ea6ca8..dadc083 100644 --- a/contracts/whitelist/contract.ts +++ b/contracts/whitelist/contract.ts @@ -33,6 +33,7 @@ export interface WhiteListInstance { removeMembers: (memberList: string[]) => Promise updatePerAddressLimit: (limit: number) => Promise increaseMemberLimit: (limit: number) => Promise + updateAdmins: (admins: string[]) => Promise } export interface WhitelistMessages { @@ -42,6 +43,7 @@ export interface WhitelistMessages { removeMembers: (memberList: string[]) => RemoveMembersMessage updatePerAddressLimit: (limit: number) => UpdatePerAddressLimitMessage increaseMemberLimit: (limit: number) => IncreaseMemberLimitMessage + updateAdmins: (admins: string[]) => UpdateAdminsMessage } export interface UpdateStartTimeMessage { @@ -62,6 +64,14 @@ export interface UpdateEndTimeMessage { funds: Coin[] } +export interface UpdateAdminsMessage { + sender: string + contract: string + msg: { + update_admins: { admins: string[] } + } + funds: Coin[] +} export interface AddMembersMessage { sender: string contract: string @@ -170,6 +180,20 @@ export const WhiteList = (client: SigningCosmWasmClient, txSigner: string): Whit return res.transactionHash } + const updateAdmins = async (admins: string[]): Promise => { + const res = await client.execute( + txSigner, + contractAddress, + { + update_admins: { + admins, + }, + }, + 'auto', + ) + return res.transactionHash + } + const removeMembers = async (memberList: string[]): Promise => { const res = await client.execute( txSigner, @@ -199,6 +223,7 @@ export const WhiteList = (client: SigningCosmWasmClient, txSigner: string): Whit contractAddress, updateStartTime, updateEndTime, + updateAdmins, addMembers, removeMembers, updatePerAddressLimit, @@ -263,6 +288,17 @@ export const WhiteList = (client: SigningCosmWasmClient, txSigner: string): Whit } } + const updateAdmins = (admins: string[]) => { + return { + sender: txSigner, + contract: contractAddress, + msg: { + update_admins: { admins }, + }, + funds: [], + } + } + const removeMembers = (memberList: string[]) => { return { sender: txSigner, @@ -299,6 +335,7 @@ export const WhiteList = (client: SigningCosmWasmClient, txSigner: string): Whit return { updateStartTime, updateEndTime, + updateAdmins, addMembers, removeMembers, updatePerAddressLimit, diff --git a/contracts/whitelist/messages/execute.ts b/contracts/whitelist/messages/execute.ts index 0d1a885..59876ce 100644 --- a/contracts/whitelist/messages/execute.ts +++ b/contracts/whitelist/messages/execute.ts @@ -6,6 +6,7 @@ export type ExecuteType = typeof EXECUTE_TYPES[number] export const EXECUTE_TYPES = [ 'update_start_time', 'update_end_time', + 'update_admins', 'add_members', 'remove_members', 'update_per_address_limit', @@ -29,6 +30,11 @@ export const EXECUTE_LIST: ExecuteListItem[] = [ name: 'Update End Time', description: `Update the end time of the whitelist`, }, + { + id: 'update_admins', + name: 'Update Admins', + description: `Update the list of administrators for the whitelist`, + }, { id: 'add_members', name: 'Add Members', @@ -70,6 +76,7 @@ export type DispatchExecuteArgs = { | { type: Select<'remove_members'>; members: string[] } | { type: Select<'update_per_address_limit'>; limit: number } | { type: Select<'increase_member_limit'>; limit: number } + | { type: Select<'update_admins'>; admins: string[] } ) export const dispatchExecute = async (args: DispatchExecuteArgs) => { @@ -84,6 +91,9 @@ export const dispatchExecute = async (args: DispatchExecuteArgs) => { case 'update_end_time': { return messages.updateEndTime(args.timestamp) } + case 'update_admins': { + return messages.updateAdmins(args.admins) + } case 'add_members': { return messages.addMembers(args.members) } @@ -113,6 +123,9 @@ export const previewExecutePayload = (args: DispatchExecuteArgs) => { case 'update_end_time': { return messages(contract)?.updateEndTime(args.timestamp) } + case 'update_admins': { + return messages(contract)?.updateAdmins(args.admins) + } case 'add_members': { return messages(contract)?.addMembers(args.members) } diff --git a/pages/contracts/whitelist/execute.tsx b/pages/contracts/whitelist/execute.tsx index b4e54e6..d38339b 100644 --- a/pages/contracts/whitelist/execute.tsx +++ b/pages/contracts/whitelist/execute.tsx @@ -64,6 +64,7 @@ const WhitelistExecutePage: NextPage = () => { const showLimitState = isEitherType(type, ['update_per_address_limit', 'increase_member_limit']) const showTimestamp = isEitherType(type, ['update_start_time', 'update_end_time']) const showMemberList = isEitherType(type, ['add_members', 'remove_members']) + const showAdminList = isEitherType(type, ['update_admins']) const messages = useMemo(() => contract?.use(contractState.value), [contract, contractState.value]) const payload: DispatchExecuteArgs = { @@ -80,6 +81,13 @@ const WhitelistExecutePage: NextPage = () => { .concat(memberList), ), ], + admins: [ + ...new Set( + addressListState.values + .map((a) => a.address.trim()) + .filter((address) => address !== '' && isValidAddress(address.trim()) && address.startsWith('stars')), + ), + ] || [wallet.address], } const { isLoading, mutate } = useMutation( async (event: FormEvent) => { @@ -146,20 +154,22 @@ const WhitelistExecutePage: NextPage = () => { setTimestamp(date)} value={timestamp} /> - + - - You may optionally choose a text file of additional member addresses. - - + + + You may optionally choose a text file of additional member addresses. + + +
diff --git a/pages/contracts/whitelist/instantiate.tsx b/pages/contracts/whitelist/instantiate.tsx index 3dc28aa..9ffab56 100644 --- a/pages/contracts/whitelist/instantiate.tsx +++ b/pages/contracts/whitelist/instantiate.tsx @@ -85,12 +85,12 @@ const WhitelistInstantiatePage: NextPage = () => { per_address_limit: perAddressLimitState.value, member_limit: memberLimitState.value, admins: [ - ...(new Set( + ...new Set( addressListState.values .map((a) => a.address.trim()) .filter((address) => address !== '' && isValidAddress(address.trim()) && address.startsWith('stars')), - ) || [wallet.address]), - ], + ), + ] || [wallet.address], admins_mutable: adminsMutable, } return toast.promise(contract.instantiate(1835, msg, 'Stargaze Whitelist Contract', wallet.address), {