Merge branch 'osmosis-labs:main' into patch-1

osmosis-labs · Jul 10, 2024 · 0949180 · 0949180
2 parents e5b9d53 + 0d8c879
commit 0949180
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/docs/osmosis-core/modules/cosmwasmpool/README.md b/docs/osmosis-core/modules/cosmwasmpool/README.md
@@ -311,7 +311,7 @@ pub struct AfterPoolCreated {
 pub enum CreatePoolGauges {
     // This works exactly like `gamm`'s.
     DefaultLockableDurations {},
-    // Custom guages can be created.
+    // Custom gauges can be created.
     Custom { msgs: Vec<MsgCreateGauge> },
 }
 ```

diff --git a/docs/overview/educate/osmo.md → docs/overview/educate/osmo.mdx b/docs/overview/educate/osmo.md → docs/overview/educate/osmo.mdx
@@ -14,6 +14,13 @@ The pools eligible for liquidity rewards are selected by OSMO governance partici
 Transaction fees are paid by any user to post a transaction on the chain. The fee amount is determined by the computation and storage costs of the transaction. Minimum gas costs are determined by the proposer of a block in which the transaction is included. This transaction fee is distributed to OSMO stakers on the network.
 Validators can choose which assets to accept for fees in the blocks that they propose, but all accepted assets are converted to OSMO before distribution.
 
+:::info
+
+The list of tokens accepted for tx fees is **permissionless**. Head to the [Fee Token Whitelist Controller DAO](https://daodao.zone/dao/osmo17eqe9dpglajwd48r65lasq3mftra5q4uxce525htyvjdp0q037vqpurhve/proposals).  
+_the token must have reasonable liquidity, paired with $OSMO as a minimum requirement_
+
+:::
+
 ## ProtoRev
 The ProtoRev module mints and burns the OSMO token in order to perform privileged arbitrage transactions on chain to ensure prices are balanced across liquidity sources on chain.
 No use for this revenue has currently been decided, but will be allocated by governance in the future.

diff --git a/static/api/LCD.yaml b/static/api/LCD.yaml
@@ -10324,7 +10324,7 @@ components:
                 title: start_time is the distribution start time
                 type: string
             type: object
-          title: Active gagues that match denom in query
+          title: Active gauges that match denom in query
           type: array
         pagination:
           description: "PageResponse is to be embedded in gRPC response messages where\
@@ -10480,7 +10480,7 @@ components:
                 title: start_time is the distribution start time
                 type: string
             type: object
-          title: Active gagues only
+          title: Active gauges only
           type: array
         pagination:
           description: "PageResponse is to be embedded in gRPC response messages where\
@@ -10756,7 +10756,7 @@ components:
               format: date-time
               title: start_time is the distribution start time
               type: string
-          title: Gauge that corresponds to provided gague ID
+          title: Gauge that corresponds to provided gauge ID
           type: object
       type: object
     osmosis.incentives.GaugesResponse:
@@ -11117,7 +11117,7 @@ components:
                 title: start_time is the distribution start time
                 type: string
             type: object
-          title: Upcoming gagues that match denom in query
+          title: Upcoming gauges that match denom in query
           type: array
       type: object
     osmosis.incentives.UpcomingGaugesResponse:
@@ -32479,7 +32479,7 @@ paths:
                           title: start_time is the distribution start time
                           type: string
                       type: object
-                    title: Active gagues only
+                    title: Active gauges only
                     type: array
                   pagination:
                     description: "PageResponse is to be embedded in gRPC response\
@@ -32536,7 +32536,7 @@ paths:
     get:
       operationId: ActiveGaugesPerDenom
       parameters:
-      - description: Desired denom when querying active gagues.
+      - description: Desired denom when querying active gauges.
         in: query
         name: denom
         required: false
@@ -32742,7 +32742,7 @@ paths:
                           title: start_time is the distribution start time
                           type: string
                       type: object
-                    title: Active gagues that match denom in query
+                    title: Active gauges that match denom in query
                     type: array
                   pagination:
                     description: "PageResponse is to be embedded in gRPC response\
@@ -32799,7 +32799,7 @@ paths:
     get:
       operationId: GaugeByID
       parameters:
-      - description: Gague ID being queried
+      - description: gauge ID being queried
         in: path
         name: id
         required: true
@@ -32949,7 +32949,7 @@ paths:
                         format: date-time
                         title: start_time is the distribution start time
                         type: string
-                    title: Gauge that corresponds to provided gague ID
+                    title: Gauge that corresponds to provided gauge ID
                     type: object
                 type: object
           description: A successful response.
@@ -33687,7 +33687,7 @@ paths:
     get:
       operationId: UpcomingGaugesPerDenom
       parameters:
-      - description: Filter for upcoming gagues that match specific denom.
+      - description: Filter for upcoming gauges that match specific denom.
         in: query
         name: denom
         required: false
@@ -33914,7 +33914,7 @@ paths:
                           title: start_time is the distribution start time
                           type: string
                       type: object
-                    title: Upcoming gagues that match denom in query
+                    title: Upcoming gauges that match denom in query
                     type: array
                 type: object
           description: A successful response.