Merge branch 'loredana/ENG-214-add-epoch-types' into prototypes/cronjobs

* loredana/ENG-214-add-epoch-types: (40 commits)
  Update evmos v3 -> v4 after latest changes
  Add year and hour epochs
  Update evmos v3 -> v4 after latest changes
  uncomment check
  feat: Inbound / outbound peers & default seeds (evmos#541)
  upgrade: Update Evmos go.mod version `v3` -> `v4` (evmos#557)
  Add change log
  Add migration logic for epoch change
  Fix epochs unit tests
  Revert to ascending order
  Store epoch information by duration and by identifier
  audit(erc20): add types tests and update comments (evmos#550)
  [ENG-219] bump erc20 test coverage (evmos#546)
  audit(erc20): state machine audit (evmos#547)
  audit(erc20): Changes from api audit (evmos#544)
  imp: update default min-gas-prices (evmos#543)
  imp: use constants for epochs IDs (evmos#539)
  fix: upgrade client router key (evmos#537)
  impr(`inflation`): Rename total supply endpoint (evmos#536)
  fix: `buf protoc` was moved to `buf alpha protoc` (evmos#462)
  ...

.github/workflows/codeql-analysis.yml

@@ -52,7 +52,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,7 +65,8 @@ jobs:
     # If this step fails, then you should remove it and run the build manually (see below)
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
+      if: env.GIT_DIFF
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -79,5 +80,5 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
       if: env.GIT_DIFF

.github/workflows/lint.yml

@@ -40,6 +40,10 @@ jobs:
             docs/**/*.md
             x/**/*.md
             README.md
-      - uses: articulate/actions-markdownlint@v1.1.0
+      - uses: nosborn/github-action-markdown-cli@v3.0.1
+        with:
+          files: .
+          config_file: .markdownlint.yml
+          ignore_path: .markdownlintignore
         # Check only if there are differences in the source code
         if: env.GIT_DIFF

.github/workflows/security.yml

@@ -27,7 +27,7 @@ jobs:
           args: '-no-fail -fmt sarif -out results.sarif ./...'
         if: "env.GIT_DIFF_FILTERED != ''"
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           # Path to SARIF file relative to the root of the repository
           sarif_file: results.sarif

.github/workflows/semgrep.yml

@@ -35,7 +35,7 @@ jobs:
         if: "env.GIT_DIFF_FILTERED != ''"
       # Upload findings to GitHub Advanced Security Dashboard [step 2/2]
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: semgrep.sarif
         if: "env.GIT_DIFF_FILTERED != ''"

.github/workflows/slither.yml

@@ -34,7 +34,7 @@ jobs:
           target: contracts/
         if: "env.GIT_DIFF"
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: ${{ steps.slither.outputs.sarif }}
         if: "env.GIT_DIFF"

CHANGELOG.md

@@ -37,28 +37,34 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## Unreleased
 
-### Features
+### State Machine Breaking
 
-- (fees) [\#436](https://github.com/tharsis/evmos/pull/436) Add `x/fees` module.
+- (app) [\#537](https://github.com/tharsis/evmos/pull/537) Fix router key for IBC client proposals.
+- (erc20) [\#530](https://github.com/tharsis/evmos/pull/530) Use the highest denom unit when deploying an ERC20 contract.
 
-### Improvements
+### API Breaking
 
-- (vesting) [\#486](https://github.com/tharsis/evmos/pull/486) Refactor `x/vesting` types and tests.
+- (epochs) [\#553](https://github.com/tharsis/evmos/pull/553) Store epoch information by duration and by identifier.
+- (inflation) [\#536](https://github.com/tharsis/evmos/pull/536) Rename inflation endpoint `/evmos/inflation/v1/total_supply` -> `/evmos/inflation/v1/circulating_supply`
+- (erc20) [\#544](https://github.com/tharsis/evmos/pull/544) Remove `updateTokenPairERC20Proposal` functionality rename `relay` to `conversion`
+- (upgrade) [\#557](https://github.com/tharsis/evmos/pull/557) Update Evmos go.mod version `v3` -> `v4`
 
-### Bug Fixes
+### Improvements
 
-- (vesting) [\#502](https://github.com/tharsis/evmos/pull/502) Fix gas exhaustion bug by removing `SpendableCoins` during vesting account clawback.
-- (vesting) [\#483](https://github.com/tharsis/evmos/pull/483) Fix balance clawback when vesting start time is in the future
+- (cmd) [\#543](https://github.com/tharsis/evmos/pull/543) Update mainnet default `min-gas-price` to `0.0025aevmos`.
+- (p2p) [\#541](https://github.com/tharsis/evmos/pull/541) Increase default inbound connections and use 8:1 ratio of inbound:outbound. Add default seeds to reduce the need for configuration.
+- (epochs) [\#539](https://github.com/tharsis/evmos/pull/539) Use constants for epoch identifiers.
+- (deps) [\#528](https://github.com/tharsis/evmos/pull/528) Bump Cosmos SDK to [`v0.45.4`](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.45.4)
 
-### Improvements
+### Bug Fixes
 
-- (erc20) [\#484](https://github.com/tharsis/evmos/pull/484) Avoid unnecessary commits to the StateDB and don't estimate gas when performing a query
+- (erc20) [\#530](https://github.com/tharsis/evmos/pull/530) Fix `Metadata` equal check for denom units.
+- (app) [\#523](https://github.com/tharsis/evmos/pull/523) Fix testnet upgrade store loader.
 
-## [v3.0.0] - 2022-04-05
+## [v3.0.0] - 2022-04-22
 
 ### State Machine Breaking
 
-- [\#430](https://github.com/tharsis/evmos/pull/430) Exclusively delete claims records at the end of the claims period.
 - [\#342](https://github.com/tharsis/evmos/pull/342) Implement IBC middleware to recover stuck funds
 
 ### API Breaking
@@ -67,15 +73,20 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+- (vesting) [\#502](https://github.com/tharsis/evmos/pull/502) Fix gas exhaustion bug by removing `SpendableCoins` during vesting account clawback.
+- (vesting) [\#483](https://github.com/tharsis/evmos/pull/483) Fix balance clawback when vesting start time is in the future
 - (claims) [\#381](https://github.com/tharsis/evmos/pull/381) Fix claim migration and deletion for EVM chains via IBC attestation.
 - (claims) [\#374](https://github.com/tharsis/evmos/pull/374) Fix balance invariant in Claims `InitGenesis`
 - (erc20) [\#366](https://github.com/tharsis/evmos/issues/366) Delete ERC20 denom map when deleting pair.
+- (claims) [\#505](https://github.com/tharsis/evmos/pull/505) Fix IBC attestation ordering
 
 ### Improvements
 
+- (vesting) [\#486](https://github.com/tharsis/evmos/pull/486) Refactor `x/vesting` types and tests.
+- (erc20) [\#484](https://github.com/tharsis/evmos/pull/484) Avoid unnecessary commits to the StateDB and don't estimate gas when performing a query
+- (deps) [\#478](https://github.com/tharsis/evmos/pull/478) Bump Cosmos SDK to [`v0.45.3`](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.45.3)
+- (deps) [\#478](https://github.com/tharsis/evmos/pull/478) Bump Ethermint to [`v0.14.0`](https://github.com/tharsis/ethermint/releases/tag/v0.14.0)
 - (vesting) [\#468](https://github.com/tharsis/evmos/pull/468) Use coins `Min` function from Cosmos SDK.
-- (deps) [\#458](https://github.com/tharsis/evmos/pull/458) Bump Ethermint to [`v0.13.0`](https://github.com/tharsis/ethermint/releases/tag/v0.13.0)
-- (deps) [\#457](https://github.com/tharsis/evmos/pull/457) Bump Cosmos SDK to [`v0.45.2`](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.45.2)
 - (cmd) [\#446](https://github.com/tharsis/evmos/pull/446) Update `migrate` command to migrate Evmos, Ethermint and Cosmos SDK modules.
 - (app) [\#446](https://github.com/tharsis/evmos/pull/446) Refactor upgrade code.
 - (ibc) [\#412](https://github.com/tharsis/evmos/pull/412) Introduce boilerplate struct for IBC applications.
@@ -86,6 +97,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - (inflation) [\#369](https://github.com/tharsis/evmos/pull/369) Add `enableInflation` parameter.
 - (claims) [\#432](https://github.com/tharsis/evmos/pull/432) Add IBC trigger amount to claims merge/migrate IBC callbacks.
 - (claims) [\#442](https://github.com/tharsis/evmos/pull/443) Remove claims merge/migrate cases where sender already completed an action as they are never reached
+- (claims) [\#507](https://github.com/tharsis/evmos/pull/507) Always return claimable amount on grpc queries regarding of claims status.
+- (claims) [\#516](https://github.com/tharsis/evmos/pull/516) Retain claims records when all actions have been completed.
 
 ## [v2.0.1] - 2022-03-06
 

app/ante/handler_options.go

@@ -14,7 +14,7 @@ import (
 	ethante "github.com/tharsis/ethermint/app/ante"
 	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 
-	vestingtypes "github.com/tharsis/evmos/v3/x/vesting/types"
+	vestingtypes "github.com/tharsis/evmos/v4/x/vesting/types"
 )
 
 // HandlerOptions defines the list of module keepers required to run the Evmos

app/ante/vesting.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	evmtypes "github.com/tharsis/ethermint/x/evm/types"
-	vestingtypes "github.com/tharsis/evmos/v3/x/vesting/types"
+	vestingtypes "github.com/tharsis/evmos/v4/x/vesting/types"
 )
 
 // EthVestingTransactionDecorator validates if clawback vesting accounts are

app/app.go

@@ -3,6 +3,7 @@ package app
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -94,6 +95,7 @@ import (
 	ibc "github.com/cosmos/ibc-go/v3/modules/core"
 	ibcclient "github.com/cosmos/ibc-go/v3/modules/core/02-client"
 	ibcclientclient "github.com/cosmos/ibc-go/v3/modules/core/02-client/client"
+	ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
 	porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
 	ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
 	ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
@@ -115,38 +117,38 @@ import (
 	intertxtypes "github.com/tharsis/ethermint/x/inter-tx/types"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/tharsis/evmos/v3/client/docs/statik"
-
-	"github.com/tharsis/evmos/v3/app/ante"
-	v2 "github.com/tharsis/evmos/v3/app/upgrades/mainnet/v2"
-	v3 "github.com/tharsis/evmos/v3/app/upgrades/mainnet/v3"
-	tv3 "github.com/tharsis/evmos/v3/app/upgrades/testnet/v3"
-	"github.com/tharsis/evmos/v3/x/claims"
-	claimskeeper "github.com/tharsis/evmos/v3/x/claims/keeper"
-	claimstypes "github.com/tharsis/evmos/v3/x/claims/types"
-	"github.com/tharsis/evmos/v3/x/epochs"
-	epochskeeper "github.com/tharsis/evmos/v3/x/epochs/keeper"
-	epochstypes "github.com/tharsis/evmos/v3/x/epochs/types"
-	"github.com/tharsis/evmos/v3/x/erc20"
-	erc20client "github.com/tharsis/evmos/v3/x/erc20/client"
-	erc20keeper "github.com/tharsis/evmos/v3/x/erc20/keeper"
-	erc20types "github.com/tharsis/evmos/v3/x/erc20/types"
-	"github.com/tharsis/evmos/v3/x/fees"
-	feeskeeper "github.com/tharsis/evmos/v3/x/fees/keeper"
-	feestypes "github.com/tharsis/evmos/v3/x/fees/types"
-	"github.com/tharsis/evmos/v3/x/incentives"
-	incentivesclient "github.com/tharsis/evmos/v3/x/incentives/client"
-	incentiveskeeper "github.com/tharsis/evmos/v3/x/incentives/keeper"
-	incentivestypes "github.com/tharsis/evmos/v3/x/incentives/types"
-	"github.com/tharsis/evmos/v3/x/inflation"
-	inflationkeeper "github.com/tharsis/evmos/v3/x/inflation/keeper"
-	inflationtypes "github.com/tharsis/evmos/v3/x/inflation/types"
-	"github.com/tharsis/evmos/v3/x/recovery"
-	recoverykeeper "github.com/tharsis/evmos/v3/x/recovery/keeper"
-	recoverytypes "github.com/tharsis/evmos/v3/x/recovery/types"
-	"github.com/tharsis/evmos/v3/x/vesting"
-	vestingkeeper "github.com/tharsis/evmos/v3/x/vesting/keeper"
-	vestingtypes "github.com/tharsis/evmos/v3/x/vesting/types"
+	_ "github.com/tharsis/evmos/v4/client/docs/statik"
+
+	"github.com/tharsis/evmos/v4/app/ante"
+	v2 "github.com/tharsis/evmos/v4/app/upgrades/mainnet/v2"
+	v3 "github.com/tharsis/evmos/v4/app/upgrades/mainnet/v3"
+	tv3 "github.com/tharsis/evmos/v4/app/upgrades/testnet/v3"
+	"github.com/tharsis/evmos/v4/x/claims"
+	claimskeeper "github.com/tharsis/evmos/v4/x/claims/keeper"
+	claimstypes "github.com/tharsis/evmos/v4/x/claims/types"
+	"github.com/tharsis/evmos/v4/x/epochs"
+	epochskeeper "github.com/tharsis/evmos/v4/x/epochs/keeper"
+	epochstypes "github.com/tharsis/evmos/v4/x/epochs/types"
+	"github.com/tharsis/evmos/v4/x/erc20"
+	erc20client "github.com/tharsis/evmos/v4/x/erc20/client"
+	erc20keeper "github.com/tharsis/evmos/v4/x/erc20/keeper"
+	erc20types "github.com/tharsis/evmos/v4/x/erc20/types"
+	"github.com/tharsis/evmos/v4/x/fees"
+	feeskeeper "github.com/tharsis/evmos/v4/x/fees/keeper"
+	feestypes "github.com/tharsis/evmos/v4/x/fees/types"
+	"github.com/tharsis/evmos/v4/x/incentives"
+	incentivesclient "github.com/tharsis/evmos/v4/x/incentives/client"
+	incentiveskeeper "github.com/tharsis/evmos/v4/x/incentives/keeper"
+	incentivestypes "github.com/tharsis/evmos/v4/x/incentives/types"
+	"github.com/tharsis/evmos/v4/x/inflation"
+	inflationkeeper "github.com/tharsis/evmos/v4/x/inflation/keeper"
+	inflationtypes "github.com/tharsis/evmos/v4/x/inflation/types"
+	"github.com/tharsis/evmos/v4/x/recovery"
+	recoverykeeper "github.com/tharsis/evmos/v4/x/recovery/keeper"
+	recoverytypes "github.com/tharsis/evmos/v4/x/recovery/types"
+	"github.com/tharsis/evmos/v4/x/vesting"
+	vestingkeeper "github.com/tharsis/evmos/v4/x/vesting/keeper"
+	vestingtypes "github.com/tharsis/evmos/v4/x/vesting/types"
 )
 
 func init() {
@@ -188,8 +190,7 @@ var (
 			paramsclient.ProposalHandler, distrclient.ProposalHandler, upgradeclient.ProposalHandler, upgradeclient.CancelProposalHandler,
 			ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler,
 			// Evmos proposal types
-			erc20client.RegisterCoinProposalHandler, erc20client.RegisterERC20ProposalHandler,
-			erc20client.ToggleTokenRelayProposalHandler, erc20client.UpdateTokenPairERC20ProposalHandler,
+			erc20client.RegisterCoinProposalHandler, erc20client.RegisterERC20ProposalHandler, erc20client.ToggleTokenConversionProposalHandler,
 			incentivesclient.RegisterIncentiveProposalHandler, incentivesclient.CancelIncentiveProposalHandler,
 		),
 		params.AppModuleBasic{},
@@ -463,7 +464,7 @@ func NewEvmos(
 		AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
 		AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
-		AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
+		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)).
 		AddRoute(erc20types.RouterKey, erc20.NewErc20ProposalHandler(&app.Erc20Keeper)).
 		AddRoute(incentivestypes.RouterKey, incentives.NewIncentivesProposalHandler(&app.IncentivesKeeper))
 
@@ -1100,18 +1101,17 @@ func initParamsKeeper(
 }
 
 func (app *Evmos) setupUpgradeHandlers() {
-	// v2 handler
+	// v2 upgrade handler
 	app.UpgradeKeeper.SetUpgradeHandler(
 		v2.UpgradeName,
 		v2.CreateUpgradeHandler(app.mm, app.configurator),
 	)
-	// v3 handler upgrade is
+	// v3 upgrade handler
 	app.UpgradeKeeper.SetUpgradeHandler(
 		v3.UpgradeName,
 		v3.CreateUpgradeHandler(app.mm, app.configurator),
 	)
-
-	// testnet v3 handler upgrade is
+	// testnet upgrade v3 handler
 	app.UpgradeKeeper.SetUpgradeHandler(
 		tv3.UpgradeName,
 		tv3.CreateUpgradeHandler(app.mm, app.configurator),
@@ -1122,22 +1122,22 @@ func (app *Evmos) setupUpgradeHandlers() {
 	// This will read that value, and execute the preparations for the upgrade.
 	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
 	if err != nil {
-		panic(err)
+		panic(fmt.Errorf("failed to read upgrade info from disk: %w", err))
+	}
+
+	if app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		return
 	}
 
 	var storeUpgrades *storetypes.StoreUpgrades
 
-	switch {
-	case upgradeInfo.Name == v3.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
-		// prepare store for v3
-		storeUpgrades = &storetypes.StoreUpgrades{
-			Added: []string{recoverytypes.ModuleName},
-		}
-	case upgradeInfo.Name == tv3.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
-		// prepare store for testnet v3
-		storeUpgrades = &storetypes.StoreUpgrades{
-			Added: []string{recoverytypes.ModuleName},
-		}
+	switch upgradeInfo.Name {
+	case v2.UpgradeName:
+		// no store upgrades in v2
+	case v3.UpgradeName:
+		// no store upgrades in v3
+	case tv3.UpgradeName:
+		// no store upgrades in testnet v3
 	}
 
 	if storeUpgrades != nil {

app/forks.go

@@ -6,8 +6,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	v2 "github.com/tharsis/evmos/v3/app/upgrades/mainnet/v2"
-	tv3 "github.com/tharsis/evmos/v3/app/upgrades/testnet/v3"
+	v2 "github.com/tharsis/evmos/v4/app/upgrades/mainnet/v2"
+	tv3 "github.com/tharsis/evmos/v4/app/upgrades/testnet/v3"
 )
 
 // BeginBlockForks executes any necessary fork logic based upon the current block height.
@@ -25,7 +25,6 @@ func BeginBlockForks(ctx sdk.Context, app *Evmos) {
 			Height: v2.UpgradeHeight,
 		}
 
-		// FIXME: upstream no validation logic
 		err := app.UpgradeKeeper.ScheduleUpgrade(ctx, upgradePlan)
 		if err != nil {
 			panic(err)

app/test_helpers.go

@@ -16,7 +16,7 @@ import (
 	"github.com/tharsis/ethermint/encoding"
 	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
 
-	"github.com/tharsis/evmos/v3/cmd/config"
+	"github.com/tharsis/evmos/v4/cmd/config"
 )
 
 func init() {

app/upgrades/mainnet/v2/upgrades.go

@@ -5,8 +5,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	claimstypes "github.com/tharsis/evmos/v3/x/claims/types"
-	erc20types "github.com/tharsis/evmos/v3/x/erc20/types"
+	claimstypes "github.com/tharsis/evmos/v4/x/claims/types"
+	erc20types "github.com/tharsis/evmos/v4/x/erc20/types"
 )
 
 // CreateUpgradeHandler creates an SDK upgrade handler for v2

app/upgrades/testnet/v3/upgrades.go

@@ -10,9 +10,9 @@ import (
 	feemarketv010 "github.com/tharsis/ethermint/x/feemarket/migrations/v010"
 	feemarketv09types "github.com/tharsis/ethermint/x/feemarket/migrations/v09/types"
 	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
-	v1claims "github.com/tharsis/evmos/v3/x/claims/migrations/v1/types"
-	v2claims "github.com/tharsis/evmos/v3/x/claims/migrations/v2"
-	claimstypes "github.com/tharsis/evmos/v3/x/claims/types"
+	v1claims "github.com/tharsis/evmos/v4/x/claims/migrations/v1/types"
+	v2claims "github.com/tharsis/evmos/v4/x/claims/migrations/v2"
+	claimstypes "github.com/tharsis/evmos/v4/x/claims/types"
 )
 
 // CreateUpgradeHandler creates an SDK upgrade handler for v3