Skip to content

Commit

Permalink
add for nfts
Browse files Browse the repository at this point in the history
  • Loading branch information
@erokhinav
erokhinav committed Jan 31, 2025
1 parent 0147b5d commit 6b1247f
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 18 deletions.
28 changes: 22 additions & 6 deletions pkg/api/account_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/labstack/gommon/log"
"go.uber.org/zap"
"net/http"
"sort"
"strings"
"sync"
"time"

"github.com/tonkeeper/opentonapi/pkg/addressbook"
Expand Down Expand Up @@ -330,10 +333,22 @@ func (h *Handler) GetAccountDnsExpiring(ctx context.Context, params oas.GetAccou
accounts = append(accounts, dns.DnsItem.Address)
}
}
var wg sync.WaitGroup
wg.Add(1)
var nftsScamData map[ton.AccountID]core.TrustType
go func() {
defer wg.Done()
nftsScamData, err = h.spamFilter.GetNftsScamData(ctx, accounts)
if err != nil {
log.Warn("error getting nft scam data", zap.Error(err))
}
}()
nfts, err := h.storage.GetNFTs(ctx, accounts)
wg.Wait()
if err != nil {
return nil, toError(http.StatusInternalServerError, err)
}

for _, dns := range dnsExpiring {
dei := oas.DnsExpiringItemsItem{
Name: dns.Name,
Expand All @@ -342,7 +357,7 @@ func (h *Handler) GetAccountDnsExpiring(ctx context.Context, params oas.GetAccou
if dns.DnsItem != nil {
for _, n := range nfts {
if n.Address == dns.DnsItem.Address {
dei.DNSItem = oas.NewOptNftItem(h.convertNFT(ctx, n, h.addressBook, h.metaCache))
dei.DNSItem = oas.NewOptNftItem(h.convertNFT(ctx, n, h.addressBook, h.metaCache, nftsScamData[n.Address]))
break
}
}
Expand Down Expand Up @@ -454,7 +469,12 @@ func (h *Handler) GetAccountNftHistory(ctx context.Context, params oas.GetAccoun
if err != nil {
return nil, toError(http.StatusInternalServerError, err)
}
events, lastLT, err := h.convertNftHistory(ctx, account.ID, traceIDs, params.AcceptLanguage)
var eventIDs []string
for _, traceID := range traceIDs {
eventIDs = append(eventIDs, traceID.Hex())
}
isBannedTraces, err := h.spamFilter.GetEventsScamData(ctx, eventIDs)
events, lastLT, err := h.convertNftHistory(ctx, account.ID, traceIDs, isBannedTraces, params.AcceptLanguage)
if err != nil {
return nil, toError(http.StatusInternalServerError, err)
}
Expand Down Expand Up @@ -604,7 +624,3 @@ func (h *Handler) AddressParse(ctx context.Context, params oas.AddressParseParam
}
return &res, nil //todo: add testnet_only
}

func (h *Handler) GetAccountExtraCurrencyHistoryByID(ctx context.Context, params oas.GetAccountExtraCurrencyHistoryByIDParams) (*oas.AccountEvents, error) {
return &oas.AccountEvents{}, nil
}
3 changes: 2 additions & 1 deletion pkg/api/dns_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ func (h *Handler) GetDnsInfo(ctx context.Context, params oas.GetDnsInfoParams) (
convertedDomainInfo := oas.DomainInfo{
Name: params.DomainName,
}
convertedDomainInfo.Item.SetTo(h.convertNFT(ctx, nft, h.addressBook, h.metaCache))
nftScamData, err := h.spamFilter.GetNftsScamData(ctx, []ton.AccountID{nft.Address})
convertedDomainInfo.Item.SetTo(h.convertNFT(ctx, nft, h.addressBook, h.metaCache, nftScamData[nft.Address]))
if expTime != 0 {
convertedDomainInfo.ExpiringAt.SetTo(expTime)
}
Expand Down
21 changes: 18 additions & 3 deletions pkg/api/event_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import (
"context"
"encoding/hex"
"fmt"
"github.com/labstack/gommon/log"
"go.uber.org/zap"
"math/big"
"sort"
"strings"
"sync"

"github.com/tonkeeper/tongo/ton"

Expand Down Expand Up @@ -84,12 +87,24 @@ func (h *Handler) convertRisk(ctx context.Context, risk wallet.Risk, walletAddre
oasRisk.Jettons = append(oasRisk.Jettons, jettonQuantity)
}
if len(risk.Nfts) > 0 {
var wg sync.WaitGroup
wg.Add(1)
var nftsScamData map[ton.AccountID]core.TrustType
var err error
go func() {
defer wg.Done()
nftsScamData, err = h.spamFilter.GetNftsScamData(ctx, risk.Nfts)
if err != nil {
log.Warn("error getting nft scam data", zap.Error(err))
}
}()
items, err := h.storage.GetNFTs(ctx, risk.Nfts)
wg.Wait()
if err != nil {
return oas.Risk{}, err
}
for _, item := range items {
nft := h.convertNFT(ctx, item, h.addressBook, h.metaCache)
nft := h.convertNFT(ctx, item, h.addressBook, h.metaCache, nftsScamData[item.Address])
oasRisk.Nfts = append(oasRisk.Nfts, nft)
}
}
Expand Down Expand Up @@ -562,7 +577,7 @@ func (h *Handler) convertAction(ctx context.Context, viewer *tongo.AccountID, a
var name string
if len(items) == 1 {
// opentonapi doesn't implement GetNFTs() now
nft = h.convertNFT(ctx, items[0], h.addressBook, h.metaCache)
nft = h.convertNFT(ctx, items[0], h.addressBook, h.metaCache, "")
if len(nft.Previews) > 0 {
nftImage = nft.Previews[0].URL
}
Expand Down Expand Up @@ -700,7 +715,7 @@ func (h *Handler) convertAction(ctx context.Context, viewer *tongo.AccountID, a
if a.AuctionBid.Nft == nil {
return oas.Action{}, fmt.Errorf("nft is nil")
}
nft.SetTo(h.convertNFT(ctx, *a.AuctionBid.Nft, h.addressBook, h.metaCache))
nft.SetTo(h.convertNFT(ctx, *a.AuctionBid.Nft, h.addressBook, h.metaCache, ""))
action.AuctionBid.SetTo(oas.AuctionBidAction{
Amount: oas.Price{
Value: fmt.Sprintf("%v", a.AuctionBid.Amount),
Expand Down
3 changes: 2 additions & 1 deletion pkg/api/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ type SpamFilter interface {
GetEventsScamData(ctx context.Context, ids []string) (map[string]bool, error)
JettonTrust(address tongo.AccountID, symbol, name, image string) core.TrustType
AccountTrust(address tongo.AccountID) core.TrustType
NftTrust(ctx context.Context, address tongo.AccountID, collection *ton.AccountID, description, image string) core.TrustType
NftTrust(address tongo.AccountID, collection *ton.AccountID, description, image string) core.TrustType
GetNftsScamData(ctx context.Context, addresses []ton.AccountID) (map[ton.AccountID]core.TrustType, error)
}

type verifierSource interface {
Expand Down
8 changes: 6 additions & 2 deletions pkg/api/nft_converters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/tonkeeper/opentonapi/pkg/references"
)

func (h *Handler) convertNFT(ctx context.Context, item core.NftItem, book addressBook, metaCache metadataCache) oas.NftItem {
func (h *Handler) convertNFT(ctx context.Context, item core.NftItem, book addressBook, metaCache metadataCache, trustType core.TrustType) oas.NftItem {
nftItem := oas.NftItem{
Address: item.Address.ToRaw(),
Index: item.Index.BigInt().Int64(),
Expand Down Expand Up @@ -77,7 +77,11 @@ func (h *Handler) convertNFT(ctx context.Context, item core.NftItem, book addres
if len(nftItem.ApprovedBy) > 0 && nftItem.Verified {
nftItem.Trust = oas.TrustType(core.TrustWhitelist)
} else {
nftItem.Trust = oas.TrustType(h.spamFilter.NftTrust(ctx, item.Address, item.CollectionAddress, description, image))
nftTrust := h.spamFilter.NftTrust(item.Address, item.CollectionAddress, description, image)
if nftTrust == core.TrustNone && trustType != "" {
nftTrust = trustType
}
nftItem.Trust = oas.TrustType(nftTrust)
}
if image == "" {
image = references.Placeholder
Expand Down
48 changes: 44 additions & 4 deletions pkg/api/nft_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import (
"context"
"errors"
"fmt"
"github.com/labstack/gommon/log"
"github.com/tonkeeper/tongo/ton"
"net/http"
"sync"

"go.uber.org/zap"

Expand All @@ -31,7 +34,19 @@ func (h *Handler) GetNftItemsByAddresses(ctx context.Context, request oas.OptGet
}
accounts[i] = account.ID
}
var wg sync.WaitGroup
wg.Add(1)
var nftsScamData map[ton.AccountID]core.TrustType
go func() {
defer wg.Done()
var err error
nftsScamData, err = h.spamFilter.GetNftsScamData(ctx, accounts)
if err != nil {
log.Warn("error getting nft scam data", zap.Error(err))
}
}()
items, err := h.storage.GetNFTs(ctx, accounts)
wg.Wait()
if errors.Is(err, core.ErrEntityNotFound) {
return nil, toError(http.StatusNotFound, err)
}
Expand All @@ -40,7 +55,7 @@ func (h *Handler) GetNftItemsByAddresses(ctx context.Context, request oas.OptGet
}
var result oas.NftItems
for _, i := range items {
result.NftItems = append(result.NftItems, h.convertNFT(ctx, i, h.addressBook, h.metaCache))
result.NftItems = append(result.NftItems, h.convertNFT(ctx, i, h.addressBook, h.metaCache, nftsScamData[i.Address]))
}
return &result, nil
}
Expand All @@ -57,7 +72,8 @@ func (h *Handler) GetNftItemByAddress(ctx context.Context, params oas.GetNftItem
if len(items) != 1 {
return nil, toError(http.StatusNotFound, fmt.Errorf("item not found"))
}
result := h.convertNFT(ctx, items[0], h.addressBook, h.metaCache)
nftScamData, err := h.spamFilter.GetNftsScamData(ctx, []ton.AccountID{account.ID})
result := h.convertNFT(ctx, items[0], h.addressBook, h.metaCache, nftScamData[account.ID])
return &result, nil
}

Expand Down Expand Up @@ -92,7 +108,19 @@ func (h *Handler) GetAccountNftItems(ctx context.Context, params oas.GetAccountN
if len(ids) == 0 {
return &result, nil
}
var wg sync.WaitGroup
wg.Add(1)
var nftsScamData map[ton.AccountID]core.TrustType
go func() {
defer wg.Done()
var err error
nftsScamData, err = h.spamFilter.GetNftsScamData(ctx, ids)
if err != nil {
log.Warn("error getting nft scam data", zap.Error(err))
}
}()
items, err := h.storage.GetNFTs(ctx, ids)
wg.Wait()
if err != nil {
return nil, toError(http.StatusInternalServerError, err)
}
Expand All @@ -101,7 +129,7 @@ func (h *Handler) GetAccountNftItems(ctx context.Context, params oas.GetAccountN
zap.Int("offset", params.Offset.Value),
zap.Int("items", len(items)))
for _, i := range items {
result.NftItems = append(result.NftItems, h.convertNFT(ctx, i, h.addressBook, h.metaCache))
result.NftItems = append(result.NftItems, h.convertNFT(ctx, i, h.addressBook, h.metaCache, nftsScamData[i.Address]))
}
return &result, nil
}
Expand Down Expand Up @@ -147,7 +175,19 @@ func (h *Handler) GetItemsFromCollection(ctx context.Context, params oas.GetItem
if len(ids) == 0 {
return &result, nil
}
var wg sync.WaitGroup
wg.Add(1)
var nftsScamData map[ton.AccountID]core.TrustType
go func() {
defer wg.Done()
var err error
nftsScamData, err = h.spamFilter.GetNftsScamData(ctx, ids)
if err != nil {
log.Warn("error getting nft scam data", zap.Error(err))
}
}()
items, err := h.storage.GetNFTs(ctx, ids)
wg.Wait()
if err != nil {
return nil, toError(http.StatusInternalServerError, err)
}
Expand All @@ -156,7 +196,7 @@ func (h *Handler) GetItemsFromCollection(ctx context.Context, params oas.GetItem
return a.Index.Cmp(b.Index)
})
for _, i := range items {
result.NftItems = append(result.NftItems, h.convertNFT(ctx, i, h.addressBook, h.metaCache))
result.NftItems = append(result.NftItems, h.convertNFT(ctx, i, h.addressBook, h.metaCache, nftsScamData[i.Address]))
}
return &result, nil
}
Expand Down
6 changes: 5 additions & 1 deletion pkg/spam/spam.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ func NewSpamFilter() *Filter {
}
}

func (f *Filter) GetNftsScamData(ctx context.Context, addresses []ton.AccountID) (map[ton.AccountID]core.TrustType, error) {
return nil, nil
}

func (f *Filter) GetEventsScamData(ctx context.Context, ids []string) (map[string]bool, error) {
return nil, nil
}
Expand Down Expand Up @@ -54,7 +58,7 @@ func (f Filter) JettonTrust(address tongo.AccountID, symbol, name, image string)
return core.TrustNone
}

func (f Filter) NftTrust(ctx context.Context, address tongo.AccountID, collection *ton.AccountID, description, image string) core.TrustType {
func (f Filter) NftTrust(address tongo.AccountID, collection *ton.AccountID, description, image string) core.TrustType {
return core.TrustNone
}

Expand Down

0 comments on commit 6b1247f

Please sign in to comment.