update indexer: index all txs

config.yaml

@@ -30,10 +30,6 @@ networks:
       rpc:  "https://sepolia.infura.io/v3/"
 
 
-api:
-  endpoint: "https://api.rarify.tokend.io/v1/chains"
-  auto_init: true
-
 meta_data:
   header: "66613161666237613a"
   footer: "3b"

internal/assets/migrations/001_initial.sql

@@ -9,7 +9,8 @@ CREATE TABLE transactions (
     network_from  VARCHAR(10),
     value_to numeric,
     timestamp_to timestamp,
-    PRIMARY KEY (tx_hash_from,  network_from)
+    currency  VARCHAR(10),
+    PRIMARY KEY (payment_id)
 );
 
 

internal/config/main.go

@@ -14,7 +14,7 @@ type Config interface {
 	types.Copuser
 	NetworkConfiger
 	MetaDataConfiger
-	APIConfiger
+
 	ChainListenerConfiger
 	comfig.Listenerer
 }
@@ -25,7 +25,6 @@ type config struct {
 	types.Copuser
 	comfig.Listenerer
 	NetworkConfiger
-	APIConfiger
 	MetaDataConfiger
 	ChainListenerConfiger
 	getter kv.Getter
@@ -35,7 +34,6 @@ func New(getter kv.Getter) Config {
 	return &config{
 		getter:                getter,
 		MetaDataConfiger:      NewMetaDataConfiger(getter),
-		APIConfiger:           NewAPIConfiger(getter),
 		NetworkConfiger:       NewNetworkConfiger(getter),
 		Databaser:             pgdb.NewDatabaser(getter),
 		Copuser:               copus.NewCopuser(getter),

internal/data/pg/transactions.go

@@ -96,6 +96,12 @@ func (q *TransactionsQ) FilterByNotReady() data.TransactionsQ {
 
 	return q
 }
+func (q *TransactionsQ) FilterByNetworkFrom(networkFrom int32) data.TransactionsQ {
+	q.sql = q.sql.Where(sq.Eq{txHashFromField: networkFrom})
+	q.upd = q.upd.Where(sq.Eq{txHashFromField: networkFrom})
+
+	return q
+}
 
 func (q *TransactionsQ) Page(pageParams pgdb.OffsetPageParams) data.TransactionsQ {
 	q.sql = pageParams.ApplyTo(q.sql, idField)

internal/data/transactions.go

@@ -8,13 +8,14 @@ import (
 type TransactionsQ interface {
 	New() TransactionsQ
 	Insert(data *Transactions) error
-	FilterByRecipient(address string) TransactionsQ
 	Select() ([]Transactions, error)
 	Page(pageParams pgdb.OffsetPageParams) TransactionsQ
-	FilterByPaymentID(paymentID string) TransactionsQ
 	Update(data *Transactions) error
 	FilterByReady() TransactionsQ
 	FilterByNotReady() TransactionsQ
+	FilterByNetworkFrom(networkFrom int32) TransactionsQ
+	FilterByRecipient(address string) TransactionsQ
+	FilterByPaymentID(paymentID string) TransactionsQ
 }
 
 type Transactions struct {
@@ -26,5 +27,6 @@ type Transactions struct {
 	Recipient   string    `db:"recipient" structs:"recipient"`
 	Sender      string    `db:"sender" structs:"sender"`
 	ValueTo     string    `db:"value_to" structs:"value_to"`
+	Currency    string    `db:"currency" structs:"currency"`
 	TimestampTo time.Time `db:"timestamp_to" structs:"timestamp_to"`
 }

internal/service/api/main.go

@@ -23,7 +23,7 @@ func (s *service) run() error {
 	s.log.Info("Service started")
 
 	r := s.router()
-	listenHandler := handler.NewHandler(s.log, s.cfg.Network().NetInfoList, s.cfg.API(), pg.NewMasterQ(s.cfg.DB()), s.cfg.MetaData(), s.cfg.ChainListener())
+	listenHandler := handler.NewHandler(s.log, s.cfg.Network().NetInfoList, pg.NewMasterQ(s.cfg.DB()), s.cfg.MetaData(), s.cfg.ChainListener())
 	if err := listenHandler.Init(); err != nil {
 		return errors.Wrap(err, "failed to init listeners")
 	}

internal/service/core/handler/handler.go

@@ -6,7 +6,6 @@ import (
 	"github.com/dl-only-tokens/back-listener/internal/config"
 	"github.com/dl-only-tokens/back-listener/internal/data"
 	"github.com/dl-only-tokens/back-listener/internal/service/core/listener"
-	"github.com/dl-only-tokens/back-listener/internal/service/core/rarimo"
 	"github.com/pkg/errors"
 	"gitlab.com/distributed_lab/logan/v3"
 	"math/big"
@@ -18,16 +17,14 @@ type Handler interface {
 	Init() error
 }
 
-func NewHandler(log *logan.Entry, networker []config.NetInfo, rarimoApi *config.API, masterQ data.MasterQ, metaData *config.MetaData, chainListener *config.ChainListener) Handler {
+func NewHandler(log *logan.Entry, networker []config.NetInfo, masterQ data.MasterQ, metaData *config.MetaData, chainListener *config.ChainListener) Handler {
 	return &ListenerHandler{
 		Listeners:       make([]listener.Listener, 0),
 		ctx:             context.Background(),
 		log:             log,
 		supportNetworks: networker,
 		pauseTime:       chainListener.PauseTime,
-		rarimoAPI:       rarimoApi.Endpoint,
 		masterQ:         masterQ,
-		isAutoInit:      rarimoApi.IsAutoInit,
 		txMetaData:      metaData,
 		abiPath:         chainListener.AbiPath,
 		healthCheckChan: make(chan listener.Listener),
@@ -48,13 +45,6 @@ func (h *ListenerHandler) Run() {
 }
 
 func (h *ListenerHandler) Init() error {
-	if h.isAutoInit {
-		if err := h.autoInitContracts(); err != nil {
-			return errors.Wrap(err, "failed to do auto  init")
-		}
-		return nil
-	}
-
 	if err := h.initListeners(h.supportNetworks); err != nil {
 		return errors.Wrap(err, "failed to do auto  init")
 	}
@@ -63,32 +53,18 @@ func (h *ListenerHandler) Init() error {
 
 }
 
-func (h *ListenerHandler) autoInitContracts() error {
-	rarimoHandler := rarimo.NewRarimoHandler(h.rarimoAPI)
-	networks, err := rarimoHandler.GetContractsAddresses()
-	if err != nil {
-		return errors.Wrap(err, "failed to get contract list")
-	}
-
-	if err = h.initListeners(networks); err != nil {
-		return errors.Wrap(err, "failed to initListeners")
-	}
-
-	return nil
-}
-
 func (h *ListenerHandler) initListeners(data []config.NetInfo) error {
 	for _, network := range data {
 
-		preparedListener, err := h.prepareNewListener(network.Name, network.Address, false)
+		preparedListener, err := h.prepareNewListener(network.Name, false)
 		if err != nil {
 			h.log.WithError(err).Error("failed to connect to  rpc")
 			continue
 		}
 
 		h.addNewListener(preparedListener)
 
-		preparedListener, err = h.prepareNewListener(network.Name, network.Address, true)
+		preparedListener, err = h.prepareNewListener(network.Name, true)
 		if err != nil {
 			h.log.WithError(err).Error("failed to connect to  rpc")
 			continue
@@ -100,18 +76,13 @@ func (h *ListenerHandler) initListeners(data []config.NetInfo) error {
 	return nil
 }
 
-func (h *ListenerHandler) prepareNewListener(network string, address string, isIndexer bool) (listener.Listener, error) {
+func (h *ListenerHandler) prepareNewListener(network string, isIndexer bool) (listener.Listener, error) {
 	netInfo := h.findNetwork(network)
 	if netInfo == nil {
 		return nil, errors.New(fmt.Sprintf("unsupported network: %s", network))
 	}
 
-	if len(address) == 0 {
-		return nil, errors.New("address is empty")
-	}
-
 	info := listener.EthInfo{
-		Address:     address,
 		RPC:         netInfo.Rpc,
 		ChainID:     netInfo.ChainID,
 		NetworkName: network,

internal/service/core/handler/types.go

@@ -8,10 +8,6 @@ import (
 	"gitlab.com/distributed_lab/logan/v3"
 )
 
-const (
-	ChanIsClosed = iota
-)
-
 type ListenerHandler struct {
 	Listeners       []listener.Listener
 	supportNetworks []config.NetInfo
@@ -21,7 +17,6 @@ type ListenerHandler struct {
 	healthCheckChan chan listener.Listener
 	rarimoAPI       string
 	masterQ         data.MasterQ
-	isAutoInit      bool
 	txMetaData      *config.MetaData
 	abiPath         string
 }