Refactoring: Contract.tx_count -> Account.operations_count

baking-bad · Sep 26, 2023 · ffce081 · ffce081
1 parent 19384cc
commit ffce081
Show file tree

Hide file tree

Showing 62 changed files with 11,919 additions and 5,863 deletions.
diff --git a/cmd/api/handlers/account.go b/cmd/api/handlers/account.go
@@ -37,10 +37,7 @@ func GetInfo() gin.HandlerFunc {
 		if handleError(c, ctx.Storage, err, 0) {
 			return
 		}
-		stats, err := ctx.Operations.ContractStats(c.Request.Context(), acc.Address)
-		if handleError(c, ctx.Storage, err, 0) {
-			return
-		}
+
 		var balance int64
 		if !(bcd.IsRollupAddressLazy(acc.Address) || bcd.IsSmartRollupAddressLazy(acc.Address)) {
 			block, err := ctx.Blocks.Last(c.Request.Context())
@@ -53,11 +50,11 @@ func GetInfo() gin.HandlerFunc {
 			}
 		}
 		c.SecureJSON(http.StatusOK, AccountInfo{
-			Address:     acc.Address,
-			TxCount:     stats.Count,
-			Balance:     balance,
-			LastAction:  stats.LastAction.UTC(),
-			AccountType: acc.Type.String(),
+			Address:         acc.Address,
+			OperationsCount: acc.OperationsCount,
+			Balance:         balance,
+			LastAction:      acc.LastAction.UTC(),
+			AccountType:     acc.Type.String(),
 		})
 	}
 

diff --git a/cmd/api/handlers/responses.go b/cmd/api/handlers/responses.go
@@ -174,9 +174,6 @@ type Contract struct {
 func (c *Contract) FromModel(contract contract.Contract) {
 	c.Address = contract.Account.Address
 	c.Delegate = contract.Delegate.Address
-	c.TxCount = contract.TxCount
-	c.LastAction = contract.LastAction
-
 	c.Level = contract.Level
 	c.Manager = contract.Manager.Address
 	c.MigrationsCount = contract.MigrationsCount
@@ -218,8 +215,6 @@ type RecentlyCalledContract struct {
 // FromModel -
 func (c *RecentlyCalledContract) FromModel(contract contract.Contract) {
 	c.Address = contract.Account.Address
-	c.TxCount = contract.TxCount
-	c.LastAction = contract.LastAction
 	c.ID = contract.ID
 }
 
@@ -429,11 +424,11 @@ type Screenshot struct {
 
 // AccountInfo -
 type AccountInfo struct {
-	Address     string    `json:"address"`
-	Balance     int64     `json:"balance"`
-	TxCount     int64     `json:"tx_count"`
-	LastAction  time.Time `json:"last_action"`
-	AccountType string    `json:"account_type"`
+	Address         string    `json:"address"`
+	Balance         int64     `json:"balance"`
+	OperationsCount int64     `json:"operations_count"`
+	LastAction      time.Time `json:"last_action"`
+	AccountType     string    `json:"account_type"`
 }
 
 // CountResponse -

diff --git a/internal/models/account/model.go b/internal/models/account/model.go
@@ -1,6 +1,8 @@
 package account
 
 import (
+	"time"
+
 	"github.com/baking-bad/bcdhub/internal/models/types"
 	"github.com/uptrace/bun"
 )
@@ -9,10 +11,12 @@ import (
 type Account struct {
 	bun.BaseModel `bun:"accounts"`
 
-	ID      int64             `bun:"id,pk,notnull,autoincrement"`
-	Type    types.AccountType `bun:"type,type:SMALLINT"`
-	Address string            `bun:"address"`
-	Level   int64             `bun:"level"`
+	ID              int64             `bun:"id,pk,notnull,autoincrement"`
+	Type            types.AccountType `bun:"type,type:SMALLINT"`
+	Address         string            `bun:"address,unique:address_hash"`
+	Level           int64             `bun:"level"`
+	OperationsCount int64             `bun:"operations_count"`
+	LastAction      time.Time         `bun:"last_action"`
 }
 
 // GetID -

diff --git a/internal/models/contract/model.go b/internal/models/contract/model.go
@@ -25,8 +25,6 @@ type Contract struct {
 	DelegateID int64
 	Delegate   account.Account `bun:"rel:belongs-to"`
 
-	TxCount         int64
-	LastAction      time.Time
 	MigrationsCount int64
 	Tags            types.Tags
 

diff --git a/internal/models/interface.go b/internal/models/interface.go
@@ -39,7 +39,6 @@ type Transaction interface {
 	Operations(ctx context.Context, operations ...*operation.Operation) error
 	TickerUpdates(ctx context.Context, updates ...*ticket.TicketUpdate) error
 	Contracts(ctx context.Context, contracts ...*contract.Contract) error
-	UpdateContracts(ctx context.Context, updates ...*contract.Update) error
 	Scripts(ctx context.Context, scripts ...*contract.Script) error
 	ScriptConstant(ctx context.Context, data ...*contract.ScriptConstants) error
 	Block(ctx context.Context, block *block.Block) error

diff --git a/internal/models/mock/general.go b/internal/models/mock/general.go
diff --git a/internal/models/mock/operation/mock.go b/internal/models/mock/operation/mock.go
diff --git a/internal/models/mock/rollback.go b/internal/models/mock/rollback.go
diff --git a/internal/models/operation/repository.go b/internal/models/operation/repository.go
@@ -24,5 +24,4 @@ type Repository interface {
 
 	ListEvents(ctx context.Context, accountID int64, size, offset int64) ([]Operation, error)
 	EventsCount(ctx context.Context, accountID int64) (int, error)
-	ContractStats(ctx context.Context, address string) (ContractStats, error)
 }
diff --git a/internal/models/rollback.go b/internal/models/rollback.go
@@ -22,8 +22,8 @@ type Rollback interface {
 	LastDiff(ctx context.Context, ptr int64, keyHash string, skipRemoved bool) (bigmapdiff.BigMapDiff, error)
 	SaveBigMapState(ctx context.Context, state bigmapdiff.BigMapState) error
 	GetOperations(ctx context.Context, level int64) ([]operation.Operation, error)
-	GetContractsLastAction(ctx context.Context, addressIds ...int64) ([]LastAction, error)
-	UpdateContractStats(ctx context.Context, accountId int64, lastAction time.Time, txCount int64) error
+	GetLastAction(ctx context.Context, addressIds ...int64) ([]LastAction, error)
+	UpdateAccountStats(ctx context.Context, accountId int64, lastAction time.Time, txCount int64) error
 	GlobalConstants(ctx context.Context, level int64) ([]contract.GlobalConstant, error)
 	Scripts(ctx context.Context, level int64) ([]contract.Script, error)
 	DeleteScriptsConstants(ctx context.Context, scriptIds []int64, constantsIds []int64) error

diff --git a/internal/parsers/contract/alpha.go b/internal/parsers/contract/alpha.go
@@ -31,20 +31,19 @@ func (p *Alpha) Parse(ctx context.Context, operation *operation.Operation, store
 	}
 
 	contract := contract.Contract{
-		Level:      operation.Level,
-		Timestamp:  operation.Timestamp,
-		Manager:    operation.Source,
-		Account:    operation.Destination,
-		Delegate:   operation.Delegate,
-		LastAction: operation.Timestamp,
+		Level:     operation.Level,
+		Timestamp: operation.Timestamp,
+		Manager:   operation.Source,
+		Account:   operation.Destination,
+		Delegate:  operation.Delegate,
 	}
 
 	if err := p.computeMetrics(ctx, operation, &contract); err != nil {
 		return err
 	}
 
 	store.AddContracts(&contract)
-	store.AddAccounts(&contract.Account, &contract.Delegate, &contract.Manager)
+	store.AddAccounts(&contract.Account)
 	return nil
 }
 

diff --git a/internal/parsers/contract/babylon.go b/internal/parsers/contract/babylon.go
@@ -31,20 +31,19 @@ func (p *Babylon) Parse(ctx context.Context, operation *operation.Operation, sto
 	}
 
 	contract := contract.Contract{
-		Level:      operation.Level,
-		Timestamp:  operation.Timestamp,
-		Manager:    operation.Source,
-		Account:    operation.Destination,
-		Delegate:   operation.Delegate,
-		LastAction: operation.Timestamp,
+		Level:     operation.Level,
+		Timestamp: operation.Timestamp,
+		Manager:   operation.Source,
+		Account:   operation.Destination,
+		Delegate:  operation.Delegate,
 	}
 
 	if err := p.computeMetrics(ctx, operation, &contract); err != nil {
 		return err
 	}
 
 	store.AddContracts(&contract)
-	store.AddAccounts(&contract.Account, &contract.Delegate, &contract.Manager)
+	store.AddAccounts(&contract.Account)
 	return nil
 }