Merge pull request #298 from public-awesome/develop

Sync dev > main
2023-12-21 13:30:24 +02:00 · 2023-12-21 13:30:24 +02:00 · 794558dea3
commit 794558dea3
parent 039f1d02fb 4f40da141d
7 changed files with 58 additions and 2 deletions
--- a/.env.example
+++ b/.env.example
@ -51,6 +51,9 @@ NEXT_PUBLIC_VENDING_IBC_KUJI_FACTORY_FLEX_ADDRESS="stars1jralxqalpw9nf3kdc0s222z
 NEXT_PUBLIC_VENDING_IBC_HUAHUA_FACTORY_ADDRESS="stars16luw6rxgr6as9s7eu5auvnk5tnzszjrs34etsw9fmk25yqjfq09qq9gzl4"
 NEXT_PUBLIC_VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS="stars1d97h6nfgwqr8eynzdcrsm3p0n6rduvkrcqdjhm5z7heavtgnqg4sgy2yew"

+NEXT_PUBLIC_VENDING_IBC_CRBRUS_FACTORY_ADDRESS="stars1z0upxsyxhrvygrsd2t69majd6wl8qw4h8ff2fp27z3nn93m73pwsu4hpdh"
+NEXT_PUBLIC_VENDING_IBC_CRBRUS_FACTORY_FLEX_ADDRESS="stars1halhp674yxwgn3p4gpkl8790h07vkm0vjm4vj7y8ql499e3zydzqurt5m3"
+
 # 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=
@ -68,6 +71,8 @@ NEXT_PUBLIC_OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS="stars1yjvfy6fpm4nxl0afm6e8lnx

 NEXT_PUBLIC_OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS="stars1grxlqatna07y8f3tzu2l9lmt82uj8gzzshxnz2ruwn6yljpyucnq059rmn"

+# NEXT_PUBLIC_OPEN_EDITION_IBC_CRBRUS_FACTORY_ADDRESS=""
+
 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
@ -619,7 +619,8 @@ export const OpenEditionMinterCreator = ({
              mintingDetails?.selectedMintToken?.displayName === 'STRDST' ||
              mintingDetails?.selectedMintToken?.displayName === 'KUJI' ||
              mintingDetails?.selectedMintToken?.displayName === 'HUAHUA' ||
-              mintingDetails?.selectedMintToken?.displayName === 'BRNCH'
+              mintingDetails?.selectedMintToken?.displayName === 'BRNCH' ||
+              mintingDetails?.selectedMintToken?.displayName === 'CRBRUS'
            ? STRDST_SG721_CODE_ID
            : SG721_OPEN_EDITION_CODE_ID,
          name: collectionDetails?.name,
--- a/config/minter.ts
+++ b/config/minter.ts
@ -1,6 +1,7 @@
 import {
  OPEN_EDITION_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_ATOM_FACTORY_ADDRESS,
+  OPEN_EDITION_IBC_CRBRUS_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_FRNZ_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS,
  OPEN_EDITION_IBC_KUJI_FACTORY_ADDRESS,
@ -23,6 +24,8 @@ import {
  VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS,
  VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS,
  VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS,
+  VENDING_IBC_CRBRUS_FACTORY_ADDRESS,
+  VENDING_IBC_CRBRUS_FACTORY_FLEX_ADDRESS,
  VENDING_IBC_HUAHUA_FACTORY_ADDRESS,
  VENDING_IBC_HUAHUA_FACTORY_FLEX_ADDRESS,
  VENDING_IBC_KUJI_FACTORY_ADDRESS,
@ -50,6 +53,7 @@ import {
 import type { TokenInfo } from './token'
 import {
  ibcAtom,
+  ibcCrbrus,
  ibcFrnz,
  ibcHuahua,
  ibcKuji,
@ -167,6 +171,13 @@ export const openEditionIbcHuahuaMinter: MinterInfo = {
  updatable: false,
 }

+export const openEditionIbcCrbrusMinter: MinterInfo = {
+  id: 'open-edition-ibc-crbrus-minter',
+  factoryAddress: OPEN_EDITION_IBC_CRBRUS_FACTORY_ADDRESS,
+  supportedToken: ibcCrbrus,
+  updatable: false,
+}
+
 export const openEditionNativeStrdstMinter: MinterInfo = {
  id: 'open-edition-native-strdst-minter',
  factoryAddress: OPEN_EDITION_NATIVE_STRDST_FACTORY_ADDRESS,
@ -196,6 +207,7 @@ export const openEditionMinterList = [
  openEditionUpdatableIbcUskMinter,
  openEditionIbcKujiMinter,
  openEditionIbcHuahuaMinter,
+  openEditionIbcCrbrusMinter,
  openEditionNativeStrdstMinter,
  openEditionNativeBrnchMinter,
 ]
@ -296,6 +308,14 @@ export const vendingIbcHuahuaMinter: MinterInfo = {
  flexible: false,
 }

+export const vendingIbcCrbrusMinter: MinterInfo = {
+  id: 'vending-ibc-crbrus-minter',
+  factoryAddress: VENDING_IBC_CRBRUS_FACTORY_ADDRESS,
+  supportedToken: ibcCrbrus,
+  updatable: false,
+  flexible: false,
+}
+
 export const vendingNativeStardustMinter: MinterInfo = {
  id: 'vending-native-stardust-minter',
  factoryAddress: VENDING_NATIVE_STARDUST_FACTORY_ADDRESS,
@ -341,6 +361,7 @@ export const vendingMinterList = [
  vendingUpdatableIbcUskMinter,
  vendingIbcKujiMinter,
  vendingIbcHuahuaMinter,
+  vendingIbcCrbrusMinter,
  vendingNativeStardustMinter,
  vendingUpdatableNativeStardustMinter,
  vendingNativeBrnchMinter,
@ -443,6 +464,14 @@ export const flexibleVendingIbcHuahuaMinter: MinterInfo = {
  flexible: true,
 }

+export const flexibleVendingIbcCrbrusMinter: MinterInfo = {
+  id: 'flexible-vending-ibc-crbrus-minter',
+  factoryAddress: VENDING_IBC_CRBRUS_FACTORY_FLEX_ADDRESS,
+  supportedToken: ibcCrbrus,
+  updatable: false,
+  flexible: true,
+}
+
 export const flexibleVendingStrdstMinter: MinterInfo = {
  id: 'flexible-vending-native-strdst-minter',
  factoryAddress: VENDING_NATIVE_STRDST_FLEX_FACTORY_ADDRESS,
@ -472,6 +501,7 @@ export const flexibleVendingMinterList = [
  flexibleVendingUpdatableIbcUskMinter,
  flexibleVendingIbcKujiMinter,
  flexibleVendingIbcHuahuaMinter,
+  flexibleVendingIbcCrbrusMinter,
  flexibleVendingStrdstMinter,
  flexibleVendingBrnchMinter,
 ]
--- a/config/token.ts
+++ b/config/token.ts
@ -79,6 +79,16 @@ export const ibcHuahua: TokenInfo = {
  decimalPlaces: 6,
 }

+export const ibcCrbrus: TokenInfo = {
+  id: 'ibc-crbrus',
+  denom:
+    NETWORK === 'mainnet'
+      ? 'ibc/71CEEB5CC09F75A3ACDC417108C14514351B6B2A540ACE9B37A80BF930845134'
+      : 'factory/stars153w5xhuqu3et29lgqk4dsynj6gjn96lr33wx4e/uCRBRUS',
+  displayName: 'CRBRUS',
+  decimalPlaces: 6,
+}
+
 export const nativeStardust: TokenInfo = {
  id: 'native-strdst',
  denom:
@ -108,6 +118,7 @@ export const tokensList = [
  ibcNbtc,
  ibcKuji,
  ibcHuahua,
+  ibcCrbrus,
  nativeStardust,
  nativeBrnch,
 ]
--- a/env.d.ts
+++ b/env.d.ts
@ -39,6 +39,8 @@ declare namespace NodeJS {
    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_CRBRUS_FACTORY_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_CRBRUS_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
@ -51,6 +53,8 @@ declare namespace NodeJS {
    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_IBC_CRBRUS_FACTORY_FLEX_ADDRESS: string
+    readonly NEXT_PUBLIC_VENDING_IBC_CRBRUS_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
@ -72,6 +76,7 @@ declare namespace NodeJS {
    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_IBC_CRBRUS_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_NATIVE_BRNCH_FACTORY_ADDRESS: string
--- a/pages/collections/create.tsx
+++ b/pages/collections/create.tsx
@ -582,7 +582,8 @@ const CollectionCreationPage: NextPage = () => {
              mintingDetails?.selectedMintToken?.displayName === 'nBTC' ||
              mintingDetails?.selectedMintToken?.displayName === 'KUJI' ||
              mintingDetails?.selectedMintToken?.displayName === 'HUAHUA' ||
-              mintingDetails?.selectedMintToken?.displayName === 'BRNCH'
+              mintingDetails?.selectedMintToken?.displayName === 'BRNCH' ||
+              mintingDetails?.selectedMintToken?.displayName === 'CRBRUS'
            ? STRDST_SG721_CODE_ID
            : SG721_CODE_ID,
          name: collectionDetails?.name,
--- a/utils/constants.ts
+++ b/utils/constants.ts
@ -26,6 +26,7 @@ export const 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_CRBRUS_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_CRBRUS_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
@ -40,6 +41,7 @@ export const 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_CRBRUS_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_CRBRUS_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
@ -71,6 +73,7 @@ export const 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_IBC_CRBRUS_FACTORY_ADDRESS = process.env.NEXT_PUBLIC_OPEN_EDITION_IBC_CRBRUS_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 =