feat: handle feegrant module

Makefile

@@ -52,7 +52,7 @@ stop-docker-test:
 
 start-docker-test: stop-docker-test
 	@echo "Starting Docker container..."
-	@docker run --name bdjuno-test-db -e POSTGRES_USER=bdjuno -e POSTGRES_PASSWORD=password -e POSTGRES_DB=bdjuno -d -p 5433:5432 postgres
+	@docker run --name bdjuno-test-db -e POSTGRES_USER=bdjuno -e POSTGRES_PASSWORD=password -e POSTGRES_DB=bdjuno -d -p 6433:5432 postgres
 .PHONY: start-docker-test
 
 test-unit: start-docker-test

cmd/fix/feegrant/allowance.go

@@ -0,0 +1,100 @@
+package feegrant
+
+import (
+	"encoding/hex"
+	"fmt"
+	"strings"
+
+	"github.com/forbole/bdjuno/v2/modules/feegrant"
+	"github.com/forbole/bdjuno/v2/utils"
+
+	"github.com/forbole/juno/v2/cmd/parse"
+	"github.com/forbole/juno/v2/types/config"
+	"github.com/spf13/cobra"
+
+	"github.com/forbole/bdjuno/v2/database"
+
+	feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant"
+)
+
+// allowanceCmd returns the Cobra command allowing to fix all things related to fee grant allowance
+func allowanceCmd(parseConfig *parse.Config) *cobra.Command {
+	return &cobra.Command{
+		Use:   "allowance",
+		Short: "Fix granted and revoked allowances to the latest height",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			parseCtx, err := parse.GetParsingContext(parseConfig)
+			if err != nil {
+				return err
+			}
+
+			// Get the database
+			db := database.Cast(parseCtx.Database)
+
+			// Build feegrant module
+			feegrantModule := feegrant.NewModule(parseCtx.EncodingConfig.Marshaler, db)
+
+			// Get latest height
+			height, err := parseCtx.Node.LatestHeight()
+			if err != nil {
+				return fmt.Errorf("error while getting chain latest block height: %s", err)
+			}
+
+			startHeight := config.Cfg.Parser.StartHeight
+
+			// Handle messages realated to feegrant allowance of each block from the start height
+			for h := startHeight; h <= height; h++ {
+				err = refreshAllowance(parseCtx, h, feegrantModule)
+				if err != nil {
+					fmt.Printf("error while refreshing allowance: %s \n", err)
+				}
+			}
+
+			return nil
+		},
+	}
+}
+
+func refreshAllowance(parseCtx *parse.Context, blockHeight int64, feegrantModule *feegrant.Module) error {
+	// Get the block details
+	block, err := utils.QueryBlock(parseCtx.Node, blockHeight)
+	if err != nil {
+		return err
+	}
+
+	if len(block.Block.Txs) != 0 {
+		for _, tx := range block.Block.Txs {
+
+			// Get the tx details
+			junoTx, err := parseCtx.Node.Tx(hex.EncodeToString(tx.Hash()))
+			if err != nil {
+				return fmt.Errorf("error while getting tx details: %s", err)
+			}
+
+			// Handle feegrant module messages
+			for _, msg := range junoTx.GetMsgs() {
+				if msgGrantAllowance, ok := msg.(*feegranttypes.MsgGrantAllowance); ok {
+					fmt.Println("handling MsgGrantAllowance tx hash:", strings.ToUpper(hex.EncodeToString(tx.Hash())))
+
+					err = feegrantModule.HandleMsgGrantAllowance(junoTx, msgGrantAllowance)
+					if err != nil {
+						return fmt.Errorf("error while handling MsgGrantAllowance: %s", err)
+					}
+				}
+
+				if msgRevokeAllowance, ok := msg.(*feegranttypes.MsgRevokeAllowance); ok {
+					fmt.Println("handling MsgRevokeAllowance tx hash:", strings.ToUpper(hex.EncodeToString(tx.Hash())))
+
+					err = feegrantModule.HandleMsgRevokeAllowance(junoTx, msgRevokeAllowance)
+					if err != nil {
+						return fmt.Errorf("error while handling MsgRevokeAllowance: %s", err)
+					}
+				}
+
+			}
+
+		}
+	}
+
+	return nil
+}

cmd/fix/feegrant/cmd.go

@@ -0,0 +1,20 @@
+package feegrant
+
+import (
+	"github.com/forbole/juno/v2/cmd/parse"
+	"github.com/spf13/cobra"
+)
+
+// NewFeegrantCmd returns the Cobra command that allows to fix all the things related to the x/feegrant module
+func NewFeegrantCmd(parseConfig *parse.Config) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "feegrant",
+		Short: "Fix things related to the x/feegrant module",
+	}
+
+	cmd.AddCommand(
+		allowanceCmd(parseConfig),
+	)
+
+	return cmd
+}

cmd/fix/fix.go

@@ -5,6 +5,7 @@ import (
 	"github.com/spf13/cobra"
 
 	fixauth "github.com/forbole/bdjuno/v2/cmd/fix/auth"
+	fixfeegrant "github.com/forbole/bdjuno/v2/cmd/fix/feegrant"
 	fixgov "github.com/forbole/bdjuno/v2/cmd/fix/gov"
 	fixstaking "github.com/forbole/bdjuno/v2/cmd/fix/staking"
 )
@@ -19,6 +20,7 @@ func NewFixCmd(parseCfg *parse.Config) *cobra.Command {
 
 	cmd.AddCommand(
 		fixauth.NewAuthCmd(parseCfg),
+		fixfeegrant.NewFeegrantCmd(parseCfg),
 		fixgov.NewGovCmd(parseCfg),
 		fixstaking.NewStakingCmd(parseCfg),
 	)

database/database_test.go

@@ -48,7 +48,7 @@ func (suite *DbTestSuite) SetupTest() {
 	dbCfg := dbconfig.NewDatabaseConfig(
 		"bdjuno",
 		"localhost",
-		5433,
+		6433,
 		"bdjuno",
 		"password",
 		"",

database/feegrant.go

@@ -0,0 +1,51 @@
+package database
+
+import (
+	"fmt"
+
+	"github.com/cosmos/cosmos-sdk/codec"
+
+	"github.com/forbole/bdjuno/v2/types"
+)
+
+// SaveFeeGrantAllowance allows to store the fee grant allowances for the given block height
+func (db *Db) SaveFeeGrantAllowance(allowance types.FeeGrant) error {
+	// Store the accounts
+	var accounts []types.Account
+	accounts = append(accounts, types.NewAccount(allowance.Granter), types.NewAccount(allowance.Grantee))
+	err := db.SaveAccounts(accounts)
+	if err != nil {
+		return fmt.Errorf("error while storing fee grant allowance accounts: %s", err)
+	}
+
+	stmt := `
+INSERT INTO fee_grant_allowance(grantee_address, granter_address, allowance, height) 
+VALUES ($1, $2, $3, $4) 
+ON CONFLICT ON CONSTRAINT unique_fee_grant_allowance DO UPDATE 
+    SET allowance = excluded.allowance,
+        height = excluded.height
+WHERE fee_grant_allowance.height <= excluded.height`
+
+	allowanceJSON, err := codec.ProtoMarshalJSON(allowance.Allowance, nil)
+	if err != nil {
+		return fmt.Errorf("error while marshaling grant allowance: %s", err)
+	}
+
+	_, err = db.Sql.Exec(stmt, allowance.Grantee, allowance.Granter, allowanceJSON, allowance.Height)
+	if err != nil {
+		return fmt.Errorf("error while saving fee grant allowance: %s", err)
+	}
+
+	return nil
+}
+
+// DeleteFeeGrantAllowance removes the fee grant allowance data from the database
+func (db *Db) DeleteFeeGrantAllowance(allowance types.GrantRemoval) error {
+	stmt := `DELETE FROM fee_grant_allowance WHERE grantee_address = $1 AND granter_address = $2 AND height <= $3`
+	_, err := db.Sql.Exec(stmt, allowance.Grantee, allowance.Granter, allowance.Height)
+
+	if err != nil {
+		return fmt.Errorf("error while deleting grant allowance: %s", err)
+	}
+	return nil
+}

database/feegrant_test.go

@@ -0,0 +1,72 @@
+package database_test
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant"
+
+	dbtypes "github.com/forbole/bdjuno/v2/database/types"
+	"github.com/forbole/bdjuno/v2/types"
+)
+
+func (suite *DbTestSuite) TestBigDipperDb_SaveFeeGrantAllowance() {
+	allowance := &feegranttypes.BasicAllowance{SpendLimit: nil, Expiration: nil}
+	granter, err := sdk.AccAddressFromBech32("cosmos1ltzt0z992ke6qgmtjxtygwzn36km4cy6cqdknt")
+	suite.Require().NoError(err)
+
+	grantee, err := sdk.AccAddressFromBech32("cosmos1re6zjpyczs0w7flrl6uacl0r4teqtyg62crjsn")
+	suite.Require().NoError(err)
+
+	feeGrant, err := feegranttypes.NewGrant(granter, grantee, allowance)
+	suite.Require().NoError(err)
+
+	// Store the allowance
+	err = suite.database.SaveFeeGrantAllowance(types.NewFeeGrant(feeGrant, 121622))
+	suite.Require().NoError(err)
+
+	// Test double insertion
+	err = suite.database.SaveFeeGrantAllowance(types.NewFeeGrant(feeGrant, 121622))
+	suite.Require().NoError(err, "storing existing grant allowance should return no error")
+
+	// Verify the data
+	var rows []dbtypes.FeeAllowanceRow
+	err = suite.database.Sqlx.Select(&rows, `SELECT * FROM fee_grant_allowance`)
+	suite.Require().NoError(err)
+	suite.Require().Len(rows, 1)
+	suite.Require().Equal(rows[0].Granter, granter.String())
+	suite.Require().Equal(rows[0].Grantee, grantee.String())
+	suite.Require().Equal(rows[0].Height, int64(121622))
+
+	var stored feegranttypes.FeeAllowanceI
+	err = suite.database.EncodingConfig.Marshaler.UnmarshalInterfaceJSON([]byte(rows[0].Allowance), &stored)
+	suite.Require().NoError(err)
+	suite.Require().Equal(allowance, stored)
+}
+
+func (suite *DbTestSuite) TestBigDipperDb_RemoveFeeGrantAllowance() {
+	allowance := &feegranttypes.BasicAllowance{SpendLimit: nil, Expiration: nil}
+	granter, err := sdk.AccAddressFromBech32("cosmos1ltzt0z992ke6qgmtjxtygwzn36km4cy6cqdknt")
+	suite.Require().NoError(err)
+
+	grantee, err := sdk.AccAddressFromBech32("cosmos1re6zjpyczs0w7flrl6uacl0r4teqtyg62crjsn")
+	suite.Require().NoError(err)
+
+	feeGrant, err := feegranttypes.NewGrant(granter, grantee, allowance)
+	suite.Require().NoError(err)
+
+	err = suite.database.SaveFeeGrantAllowance(types.NewFeeGrant(feeGrant, 121622))
+	suite.Require().NoError(err)
+
+	// Delete the data
+	err = suite.database.DeleteFeeGrantAllowance(types.NewGrantRemoval(
+		"cosmos1re6zjpyczs0w7flrl6uacl0r4teqtyg62crjsn",
+		"cosmos1ltzt0z992ke6qgmtjxtygwzn36km4cy6cqdknt",
+		122222,
+	))
+	suite.Require().NoError(err)
+
+	// verify the data
+	var count int
+	err = suite.database.Sql.QueryRow(`SELECT COUNT(*) FROM redelegation`).Scan(&count)
+	suite.Require().NoError(err)
+	suite.Require().Equal(0, count)
+}

database/schema/12-feegrant.sql

@@ -0,0 +1,10 @@
+CREATE TABLE fee_grant_allowance
+(
+    id                 SERIAL      NOT NULL PRIMARY KEY,
+    grantee_address    TEXT        NOT NULL REFERENCES account (address),
+    granter_address    TEXT        NOT NULL REFERENCES account (address),
+    allowance          JSONB       NOT NULL DEFAULT '{}'::JSONB,
+    height             BIGINT      NOT NULL,
+    CONSTRAINT unique_fee_grant_allowance UNIQUE(grantee_address, granter_address) 
+);
+CREATE INDEX fee_grant_allowance_height_index ON fee_grant_allowance (height);

database/types/coins.go

@@ -147,7 +147,7 @@ func (coins DbCoins) ToCoins() sdk.Coins {
 	return sdkCoins
 }
 
-//_______________________________________________________
+// --------------------------------------------------------------------------------------------------------------------
 
 // DbDecCoin represents the information stored inside the database about a single coin
 type DbDecCoin struct {

database/types/feegrant.go

@@ -0,0 +1,10 @@
+package types
+
+// FeeAllowanceRow represents a single row inside the fee_grant_allowance table
+type FeeAllowanceRow struct {
+	ID        uint64 `db:"id"`
+	Grantee   string `db:"grantee_address"`
+	Granter   string `db:"granter_address"`
+	Allowance string `db:"allowance"`
+	Height    int64  `db:"height"`
+}

database/types/staking_validators.go

@@ -138,7 +138,7 @@ func (v ValidatorInfoRow) Equal(w ValidatorInfoRow) bool {
 		v.Height == w.Height
 }
 
-//________________________________________________________________
+// --------------------------------------------------------------------------------------------------------------------
 
 // ValidatorDescriptionRow represent a row in validator_description
 type ValidatorDescriptionRow struct {

database/types/utils.go

@@ -5,11 +5,6 @@ type ModuleRow struct {
 	Module string `db:"module_name"`
 }
 
-//NewModuleRow return a new instance of ModuleRow
-func NewModuleRow(name string) ModuleRow {
-	return ModuleRow{Module: name}
-}
-
 // Equal return true if two moduleRow is equal
 func (v ModuleRow) Equal(w ModuleRow) bool {
 	return v.Module == w.Module
@@ -18,7 +13,7 @@ func (v ModuleRow) Equal(w ModuleRow) bool {
 // ModuleRows represent an array of ModulerRow
 type ModuleRows []*ModuleRow
 
-//NewModuleRows return a new instance of ModuleRows
+// NewModuleRows return a new instance of ModuleRows
 func NewModuleRows(names []string) ModuleRows {
 	rows := make([]*ModuleRow, 0)
 	for _, name := range names {

database/utils.go

@@ -10,7 +10,7 @@ func (db *Db) InsertEnableModules(modules []string) error {
 		return nil
 	}
 
-	//clear table first
+	// Remove the existing modules
 	stmt := "DELETE FROM modules WHERE TRUE"
 	_, err := db.Sql.Exec(stmt)
 	if err != nil {

go.mod

@@ -3,9 +3,9 @@ module github.com/forbole/bdjuno/v2
 go 1.16
 
 require (
-	github.com/cosmos/cosmos-sdk v0.44.2
+	github.com/cosmos/cosmos-sdk v0.44.3
 	github.com/cosmos/gaia/v6 v6.0.0-rc1
-	github.com/forbole/juno/v2 v2.0.0-20211020184842-e358a33007ff
+	github.com/forbole/juno/v2 v2.0.0-20211122103136-7926db0202f2
 	github.com/go-co-op/gocron v1.10.0
 	github.com/gogo/protobuf v1.3.3
 	github.com/jmoiron/sqlx v1.2.1-0.20200324155115-ee514944af4b
@@ -15,7 +15,7 @@ require (
 	github.com/rs/zerolog v1.26.0
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
-	github.com/tendermint/tendermint v0.34.13
+	github.com/tendermint/tendermint v0.34.14
 	google.golang.org/grpc v1.40.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )