Skip to content

Commit ff99a83

Browse files
benlebbenleb
committed
(partially automated) cleanup
1 parent d4cd74c commit ff99a83

14 files changed

Lines changed: 486 additions & 127 deletions

File tree

‎go.sum‎

Lines changed: 436 additions & 0 deletions
Large diffs are not rendered by default.

‎internal/collections/collectiondb.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ func (cs *CollectionDB) Addresses() []common.Address {
3131
return addresses
3232
}
3333

34-
// OpenseaSlugs returns a slice of slugs for collections with enabled listings.
35-
func (cs *CollectionDB) OpenseaSlugsAndAddresses() map[string]common.Address {
34+
// OpenSeaSlugsAndAddresses returns a slice-to-address map of collections with enabled listings.
35+
func (cs *CollectionDB) OpenSeaSlugsAndAddresses() map[string]common.Address {
3636
// slugs := make([]string, 0)
3737
slugAddresses := make(map[string]common.Address)
3838

@@ -45,7 +45,7 @@ func (cs *CollectionDB) OpenseaSlugsAndAddresses() map[string]common.Address {
4545
return slugAddresses
4646
}
4747

48-
// OpenseaSlugs returns a slice of slugs for collections with enabled listings.
48+
// GetCollectionForSlug returns a collections for the given slug.
4949
func (cs *CollectionDB) GetCollectionForSlug(slug string) *Collection {
5050
for _, c := range cs.Collections {
5151
if c.OpenseaSlug == slug {
@@ -56,7 +56,7 @@ func (cs *CollectionDB) GetCollectionForSlug(slug string) *Collection {
5656
return nil
5757
}
5858

59-
// OpenseaSlugs returns a slice of slugs for collections with enabled listings.
59+
// OpenseaAddressToSlug returns a collectionAddressto-slug map of collections with enabled listings.
6060
func (cs *CollectionDB) OpenseaAddressToSlug() map[common.Address]string {
6161
// slugs := make([]string, 0)
6262
slugAddresses := make(map[common.Address]string)
@@ -74,7 +74,7 @@ func (cs *CollectionDB) OpenseaAddressToSlug() map[common.Address]string {
7474
func (cs *CollectionDB) OpenseaSlugs() []string {
7575
slugs := make([]string, 0)
7676

77-
for s := range cs.OpenseaSlugsAndAddresses() {
77+
for s := range cs.OpenSeaSlugsAndAddresses() {
7878
slugs = append(slugs, s)
7979
}
8080

@@ -84,7 +84,7 @@ func (cs *CollectionDB) OpenseaSlugs() []string {
8484
func (cs *CollectionDB) OpenseaSlugAddresses() []common.Address {
8585
addresses := make([]common.Address, 0)
8686

87-
for _, a := range cs.OpenseaSlugsAndAddresses() {
87+
for _, a := range cs.OpenSeaSlugsAndAddresses() {
8888
addresses = append(addresses, a)
8989
}
9090

‎internal/const.go‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package internal
22

33
import (
4-
"bufio"
54
"os"
65
"time"
76

87
"github.com/charmbracelet/log"
98
"github.com/ethereum/go-ethereum/common"
10-
"github.com/spf13/viper"
119
)
1210

1311
const (
@@ -31,6 +29,10 @@ var (
3129
ENSContractAddress = common.HexToAddress("0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85")
3230
ENSNameWrapperContractAddress = common.HexToAddress("0xd4416b13d2b3a9abae7acd5d6c2bbdbe25686401")
3331

32+
// manifold.
33+
ManifoldERC721CreatorCore = common.HexToAddress("0x5133522ea5A0494EcB83F26311A095DDD7a9D4b6")
34+
ManifoldERC1155CreatorCore = common.HexToAddress("0xE9FF7CA11280553Af56d04Ecb8Be6B8c4468DCB2")
35+
3436
// loan stuff.
3537
NFTfiContractAddress = common.HexToAddress("0x5660E206496808F7b5cDB8C56A696a96AE5E9b23")
3638
NFTLoanTicketV2ContractAddress = common.HexToAddress("0x0E258c84Df0f8728ae4A6426EA5FD163Eb6b9D1B")
@@ -63,36 +65,6 @@ var (
6365
ReportCaller: false,
6466
ReportTimestamp: false,
6567
})
66-
67-
fileLogger = map[string]*log.Logger{}
6868
)
6969

7070
// LoFi is the logger used to log to the log file with caller and timestamp reporting.
71-
func LoFi(filePath string) *log.Logger {
72-
if filePath == "" {
73-
filePath = viper.GetString("log.log_file")
74-
}
75-
76-
if loFi, ok := fileLogger[filePath]; ok {
77-
return loFi
78-
}
79-
80-
f, err := os.Create(filePath)
81-
if err != nil {
82-
BaseLogger.Error(err)
83-
}
84-
85-
w := bufio.NewWriter(f)
86-
87-
loFi := log.NewWithOptions(w, log.Options{
88-
TimeFormat: time.RFC3339,
89-
ReportCaller: true,
90-
ReportTimestamp: true,
91-
})
92-
93-
// defer f.Close()
94-
95-
fileLogger[filePath] = loFi
96-
97-
return loFi
98-
}

‎internal/degendb/degendata/degendata.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func LoadOpenseaRanks(gb *gloomberg.Gloomberg) error {
3939
slug := strings.TrimSuffix(rFile.Name(), "_opensea.json")
4040
filePath := path.Join(ddPathRanks, rFile.Name())
4141

42-
address, ok := gb.CollectionDB.OpenseaSlugsAndAddresses()[slug]
42+
address, ok := gb.CollectionDB.OpenSeaSlugsAndAddresses()[slug]
4343
if !ok {
4444
if addr, err := gb.Rueidi.GetAddressForOSSlug(context.Background(), slug); err == nil && addr != "" {
4545
address = common.HexToAddress(addr)
@@ -82,14 +82,14 @@ func LoadOpenseaRanks(gb *gloomberg.Gloomberg) error {
8282

8383
continue
8484
}
85-
defer ranksFile.Close()
8685

8786
ranksBytes, err := io.ReadAll(ranksFile)
8887
if err != nil {
8988
log.Errorf("failed to read content from file: %s", err)
9089

9190
continue
9291
}
92+
ranksFile.Close()
9393

9494
// parse json to structs
9595
err = json.Unmarshal(ranksBytes, &ranksOpensea)
@@ -100,17 +100,17 @@ func LoadOpenseaRanks(gb *gloomberg.Gloomberg) error {
100100
}
101101

102102
// validate
103-
for token_id, rank := range ranksOpensea {
103+
for tokenId, rank := range ranksOpensea {
104104
if rank.Rank <= 0 {
105-
gbl.Log.Debugf("%s | rank is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(token_id)))
106-
gb.PrDModf("ddb", "%s | rank is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(token_id)))
105+
gbl.Log.Debugf("%s | rank is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(tokenId)))
106+
gb.PrDModf("ddb", "%s | rank is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(tokenId)))
107107

108108
continue
109109
}
110110

111111
if rank.Score <= 0 {
112-
gbl.Log.Debugf("%s | score is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(token_id)))
113-
gb.PrDModf("ddb", "%s | score is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(token_id)))
112+
gbl.Log.Debugf("%s | score is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(tokenId)))
113+
gb.PrDModf("ddb", "%s | score is <=0 for %s", style.AlmostWhiteStyle.Render(slug), style.AlmostWhiteStyle.Render(fmt.Sprint(tokenId)))
114114

115115
continue
116116
}

‎internal/nemo/gloomberg/marmot.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@ import (
66
"github.com/benleb/gloomberg/internal/gbl"
77
)
88

9+
// marmot is a simple task runner/scheduler.
910
//
1011
// example usage
1112
//
12-
// gb.CreatePeriodicTask("testing", 5*time.Second, func(gb *gloomberg.Gloomberg) {
13-
// log.Printf("testing tasks lol! %+v", len(gb.Ranks))
14-
// })
15-
//
16-
// gb.CreateScheduledTask("testing", time.Now().Add(17*time.Second), func(gb *gloomberg.Gloomberg) {
17-
// log.Printf("testing scheduled tasks lol! %+v", len(gb.Ranks))
18-
// })
13+
// gb.CreatePeriodicTask("testing", 5*time.Second, func(gb *gloomberg.Gloomberg) {
14+
// log.Printf("testing tasks lol! %+v", len(gb.Ranks))
15+
// })
1916
//
17+
// gb.CreateScheduledTask("testing", time.Now().Add(17*time.Second), func(gb *gloomberg.Gloomberg) {
18+
// log.Printf("testing scheduled tasks lol! %+v", len(gb.Ranks))
19+
// })
2020

21-
// marmot is a simple task runner/scheduler.
2221
type marmot struct {
2322
gb *Gloomberg
2423

‎internal/nemo/gloomberg/stats.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func (s *Stats) UpdateBalances() (*wallet.Wallets, error) {
151151
balanceTotalWei = big.NewInt(0).Add(balanceTotalWei, balance.BalanceBlurPool)
152152
}
153153

154-
gbl.Log.Debugf("%s: %6.3fΞ total || %6.3f ETH | %6.3f WETH | %6.3f BlurPool", balanceTotalWei, balance.Account, utils.WeiToEther(balance.BalanceETH), utils.WeiToEther(balance.BalanceWETH), utils.WeiToEther(balance.BalanceBlurPool))
154+
gbl.Log.Debugf("%s: %6.3fΞ total || %6.3f ETH | %6.3f WETH | %6.3f BlurPool", balance.Account, balanceTotalWei, utils.WeiToEther(balance.BalanceETH), utils.WeiToEther(balance.BalanceWETH), utils.WeiToEther(balance.BalanceBlurPool))
155155

156156
(*s.wallets)[walletAddress].BalanceBefore = (*s.wallets)[walletAddress].Balance
157157
(*s.wallets)[walletAddress].Balance = balanceTotalWei

‎internal/nemo/osmodels/osmodels.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
type EventType string
1515

1616
const (
17-
ItemListed EventType = "item_listed"
18-
ItemSold EventType = "item_sold"
19-
ItemReceivedBid EventType = "item_received_bid"
20-
ItemReceivedOffer EventType = "item_received_offer"
17+
ItemListed EventType = "item_listed"
18+
ItemSold EventType = "item_sold"
19+
ItemReceivedBid EventType = "item_received_bid"
20+
// ItemReceivedOffer EventType = "item_received_offer".
2121
ItemMetadataUpdated EventType = "item_metadata_updated"
2222

2323
CollectionOffer EventType = "collection_offer"

‎internal/nemo/provider/pool.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,14 @@ func (pp *Pool) ReconnectProviders() {
189189
// store the current queueLogs channel
190190
queueLogs := pp.queueLogs
191191

192-
// reconnect to the providers
193-
if pool, err := FromConfig(providerConfig); err != nil {
194-
gbl.Log.Fatal("❌ running provider failed, exiting")
195-
} else if pool != nil {
196-
pp = pool
197-
}
192+
gbl.Log.Infof("🔌 trying to re-connect: %+v", providerConfig)
193+
194+
//// reconnect to the providers
195+
// if pool, err := FromConfig(providerConfig); err != nil {
196+
// gbl.Log.Fatal("❌ running provider failed, exiting")
197+
// } else if pool != nil {
198+
// pp = pool
199+
//}
198200

199201
// restore the queueLogs channel
200202
pp.queueLogs = queueLogs
@@ -245,7 +247,7 @@ func (pp *Pool) Subscribe(queueLogs chan types.Log) (uint64, error) {
245247
for _, provider := range availableProvider {
246248
// subscribe to all logs with "Tranfer" or "TransferSingle" as first topic
247249
if _, err := provider.subscribeToAllTransfers(pp.queueLogs); err != nil {
248-
gbl.Log.Warnf("subscribe to topic TransferSingle via node %d failed: %s", provider.Name, err)
250+
gbl.Log.Warnf("subscribe to topic TransferSingle via node %s failed: %s", provider.Name, err)
249251
} else {
250252
subscribedTo++
251253
gbl.Log.Infof("✍️ subscribed to all transfer topics via node %s", style.Bold(provider.Name))
@@ -278,7 +280,7 @@ func (pp *Pool) SubscribeToEverything(queueLogs chan types.Log) (uint64, error)
278280
for _, provider := range availableProvider {
279281
// subscribe to all logs with "Tranfer" or "TransferSingle" as first topic
280282
if _, err := provider.subscribeTo(pp.queueLogs, [][]common.Hash{}, []common.Address{}); err != nil {
281-
gbl.Log.Warnf("subscribe to everything via node %d failed: %s", provider.Name, err)
283+
gbl.Log.Warnf("subscribe to everything via node %s failed: %s", provider.Name, err)
282284
} else {
283285
subscribedTo++
284286
gbl.Log.Infof("✍️ subscribed to everything via node %s", style.Bold(provider.Name))
@@ -344,7 +346,7 @@ func (pp *Pool) SubscribeToTopics(queueLogs chan types.Log, topics [][]common.Ha
344346
for _, provider := range availableProvider {
345347
// subscribe to all logs with "Tranfer" or "TransferSingle" as first topic
346348
if _, err := provider.subscribeTo(pp.queueLogs, topics, nil); err != nil {
347-
gbl.Log.Warnf("subscribe to topic TransferSingle via node %d failed: %s", provider.Name, err)
349+
gbl.Log.Warnf("subscribe to topic TransferSingle via node %s failed: %s", provider.Name, err)
348350
} else {
349351
subscribedTo++
350352
gbl.Log.Infof("✍️ subscribed to all transfer topics via node %s", style.Bold(provider.Name))
@@ -370,7 +372,7 @@ func (pp *Pool) SubscribeToEverythingPending(queuePendingTx chan *types.Transact
370372
for _, provider := range availableProvider {
371373
// subscribe to all logs with "Tranfer" or "TransferSingle" as first topic
372374
if _, err := provider.GethClient.SubscribeFullPendingTransactions(context.TODO(), queuePendingTx); err != nil {
373-
gbl.Log.Warnf("subscribe to pending transactions via node %d failed: %s", provider.Name, err)
375+
gbl.Log.Warnf("subscribe to pending transactions via node %s failed: %s", provider.Name, err)
374376
} else {
375377
subscribedTo++
376378
gbl.Log.Infof("✍️ subscribed to pending transactions via node %s", style.Bold(provider.Name))

‎internal/notify/notify.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func SendMessageViaTelegram(message string, chatID int64, imageURI string, reply
152152
// send telegram message
153153
msg, err := sendTelegramMessageWithMarkup(chatID, message, imageURI, replyToMessageID, replyMarkup)
154154
if err != nil {
155-
gbl.Log.Warnf("❌ failed to send telegram message: %s | chatID: '%s' | imageURI: '%s' | msgTelegram: '%s'", err, chatID, imageURI, message)
155+
gbl.Log.Warnf("❌ failed to send telegram message: %s | chatID: '%d' | imageURI: '%s' | msgTelegram: '%s'", err, chatID, imageURI, message)
156156

157157
return
158158
}

‎internal/rueidica/rueidica.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (r *Rueidica) getCachedNumber(ctx context.Context, address common.Address,
183183
case err != nil:
184184
gbl.Log.Errorf("rueidis | error getting cached number: %s", err)
185185
default:
186-
gbl.Log.Debugf("rueidis | found number: %s -> %f", keyFunc(address), cachedNumber)
186+
gbl.Log.Debugf("rueidis | found number: %s -> %s", keyFunc(address), cachedNumber)
187187
}
188188

189189
num, err := strconv.ParseFloat(cachedNumber, 64)

0 commit comments

Comments
 (0)