Fix: fees to sudo address

aopoltorzhicky · aopoltorzhicky · commit 68943a1de960 · 2025-10-31T17:09:38.000+03:00
diff --git a/cmd/api/docs/docs.go b/cmd/api/docs/docs.go
diff --git a/cmd/api/docs/swagger.json b/cmd/api/docs/swagger.json
diff --git a/cmd/api/docs/swagger.yaml b/cmd/api/docs/swagger.yaml
diff --git a/cmd/api/handler/responses/block.go b/cmd/api/handler/responses/block.go
@@ -72,7 +72,6 @@ type BlockStats struct {
 func NewBlockStats(stats *storage.BlockStats) *BlockStats {
 	return &BlockStats{
 		TxCount:      stats.TxCount,
-		Fee:          stats.Fee.String(),
 		SupplyChange: stats.SupplyChange.String(),
 		BlockTime:    stats.BlockTime,
 		BytesInBlock: stats.BytesInBlock,
diff --git a/cmd/api/handler/stats.go b/cmd/api/handler/stats.go
@@ -109,7 +109,7 @@ func (sh *StatsHandler) SummaryTimeframe(c echo.Context) error {
 
 type seriesRequest struct {
 	Timeframe  string `example:"hour"       param:"timeframe" swaggertype:"string"  validate:"required,oneof=hour day month"`
-	SeriesName string `example:"tps"        param:"name"      swaggertype:"string"  validate:"required,oneof=data_size tps bps rbps fee supply_change block_time tx_count bytes_in_block"`
+	SeriesName string `example:"tps"        param:"name"      swaggertype:"string"  validate:"required,oneof=data_size tps bps rbps supply_change block_time tx_count bytes_in_block"`
 	From       int64  `example:"1692892095" query:"from"      swaggertype:"integer" validate:"omitempty,min=1"`
 	To         int64  `example:"1692892095" query:"to"        swaggertype:"integer" validate:"omitempty,min=1"`
 }
@@ -121,7 +121,7 @@ type seriesRequest struct {
 //	@Tags			stats
 //	@ID				stats-series
 //	@Param			timeframe	path	string	true	"Timeframe"						Enums(hour, day, month)
-//	@Param			name		path	string	true	"Series name"					Enums(data_size, tps, bps, rbps, fee, supply_change, block_time, tx_count, bytes_in_block)
+//	@Param			name		path	string	true	"Series name"					Enums(data_size, tps, bps, rbps, supply_change, block_time, tx_count, bytes_in_block)
 //	@Param			from		query	integer	false	"Time from in unix timestamp"	mininum(1)
 //	@Param			to			query	integer	false	"Time to in unix timestamp"		mininum(1)
 //	@Produce		json
diff --git a/cmd/api/handler/stats_test.go b/cmd/api/handler/stats_test.go
@@ -56,7 +56,6 @@ func (s *StatsTestSuite) TestBlockStatsHistogram() {
 		storage.SeriesDataSize,
 		storage.SeriesBlockTime,
 		storage.SeriesBytesInBlock,
-		storage.SeriesFee,
 		storage.SeriesSupplyChange,
 		storage.SeriesTPS,
 		storage.SeriesTxCount,
diff --git a/database/views/00_block_stats_by_hour.sql b/database/views/00_block_stats_by_hour.sql
@@ -6,7 +6,6 @@ WITH (timescaledb.continuous, timescaledb.materialized_only=false) AS
 		avg(block_time) as block_time,
 		percentile_agg(block_time) as block_time_pct,
 		sum(supply_change) as supply_change,
-		sum(fee) as fee,
 		sum(bytes_in_block) as bytes_in_block,
 		sum(data_size) as data_size,
 		(sum(bytes_in_block)/3600.0) as bps,
diff --git a/database/views/01_block_stats_by_day.sql b/database/views/01_block_stats_by_day.sql
@@ -5,7 +5,6 @@ WITH (timescaledb.continuous, timescaledb.materialized_only=false) AS
 		sum(tx_count) as tx_count,
 		mean(rollup(block_time_pct)) as block_time,
 		rollup(block_time_pct) as block_time_pct,
-		sum(fee) as fee,
 		sum(supply_change) as supply_change,
 		sum(bytes_in_block) as bytes_in_block,
 		sum(data_size) as data_size,
diff --git a/database/views/02_block_stats_by_month.sql b/database/views/02_block_stats_by_month.sql
@@ -5,7 +5,6 @@ WITH (timescaledb.continuous, timescaledb.materialized_only=false) AS
 		sum(tx_count) as tx_count,
 		mean(rollup(block_time_pct)) as block_time,
 		rollup(block_time_pct) as block_time_pct,
-		sum(fee) as fee,
 		sum(supply_change) as supply_change,
 		sum(bytes_in_block) as bytes_in_block,
 		sum(data_size) as data_size,
diff --git a/internal/storage/block_stats.go b/internal/storage/block_stats.go
@@ -24,12 +24,11 @@ type BlockStats struct {
 	Height pkgTypes.Level `bun:"height"                    comment:"The number (height) of this block"`
 	Time   time.Time      `bun:"time,pk,notnull"           comment:"The time of block"`
 
-	TxCount      int64           `bun:"tx_count"         comment:"Count of transactions in block"`
-	BlockTime    uint64          `bun:"block_time"       comment:"Time in milliseconds between current and previous block"`
-	SupplyChange decimal.Decimal `bun:",type:numeric"    comment:"Change of total supply in the block"`
-	Fee          decimal.Decimal `bun:"fee,type:numeric" comment:"Summary block fee"`
-	BytesInBlock int64           `bun:"bytes_in_block"   comment:"Size of all transactions in bytes"`
-	DataSize     int64           `bun:"data_size"        comment:"Size of all rollup data in block"`
+	TxCount      int64           `bun:"tx_count"       comment:"Count of transactions in block"`
+	BlockTime    uint64          `bun:"block_time"     comment:"Time in milliseconds between current and previous block"`
+	SupplyChange decimal.Decimal `bun:",type:numeric"  comment:"Change of total supply in the block"`
+	BytesInBlock int64           `bun:"bytes_in_block" comment:"Size of all transactions in bytes"`
+	DataSize     int64           `bun:"data_size"      comment:"Size of all rollup data in block"`
 }
 
 func (BlockStats) TableName() string {
diff --git a/internal/storage/postgres/block.go b/internal/storage/postgres/block.go
@@ -42,7 +42,7 @@ func (b *Blocks) ByHeight(ctx context.Context, height types.Level, withStats boo
 		query = query.
 			ColumnExpr("stats.id AS stats__id, stats.height AS stats__height, stats.time AS stats__time, stats.tx_count AS stats__tx_count").
 			ColumnExpr("stats.block_time AS stats__block_time, stats.bytes_in_block AS stats__bytes_in_block").
-			ColumnExpr("stats.supply_change AS stats__supply_change, stats.fee AS stats__fee").
+			ColumnExpr("stats.supply_change AS stats__supply_change").
 			Join("left join block_stats as stats ON stats.height = block.height AND stats.time = block.time")
 	}
 
@@ -75,7 +75,7 @@ func (b *Blocks) ByHash(ctx context.Context, hash []byte) (block storage.Block,
 		ColumnExpr("validator.id as proposer__id, validator.address as proposer__address, validator.name as proposer__name").
 		ColumnExpr("stats.id AS stats__id, stats.height AS stats__height, stats.time AS stats__time, stats.tx_count AS stats__tx_count").
 		ColumnExpr("stats.block_time AS stats__block_time, stats.bytes_in_block AS stats__bytes_in_block").
-		ColumnExpr("stats.supply_change AS stats__supply_change, stats.fee AS stats__fee").
+		ColumnExpr("stats.supply_change AS stats__supply_change").
 		Join("left join validator on block.proposer_id = validator.id").
 		Join("left join block_stats as stats ON stats.height = block.height AND stats.time = block.time").
 		Scan(ctx, &block)
@@ -94,7 +94,7 @@ func (b *Blocks) ListWithStats(ctx context.Context, limit, offset uint64, order
 		ColumnExpr("v.id AS proposer__id, v.address as proposer__address, v.name as proposer__name").
 		ColumnExpr("stats.id AS stats__id, stats.height AS stats__height, stats.time AS stats__time, stats.tx_count AS stats__tx_count").
 		ColumnExpr("stats.block_time AS stats__block_time, stats.bytes_in_block AS stats__bytes_in_block").
-		ColumnExpr("stats.supply_change AS stats__supply_change, stats.fee AS stats__fee").
+		ColumnExpr("stats.supply_change AS stats__supply_change").
 		TableExpr("(?) as block", subQuery).
 		Join("LEFT JOIN block_stats as stats ON stats.height = block.height AND stats.time = block.time").
 		Join("LEFT JOIN validator as v ON v.id = block.proposer_id")
@@ -117,7 +117,7 @@ func (b *Blocks) ByProposer(ctx context.Context, proposerId uint64, limit, offse
 		ColumnExpr("v.id AS proposer__id, v.address as proposer__address, v.name as proposer__name").
 		ColumnExpr("stats.id AS stats__id, stats.height AS stats__height, stats.time AS stats__time, stats.tx_count AS stats__tx_count").
 		ColumnExpr("stats.block_time AS stats__block_time, stats.bytes_in_block AS stats__bytes_in_block").
-		ColumnExpr("stats.supply_change AS stats__supply_change, stats.fee AS stats__fee").
+		ColumnExpr("stats.supply_change AS stats__supply_change").
 		TableExpr("(?) as block", subQuery).
 		Join("LEFT JOIN block_stats as stats ON stats.height = block.height AND stats.time = block.time").
 		Join("LEFT JOIN validator as v ON v.id = block.proposer_id")
@@ -138,7 +138,7 @@ func (b *Blocks) ByIdWithRelations(ctx context.Context, id uint64) (block storag
 		ColumnExpr("validator.id as proposer__id, validator.address as proposer__address, validator.name as proposer__name, validator.pubkey as proposer__pubkey, validator.pubkey_type as proposer__pubkey_type, validator.power as proposer__power, validator.height as proposer__height").
 		ColumnExpr("stats.id AS stats__id, stats.height AS stats__height, stats.time AS stats__time, stats.tx_count AS stats__tx_count").
 		ColumnExpr("stats.block_time AS stats__block_time, stats.bytes_in_block AS stats__bytes_in_block").
-		ColumnExpr("stats.supply_change AS stats__supply_change, stats.fee AS stats__fee").
+		ColumnExpr("stats.supply_change AS stats__supply_change").
 		Join("left join validator on block.proposer_id = validator.id").
 		Join("left join block_stats as stats ON stats.height = block.height AND stats.time = block.time").
 		Scan(ctx, &block)
diff --git a/internal/storage/postgres/stats.go b/internal/storage/postgres/stats.go
@@ -48,8 +48,6 @@ func (s Stats) Series(ctx context.Context, timeframe storage.Timeframe, name str
 		query.ColumnExpr("ts, bps as value, bps_max as max, bps_min as min")
 	case storage.SeriesRBPS:
 		query.ColumnExpr("ts, rbps as value, rbps_max as max, rbps_min as min")
-	case storage.SeriesFee:
-		query.ColumnExpr("ts, fee as value")
 	case storage.SeriesSupplyChange:
 		query.ColumnExpr("ts, supply_change as value")
 	case storage.SeriesBlockTime:
@@ -117,7 +115,7 @@ func (s Stats) RollupSeries(ctx context.Context, rollupId uint64, timeframe stor
 
 func (s Stats) Summary(ctx context.Context) (summary storage.NetworkSummary, err error) {
 	err = s.db.DB().NewSelect().Table(storage.ViewBlockStatsByMonth).
-		ColumnExpr("sum(data_size) as data_size, sum(fee) as fee, sum(supply_change) as supply, sum(tx_count) as tx_count, sum(bytes_in_block) as bytes_in_block").
+		ColumnExpr("sum(data_size) as data_size, sum(supply_change) as supply, sum(tx_count) as tx_count, sum(bytes_in_block) as bytes_in_block").
 		ColumnExpr("avg(tps) as tps, avg(bps) as bps, avg(rbps) as rbps, avg(block_time) as block_time").
 		Scan(ctx, &summary)
 	return
diff --git a/internal/storage/stats.go b/internal/storage/stats.go
@@ -59,7 +59,6 @@ const (
 	SeriesTPS          = "tps"
 	SeriesBPS          = "bps"
 	SeriesRBPS         = "rbps"
-	SeriesFee          = "fee"
 	SeriesSupplyChange = "supply_change"
 	SeriesBlockTime    = "block_time"
 	SeriesTxCount      = "tx_count"
diff --git a/pkg/indexer/decode/actions.go b/pkg/indexer/decode/actions.go
@@ -140,7 +140,7 @@ func parseActions(height types.Level, blockTime time.Time, from string, tx *Deco
 				Update:   fromAmount,
 			})
 
-			to := ctx.Addresses.Set(ctx.Proposer, height, actionFee.Amount, actionFee.Asset, 0, 0)
+			to := ctx.Addresses.Set(ctx.SudoAddress, height, actionFee.Amount, actionFee.Asset, 0, 0)
 			actions[i].BalanceUpdates = append(actions[i].BalanceUpdates, storage.BalanceUpdate{
 				Address:  to,
 				Height:   actions[i].Height,
diff --git a/pkg/indexer/decode/context.go b/pkg/indexer/decode/context.go
@@ -33,7 +33,7 @@ type Context struct {
 	MarketProviders  []storage.MarketProviderUpdate
 	Prices           []storage.Price
 	HasWriteAckError bool
-	Proposer         string
+	SudoAddress      string
 
 	bridgeAssets map[string]string
 	blockTime    time.Time
diff --git a/pkg/indexer/genesis/parse.go b/pkg/indexer/genesis/parse.go
@@ -44,7 +44,6 @@ func (module *Module) parse(genesis types.Genesis) (parsedData, error) {
 		Stats: &storage.BlockStats{
 			Time:         genesis.GenesisTime,
 			Height:       pkgTypes.Level(genesis.InitialHeight - 1),
-			Fee:          decimal.Zero,
 			SupplyChange: decimal.Zero,
 		},
 	}
diff --git a/pkg/indexer/genesis/save.go b/pkg/indexer/genesis/save.go
@@ -91,7 +91,6 @@ func (module *Module) save(ctx context.Context, data parsedData) error {
 	}
 	module.Log.Info().
 		Uint64("height", data.block.Id).
-		Str("block_fee", data.block.Stats.Fee.String()).
 		Int64("ms", time.Since(start).Milliseconds()).
 		Msg("block saved")
 	return nil
diff --git a/pkg/indexer/indexer.go b/pkg/indexer/indexer.go
@@ -48,6 +48,7 @@ func New(cfg *config.Config, pg *sdkPg.Storage, stopperModule modules.Module) (I
 	blocks := postgres.NewBlocks(pg)
 	bridges := postgres.NewBridge(pg)
 	notificator := postgres.NewNotificator(cfg.Database, pg)
+	constants := postgres.NewConstant(pg)
 
 	api, r, err := createReceiver(cfg)
 	if err != nil {
@@ -59,7 +60,7 @@ func New(cfg *config.Config, pg *sdkPg.Storage, stopperModule modules.Module) (I
 		return Indexer{}, errors.Wrap(err, "while creating rollback module")
 	}
 
-	p, err := createParser(r, &api)
+	p, err := createParser(r, &api, constants)
 	if err != nil {
 		return Indexer{}, errors.Wrap(err, "while creating parser module")
 	}
@@ -174,8 +175,8 @@ func makeBridgeAssetsMap(ctx context.Context, bridges internalStorage.IBridge) (
 	return assets, nil
 }
 
-func createParser(receiverModule modules.Module, api node.Api) (*parser.Module, error) {
-	parserModule := parser.NewModule(api)
+func createParser(receiverModule modules.Module, api node.Api, constants internalStorage.IConstant) (*parser.Module, error) {
+	parserModule := parser.NewModule(api, constants)
 
 	if err := parserModule.AttachTo(receiverModule, receiver.BlocksOutput, parser.InputName); err != nil {
 		return nil, errors.Wrap(err, "while attaching parser to receiver")
diff --git a/pkg/indexer/parser/parse.go b/pkg/indexer/parser/parse.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/celenium-io/astria-indexer/internal/astria"
 	"github.com/celenium-io/astria-indexer/internal/storage"
+	storageTypes "github.com/celenium-io/astria-indexer/internal/storage/types"
 	"github.com/celenium-io/astria-indexer/pkg/indexer/decode"
 	"github.com/celenium-io/astria-indexer/pkg/types"
 	"github.com/pkg/errors"
-	"github.com/shopspring/decimal"
 )
 
 func (p *Module) parse(ctx context.Context, b types.BlockData) error {
@@ -23,13 +23,18 @@ func (p *Module) parse(ctx context.Context, b types.BlockData) error {
 		Int64("height", b.Block.Height).
 		Msg("parsing block...")
 
+	sudoAddress, err := p.constants.Get(ctx, storageTypes.ModuleNameGeneric, "authority_sudo_address")
+	if err != nil {
+		return errors.Wrap(err, "getting sudo address")
+	}
+
 	proposer, err := astria.EncodeFromHex(b.Block.ProposerAddress.String())
 	if err != nil {
 		return errors.Wrap(err, "decoding block proposer address")
 	}
 
 	decodeCtx := decode.NewContext(p.bridgeAssets, b.Block.Time)
-	decodeCtx.Proposer = proposer
+	decodeCtx.SudoAddress = sudoAddress.Value
 
 	if err := parseEvents(ctx, b.FinalizeBlockEvents, b.Height, &decodeCtx, p.api); err != nil {
 		return errors.Wrap(err, "parse finalize events")
@@ -73,7 +78,6 @@ func (p *Module) parse(ctx context.Context, b types.BlockData) error {
 			Height:       b.Height,
 			Time:         b.Block.Time,
 			TxCount:      int64(len(txs)),
-			Fee:          decimal.Zero,
 			SupplyChange: decodeCtx.SupplyChange,
 			BytesInBlock: decodeCtx.BytesInBlock,
 			DataSize:     decodeCtx.DataSize,
diff --git a/pkg/indexer/parser/parser.go b/pkg/indexer/parser/parser.go
@@ -6,6 +6,7 @@ package parser
 import (
 	"context"
 
+	"github.com/celenium-io/astria-indexer/internal/storage"
 	"github.com/celenium-io/astria-indexer/pkg/node"
 	"github.com/dipdup-net/indexer-sdk/pkg/modules"
 )
@@ -14,6 +15,7 @@ type Module struct {
 	modules.BaseModule
 
 	api          node.Api
+	constants    storage.IConstant
 	bridgeAssets map[string]string
 }
 
@@ -25,10 +27,11 @@ const (
 	StopOutput = "stop"
 )
 
-func NewModule(api node.Api) Module {
+func NewModule(api node.Api, constants storage.IConstant) Module {
 	m := Module{
 		BaseModule: modules.New("parser"),
 		api:        api,
+		constants:  constants,
 	}
 	m.CreateInput(InputName)
 	m.CreateOutput(OutputName)
diff --git a/pkg/indexer/parser/parser_test.go b/pkg/indexer/parser/parser_test.go
@@ -9,6 +9,8 @@ import (
 	"time"
 
 	"github.com/celenium-io/astria-indexer/internal/storage"
+	modelMock "github.com/celenium-io/astria-indexer/internal/storage/mock"
+	storageTypes "github.com/celenium-io/astria-indexer/internal/storage/types"
 	"github.com/celenium-io/astria-indexer/pkg/node/mock"
 	"github.com/celenium-io/astria-indexer/pkg/types"
 	cometTypes "github.com/cometbft/cometbft/types"
@@ -26,7 +28,16 @@ func createModules(t *testing.T, ctrl *gomock.Controller) (modules.BaseModule, s
 	writerModule.CreateOutput(outputName)
 
 	api := mock.NewMockApi(ctrl)
-	parserModule := NewModule(api)
+	constants := modelMock.NewMockIConstant(ctrl)
+	constants.EXPECT().
+		Get(gomock.Any(), storageTypes.ModuleNameGeneric, "authority_sudo_address").
+		Return(storage.Constant{
+			Module: storageTypes.ModuleNameGeneric,
+			Name:   "authority_sudo_address",
+			Value:  "astria1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqd3h4f",
+		}, nil).
+		AnyTimes()
+	parserModule := NewModule(api, constants)
 
 	err := parserModule.AttachTo(&writerModule, outputName, InputName)
 	assert.NoError(t, err)
@@ -59,7 +70,6 @@ func getExpectedBlock() storage.Block {
 			Height:       100,
 			Time:         testTime,
 			TxCount:      0,
-			Fee:          decimal.Zero,
 			SupplyChange: decimal.Zero,
 		},
 		Addresses:       make(map[string]*storage.Address),
diff --git a/pkg/indexer/storage/state_test.go b/pkg/indexer/storage/state_test.go
@@ -38,7 +38,6 @@ func Test_updateState(t *testing.T) {
 					Stats: &storage.BlockStats{
 						TxCount:      10,
 						SupplyChange: decimal.RequireFromString("100"),
-						Fee:          decimal.RequireFromString("10"),
 					},
 				},
 				totalAccounts: 10,
diff --git a/test/data/block_stats.yml b/test/data/block_stats.yml
