Merge pull request #291 from public-awesome/develop

Sync dev > main
2023-12-11 10:24:43 +02:00 · 2023-12-11 10:24:43 +02:00 · c62d7c10ba
commit c62d7c10ba
parent cbf401638a ac3f65f866
7 changed files with 64 additions and 9 deletions
--- a/.env.example
+++ b/.env.example
@ -44,6 +44,9 @@ NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_FACTORY_ADDRESS="stars1fk5dkzcylam8mcpqrn8y9s
 NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_ADDRESS="stars1yyje87e0h9mqg34kp3x75yesa78ve4glc3dstdrn6nscw3zjfanqkj95f0"
 NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_FLEX_ADDRESS="stars1jralxqalpw9nf3kdc0s222z3mk343wry60cjaze9xadgfn2te4usf92e9r"

+NEXT_PUBLIC_VENDING_IBC_HUAHUA_FACTORY_ADDRESS="stars16luw6rxgr6as9s7eu5auvnk5tnzszjrs34etsw9fmk25yqjfq09qq9gzl4"
+NEXT_PUBLIC_VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS="stars1d97h6nfgwqr8eynzdcrsm3p0n6rduvkrcqdjhm5z7heavtgnqg4sgy2yew"
+
 # NEXT_PUBLIC_OPEN_EDITION_IBC_ATOM_FACTORY_ADDRESS=
 # NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_ATOM_FACTORY_ADDRESS=
 # NEXT_PUBLIC_OPEN_EDITION_IBC_USDC_FACTORY_ADDRESS=
@ -58,6 +61,8 @@ NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_USK_FACTORY_ADDRESS="stars1njhkyyv0l8dmq5

 NEXT_PUBLIC_OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS="stars1yjvfy6fpm4nxl0afm6e8lnx96e6v49e3fxsymsdxxtu0pdeshrxq702zaz"

+NEXT_PUBLIC_OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS="stars1grxlqatna07y8f3tzu2l9lmt82uj8gzzshxnz2ruwn6yljpyucnq059rmn"
+
 NEXT_PUBLIC_OPEN_EDITION_IBC_USDC_FACTORY_ADDRESS="stars1tjzlz2e8pkucgytkjct5drt7x0dysnepqv3nmvxn0fzk2hfv73zsneevyt"

 NEXT_PUBLIC_OPEN_EDITION_IBC_NBTC_FACTORY_ADDRESS="stars1cd4gykxfq4nc4yx8uzn8yr3ggu86r57chhxme4y7q2jag53cw75qgs96u8"
--- a/components/openEdition/OpenEditionMinterCreator.tsx
+++ b/components/openEdition/OpenEditionMinterCreator.tsx
@ -617,7 +617,8 @@ export const OpenEditionMinterCreator = ({
            : mintingDetails?.selectedMintToken?.displayName === 'USK' ||
              mintingDetails?.selectedMintToken?.displayName === 'USDC' ||
              mintingDetails?.selectedMintToken?.displayName === 'STRDST' ||
-              mintingDetails?.selectedMintToken?.displayName === 'KUJI'
+              mintingDetails?.selectedMintToken?.displayName === 'KUJI' ||
+              mintingDetails?.selectedMintToken?.displayName === 'HUAHUA'
            ? STRDST_SG721_CODE_ID
            : SG721_OPEN_EDITION_CODE_ID,
          name: collectionDetails?.name,
--- a/config/minter.ts
+++ b/config/minter.ts
@ -2,6 +2,7 @@ import {
  OPEN_EDITION_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_ATOM_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_FRNZ_FACTORY_ADDRESS,
+  OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_NBTC_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_USDC_FACTORY_ADDRESS,
@ -21,6 +22,8 @@ import {
  VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS,
  VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS,
  VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS,
+  VENDING_IBC_HUAHUA_FACTORY_ADDRESS,
+  VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS,
  VENDING_IBC_KUJI_FACTORY_ADDRESS,
  VENDING_IBC_KUJI_FACTORY_FLEX_ADDRESS,
  VENDING_IBC_NBTC_FACTORY_ADDRESS,
@ -41,7 +44,7 @@ import {
 } from 'utils/constants'

 import type { TokenInfo } from './token'
-import { ibcAtom, ibcFrnz, ibcKuji, ibcNbtc, ibcUsdc, ibcUsk, nativeStardust, stars } from './token'
+import { ibcAtom, ibcFrnz, ibcHuahua, ibcKuji, ibcNbtc, ibcUsdc, ibcUsk, nativeStardust, stars } from './token'

 export interface MinterInfo {
  id: string
@ -128,6 +131,13 @@ export const openEditionIbcUskMinter: MinterInfo = {
  updatable: false,
 }

+export const openEditionUpdatableIbcUskMinter: MinterInfo = {
+  id: 'open-edition-updatable-ibc-usk-minter',
+  factoryAddress: OPEN_EDITION_UPDATABLE_IBC_USK_FACTORY_ADDRESS,
+  supportedToken: ibcUsk,
+  updatable: true,
+}
+
 export const openEditionIbcKujiMinter: MinterInfo = {
  id: 'open-edition-ibc-kuji-minter',
  factoryAddress: OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS,
@ -135,11 +145,11 @@ export const openEditionIbcKujiMinter: MinterInfo = {
  updatable: false,
 }

-export const openEditionUpdatableIbcUskMinter: MinterInfo = {
-  id: 'open-edition-updatable-ibc-usk-minter',
-  factoryAddress: OPEN_EDITION_UPDATABLE_IBC_USK_FACTORY_ADDRESS,
-  supportedToken: ibcUsk,
-  updatable: true,
+export const openEditionIbcHuahuaMinter: MinterInfo = {
+  id: 'open-edition-ibc-huahua-minter',
+  factoryAddress: OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS,
+  supportedToken: ibcHuahua,
+  updatable: false,
 }

 export const openEditionNativeStrdstMinter: MinterInfo = {
@ -163,6 +173,7 @@ export const openEditionMinterList = [
  openEditionIbcUskMinter,
  openEditionUpdatableIbcUskMinter,
  openEditionIbcKujiMinter,
+  openEditionIbcHuahuaMinter,
  openEditionNativeStrdstMinter,
 ]

@ -254,6 +265,14 @@ export const vendingIbcKujiMinter: MinterInfo = {
  flexible: false,
 }

+export const vendingIbcHuahuaMinter: MinterInfo = {
+  id: 'vending-ibc-huahua-minter',
+  factoryAddress: VENDING_IBC_HUAHUA_FACTORY_ADDRESS,
+  supportedToken: ibcHuahua,
+  updatable: false,
+  flexible: false,
+}
+
 export const vendingNativeStardustMinter: MinterInfo = {
  id: 'vending-native-stardust-minter',
  factoryAddress: VENDING_NATIVE_STARDUST_FACTORY_ADDRESS,
@ -282,6 +301,7 @@ export const vendingMinterList = [
  vendingIbcUskMinter,
  vendingUpdatableIbcUskMinter,
  vendingIbcKujiMinter,
+  vendingIbcHuahuaMinter,
  vendingNativeStardustMinter,
  vendingUpdatableNativeStardustMinter,
 ]
@ -374,6 +394,14 @@ export const flexibleVendingIbcKujiMinter: MinterInfo = {
  flexible: true,
 }

+export const flexibleVendingIbcHuahuaMinter: MinterInfo = {
+  id: 'flexible-vending-ibc-huahua-minter',
+  factoryAddress: VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS,
+  supportedToken: ibcHuahua,
+  updatable: false,
+  flexible: true,
+}
+
 export const flexibleVendingStrdstMinter: MinterInfo = {
  id: 'flexible-vending-native-strdst-minter',
  factoryAddress: VENDING_NATIVE_STRDST_FLEX_FACTORY_ADDRESS,
@ -394,5 +422,6 @@ export const flexibleVendingMinterList = [
  flexibleVendingIbcUskMinter,
  flexibleVendingUpdatableIbcUskMinter,
  flexibleVendingIbcKujiMinter,
+  flexibleVendingIbcHuahuaMinter,
  flexibleVendingStrdstMinter,
 ]
--- a/config/token.ts
+++ b/config/token.ts
@ -69,6 +69,16 @@ export const ibcNbtc: TokenInfo = {
  decimalPlaces: 6,
 }

+export const ibcHuahua: TokenInfo = {
+  id: 'ibc-huahua',
+  denom:
+    NETWORK === 'mainnet'
+      ? 'ibc/CAD8A9F306CAAC55731C66930D6BEE539856DD12E59061C965E44D82AA26A0E7'
+      : 'factory/stars153w5xhuqu3et29lgqk4dsynj6gjn96lr33wx4e/uhuahua',
+  displayName: 'HUAHUA',
+  decimalPlaces: 6,
+}
+
 export const nativeStardust: TokenInfo = {
  id: 'native-strdst',
  denom:
@ -79,4 +89,4 @@ export const nativeStardust: TokenInfo = {
  decimalPlaces: 6,
 }

-export const tokensList = [stars, ibcAtom, ibcUsdc, ibcUsk, ibcFrnz, ibcNbtc, ibcKuji, nativeStardust]
+export const tokensList = [stars, ibcAtom, ibcUsdc, ibcUsk, ibcFrnz, ibcNbtc, ibcKuji, ibcHuahua, nativeStardust]
--- a/env.d.ts
+++ b/env.d.ts
@ -37,6 +37,8 @@ declare namespace NodeJS {
    readonly NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_ADDRESS: string
    readonly NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_ADDRESS: string
    readonly NEXT_PUBLIC_VENDING_IBC_KUJI_UPDATABLE_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_HUAHUA_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_HUAHUA_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
@ -47,6 +49,8 @@ declare namespace NodeJS {
    readonly NEXT_PUBLIC_VENDING_IBC_USK_UPDATABLE_FACTORY_FLEX_ADDRESS: string
    readonly NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_FLEX_ADDRESS: string
    readonly NEXT_PUBLIC_VENDING_IBC_KUJI_UPDATABLE_FACTORY_FLEX_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_HUAHUA_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
@ -64,6 +68,8 @@ declare namespace NodeJS {
    readonly NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_USK_FACTORY_ADDRESS: string
    readonly NEXT_PUBLIC_OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS: string
    readonly NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_KUJI_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_HUAHUA_FACTORY_ADDRESS: string
    readonly NEXT_PUBLIC_OPEN_EDITION_NATIVE_STRDST_FACTORY_ADDRESS: string
    readonly NEXT_PUBLIC_OPEN_EDITION_MINTER_CODE_ID: string
    readonly NEXT_PUBLIC_BASE_FACTORY_ADDRESS: string
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@ -580,7 +580,8 @@ const CollectionCreationPage: NextPage = () => {
              mintingDetails?.selectedMintToken?.displayName === 'USK' ||
              mintingDetails?.selectedMintToken?.displayName === 'USDC' ||
              mintingDetails?.selectedMintToken?.displayName === 'nBTC' ||
-              mintingDetails?.selectedMintToken?.displayName === 'KUJI'
+              mintingDetails?.selectedMintToken?.displayName === 'KUJI' ||
+              mintingDetails?.selectedMintToken?.displayName === 'HUAHUA'
            ? STRDST_SG721_CODE_ID
            : SG721_CODE_ID,
          name: collectionDetails?.name,
--- a/utils/constants.ts
+++ b/utils/constants.ts
@ -25,6 +25,7 @@ export const VENDING_IBC_NBTC_UPDATABLE_FACTORY_ADDRESS =
  process.env.NEXT_PUBLIC_VENDING_IBC_NBTC_UPDATABLE_FACTORY_ADDRESS
 export const VENDING_IBC_USK_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_USK_FACTORY_ADDRESS
 export const VENDING_IBC_KUJI_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_ADDRESS
+export const VENDING_IBC_HUAHUA_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_HUAHUA_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
@ -38,6 +39,7 @@ export const VENDING_IBC_NBTC_UPDATABLE_FACTORY_FLEX_ADDRESS =
  process.env.NEXT_PUBLIC_VENDING_IBC_NBTC_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_KUJI_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_FLEX_ADDRESS
+export const VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_HUAHUA_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
@ -63,6 +65,7 @@ export const OPEN_EDITION_UPDATABLE_IBC_FRNZ_FACTORY_ADDRESS =
  process.env.NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_FRNZ_FACTORY_ADDRESS
 export const OPEN_EDITION_IBC_USK_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_OPEN_EDITION_IBC_USK_FACTORY_ADDRESS
 export const OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS
+export const OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS
 export const OPEN_EDITION_UPDATABLE_IBC_USK_FACTORY_ADDRESS =
  process.env.NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_USK_FACTORY_ADDRESS
 export const OPEN_EDITION_NATIVE_STRDST_FACTORY_ADDRESS =