Add signers to transaction model (#126)

* Add signers to transaction model * Rebuild API docs
celenium-io · Feb 12, 2024 · de33b49 · de33b49
1 parent 25b17e4
commit de33b49
Show file tree

Hide file tree

Showing 12 changed files with 449 additions and 311 deletions.
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/tx.go b/cmd/api/handler/responses/tx.go
@@ -30,6 +30,7 @@ type Tx struct {
 	Time          time.Time      `example:"2023-07-04T03:10:57+00:00"                                        format:"date-time" json:"time"                swaggertype:"string"`
 
 	Messages []Message `json:"messages,omitempty"`
+	Signers  []string  `json:"signers"`
 
 	MessageTypes []types.MsgType `example:"MsgSend,MsgUnjail" json:"message_types"`
 	Status       types.Status    `example:"success"           json:"status"`
@@ -57,11 +58,15 @@ func NewTx(tx storage.Tx) Tx {
 		MessageTypes:  tx.MessageTypes.Names(),
 		MsgTypeMask:   tx.MessageTypes,
 		Messages:      make([]Message, 0),
+		Signers:       make([]string, len(tx.Signers)),
 	}
 
 	for i := range tx.Messages {
 		result.Messages = append(result.Messages, NewMessage(tx.Messages[i]))
 	}
+	for i := range tx.Signers {
+		result.Signers[i] = tx.Signers[i].Address
+	}
 
 	return result
 }

diff --git a/cmd/api/handler/tx_test.go b/cmd/api/handler/tx_test.go
@@ -49,6 +49,11 @@ var (
 				Type: types.MsgSend,
 			},
 		},
+		Signers: []storage.Address{
+			{
+				Address: testAddress,
+			},
+		},
 	}
 )
 
@@ -122,6 +127,8 @@ func (s *TxTestSuite) TestGet() {
 	s.Require().Equal("memo", tx.Memo)
 	s.Require().Equal("sdk", tx.Codespace)
 	s.Require().Equal(types.StatusSuccess, tx.Status)
+	s.Require().Len(tx.Signers, 1)
+	s.Require().Equal(testAddress, tx.Signers[0])
 }
 
 func (s *TxTestSuite) TestGetInvalidTx() {
@@ -183,6 +190,8 @@ func (s *TxTestSuite) TestList() {
 	s.Require().Equal("memo", tx.Memo)
 	s.Require().Equal("sdk", tx.Codespace)
 	s.Require().Equal(types.StatusSuccess, tx.Status)
+	s.Require().Len(tx.Signers, 1)
+	s.Require().Equal(testAddress, tx.Signers[0])
 }
 
 func (s *TxTestSuite) TestListValidationStatusError() {
@@ -273,6 +282,8 @@ func (s *TxTestSuite) TestListTime() {
 	s.Require().Equal("memo", tx.Memo)
 	s.Require().Equal("sdk", tx.Codespace)
 	s.Require().Equal(types.StatusSuccess, tx.Status)
+	s.Require().Len(tx.Signers, 1)
+	s.Require().Equal(testAddress, tx.Signers[0])
 }
 
 func (s *TxTestSuite) TestListHeight() {
@@ -330,6 +341,8 @@ func (s *TxTestSuite) TestListHeight() {
 	s.Require().Equal(types.StatusSuccess, tx.Status)
 
 	s.Require().Len(tx.Messages, 1)
+	s.Require().Len(tx.Signers, 1)
+	s.Require().Equal(testAddress, tx.Signers[0])
 }
 
 func (s *TxTestSuite) TestListExcludedMessages() {
@@ -387,6 +400,8 @@ func (s *TxTestSuite) TestListExcludedMessages() {
 	s.Require().Equal(types.StatusSuccess, tx.Status)
 
 	s.Require().Len(tx.Messages, 1)
+	s.Require().Len(tx.Signers, 1)
+	s.Require().Equal(testAddress, tx.Signers[0])
 }
 
 func (s *TxTestSuite) TestGetEvents() {
@@ -532,6 +547,8 @@ func (s *TxTestSuite) TestGenesis() {
 	s.Require().EqualValues(1, tx.MessagesCount)
 	s.Require().EqualValues(types.StatusSuccess, tx.Status)
 	s.Require().EqualValues([]types.MsgType{types.MsgCreateValidator}, tx.MessageTypes)
+
+	s.Require().Len(tx.Signers, 0)
 }
 
 func (s *TxTestSuite) TestNamespaces() {

diff --git a/internal/storage/postgres/blob_log_test.go b/internal/storage/postgres/blob_log_test.go
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2024 PK Lab AG <contact@pklab.io>
+// SPDX-License-Identifier: MIT
+
 package postgres
 
 import (

diff --git a/internal/storage/postgres/core.go b/internal/storage/postgres/core.go
@@ -95,7 +95,6 @@ func initDatabase(ctx context.Context, conn *database.Bun) error {
 	// register many-to-many relationships
 	conn.DB().RegisterModel(
 		(*models.NamespaceMessage)(nil),
-		(*models.Signer)(nil),
 		(*models.MsgAddress)(nil),
 		(*models.RollupProvider)(nil),
 	)