incentive APR query fix

config.yml

@@ -454,9 +454,6 @@ genesis:
           - denom: "uinc"
             min_amount: "1000000"
         reward_portion_for_lps: "0.6"
-        dex_rewards_lps:
-          num_blocks: "1"
-          amount: "0"
         max_eden_reward_apr_lps: "0.5"
         protocol_revenue_address: "elys10d07y265gmmuvt4z0w9aw880jnsr700j6z2zm3"
   chain_id: elystestnet-1

docs/static/openapi.yml

@@ -40775,6 +40775,56 @@ paths:
           type: boolean
       tags:
         - Query
+  /elys-network/elys/leveragelp/close_estimation:
+    get:
+      summary: Get estimated amount of return value closing a position
+      operationId: ElysLeveragelpCloseEst
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              liability:
+                type: string
+              weight_balance_ratio:
+                type: string
+              amount_returned:
+                type: string
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      parameters:
+        - name: owner
+          in: query
+          required: false
+          type: string
+        - name: id
+          in: query
+          required: false
+          type: string
+          format: uint64
+        - name: lp_amount
+          in: query
+          required: false
+          type: string
+      tags:
+        - Query
   /elys-network/elys/leveragelp/is-whitelisted:
     get:
       summary: Queries a list of IsWhitelisted items.
@@ -40814,6 +40864,60 @@ paths:
           type: string
       tags:
         - Query
+  /elys-network/elys/leveragelp/open_estimation:
+    get:
+      summary: Get estimated amount of return value opening a position
+      operationId: ElysLeveragelpOpenEst
+      responses:
+        '200':
+          description: A successful response.
+          schema:
+            type: object
+            properties:
+              position_size:
+                type: string
+              weight_balance_ratio:
+                type: string
+              borrow_fee:
+                type: string
+        default:
+          description: An unexpected error response.
+          schema:
+            type: object
+            properties:
+              code:
+                type: integer
+                format: int32
+              message:
+                type: string
+              details:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    '@type':
+                      type: string
+                  additionalProperties: {}
+      parameters:
+        - name: collateral_asset
+          in: query
+          required: false
+          type: string
+        - name: collateral_amount
+          in: query
+          required: false
+          type: string
+        - name: amm_pool_id
+          in: query
+          required: false
+          type: string
+          format: uint64
+        - name: leverage
+          in: query
+          required: false
+          type: string
+      tags:
+        - Query
   /elys-network/elys/leveragelp/params:
     get:
       summary: Parameters queries the parameters of the module.
@@ -41865,20 +41969,6 @@ paths:
                       gas fees and swap fees portion for stakers, `100 -
                       reward_portion_for_lps - reward_portion_for_stakers =
                       revenue percent for protocol`.
-                  dex_rewards_lps:
-                    title: Tracking dex rewards given to LPs
-                    type: object
-                    properties:
-                      num_blocks:
-                        type: string
-                        title: >-
-                          Number of blocks since start of epoch (distribution
-                          epoch)
-                      amount:
-                        type: string
-                        title: >-
-                          Accumulated amount at distribution epoch -
-                          recalculated at every distribution epoch
                   max_eden_reward_apr_lps:
                     type: string
                     title: Maximum eden reward apr for lps - [0 - 0.3]
@@ -42060,28 +42150,21 @@ paths:
                   pool_id:
                     type: string
                     format: uint64
-                    title: reward amount
                   reward_wallet:
                     type: string
                     title: reward wallet address
                   multiplier:
                     type: string
                     title: multiplier for lp rewards
-                  num_blocks:
-                    type: string
-                    title: Block number since the creation of PoolInfo
-                  dex_reward_amount_given:
-                    type: string
-                    title: Total dex rewards given
-                  eden_reward_amount_given:
-                    type: string
-                    title: Total eden rewards given
                   eden_apr:
                     type: string
                     title: Eden APR, updated at every distribution
                   dex_apr:
                     type: string
                     title: Dex APR, updated at every distribution
+                  gas_apr:
+                    type: string
+                    title: Gas APR, updated at every distribution
                   external_incentive_apr:
                     type: string
                     title: External Incentive APR, updated at every distribution
@@ -42090,7 +42173,6 @@ paths:
                     items:
                       type: string
                     title: external reward denoms on the pool
-                title: Pool Info
         default:
           description: An unexpected error response.
           schema:
@@ -42928,6 +43010,10 @@ paths:
                   total_blocks_per_year:
                     type: string
                     format: int64
+                  rewards_data_lifetime:
+                    type: string
+                    format: int64
+                    title: default 1 day = 86400
             description: >-
               QueryParamsResponse is response type for the Query/Params RPC
               method.
@@ -86712,6 +86798,15 @@ definitions:
                    repeated Bar results = 1;
                    PageResponse page = 2;
            }
+  elys.leveragelp.QueryCloseEstResponse:
+    type: object
+    properties:
+      liability:
+        type: string
+      weight_balance_ratio:
+        type: string
+      amount_returned:
+        type: string
   elys.leveragelp.QueryGetPoolResponse:
     type: object
     properties:
@@ -86731,6 +86826,15 @@ definitions:
             type: string
           leverage_max:
             type: string
+  elys.leveragelp.QueryOpenEstResponse:
+    type: object
+    properties:
+      position_size:
+        type: string
+      weight_balance_ratio:
+        type: string
+      borrow_fee:
+        type: string
   elys.leveragelp.StatusResponse:
     type: object
     properties:
@@ -86773,20 +86877,6 @@ definitions:
                    repeated Bar results = 1;
                    PageResponse page = 2;
            }
-  elys.masterchef.DexRewardsTracker:
-    type: object
-    properties:
-      num_blocks:
-        type: string
-        title: Number of blocks since start of epoch (distribution epoch)
-      amount:
-        type: string
-        title: >-
-          Accumulated amount at distribution epoch - recalculated at every
-          distribution epoch
-    title: >-
-      DexRewardsTracker is used for tracking rewards for LPs, all amount here is
-      in USDC
   elys.masterchef.ExternalIncentive:
     type: object
     properties:
@@ -86865,18 +86955,6 @@ definitions:
           gas fees and swap fees portion for stakers, `100 -
           reward_portion_for_lps - reward_portion_for_stakers = revenue percent
           for protocol`.
-      dex_rewards_lps:
-        title: Tracking dex rewards given to LPs
-        type: object
-        properties:
-          num_blocks:
-            type: string
-            title: Number of blocks since start of epoch (distribution epoch)
-          amount:
-            type: string
-            title: >-
-              Accumulated amount at distribution epoch - recalculated at every
-              distribution epoch
       max_eden_reward_apr_lps:
         type: string
         title: Maximum eden reward apr for lps - [0 - 0.3]
@@ -86910,28 +86988,21 @@ definitions:
       pool_id:
         type: string
         format: uint64
-        title: reward amount
       reward_wallet:
         type: string
         title: reward wallet address
       multiplier:
         type: string
         title: multiplier for lp rewards
-      num_blocks:
-        type: string
-        title: Block number since the creation of PoolInfo
-      dex_reward_amount_given:
-        type: string
-        title: Total dex rewards given
-      eden_reward_amount_given:
-        type: string
-        title: Total eden rewards given
       eden_apr:
         type: string
         title: Eden APR, updated at every distribution
       dex_apr:
         type: string
         title: Dex APR, updated at every distribution
+      gas_apr:
+        type: string
+        title: Gas APR, updated at every distribution
       external_incentive_apr:
         type: string
         title: External Incentive APR, updated at every distribution
@@ -86940,7 +87011,6 @@ definitions:
         items:
           type: string
         title: external reward denoms on the pool
-    title: Pool Info
   elys.masterchef.PoolMultiplier:
     type: object
     properties:
@@ -87022,18 +87092,6 @@ definitions:
               gas fees and swap fees portion for stakers, `100 -
               reward_portion_for_lps - reward_portion_for_stakers = revenue
               percent for protocol`.
-          dex_rewards_lps:
-            title: Tracking dex rewards given to LPs
-            type: object
-            properties:
-              num_blocks:
-                type: string
-                title: Number of blocks since start of epoch (distribution epoch)
-              amount:
-                type: string
-                title: >-
-                  Accumulated amount at distribution epoch - recalculated at
-                  every distribution epoch
           max_eden_reward_apr_lps:
             type: string
             title: Maximum eden reward apr for lps - [0 - 0.3]
@@ -87075,28 +87133,21 @@ definitions:
           pool_id:
             type: string
             format: uint64
-            title: reward amount
           reward_wallet:
             type: string
             title: reward wallet address
           multiplier:
             type: string
             title: multiplier for lp rewards
-          num_blocks:
-            type: string
-            title: Block number since the creation of PoolInfo
-          dex_reward_amount_given:
-            type: string
-            title: Total dex rewards given
-          eden_reward_amount_given:
-            type: string
-            title: Total eden rewards given
           eden_apr:
             type: string
             title: Eden APR, updated at every distribution
           dex_apr:
             type: string
             title: Dex APR, updated at every distribution
+          gas_apr:
+            type: string
+            title: Gas APR, updated at every distribution
           external_incentive_apr:
             type: string
             title: External Incentive APR, updated at every distribution
@@ -87105,7 +87156,6 @@ definitions:
             items:
               type: string
             title: external reward denoms on the pool
-        title: Pool Info
   elys.masterchef.QueryPoolRewardInfoResponse:
     type: object
     properties:
@@ -87613,6 +87663,10 @@ definitions:
       total_blocks_per_year:
         type: string
         format: int64
+      rewards_data_lifetime:
+        type: string
+        format: int64
+        title: default 1 day = 86400
     description: Params defines the parameters for the module.
   elys.parameter.QueryParamsResponse:
     type: object
@@ -87632,6 +87686,10 @@ definitions:
           total_blocks_per_year:
             type: string
             format: int64
+          rewards_data_lifetime:
+            type: string
+            format: int64
+            title: default 1 day = 86400
     description: QueryParamsResponse is response type for the Query/Params RPC method.
   elys.perpetual.IsWhitelistedResponse:
     type: object