Skip to content

Commit 02a725b

Browse files
264 inf denom lookup failed for gamm token will be inserted as unknown denom received gammpool717 err getdenomforbase no denom unit for the specified denom gammpool717 (#287)
* add pagination to denom query * reduce missing denom log msg from inf to warn
1 parent 28ddd06 commit 02a725b

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

core/tx.go

+3-15
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,7 @@ func ProcessTx(db *gorm.DB, tx txTypes.MergedTx) (txDBWapper dbTypes.TxDBWrapper
333333
denomSent, err = dbTypes.GetDenomForBase(v.DenominationSent)
334334
if err != nil {
335335
// attempt to add missing denoms to the database
336-
if strings.Contains(v.DenominationSent, "gamm") {
337-
config.Log.Infof("Denom lookup failed for gamm token. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", v.DenominationSent, err)
338-
} else {
339-
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", v.DenominationSent, err)
340-
}
336+
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", v.DenominationSent, err)
341337
denomSent, err = dbTypes.AddUnknownDenom(db, v.DenominationSent)
342338
if err != nil {
343339
config.Log.Error(fmt.Sprintf("There was an error adding a missing denom. Denom sent: %v", v.DenominationSent), err)
@@ -353,11 +349,7 @@ func ProcessTx(db *gorm.DB, tx txTypes.MergedTx) (txDBWapper dbTypes.TxDBWrapper
353349
denomReceived, err = dbTypes.GetDenomForBase(v.DenominationReceived)
354350
if err != nil {
355351
// attempt to add missing denoms to the database
356-
if strings.Contains(v.DenominationReceived, "gamm") {
357-
config.Log.Infof("Denom lookup failed for gamm token. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", v.DenominationReceived, err)
358-
} else {
359-
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", v.DenominationReceived, err)
360-
}
352+
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", v.DenominationReceived, err)
361353
denomReceived, err = dbTypes.AddUnknownDenom(db, v.DenominationReceived)
362354
if err != nil {
363355
config.Log.Error(fmt.Sprintf("There was an error adding a missing denom. Denom received: %v", v.DenominationReceived), err)
@@ -410,11 +402,7 @@ func ProcessFees(db *gorm.DB, authInfo cosmosTx.AuthInfo, signers []types.AccAdd
410402
denom, err := dbTypes.GetDenomForBase(coin.Denom)
411403
if err != nil {
412404
// attempt to add missing denoms to the database
413-
if strings.Contains(coin.Denom, "gamm") {
414-
config.Log.Infof("Denom lookup failed for gamm token. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", coin.Denom, err)
415-
} else {
416-
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", coin.Denom, err)
417-
}
405+
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", coin.Denom, err)
418406
denom, err = dbTypes.AddUnknownDenom(db, coin.Denom)
419407
if err != nil {
420408
config.Log.Error(fmt.Sprintf("There was an error adding a missing denom. Denom: %v", coin.Denom), err)

db/osmosis.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"crypto/sha256"
55
"fmt"
66
"sort"
7-
"strings"
87

98
"github.com/DefiantLabs/cosmos-tax-cli-private/config"
109
"github.com/DefiantLabs/cosmos-tax-cli-private/osmosis"
1110
"github.com/DefiantLabs/cosmos-tax-cli-private/util"
11+
1212
"gorm.io/gorm"
1313
)
1414

@@ -72,11 +72,7 @@ func IndexOsmoRewards(db *gorm.DB, dryRun bool, chainID string, chainName string
7272
denom, err := GetDenomForBase(coin.Denom)
7373
if err != nil {
7474
// attempt to add missing denoms to the database
75-
if strings.Contains(coin.Denom, "gamm") {
76-
config.Log.Infof("Denom lookup failed for gamm token. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", coin.Denom, err)
77-
} else {
78-
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", coin.Denom, err)
79-
}
75+
config.Log.Warnf("Denom lookup failed. Will be inserted as UNKNOWN. Denom Received: %v. Err: %v", coin.Denom, err)
8076
denom, err = AddUnknownDenom(db, coin.Denom)
8177
if err != nil {
8278
config.Log.Error(fmt.Sprintf("There was an error adding a missing denom. Denom Received: %v", coin.Denom), err)

rest/requests.go

+22-1
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,30 @@ func checkResponseErrorCode(requestEndpoint string, resp *http.Response) error {
129129
}
130130

131131
func GetDenomsMetadatas(host string) (result denoms.GetDenomsMetadatasResponse, err error) {
132+
result, err = getDenomsMetadatas(host, "")
133+
if err != nil {
134+
return
135+
}
136+
allResults := result
137+
for result.Pagination.NextKey != "" {
138+
result, err = getDenomsMetadatas(host, result.Pagination.NextKey)
139+
if err != nil {
140+
return
141+
}
142+
allResults.Metadatas = append(allResults.Metadatas, result.Metadatas...)
143+
}
144+
result = allResults
145+
return
146+
}
147+
148+
func getDenomsMetadatas(host string, paginationKey string) (result denoms.GetDenomsMetadatasResponse, err error) {
132149
requestEndpoint := apiEndpoints["denoms_metadata"]
150+
url := fmt.Sprintf("%s%s", host, requestEndpoint)
151+
if paginationKey != "" {
152+
url = fmt.Sprintf("%v?pagination.key=%v", url, paginationKey)
153+
}
133154

134-
resp, err := http.Get(fmt.Sprintf("%s%s", host, requestEndpoint))
155+
resp, err := http.Get(url) //nolint:gosec
135156
if err != nil {
136157
return result, err
137158
}

0 commit comments

Comments
 (0)