Merge pull request #4 from celenium-io/fix/tx-signer-hash

Fix: signer hash
celenium-io · Mar 21, 2024 · 4d01e87 · 4d01e87
2 parents c92644f + 8e97baa
commit 4d01e87
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/cmd/api/init.go b/cmd/api/init.go
@@ -347,7 +347,7 @@ func initHandlers(ctx context.Context, e *echo.Echo, cfg Config, db postgres.Sto
 	v1.GET("/swagger/*", echoSwagger.WrapHandler)
 
 	if cfg.ApiConfig.Websocket {
-		initWebsocket(ctx, db, v1)
+		initWebsocket(ctx, v1)
 	}
 
 	log.Info().Msg("API routes:")
@@ -381,7 +381,7 @@ var (
 	endpointCache *cache.Cache
 )
 
-func initWebsocket(ctx context.Context, db postgres.Storage, group *echo.Group) {
+func initWebsocket(ctx context.Context, group *echo.Group) {
 	observer := dispatcher.Observe(storage.ChannelHead, storage.ChannelBlock)
 	wsManager = websocket.NewManager(observer)
 	wsManager.Start(ctx)

diff --git a/internal/storage/postgres/stats_test.go b/internal/storage/postgres/stats_test.go
@@ -118,9 +118,9 @@ func (s *StatsTestSuite) TestSummary() {
 	s.Require().EqualValues(0.0038194444444444443, summary.BPS)
 	s.Require().EqualValues(2327, summary.BlockTime)
 	s.Require().EqualValues(330, summary.BytesInBlock)
-	s.Require().EqualValues(0, summary.DataSize)
+	s.Require().EqualValues(202, summary.DataSize)
 	s.Require().EqualValues("0", summary.Fee.String())
-	s.Require().EqualValues(0, summary.RBPS)
+	s.Require().EqualValues(0.002337962962962963, summary.RBPS)
 	s.Require().EqualValues("0", summary.Supply.String())
 	s.Require().EqualValues(1, summary.TxCount)
 }

diff --git a/internal/storage/postgres/tx.go b/internal/storage/postgres/tx.go
@@ -25,9 +25,16 @@ func NewTx(db *database.Bun) *Tx {
 }
 
 func (tx *Tx) ByHash(ctx context.Context, hash []byte) (transaction storage.Tx, err error) {
-	err = tx.DB().NewSelect().Model(&transaction).
+	query := tx.DB().NewSelect().Model((*storage.Tx)(nil)).
 		Where("hash = ?", hash).
-		Scan(ctx)
+		Limit(1)
+
+	err = tx.DB().NewSelect().
+		TableExpr("(?) as tx", query).
+		ColumnExpr("tx.*").
+		ColumnExpr("address.hash as signer__hash").
+		Join("left join address on address.id = tx.signer_id").
+		Scan(ctx, &transaction)
 	return
 }
 

diff --git a/internal/storage/postgres/tx_test.go b/internal/storage/postgres/tx_test.go
@@ -31,6 +31,8 @@ func (s *StorageTestSuite) TestTxByHash() {
 	s.Require().EqualValues(1, tx.SignerId)
 	s.Require().EqualValues(types.StatusSuccess, tx.Status)
 	s.Require().EqualValues(hash, tx.Hash)
+	s.Require().NotNil(tx.Signer)
+	s.Require().Equal("3fff1c39b9d163bfb9bcbf9dfea78675f1b4bc2c", hex.EncodeToString(tx.Signer.Hash))
 }
 
 func (s *StorageTestSuite) TestTxByHeight() {

diff --git a/test/data/block_stats.yml b/test/data/block_stats.yml
@@ -8,6 +8,7 @@
   supply_change: 0
   fee: 0
   bytes_in_block: 64
+  data_size: 0
 - id: 7966
   height: 7965
   time: '2023-12-01T00:18:07.575Z'
@@ -18,3 +19,4 @@
   supply_change: 0
   fee: 0
   bytes_in_block: 266
+  data_size: 202