From 13d9d12bc9b00cf0d05cba8167bc1881dd15bd56 Mon Sep 17 00:00:00 2001 From: Ashton Date: Wed, 24 Jan 2024 09:23:09 +0000 Subject: [PATCH] all methods --- cmd/dev/main.go | 2 +- eth/{blocks.go => method_blocks.go} | 0 eth/method_pairs.go | 206 +++++++++++++++++++++++++++ eth/{methods.go => method_tokens.go} | 196 ------------------------- eth/pairs.go | 1 - eth/tokens.go | 1 - 6 files changed, 207 insertions(+), 199 deletions(-) rename eth/{blocks.go => method_blocks.go} (100%) create mode 100644 eth/method_pairs.go rename eth/{methods.go => method_tokens.go} (55%) delete mode 100644 eth/pairs.go delete mode 100644 eth/tokens.go diff --git a/cmd/dev/main.go b/cmd/dev/main.go index 23cb451..b61ddc8 100644 --- a/cmd/dev/main.go +++ b/cmd/dev/main.go @@ -92,7 +92,7 @@ func getTokens(n *eth.Network) { func getPairs(n *eth.Network) { ctx, cancel := context.WithTimeout(context.Background(), time.Second*2) defer cancel() - pairs, err := n.GetPairs(ctx, 18000010, 18000000) + pairs, err := n.GetPairs(ctx, 18000100, 18000000) if err != nil { panic(err) } diff --git a/eth/blocks.go b/eth/method_blocks.go similarity index 100% rename from eth/blocks.go rename to eth/method_blocks.go diff --git a/eth/method_pairs.go b/eth/method_pairs.go new file mode 100644 index 0000000..19190ec --- /dev/null +++ b/eth/method_pairs.go @@ -0,0 +1,206 @@ +package eth + +import ( + "context" + "errors" + "log/slog" + "math/big" + "strings" + + "github.com/autoapev1/indexer/types" + "github.com/autoapev1/indexer/utils" + "github.com/ethereum/go-ethereum" + "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethereum/go-ethereum/common" +) + +type pairMode int + +const ( + pairModeV2 pairMode = iota + pairModeV3 +) + +func (n *Network) GetPairs(ctx context.Context, to int64, from int64) ([]*types.Pair, error) { + pairs := make([]*types.Pair, 0) + + bRange := toRange(to, from) + if err := bRange.validate(); err != nil { + return nil, err + } + + batchRange := n.config.Sync.Pairs.BlockRange + + if batchRange > 1000 { + batchRange = 200 + } + + var ( + V2factoryAddr string + V3factoryAddr string + V2factoryABI string + V3factoryABI string + V2eventSig common.Hash + V3eventSig common.Hash + ) + switch n.Chain.ChainID { + case 1: + V2factoryABI = types.EthV2FactoryABI + V3factoryABI = types.EthV3FactoryABI + V2factoryAddr = types.EthV2FactoryAddress + V3factoryAddr = types.EthV3FactoryAddress + + case 56: + V2factoryABI = types.BscV2FactoryABI + V3factoryABI = types.BscV3FactoryABI + V2factoryAddr = types.BscV2FactoryAddress + V3factoryAddr = types.BscV3FactoryAddress + default: + return nil, errors.New("invalid chain (n.Chain.ChainID)") + } + + v2factoryDecoder, err := abi.JSON(strings.NewReader(V2factoryABI)) + if err != nil { + return nil, err + } + + v3factoryDecoder, err := abi.JSON(strings.NewReader(V3factoryABI)) + if err != nil { + return nil, err + } + + V2eventSig = utils.TopicToHash("PairCreated(address,address,address,uint256)") + V3eventSig = utils.TopicToHash("PoolCreated(address,address,uint24,int24,address)") + + v2s, v2err := n.getPairs(ctx, v2factoryDecoder, V2eventSig, V2factoryAddr, bRange, pairModeV2) + v3s, v3err := n.getPairs(ctx, v3factoryDecoder, V3eventSig, V3factoryAddr, bRange, pairModeV3) + + if v2err != nil { + return pairs, v2err + } + + if v3err != nil { + return pairs, v3err + } + + pairs = append(pairs, v2s...) + pairs = append(pairs, v3s...) + + return pairs, nil +} + +func (n *Network) getPairs(ctx context.Context, decoder abi.ABI, signature common.Hash, factory string, bRange blockRange, mode pairMode) ([]*types.Pair, error) { + var ( + pairs = make([]*types.Pair, 0) + err error + ) + topic := make([][]common.Hash, 0, 1) + topic = append(topic, []common.Hash{signature}) + + filter := ethereum.FilterQuery{ + FromBlock: big.NewInt(bRange.from), + ToBlock: big.NewInt(bRange.to), + Addresses: []common.Address{common.HexToAddress(factory)}, + Topics: topic, + } + + logs, err := n.Client.FilterLogs(ctx, filter) + if err != nil { + return nil, err + } + + switch mode { + case pairModeV2: + for _, l := range logs { + if len(l.Topics) != 3 { + slog.Warn("error decoding v2 PairCreated event", "error", "len(l.Topics) != 3") + continue + } + + p := &types.Pair{ + ChainID: int16(n.Chain.ChainID), + CreatedAt: int64(l.BlockNumber), + Hash: l.TxHash.String(), + Token0Address: common.HexToAddress((l.Topics[1].String())).String(), + Token1Address: common.HexToAddress((l.Topics[2].String())).String(), + Fee: 0, + TickSpacing: 0, + PoolType: 2, + } + + decoded, err := decoder.Unpack("PairCreated", l.Data) + if err != nil { + slog.Warn("error decoding v2 PairCreated event", "error", err) + continue + } + + if len(decoded) != 2 { + slog.Warn("error decoding v2 PairCreated event", "error", "len(decoded) != 2") + continue + } + + pair, ok := decoded[0].(common.Address) + if !ok { + slog.Warn("error decoding v2 PairCreated event", "error", "pair, ok := decoded[0].(common.Address)") + continue + } + + p.PoolAddress = pair.String() + p.Lower() + pairs = append(pairs, p) + } + + case pairModeV3: + for _, l := range logs { + if len(l.Topics) != 4 { + slog.Warn("error decoding v3 PoolCreated event", "error", "len(l.Topics) != 4") + continue + } + + p := &types.Pair{ + ChainID: int16(n.Chain.ChainID), + CreatedAt: int64(l.BlockNumber), + Hash: l.TxHash.String(), + Token0Address: common.HexToAddress((l.Topics[1].String())).String(), + Token1Address: common.HexToAddress((l.Topics[2].String())).String(), + Fee: l.Topics[3].Big().Int64(), + PoolType: 3, + PoolAddress: "unknown", + TickSpacing: 0, + } + + decoded, err := decoder.Unpack("PoolCreated", l.Data) + if err != nil { + slog.Warn("error decoding v3 PoolCreated event", "error", err) + continue + } + + if len(decoded) != 2 { + slog.Warn("error decoding v3 PoolCreated event", "error", "len(decoded) != 2") + continue + } + + tickSpacing, ok := decoded[0].(*big.Int) + if !ok { + slog.Warn("error decoding v3 PoolCreated event", "error", "p.TickSpacing, ok = decoded[0].(*big.Int)") + continue + } + + poolAddress, ok := decoded[1].(common.Address) + if !ok { + slog.Warn("error decoding v3 PoolCreated event", "error", "poolAddress, ok := decoded[1].(common.Address)") + continue + } + + p.PoolAddress = poolAddress.String() + p.TickSpacing = tickSpacing.Int64() + + p.Lower() + pairs = append(pairs, p) + } + default: + return nil, errors.New("invalid pair mode") + } + + return pairs, nil +} diff --git a/eth/methods.go b/eth/method_tokens.go similarity index 55% rename from eth/methods.go rename to eth/method_tokens.go index 33af830..6321700 100644 --- a/eth/methods.go +++ b/eth/method_tokens.go @@ -5,16 +5,11 @@ import ( "encoding/hex" "errors" "log/slog" - "math/big" "strconv" "strings" "sync" "github.com/autoapev1/indexer/types" - "github.com/autoapev1/indexer/utils" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rpc" ) @@ -295,194 +290,3 @@ func (n *Network) getStage2TokenInfoBatch(ctx context.Context, batch []rpc.Batch return nil } - -type pairMode int - -const ( - pairModeV2 pairMode = iota - pairModeV3 -) - -func (n *Network) GetPairs(ctx context.Context, to int64, from int64) ([]*types.Pair, error) { - pairs := make([]*types.Pair, 0) - - bRange := toRange(to, from) - if err := bRange.validate(); err != nil { - return nil, err - } - - batchRange := n.config.Sync.Pairs.BlockRange - - if batchRange > 1000 { - batchRange = 200 - } - - var ( - V2factoryAddr string - V3factoryAddr string - V2factoryABI string - V3factoryABI string - V2eventSig common.Hash - V3eventSig common.Hash - ) - switch n.Chain.ChainID { - case 1: - V2factoryABI = types.EthV2FactoryABI - V3factoryABI = types.EthV3FactoryABI - V2factoryAddr = types.EthV2FactoryAddress - V3factoryAddr = types.EthV3FactoryAddress - - case 56: - V2factoryABI = types.BscV2FactoryABI - V3factoryABI = types.BscV3FactoryABI - V2factoryAddr = types.BscV2FactoryAddress - V3factoryAddr = types.BscV3FactoryAddress - default: - return nil, errors.New("invalid chain (n.Chain.ChainID)") - } - - v2factoryDecoder, err := abi.JSON(strings.NewReader(V2factoryABI)) - if err != nil { - return nil, err - } - - v3factoryDecoder, err := abi.JSON(strings.NewReader(V3factoryABI)) - if err != nil { - return nil, err - } - - V2eventSig = utils.TopicToHash("PairCreated(address,address,address,uint256)") - V3eventSig = utils.TopicToHash("PoolCreated(address,address,uint24,int24,address)") - - v2s, v2err := n.getPairs(ctx, v2factoryDecoder, V2eventSig, V2factoryAddr, bRange, pairModeV2) - v3s, v3err := n.getPairs(ctx, v3factoryDecoder, V3eventSig, V3factoryAddr, bRange, pairModeV3) - - if v2err != nil { - return pairs, v2err - } - - if v3err != nil { - return pairs, v3err - } - - pairs = append(pairs, v2s...) - pairs = append(pairs, v3s...) - - return pairs, nil -} - -func (n *Network) getPairs(ctx context.Context, decoder abi.ABI, signature common.Hash, factory string, bRange blockRange, mode pairMode) ([]*types.Pair, error) { - var ( - pairs = make([]*types.Pair, 0) - err error - ) - topic := make([][]common.Hash, 0, 1) - topic = append(topic, []common.Hash{signature}) - - filter := ethereum.FilterQuery{ - FromBlock: big.NewInt(bRange.from), - ToBlock: big.NewInt(bRange.to), - Addresses: []common.Address{common.HexToAddress(factory)}, - Topics: topic, - } - - logs, err := n.Client.FilterLogs(ctx, filter) - if err != nil { - return nil, err - } - - switch mode { - case pairModeV2: - for _, l := range logs { - if len(l.Topics) != 3 { - slog.Warn("error decoding v2 PairCreated event", "error", "len(l.Topics) != 3") - continue - } - - p := &types.Pair{ - ChainID: int16(n.Chain.ChainID), - CreatedAt: int64(l.BlockNumber), - Hash: l.TxHash.String(), - Token0Address: common.HexToAddress((l.Topics[1].String())).String(), - Token1Address: common.HexToAddress((l.Topics[2].String())).String(), - Fee: 0, - TickSpacing: 0, - PoolType: 2, - } - - decoded, err := decoder.Unpack("PairCreated", l.Data) - if err != nil { - slog.Warn("error decoding v2 PairCreated event", "error", err) - continue - } - - if len(decoded) != 2 { - slog.Warn("error decoding v2 PairCreated event", "error", "len(decoded) != 2") - continue - } - - pair, ok := decoded[0].(common.Address) - if !ok { - slog.Warn("error decoding v2 PairCreated event", "error", "pair, ok := decoded[0].(common.Address)") - continue - } - - p.PoolAddress = pair.String() - p.Lower() - pairs = append(pairs, p) - } - - case pairModeV3: - for _, l := range logs { - if len(l.Topics) != 4 { - slog.Warn("error decoding v3 PoolCreated event", "error", "len(l.Topics) != 4") - continue - } - - p := &types.Pair{ - ChainID: int16(n.Chain.ChainID), - CreatedAt: int64(l.BlockNumber), - Hash: l.TxHash.String(), - Token0Address: common.HexToAddress((l.Topics[1].String())).String(), - Token1Address: common.HexToAddress((l.Topics[2].String())).String(), - Fee: l.Topics[3].Big().Int64(), - PoolType: 3, - PoolAddress: "unknown", - TickSpacing: 0, - } - - decoded, err := decoder.Unpack("PoolCreated", l.Data) - if err != nil { - slog.Warn("error decoding v3 PoolCreated event", "error", err) - continue - } - - if len(decoded) != 2 { - slog.Warn("error decoding v3 PoolCreated event", "error", "len(decoded) != 2") - continue - } - - tickSpacing, ok := decoded[0].(*big.Int) - if !ok { - slog.Warn("error decoding v3 PoolCreated event", "error", "p.TickSpacing, ok = decoded[0].(*big.Int)") - continue - } - - poolAddress, ok := decoded[1].(common.Address) - if !ok { - slog.Warn("error decoding v3 PoolCreated event", "error", "poolAddress, ok := decoded[1].(common.Address)") - continue - } - - p.PoolAddress = poolAddress.String() - p.TickSpacing = tickSpacing.Int64() - - p.Lower() - pairs = append(pairs, p) - } - default: - return nil, errors.New("invalid pair mode") - } - - return pairs, nil -} diff --git a/eth/pairs.go b/eth/pairs.go deleted file mode 100644 index b11c70e..0000000 --- a/eth/pairs.go +++ /dev/null @@ -1 +0,0 @@ -package eth diff --git a/eth/tokens.go b/eth/tokens.go deleted file mode 100644 index b11c70e..0000000 --- a/eth/tokens.go +++ /dev/null @@ -1 +0,0 @@ -package eth