Refactor Ethereum client integration and start price monitoring services

- Wrap ethclient.Client with EthClientWrapper to implement mock.EthClient interface
- Start price monitoring and price alert services on application startup
- Subscribe to new Ethereum block headers and process transactions for alerts
- Ensure compatibility with repository

Author: Jetlum

config.yaml

@@ -6,4 +6,6 @@ sendgrid:
   api_key: "YOUR_SENDGRID_API_KEY"
 push_notification:
   provider: "firebase" # or other provider
-  api_key: "YOUR_PUSH_NOTIFICATION_API_KEY"
+  api_key: "YOUR_PUSH_NOTIFICATION_API_KEY"
+coingecko:
+  api_key: "YOUR_COINGECKO_API_KEY"

config/config.go

@@ -19,6 +19,7 @@ func LoadConfig() (*Config, error) {
 			DatabaseURL:     "test_db_url",
 			SendGridAPIKey:  "test_api_key",
 			InfuraProjectID: "test_infura_id",
+			CoinGeckoAPIKey: "test_coingecko_key",
 		}, nil
 	}
 	viper.SetConfigName("config")
@@ -29,9 +30,11 @@ func LoadConfig() (*Config, error) {
 		return nil, err
 	}
 
-	var cfg Config
-	if err := viper.Unmarshal(&cfg); err != nil {
-		return nil, err
+	cfg := Config{
+		DatabaseURL:     viper.GetString("database.url"),
+		SendGridAPIKey:  viper.GetString("sendgrid.api_key"),
+		InfuraProjectID: viper.GetString("infura.project_id"),
+		CoinGeckoAPIKey: viper.GetString("coingecko.api_key"),
 	}
 
 	return &cfg, nil

database/database.go

@@ -27,7 +27,6 @@ func init() {
 }
 
 func InitDB(dsn string) (*gorm.DB, error) {
-	IsMockMode = true
 	mu.Lock()
 	defer mu.Unlock()
 
@@ -36,7 +35,9 @@ func InitDB(dsn string) (*gorm.DB, error) {
 		return nil, nil
 	}
 
-	return nil, nil
+	// Add actual database initialization here
+	// For now, returning error to indicate it needs implementation
+	return nil, errors.New("database initialization not implemented")
 }
 
 func SetupMockDB() {

main.go

@@ -16,10 +16,31 @@ import (
 	nfts "github.com/Jetlum/WalletAlertService/nft"
 	"github.com/Jetlum/WalletAlertService/repository"
 	"github.com/Jetlum/WalletAlertService/services"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 )
 
+type EthClientWrapper struct {
+	*ethclient.Client
+}
+
+func (w *EthClientWrapper) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {
+	return w.Client.BlockByHash(ctx, hash)
+}
+
+func (w *EthClientWrapper) BlockNumber(ctx context.Context) (uint64, error) {
+	return w.Client.BlockNumber(ctx)
+}
+
+func (w *EthClientWrapper) HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error) {
+	return w.Client.HeaderByNumber(ctx, number)
+}
+
+func (w *EthClientWrapper) NetworkID(ctx context.Context) (*big.Int, error) {
+	return w.Client.NetworkID(ctx)
+}
+
 func init() {
 	// Skip completely in test mode
 	if os.Getenv("GO_ENV") == "test" {
@@ -75,17 +96,20 @@ func main() {
 	priceAlertService.StartMonitoring()
 
 	// Connect to Ethereum node
-	client, err := ethclient.Dial(fmt.Sprintf("wss://mainnet.infura.io/ws/v3/%s", cfg.InfuraProjectID))
+	ethClient, err := ethclient.Dial(fmt.Sprintf("wss://mainnet.infura.io/ws/v3/%s", cfg.InfuraProjectID))
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer client.Close()
+	defer ethClient.Close()
+
+	client := &EthClientWrapper{Client: ethClient}
 
 	fmt.Println("Connected to Ethereum network")
 
 	// Subscribe to new head (block) events
 	headers := make(chan *types.Header)
-	sub, err := client.SubscribeNewHead(context.Background(), headers)
+	// Update subscription
+	sub, err := ethClient.SubscribeNewHead(context.Background(), headers)
 	if err != nil {
 		log.Fatal(err)
 	}

services/notification.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/Jetlum/WalletAlertService/models"
+	"github.com/sendgrid/sendgrid-go"
 )
 
 type NotificationService interface {
@@ -13,6 +14,7 @@ type NotificationService interface {
 func NewEmailNotification(apiKey string) *EmailNotification {
 	return &EmailNotification{
 		APIKey: apiKey,
+		client: sendgrid.NewSendClient(apiKey),
 	}
 }
 

services/price_monitor.go

@@ -19,7 +19,7 @@ type CoinGeckoPrice struct {
 		USD float64 `json:"usd"`
 	} `json:"bitcoin"`
 	Ethereum struct {
-		USD float64 `json:"ethereum"`
+		USD float64 `json:"usd"`
 	} `json:"ethereum"`
 }
 
@@ -49,13 +49,23 @@ func (pm *PriceMonitor) updatePrices() error {
 	}
 	defer resp.Body.Close()
 
-	var prices CoinGeckoPrice
-	if err := json.NewDecoder(resp.Body).Decode(&prices); err != nil {
+	var result map[string]map[string]float64
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
 		return fmt.Errorf("failed to decode response: %w", err)
 	}
 
-	pm.prices.Store("BTC", prices.Bitcoin.USD)
-	pm.prices.Store("ETH", prices.Ethereum.USD)
+	if btc, ok := result["bitcoin"]; ok {
+		if price, ok := btc["usd"]; ok {
+			pm.prices.Store("BTC", price)
+		}
+	}
+
+	if eth, ok := result["ethereum"]; ok {
+		if price, ok := eth["usd"]; ok {
+			pm.prices.Store("ETH", price)
+		}
+	}
+
 	return nil
 }
 

services/push_notification.go

@@ -3,6 +3,11 @@ package services
 
 import "github.com/Jetlum/WalletAlertService/models"
 
+type Config struct {
+	Provider string
+	APIKey   string
+}
+
 type PushNotifier interface {
 	Send(event *models.Event, userPref *models.UserPreference) error
 }