Merge pull request #392 from public-awesome/develop

Sync dev > main

.env.example

@@ -21,12 +21,10 @@ NEXT_PUBLIC_FEATURED_VENDING_FACTORY_MERKLE_TREE_ADDRESS="stars167tudcsr9n2y9ljg
 NEXT_PUBLIC_FEATURED_VENDING_FACTORY_FLEX_ADDRESS="stars1udlmmnmmnnqamh36hy6d7azn3ycv23yymkmg6558ntalvyt2pz7s8lhgcd"
 # NEXT_PUBLIC_VENDING_FACTORY_UPDATABLE_FLEX_ADDRESS=
 
-NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_ADDRESS="stars1k4y70ams88nrg88wdumfl8m3gxvwt55wls4alxs88ktrpdv2rkpsaca5e3"
-NEXT_PUBLIC_FEATURED_VENDING_IBC_ATOM_FACTORY_ADDRESS="stars1k4y70ams88nrg88wdumfl8m3gxvwt55wls4alxs88ktrpdv2rkpsaca5e3"
-# NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_ADDRESS=
-NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS="stars1zazpgpl5uhvnwl3sknc3neqnjv4224es9c2kl5ymg276g6qxlhxsfly4wz"
-NEXT_PUBLIC_FEATURED_VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS="stars1zazpgpl5uhvnwl3sknc3neqnjv4224es9c2kl5ymg276g6qxlhxsfly4wz"
-# NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS=
+# NEXT_PUBLIC_VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS=
 
 # NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_ADDRESS=
 # NEXT_PUBLIC_FEATURED_VENDING_IBC_USDC_FACTORY_ADDRESS=
@@ -98,9 +96,6 @@ NEXT_PUBLIC_OPEN_EDITION_IBC_HUAHUA_FACTORY_ADDRESS="stars1grxlqatna07y8f3tzu2l9
 
 NEXT_PUBLIC_OPEN_EDITION_IBC_USDC_FACTORY_ADDRESS="stars1tjzlz2e8pkucgytkjct5drt7x0dysnepqv3nmvxn0fzk2hfv73zsneevyt"
 
-NEXT_PUBLIC_OPEN_EDITION_IBC_ATOM_FACTORY_ADDRESS="stars1l0ah50mre3ul3vqhzvtk7d2reqa5y4uepr3nnj92r5k2j42rcvxsath4qp"
-NEXT_PUBLIC_OPEN_EDITION_IBC_ATOM_FACTORY_FLEX_ADDRESS="stars18xteu8rzkdjq6uc6dvvvatmsyn9k977cc5xdpfehpes69gmm2vaq9cm4zy"
-
 NEXT_PUBLIC_OPEN_EDITION_IBC_NBTC_FACTORY_ADDRESS="stars1cd4gykxfq4nc4yx8uzn8yr3ggu86r57chhxme4y7q2jag53cw75qgs96u8"
 NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_NBTC_FACTORY_ADDRESS="stars1d57xe77mvcg5q337umf4qz49vumfn6w3wss0t7u8ra6s3cyvezsqyaeejn"
 

components/openEdition/OpenEditionMinterCreator.tsx

@@ -903,8 +903,7 @@ export const OpenEditionMinterCreator = ({
               mintingDetails?.selectedMintToken?.displayName === 'KUJI' ||
               mintingDetails?.selectedMintToken?.displayName === 'HUAHUA' ||
               mintingDetails?.selectedMintToken?.displayName === 'BRNCH' ||
-              mintingDetails?.selectedMintToken?.displayName === 'CRBRUS' ||
-              mintingDetails?.selectedMintToken?.displayName === 'ATOM'
+              mintingDetails?.selectedMintToken?.displayName === 'CRBRUS'
             ? STRDST_SG721_CODE_ID
             : SG721_OPEN_EDITION_CODE_ID,
           name: collectionDetails?.name,

config/minter.ts

@@ -4,7 +4,6 @@ import {
   FEATURED_VENDING_FACTORY_ADDRESS,
   FEATURED_VENDING_FACTORY_FLEX_ADDRESS,
   FEATURED_VENDING_FACTORY_MERKLE_TREE_ADDRESS,
-  FEATURED_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS,
   FEATURED_VENDING_IBC_TIA_FACTORY_FLEX_ADDRESS,
   FEATURED_VENDING_IBC_TIA_FACTORY_MERKLE_TREE_ADDRESS,
   FEATURED_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS,
@@ -37,7 +36,6 @@ import {
   VENDING_FACTORY_UPDATABLE_FLEX_ADDRESS,
   VENDING_IBC_ATOM_FACTORY_ADDRESS,
   VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS,
-  VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS,
   VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS,
   VENDING_IBC_ATOM_UPDATABLE_FACTORY_FLEX_ADDRESS,
   VENDING_IBC_CRBRUS_FACTORY_ADDRESS,
@@ -838,31 +836,9 @@ export const merkleTreeVendingFeaturedIbcTiaMinter: MinterInfo = {
   featured: true,
 }
 
-export const merkleTreeVendingIbcAtomMinter: MinterInfo = {
-  id: 'merkletree-vending-ibc-atom-minter',
-  factoryAddress: VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS,
-  supportedToken: ibcAtom,
-  updatable: false,
-  flexible: false,
-  merkleTree: true,
-  featured: false,
-}
-
-export const merkleTreeVendingFeaturedIbcAtomMinter: MinterInfo = {
-  id: 'merkletree-vending-featured-ibc-atom-minter',
-  factoryAddress: FEATURED_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS,
-  supportedToken: ibcAtom,
-  updatable: false,
-  flexible: false,
-  merkleTree: true,
-  featured: true,
-}
-
 export const merkleTreeVendingMinterList = [
   merkleTreeVendingStarsMinter,
   merkleTreeVendingIbcTiaMinter,
   merkleTreeVendingFeaturedStarsMinter,
   merkleTreeVendingFeaturedIbcTiaMinter,
-  merkleTreeVendingIbcAtomMinter,
-  merkleTreeVendingFeaturedIbcAtomMinter,
 ]

config/token.ts

@@ -18,10 +18,7 @@ export const stars: TokenInfo = {
 
 export const ibcAtom: TokenInfo = {
   id: 'ibc-atom',
-  denom:
-    NETWORK === 'mainnet'
-      ? 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2'
-      : 'factory/stars153w5xhuqu3et29lgqk4dsynj6gjn96lr33wx4e/uatom',
+  denom: 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2',
   displayName: 'ATOM',
   decimalPlaces: 6,
 }

env.d.ts

@@ -34,7 +34,6 @@ declare namespace NodeJS {
     readonly NEXT_PUBLIC_FEATURED_VENDING_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_FACTORY_UPDATABLE_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_ADDRESS: string
-    readonly NEXT_PUBLIC_FEATURED_VENDING_IBC_ATOM_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_ATOM_UPDATABLE_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_FEATURED_VENDING_IBC_USDC_FACTORY_ADDRESS: string
@@ -54,9 +53,6 @@ declare namespace NodeJS {
     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_FEATURED_VENDING_IBC_ATOM_FACTORY_FLEX_ADDRESS: string
-    readonly NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS: string
-    readonly NEXT_PUBLIC_FEATURED_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_FEATURED_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_VENDING_IBC_USDC_UPDATABLE_FACTORY_FLEX_ADDRESS: string
@@ -90,9 +86,6 @@ declare namespace NodeJS {
     readonly NEXT_PUBLIC_OPEN_EDITION_IBC_USDC_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_OPEN_EDITION_IBC_USDC_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_USDC_FACTORY_ADDRESS: string
-    readonly NEXT_PUBLIC_OPEN_EDITION_IBC_ATOM_FACTORY_ADDRESS: string
-    readonly NEXT_PUBLIC_OPEN_EDITION_IBC_ATOM_FACTORY_FLEX_ADDRESS: string
-    readonly NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_ATOM_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_OPEN_EDITION_IBC_TIA_FACTORY_ADDRESS: string
     readonly NEXT_PUBLIC_OPEN_EDITION_IBC_TIA_FACTORY_FLEX_ADDRESS: string
     readonly NEXT_PUBLIC_OPEN_EDITION_UPDATABLE_IBC_TIA_FACTORY_ADDRESS: string

pages/collections/create.tsx

@@ -648,7 +648,6 @@ const CollectionCreationPage: NextPage = () => {
               mintingDetails?.selectedMintToken?.displayName === 'HUAHUA' ||
               mintingDetails?.selectedMintToken?.displayName === 'BRNCH' ||
               mintingDetails?.selectedMintToken?.displayName === 'CRBRUS' ||
-              mintingDetails?.selectedMintToken?.displayName === 'ATOM' ||
               isFeaturedCollection
             ? STRDST_SG721_CODE_ID
             : SG721_CODE_ID,

utils/constants.ts

@@ -44,10 +44,6 @@ export const 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_ATOM_FACTORY_MERKLE_TREE_ADDRESS =
-  process.env.NEXT_PUBLIC_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS
-export const FEATURED_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS =
-  process.env.NEXT_PUBLIC_FEATURED_VENDING_IBC_ATOM_FACTORY_MERKLE_TREE_ADDRESS
 export const VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS = process.env.NEXT_PUBLIC_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS
 export const FEATURED_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS =
   process.env.NEXT_PUBLIC_FEATURED_VENDING_IBC_USDC_FACTORY_FLEX_ADDRESS