improve liquid staking

Author: mr-tron

api/openapi.json

@@ -131,7 +131,7 @@
     "required": false,
     "schema": {
      "default": 30,
-     "maximum": 90,
+     "maximum": 360,
      "minimum": 1,
      "type": "integer"
     }
@@ -1297,6 +1297,24 @@
     ],
     "type": "object"
    },
+   "DomainInfo": {
+    "properties": {
+     "expiring_at": {
+      "description": "date of expiring. optional. not all domain in ton has expiration date",
+      "type": "integer"
+     },
+     "item": {
+      "$ref": "#/components/schemas/NftItem"
+     },
+     "name": {
+      "type": "string"
+     }
+    },
+    "required": [
+     "name"
+    ],
+    "type": "object"
+   },
    "DomainNames": {
     "properties": {
      "domains": {
@@ -4024,6 +4042,44 @@
     ]
    }
   },
+  "/v2/dns/{domain_name}": {
+   "get": {
+    "description": "get full information about domain name",
+    "operationId": "dnsInfo",
+    "parameters": [
+     {
+      "$ref": "#/components/parameters/domainNameParameter"
+     }
+    ],
+    "responses": {
+     "200": {
+      "content": {
+       "application/json": {
+        "schema": {
+         "$ref": "#/components/schemas/DomainInfo"
+        }
+       }
+      },
+      "description": "domain info"
+     },
+     "400": {
+      "$ref": "#/components/responses/BadRequest"
+     },
+     "401": {
+      "$ref": "#/components/responses/UnauthorizedError"
+     },
+     "404": {
+      "$ref": "#/components/responses/NotFound"
+     },
+     "500": {
+      "$ref": "#/components/responses/InternalError"
+     }
+    },
+    "tags": [
+     "DNS"
+    ]
+   }
+  },
   "/v2/dns/{domain_name}/bids": {
    "get": {
     "description": "Get domain bids",

api/openapi.yml

@@ -798,6 +798,29 @@ paths:
         '500':
           $ref: '#/components/responses/InternalError'
 
+  /v2/dns/{domain_name}:
+    get:
+      description: get full information about domain name
+      operationId: dnsInfo
+      tags:
+        - DNS
+      parameters:
+        - $ref: '#/components/parameters/domainNameParameter'
+      responses:
+        '200':
+          description: "domain info"
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DomainInfo'
+        '401':
+          $ref: '#/components/responses/UnauthorizedError'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalError'
   /v2/dns/{domain_name}/resolve:
     get:
       description: DNS resolve for domain name
@@ -1487,7 +1510,7 @@ components:
         type: integer
         default: 30
         minimum: 1
-        maximum: 90
+        maximum: 360
     collectionQuery:
       in: query
       name: collection
@@ -3053,7 +3076,18 @@ components:
           items:
             type: string
             example: "name"
-
+    DomainInfo:
+      type: object
+      required:
+        - name
+      properties:
+        name:
+          type: string
+        expiring_at:
+          type: integer
+          description: date of expiring. optional. not all domain in ton has expiration date
+        item:
+          $ref: '#/components/schemas/NftItem'
     DnsRecord:
       type: object
       required:

pkg/api/interfaces.go

@@ -41,6 +41,7 @@ type storage interface {
 	GetTFPools(ctx context.Context) ([]core.TFPool, error)
 	GetTFPool(ctx context.Context, pool tongo.AccountID) (core.TFPool, error)
 	GetLiquidPool(ctx context.Context, pool tongo.AccountID) (core.LiquidPool, error)
+	GetLiquidPools(ctx context.Context) ([]core.LiquidPool, error)
 
 	GetNFTs(ctx context.Context, accounts []tongo.AccountID) ([]core.NftItem, error)
 	SearchNFTs(ctx context.Context,

pkg/api/staking_converters.go

@@ -46,18 +46,16 @@ func convertStakingTFPool(p core.TFPool, info addressbook.TFPoolInfo, apy float6
 }
 
 func convertLiquidStaking(p core.LiquidPool, apy float64) oas.PoolInfo {
-
 	name := p.Address.ToHuman(true, false)
-
 	return oas.PoolInfo{
 		Address:           p.Address.ToRaw(),
 		Name:              name,
 		TotalAmount:       p.TotalAmount,
 		Implementation:    oas.PoolInfoImplementationLiquidTF,
-		Apy:               apy * 0.6,
+		Apy:               330,
 		MinStake:          10,
 		Verified:          p.VerifiedSources,
-		CurrentNominators: 0,
+		CurrentNominators: 1,
 		MaxNominators:     0,
 	}
 }

pkg/api/staking_handlers.go

@@ -107,6 +107,14 @@ func (h Handler) StakingPools(ctx context.Context, params oas.StakingPoolsParams
 		result.Pools = append(result.Pools, pool)
 	}
 
+	liquidPools, err := h.storage.GetLiquidPools(ctx)
+	if err != nil {
+		return nil, err
+	}
+	for _, p := range liquidPools {
+		result.Pools = append(result.Pools, convertLiquidStaking(p, h.state.GetAPY()))
+	}
+
 	slices.SortFunc(result.Pools, func(a, b oas.PoolInfo) bool {
 		return a.Apy > b.Apy
 	})
@@ -124,6 +132,11 @@ func (h Handler) StakingPools(ctx context.Context, params oas.StakingPoolsParams
 			Description: i18n.T(params.AcceptLanguage.Value, i18n.C{MessageID: "poolImplementationDescription", TemplateData: map[string]interface{}{"Deposit": minTF / 1_000_000_000}}),
 			URL:         references.TFPoolImplementationsURL,
 		},
+		string(oas.PoolInfoImplementationLiquidTF): {
+			Name:        references.LiquidImplementationsName,
+			Description: i18n.T(params.AcceptLanguage.Value, i18n.C{MessageID: "poolImplementationDescription", TemplateData: map[string]interface{}{"Deposit": 10}}),
+			URL:         references.LiquidImplementationsUrl,
+		},
 	})
 
 	return &result, nil

pkg/litestorage/stacking.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/tonkeeper/opentonapi/pkg/core"
@@ -151,3 +152,7 @@ func (s *LiteStorage) GetLiquidPool(ctx context.Context, pool tongo.AccountID) (
 		VerifiedSources: bytes.Equal(hash, references.TFLiquidPoolCodeHash[:]),
 	}, err
 }
+
+func (s *LiteStorage) GetLiquidPools(ctx context.Context) ([]core.LiquidPool, error) {
+	return nil, nil
+}