Merge pull request #254 from public-awesome/usk-factory-update

Include USK as a mint price denom option

.env.example

@@ -26,6 +26,11 @@ NEXT_PUBLIC_VENDING_FACTORY_UPDATABLE_FLEX_ADDRESS=
 # NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS=
 # NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS=
 
+# NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_FLEX_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS=
+
 NEXT_PUBLIC_VENDING_NATIVE_STARDUST_FACTORY_ADDRESS="stars1mxwf2hjcjvqnlw0v3j7m0u34975qesp325wzrgz0ht7vr8ys2zmsenjutf"
 NEXT_PUBLIC_VENDING_NATIVE_STARDUST_UPDATABLE_FACTORY_ADDRESS="stars18gjczf88jd4z3a3megwj9g5c9famu654csxfnnq59mkqeszuzy4ssdgr46"
 NEXT_PUBLIC_VENDING_NATIVE_STRDST_FLEX_FACTORY_ADDRESS="stars1eluqmr6x78ehl4plrln6khxc0qrspfhc7rt3whmr59escpve0r4swcacjh"

components/badges/queries/query.ts

@@ -51,7 +51,7 @@ export type DispatchQueryArgs = {
 export const dispatchQuery = async (args: DispatchQueryArgs) => {
   const { badgeHubMessages } = args
   if (!badgeHubMessages) {
-    throw new Error('Cannot perform a query')
+    throw new Error('Cannot perform a query. Please connect your wallet first.')
   }
   switch (args.type) {
     case 'config': {

config/minter.ts

@@ -19,13 +19,17 @@ import {
   VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS,
   VENDING_IBC_USDC_UPDATABLE_FACTORY_ADDRESS,
   VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS,
+  VENDING_IBC_USK_FACTORY_ADDRESS,
+  VENDING_IBC_USK_FACTORY_FLEX_ADDRESS,
+  VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS,
+  VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS,
   VENDING_NATIVE_STARDUST_FACTORY_ADDRESS,
   VENDING_NATIVE_STARDUST_UPDATABLE_FACTORY_ADDRESS,
   VENDING_NATIVE_STRDST_FLEX_FACTORY_ADDRESS,
 } from 'utils/constants'
 
 import type { TokenInfo } from './token'
-import { ibcAtom, ibcFrnz, ibcUsdc, nativeStardust, stars } from './token'
+import { ibcAtom, ibcFrnz, ibcUsdc, ibcUsk, nativeStardust, stars } from './token'
 
 export interface MinterInfo {
   id: string
@@ -150,6 +154,22 @@ export const vendingUpdatableIbcUsdcMinter: MinterInfo = {
   flexible: false,
 }
 
+export const vendingIbcUskMinter: MinterInfo = {
+  id: 'vending-ibc-usk-minter',
+  factoryAddress: VENDING_IBC_USK_FACTORY_ADDRESS,
+  supportedToken: ibcUsk,
+  updatable: false,
+  flexible: false,
+}
+
+export const vendingUpdatableIbcUskMinter: MinterInfo = {
+  id: 'vending-updatable-ibc-usk-minter',
+  factoryAddress: VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS,
+  supportedToken: ibcUsk,
+  updatable: true,
+  flexible: false,
+}
+
 export const vendingNativeStardustMinter: MinterInfo = {
   id: 'vending-native-stardust-minter',
   factoryAddress: VENDING_NATIVE_STARDUST_FACTORY_ADDRESS,
@@ -173,6 +193,8 @@ export const vendingMinterList = [
   vendingUpdatableIbcAtomMinter,
   vendingIbcUsdcMinter,
   vendingUpdatableIbcUsdcMinter,
+  vendingIbcUskMinter,
+  vendingUpdatableIbcUskMinter,
   vendingNativeStardustMinter,
   vendingUpdatableNativeStardustMinter,
 ]
@@ -225,6 +247,22 @@ export const flexibleVendingUpdatableIbcUsdcMinter: MinterInfo = {
   flexible: true,
 }
 
+export const flexibleVendingIbcUskMinter: MinterInfo = {
+  id: 'flexible-vending-ibc-usk-minter',
+  factoryAddress: VENDING_IBC_USK_FACTORY_FLEX_ADDRESS,
+  supportedToken: ibcUsk,
+  updatable: false,
+  flexible: true,
+}
+
+export const flexibleVendingUpdatableIbcUskMinter: MinterInfo = {
+  id: 'flexible-vending-updatable-ibc-usk-minter',
+  factoryAddress: VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS,
+  supportedToken: ibcUsk,
+  updatable: true,
+  flexible: true,
+}
+
 export const flexibleVendingStrdstMinter: MinterInfo = {
   id: 'flexible-vending-native-strdst-minter',
   factoryAddress: VENDING_NATIVE_STRDST_FLEX_FACTORY_ADDRESS,
@@ -240,5 +278,7 @@ export const flexibleVendingMinterList = [
   flexibleVendingUpdatableIbcAtomMinter,
   flexibleVendingIbcUsdcMinter,
   flexibleVendingUpdatableIbcUsdcMinter,
+  flexibleVendingIbcUskMinter,
+  flexibleVendingUpdatableIbcUskMinter,
   flexibleVendingStrdstMinter,
 ]

config/token.ts

@@ -32,6 +32,13 @@ export const ibcUsdc: TokenInfo = {
   displayName: 'USDC',
   decimalPlaces: 6,
 }
+export const ibcUsk: TokenInfo = {
+  id: 'ibc-usk',
+  denom:
+    NETWORK === 'mainnet' ? 'ibc/938CEB62ABCBA6366AA369A8362E310B2A0B1A54835E4F3FF01D69D860959128' : 'Not available',
+  displayName: 'USK',
+  decimalPlaces: 6,
+}
 
 export const ibcFrnz: TokenInfo = {
   id: 'ibc-frnz',

env.d.ts

@@ -31,10 +31,14 @@ declare namespace NodeJS {
     readonly NEXT_PUBLIC_VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_FLEX_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_NATIVE_STARDUST_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_NATIVE_STARDUST_UPDATABLE_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_NATIVE_STRDST_FLEX_FACTORY_ADDRESS: string

pages/collections/create.tsx

@@ -576,7 +576,8 @@ const CollectionCreationPage: NextPage = () => {
         collection_params: {
           code_id: collectionDetails?.updatable
             ? SG721_UPDATABLE_CODE_ID
-            : mintingDetails?.selectedMintToken?.displayName === 'STRDST'
+            : mintingDetails?.selectedMintToken?.displayName === 'STRDST' ||
+              mintingDetails?.selectedMintToken?.displayName === 'USK'
             ? STRDST_SG721_CODE_ID
             : SG721_CODE_ID,
           name: collectionDetails?.name,

utils/constants.ts

@@ -20,12 +20,18 @@ export const VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS =
 export const VENDING_IBC_USDC_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_ADDRESS
 export const VENDING_IBC_USDC_UPDATABLE_FACTORY_ADDRESS =
   process.env.NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_ADDRESS
+export const VENDING_IBC_USK_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_ADDRESS
+export const VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS =
+  process.env.NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS
 export const VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS
 export const VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS =
   process.env.NEXT_PUBLIC_VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS
 export const VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS
 export const VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS =
   process.env.NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS
+export const VENDING_IBC_USK_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_FLEX_ADDRESS
+export const VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS =
+  process.env.NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS
 export const VENDING_NATIVE_STARDUST_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_NATIVE_STARDUST_FACTORY_ADDRESS
 export const VENDING_NATIVE_STARDUST_UPDATABLE_FACTORY_ADDRESS =
   process.env.NEXT_PUBLIC_VENDING_NATIVE_STARDUST_UPDATABLE_FACTORY_ADDRESS