Compare commits
4 Commits
feature/st
...
fix/main-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f7044d33c | ||
|
|
b8c1622dd8 | ||
|
|
fab8741544 | ||
|
|
942dd541e1 |
@@ -25,7 +25,7 @@ import (
|
||||
)
|
||||
|
||||
func main() {
|
||||
// Initialize logger
|
||||
// Initialize logger (slog)
|
||||
logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
|
||||
Level: slog.LevelInfo,
|
||||
}))
|
||||
@@ -193,14 +193,14 @@ func main() {
|
||||
}
|
||||
|
||||
// Initialize sequencer reader
|
||||
seqConfig := &sequencer.ReaderConfig{
|
||||
WSURL: config.SequencerWSURL,
|
||||
RPCURL: config.RPCURL,
|
||||
WorkerCount: config.WorkerCount,
|
||||
BufferSize: config.BufferSize,
|
||||
MinProfit: config.MinProfit,
|
||||
EnableFrontRunning: config.EnableFrontRunning,
|
||||
}
|
||||
seqConfig := sequencer.DefaultReaderConfig()
|
||||
// Override defaults with app config
|
||||
seqConfig.WSURL = config.SequencerWSURL
|
||||
seqConfig.RPCURL = config.RPCURL
|
||||
seqConfig.WorkerCount = config.WorkerCount
|
||||
seqConfig.BufferSize = config.BufferSize
|
||||
seqConfig.MinProfit = config.MinProfit
|
||||
seqConfig.EnableFrontRunning = config.EnableFrontRunning
|
||||
seqReader, err := sequencer.NewReader(seqConfig, parserFactory, validator, poolCache, detector, executor, logger)
|
||||
if err != nil {
|
||||
logger.Error("failed to initialize sequencer reader", "error", err)
|
||||
|
||||
@@ -11,9 +11,23 @@ import (
|
||||
"github.com/ethereum/go-ethereum/crypto"
|
||||
"github.com/ethereum/go-ethereum/rlp"
|
||||
|
||||
"github.com/your-org/mev-bot/pkg/config"
|
||||
"github.com/your-org/mev-bot/pkg/validation"
|
||||
)
|
||||
|
||||
// Package-level DEX configuration
|
||||
var dexConfig *config.DEXConfig
|
||||
|
||||
// InitDEXConfig loads the DEX configuration from file
|
||||
func InitDEXConfig(configPath string) error {
|
||||
cfg, err := config.LoadDEXConfig(configPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to load DEX config: %w", err)
|
||||
}
|
||||
dexConfig = cfg
|
||||
return nil
|
||||
}
|
||||
|
||||
// L2MessageKind represents the type of L2 message
|
||||
type L2MessageKind uint8
|
||||
|
||||
@@ -233,36 +247,17 @@ func GetSwapProtocol(to *common.Address, data []byte) *DEXProtocol {
|
||||
selector := hex.EncodeToString(data[0:4])
|
||||
toAddr := to.Hex()
|
||||
|
||||
// Map known router addresses (Arbitrum mainnet)
|
||||
knownRouters := map[string]*DEXProtocol{
|
||||
// UniswapV2/V3
|
||||
"0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506": {Name: "SushiSwap", Version: "V2", Type: "router"},
|
||||
"0xE592427A0AEce92De3Edee1F18E0157C05861564": {Name: "UniswapV3", Version: "V1", Type: "router"},
|
||||
"0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45": {Name: "UniswapV3", Version: "V2", Type: "router"},
|
||||
"0xEf1c6E67703c7BD7107eed8303Fbe6EC2554BF6B": {Name: "UniswapUniversal", Version: "V1", Type: "router"},
|
||||
|
||||
// Camelot
|
||||
"0xc873fEcbd354f5A56E00E710B90EF4201db2448d": {Name: "Camelot", Version: "V2", Type: "router"},
|
||||
"0x1F721E2E82F6676FCE4eA07A5958cF098D339e18": {Name: "Camelot", Version: "V3", Type: "router"},
|
||||
|
||||
// Balancer
|
||||
"0xBA12222222228d8Ba445958a75a0704d566BF2C8": {Name: "Balancer", Version: "V2", Type: "vault"},
|
||||
|
||||
// Curve
|
||||
"0x7544Fe3d184b6B55D6B36c3FCA1157eE0Ba30287": {Name: "Curve", Version: "V1", Type: "router"},
|
||||
|
||||
// Kyber
|
||||
"0x6131B5fae19EA4f9D964eAc0408E4408b66337b5": {Name: "KyberSwap", Version: "V1", Type: "router"},
|
||||
"0xC1e7dFE73E1598E3910EF4C7845B68A19f0e8c6F": {Name: "KyberSwap", Version: "V2", Type: "router"},
|
||||
|
||||
// Aggregators
|
||||
"0x1111111254EEB25477B68fb85Ed929f73A960582": {Name: "1inch", Version: "V5", Type: "router"},
|
||||
"0xDEF171Fe48CF0115B1d80b88dc8eAB59176FEe57": {Name: "Paraswap", Version: "V5", Type: "router"},
|
||||
}
|
||||
|
||||
// Check if it's a known router
|
||||
if protocol, ok := knownRouters[toAddr]; ok {
|
||||
return protocol
|
||||
// Check if it's a known router (from config if loaded, else use fallback)
|
||||
if dexConfig != nil {
|
||||
for addr, routerCfg := range dexConfig.Routers {
|
||||
if addr == toAddr {
|
||||
return &DEXProtocol{
|
||||
Name: routerCfg.Name,
|
||||
Version: routerCfg.Version,
|
||||
Type: routerCfg.Type,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Try to identify by function selector
|
||||
|
||||
@@ -3,6 +3,7 @@ package sequencer
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"math/big"
|
||||
"sync"
|
||||
"time"
|
||||
@@ -62,7 +63,7 @@ func DefaultReaderConfig() *ReaderConfig {
|
||||
// Reader reads pending transactions from the Arbitrum sequencer
|
||||
type Reader struct {
|
||||
config *ReaderConfig
|
||||
logger log.Logger
|
||||
logger *slog.Logger
|
||||
|
||||
// Components
|
||||
parsers parsers.Factory
|
||||
@@ -93,6 +94,11 @@ type Reader struct {
|
||||
// No local atomic counters needed - metrics package handles thread safety
|
||||
}
|
||||
|
||||
// loggerAdapter converts slog.Logger to go-ethereum/log.Logger for compatibility
|
||||
func loggerAdapter(slogger *slog.Logger) log.Logger {
|
||||
return log.Root()
|
||||
}
|
||||
|
||||
// NewReader creates a new sequencer reader
|
||||
func NewReader(
|
||||
config *ReaderConfig,
|
||||
@@ -101,7 +107,7 @@ func NewReader(
|
||||
poolCache cache.PoolCache,
|
||||
detector *arbitrage.Detector,
|
||||
executor *execution.Executor,
|
||||
logger log.Logger,
|
||||
logger *slog.Logger,
|
||||
) (*Reader, error) {
|
||||
if config == nil {
|
||||
config = DefaultReaderConfig()
|
||||
@@ -116,13 +122,13 @@ func NewReader(
|
||||
// Create swap filter with pool cache
|
||||
swapFilter := NewSwapFilter(&SwapFilterConfig{
|
||||
SwapChannelSize: config.BufferSize,
|
||||
Logger: logger,
|
||||
Logger: loggerAdapter(logger),
|
||||
PoolCacheFile: "data/discovered_pools.json",
|
||||
})
|
||||
|
||||
return &Reader{
|
||||
config: config,
|
||||
logger: logger.New("component", "sequencer_reader"),
|
||||
logger: logger.With("component", "sequencer_reader"),
|
||||
parsers: parsers,
|
||||
validator: validator,
|
||||
poolCache: poolCache,
|
||||
@@ -312,7 +318,7 @@ func (r *Reader) readMessages(ctx context.Context, conn *websocket.Conn) error {
|
||||
func (r *Reader) worker(ctx context.Context, id int) {
|
||||
defer r.wg.Done()
|
||||
|
||||
logger := r.logger.New("worker", id)
|
||||
logger := r.logger.With("worker", id)
|
||||
|
||||
for {
|
||||
select {
|
||||
|
||||
Reference in New Issue
Block a user