Revert "Merge branch 'release/v1.6.x' into fix/staking-optimization"

This reverts commit 61271ea, reversing
changes made to 00e49d6.

Author: randy-cro

Makefile

@@ -148,10 +148,7 @@ lint-py:
 lint-nix:
 	find . -name "*.nix" ! -path './integration_tests/contracts/*' ! -path "./contracts/*" | xargs nixfmt -c
 
-lint-nix-fix:
-	find . -name "*.nix" ! -path './integration_tests/contracts/*' ! -path "./contracts/*" | xargs nixfmt
-
-.PHONY: lint-install lint lint-fix lint-py lint-nix lint-nix-fix
+.PHONY: lint lint-fix lint-py
 
 ###############################################################################
 ###                                Releasing                                ###

app/proposal.go

@@ -9,7 +9,6 @@ import (
 
 	"filippo.io/age"
 	abci "github.com/cometbft/cometbft/abci/types"
-	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
 	"cosmossdk.io/core/address"
 
@@ -174,25 +173,6 @@ func (h *ProposalHandler) ValidateTransaction(tx sdk.Tx, txBz []byte) error {
 			return fmt.Errorf("signer is blocked: %s", encoded)
 		}
 	}
-
-	// check EIP-7702 authorisation list
-	for _, msg := range tx.GetMsgs() {
-		msgEthTx, ok := msg.(*evmtypes.MsgEthereumTx)
-		if ok {
-			ethTx := msgEthTx.AsTransaction()
-			if ethTx.SetCodeAuthorizations() != nil {
-				for _, auth := range ethTx.SetCodeAuthorizations() {
-					addr, err := auth.Authority()
-					if err == nil {
-						if _, ok := h.blocklist[sdk.AccAddress(addr.Bytes()).String()]; ok {
-							return fmt.Errorf("signer is blocked: %s", addr.String())
-						}
-					}
-				}
-			}
-		}
-	}
-
 	return nil
 }
 

app/upgrades.go

@@ -2,7 +2,9 @@ package app
 
 import (
 	"context"
+	"fmt"
 
+	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -11,9 +13,24 @@ import (
 
 // RegisterUpgradeHandlers returns if store loader is overridden
 func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, maxVersion int64) bool {
-	planName := "v1.6" // TBD
+	planName := "v1.5" // TBD
 	app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		return app.ModuleManager.RunMigrations(ctx, app.configurator, fromVM)
 	})
+
+	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
+	if err != nil {
+		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
+	}
+
+	if !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		if upgradeInfo.Name == planName {
+			app.SetStoreLoader(MaxVersionUpgradeStoreLoader(maxVersion, upgradeInfo.Height, &storetypes.StoreUpgrades{
+				Deleted: []string{"capability", "feeibc"},
+			}))
+			return true
+		}
+	}
+
 	return false
 }

default.nix

@@ -11,7 +11,7 @@
   nativeByteOrder ? true, # nativeByteOrder mode will panic on big endian machines
 }:
 let
-  version = "v1.6.0";
+  version = "v1.5.4";
   pname = "cronosd";
   tags = [
     "ledger"

integration_tests/configs/upgrade-test-package.nix

@@ -24,9 +24,6 @@ let
   # release/v1.4.8
   released1_4 =
     (fetchFlake "crypto-org-chain/cronos" "513fda768eb6d0602df1abe48abd4d2cda7a2a11").default;
-  # release/v1.5.4
-  released1_5 =
-    (fetchFlake "crypto-org-chain/cronos" "5ccd423a14f100f4e485d0fb6aa8fa4b96d11b60").default;
   current = pkgs.callPackage ../../. { };
 in
 pkgs.linkFarm "upgrade-test-package" [
@@ -52,10 +49,6 @@ pkgs.linkFarm "upgrade-test-package" [
   }
   {
     name = "v1.5";
-    path = released1_5;
-  }
-  {
-    name = "v1.6";
     path = current;
   }
 ]

integration_tests/contracts/contracts/Counter.sol

@@ -5,8 +5,8 @@ import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/utils/Address.sol";
-import "@openzeppelin/contracts/utils/Pausable.sol";
-import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
+import "@openzeppelin/contracts/security/Pausable.sol";
+import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "./CosmosToken.sol";
 
@@ -787,7 +787,7 @@ contract Gravity is ReentrancyGuard, AccessControl, Pausable, Ownable {
 		address[] memory _validators,
 		uint256[] memory _powers,
 		address relayerAdmin
-	) Ownable(relayerAdmin) {
+	) {
 		// CHECKS
 
 		// Check that validators, powers, and signatures (v,r,s) set is well-formed
@@ -825,7 +825,7 @@ contract Gravity is ReentrancyGuard, AccessControl, Pausable, Ownable {
 
 		// ACL
 
-		_grantRole(RELAYER_ADMIN, relayerAdmin);
+		_setupRole(RELAYER_ADMIN, relayerAdmin);
 		_setRoleAdmin(RELAYER, RELAYER_ADMIN);
 		_setRoleAdmin(RELAYER_ADMIN, RELAYER_ADMIN);
 

integration_tests/contracts/contracts/Gravity.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.8.20;
+pragma solidity 0.8.10;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TestERC20A is ERC20 {