Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions internal/storage/postgres/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,34 @@ func createIndices(ctx context.Context, conn *database.Bun) error {
return err
}

// Hyperlane Gas Payment
if _, err := tx.NewCreateIndex().
IfNotExists().
Model((*storage.HLGasPayment)(nil)).
Index("hl_gas_payment_height_idx").
Column("height").
Using("BRIN").
Exec(ctx); err != nil {
return err
}
if _, err := tx.NewCreateIndex().
IfNotExists().
Model((*storage.HLGasPayment)(nil)).
Index("hl_gas_payment_transfer_id_idx").
Column("transfer_id").
Exec(ctx); err != nil {
return err
}
if _, err := tx.NewCreateIndex().
IfNotExists().
Model((*storage.HLGasPayment)(nil)).
Index("hl_gas_payment_igp_id_idx").
Column("igp_id").
Where("igp_id is not null").
Exec(ctx); err != nil {
return err
}

// Hyperlane Mailbox
if _, err := tx.NewCreateIndex().
IfNotExists().
Expand Down
30 changes: 24 additions & 6 deletions internal/storage/postgres/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,28 @@ func (tx *Tx) setSigners(ctx context.Context, txs []storage.Tx) error {
return err
}

matchSignersWithTx(txs, signers)
return nil
}

func matchSignersWithTx(txs []storage.Tx, signers []storage.Signer) {
signerMap := make(map[uint64][]storage.Address, len(txs))

for i := range signers {
for j := range txs {
if txs[j].Id == signers[i].TxId && signers[i].Address != nil {
txs[j].Signers = append(txs[j].Signers, *signers[i].Address)
break
}
if signers[i].Address == nil {
continue
}
signerMap[signers[i].TxId] = append(
signerMap[signers[i].TxId],
*signers[i].Address,
)
}

for i := range txs {
if addrs, ok := signerMap[txs[i].Id]; ok {
txs[i].Signers = addrs
}
}
return nil
}

func (tx *Tx) ByHash(ctx context.Context, hash []byte) (transaction storage.Tx, err error) {
Expand Down Expand Up @@ -124,6 +137,11 @@ func (tx *Tx) ByAddress(ctx context.Context, addressId uint64, fltrs storage.TxF
Model(&relations).
Where("address_id = ?", addressId)

if fltrs.IsEmpty() {
signersQuery = limitScope(signersQuery, fltrs.Limit)
signersQuery = signersQuery.Offset(fltrs.Offset)
}

signersQuery = sortScope(signersQuery, "tx_id", fltrs.Sort)

query := tx.DB().NewSelect().
Expand Down
33 changes: 33 additions & 0 deletions internal/storage/postgres/tx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ package postgres
import (
"context"
"encoding/hex"
"fmt"
"testing"
"time"

"github.com/celenium-io/celestia-indexer/internal/storage"
Expand Down Expand Up @@ -318,6 +320,17 @@ func (s *StorageTestSuite) TestTxByAddressAndTime() {
s.Require().Len(txs, 2)
}

func (s *StorageTestSuite) TestTxByAddress() {
ctx, ctxCancel := context.WithTimeout(context.Background(), 5*time.Second)
defer ctxCancel()

txs, err := s.storage.Tx.ByAddress(ctx, 1, storage.TxFilter{
Limit: 10,
})
s.Require().NoError(err)
s.Require().Len(txs, 3)
}

func (s *StorageTestSuite) TestTxGas() {
ctx, ctxCancel := context.WithTimeout(context.Background(), 5*time.Second)
defer ctxCancel()
Expand All @@ -341,3 +354,23 @@ func (s *StorageTestSuite) TestTxGas() {
s.Require().EqualValues("80410", tx1.Fee.String())
s.Require().EqualValues("1", tx1.GasPrice.String())
}

func BenchmarkSetSigners(b *testing.B) {
txs := make([]storage.Tx, 100)
signers := make([]storage.Signer, 1000)

for i := 0; i < 100; i++ {
txs[i].Id = uint64(i)
for j := 0; j < 10; j++ {
idx := i*10 + j
signers[idx].TxId = uint64(i)
addr := storage.Address{Address: fmt.Sprintf("addr_%d", idx)}
signers[idx].Address = &addr
}
}

b.ResetTimer()
for i := 0; i < b.N; i++ {
matchSignersWithTx(txs, signers)
}
}
9 changes: 9 additions & 0 deletions internal/storage/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ type TxFilter struct {
WithMessages bool
}

func (filter *TxFilter) IsEmpty() bool {
return len(filter.Status) == 0 &&
filter.MessageTypes.Empty() &&
filter.ExcludedMessageTypes.Empty() &&
filter.Height == nil &&
filter.TimeFrom.IsZero() &&
filter.TimeTo.IsZero()
}

// Tx -
type Tx struct {
bun.BaseModel `bun:"tx" comment:"Table with celestia transactions."`
Expand Down
2 changes: 1 addition & 1 deletion pkg/indexer/storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ func (module *Module) processBlockInTransaction(ctx context.Context, tx storage.
if err := tx.SaveEvents(ctx, events...); err != nil {
return state, err
}
events = make([]storage.Event, 0, 10000)
events = events[:0]
}
}
if len(events) > 0 {
Expand Down
Loading