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

Author: randy-cro

Makefile

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

app/proposal.go

@@ -9,6 +9,7 @@ import (
 
 	"filippo.io/age"
 	abci "github.com/cometbft/cometbft/abci/types"
+	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
 	"cosmossdk.io/core/address"
 
@@ -173,6 +174,25 @@ 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,9 +2,7 @@ package app
 
 import (
 	"context"
-	"fmt"
 
-	storetypes "cosmossdk.io/store/types"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -13,24 +11,9 @@ import (
 
 // RegisterUpgradeHandlers returns if store loader is overridden
 func (app *App) RegisterUpgradeHandlers(cdc codec.BinaryCodec, maxVersion int64) bool {
-	planName := "v1.5" // TBD
+	planName := "v1.6" // 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.5.4";
+  version = "v1.6.0";
   pname = "cronosd";
   tags = [
     "ledger"

integration_tests/configs/upgrade-test-package.nix

@@ -24,6 +24,9 @@ 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" [
@@ -49,6 +52,10 @@ pkgs.linkFarm "upgrade-test-package" [
   }
   {
     name = "v1.5";
+    path = released1_5;
+  }
+  {
+    name = "v1.6";
     path = current;
   }
 ]

integration_tests/contracts/contracts/Counter.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+contract Counter {
+    uint public count;
+
+    function increase() public {
+        count++;
+    }
+
+    function decrease() public {
+        count--;
+    }
+}

integration_tests/contracts/contracts/Gravity.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/security/Pausable.sol";
-import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+import "@openzeppelin/contracts/utils/Pausable.sol";
+import "@openzeppelin/contracts/utils/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
 
-		_setupRole(RELAYER_ADMIN, relayerAdmin);
+		_grantRole(RELAYER_ADMIN, relayerAdmin);
 		_setRoleAdmin(RELAYER, RELAYER_ADMIN);
 		_setRoleAdmin(RELAYER_ADMIN, RELAYER_ADMIN);
 

integration_tests/contracts/contracts/Simple7702Account.sol

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import "@openzeppelin/contracts/interfaces/IERC1271.sol";
+import "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
+import "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";
+import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import "account-abstraction/contracts/core/Helpers.sol";
+import "account-abstraction/contracts/core/BaseAccount.sol";
+
+/**
+ * Simple7702Account.sol
+ * A minimal account to be used with EIP-7702 (for batching) and ERC-4337 (for gas sponsoring)
+ */
+contract Simple7702Account is BaseAccount, IERC165, IERC1271, ERC1155Holder, ERC721Holder {
+
+    // address of entryPoint v0.8
+    function entryPoint() public pure override returns (IEntryPoint) {
+        return IEntryPoint(0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108);
+    }
+
+    /**
+     * Make this account callable through ERC-4337 EntryPoint.
+     * The UserOperation should be signed by this account's private key.
+     */
+    function _validateSignature(
+        PackedUserOperation calldata userOp,
+        bytes32 userOpHash
+    ) internal virtual override returns (uint256 validationData) {
+
+        return _checkSignature(userOpHash, userOp.signature) ? SIG_VALIDATION_SUCCESS : SIG_VALIDATION_FAILED;
+    }
+
+    function isValidSignature(bytes32 hash, bytes memory signature) public view returns (bytes4 magicValue) {
+        return _checkSignature(hash, signature) ? this.isValidSignature.selector : bytes4(0xffffffff);
+    }
+
+    function _checkSignature(bytes32 hash, bytes memory signature) internal view returns (bool) {
+        return ECDSA.recover(hash, signature) == address(this);
+    }
+
+    function _requireForExecute() internal view virtual override {
+        require(
+            msg.sender == address(this) ||
+            msg.sender == address(entryPoint()),
+            "not from self or EntryPoint"
+        );
+    }
+
+    function supportsInterface(bytes4 id) public override(ERC1155Holder, IERC165) pure returns (bool) {
+        return
+            id == type(IERC165).interfaceId ||
+            id == type(IAccount).interfaceId ||
+            id == type(IERC1271).interfaceId ||
+            id == type(IERC1155Receiver).interfaceId ||
+            id == type(IERC721Receiver).interfaceId;
+    }
+
+    // accept incoming calls (with or without value), to mimic an EOA.
+    fallback() external payable {
+    }
+
+    receive() external payable {
+    }
+}

integration_tests/contracts/contracts/Simple7702Counter.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+contract Simple7702Counter {
+    uint public count;
+
+    function increase() public {
+        count++;
+    }
+
+    function decrease() public {
+        count--;
+    }
+
+    receive() external payable { }
+    fallback() external payable { }
+}

integration_tests/contracts/contracts/TestERC20A.sol

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