evmos · MalteHerrmann · Aug 29, 2023 · Aug 29, 2023 · Aug 29, 2023 · Aug 29, 2023
@@ -178,6 +178,26 @@ var _ = Describe("Interacting with the vesting extension", func() {
 				}
 			})
 
+			It(fmt.Sprintf("should not create a clawback vesting account for a smart contract (%s)", callType.name), func() {
+				if callType.directCall {
+					Skip("this should only be run for smart contract calls")
+				}
+
+				createClawbackArgs := s.BuildCallArgs(callType, contractAddr).
+					WithMethodName("createClawbackVestingAccountForContract").
+					WithArgs()
+
+				_, _, err = contracts.CallContractAndCheckLogs(s.ctx, s.app, createClawbackArgs, failCheck)
+				Expect(err).To(HaveOccurred(), "error while calling the contract: %v", err)
+				Expect(err.Error()).To(ContainSubstring("execution reverted"))
+
+				// Check that the smart contract was not converted
+				acc := s.app.AccountKeeper.GetAccount(s.ctx, contractAddr.Bytes())
+				Expect(acc).ToNot(BeNil(), "smart contract should be found")
+				_, ok := acc.(*vestingtypes.ClawbackVestingAccount)
+				Expect(ok).To(BeFalse(), "smart contract should not be converted to a vesting account")
+			})
+
 			It(fmt.Sprintf("should not create a clawback vesting account if the account already is subject to vesting (%s)", callType.name), func() {
 				addr, priv := testutiltx.NewAddrKey()
 				err := evmosutil.FundAccountWithBaseDenom(s.ctx, s.app.BankKeeper, addr.Bytes(), 1e18)

@@ -1,6 +1,7 @@
 package keeper_test
 
 import (
+	"fmt"
 	"math/big"
 	"strings"
 	"time"
@@ -15,10 +16,13 @@ import (
 	sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/evmos/evmos/v14/contracts"
 	"github.com/evmos/evmos/v14/crypto/ethsecp256k1"
 	"github.com/evmos/evmos/v14/testutil"
 	utiltx "github.com/evmos/evmos/v14/testutil/tx"
 	"github.com/evmos/evmos/v14/utils"
+	evmtypes "github.com/evmos/evmos/v14/x/evm/types"
 	"github.com/evmos/evmos/v14/x/vesting/types"
 )
 
@@ -1175,6 +1179,62 @@ var _ = Describe("Clawback Vesting Accounts - claw back tokens", func() {
 	})
 })
 
+// Testing that smart contracts cannot be converted to clawback vesting accounts
+//
+// NOTE: For smart contracts, it is not possible to directly call keeper methods
+// or send SDK transactions. They go exclusively through the EVM, which is tested
+// in the precompiles package.
+// The test here is just confirming the expected behavior on the module level.
+var _ = Describe("Clawback Vesting Account - Smart contract", func() {
+	var (
+		contractAddr common.Address
+		contract     evmtypes.CompiledContract
+		err          error
+	)
+
+	BeforeEach(func() {
+		contract = contracts.ERC20MinterBurnerDecimalsContract
+		contractAddr, err = testutil.DeployContract(
+			s.ctx,
+			s.app,
+			s.priv,
+			s.queryClientEvm,
+			contract,
+			"Test", "TTT", uint8(18),
+		)
+		Expect(err).ToNot(HaveOccurred(), "failed to deploy contract")
+	})
+
+	It("should not convert a smart contract to a clawback vesting account", func() {
+		msgCreate := types.NewMsgCreateClawbackVestingAccount(
+			s.address.Bytes(),
+			contractAddr.Bytes(),
+			false,
+		)
+		_, err := s.app.VestingKeeper.CreateClawbackVestingAccount(s.ctx, msgCreate)
+		Expect(err).To(HaveOccurred(), "expected error")
+		Expect(err.Error()).To(ContainSubstring(
+			fmt.Sprintf(
+				"account %s is a contract account and cannot be converted in a clawback vesting account",
+				sdk.AccAddress(contractAddr.Bytes()).String()),
+		))
+
+		// Check that the account was not converted
+		acc := s.app.AccountKeeper.GetAccount(s.ctx, contractAddr.Bytes())
+		Expect(acc).ToNot(BeNil(), "smart contract should be found")
+		_, ok := acc.(*types.ClawbackVestingAccount)
+		Expect(ok).To(BeFalse(), "account should not be a clawback vesting account")
+
+		// Check that the contract code was not deleted
+		//
+		// NOTE: When it was possible to create clawback vesting accounts for smart contracts,
+		// the contract code was deleted from the EVM state. This checks that this is not the case.
+		res, err := s.app.EvmKeeper.Code(s.ctx, &evmtypes.QueryCodeRequest{Address: contractAddr.String()})
+		Expect(err).ToNot(HaveOccurred(), "failed to query contract code")
+		Expect(res.Code).ToNot(BeEmpty(), "contract code should not be empty")
+	})
+})
+
 // Trying to replicate the faulty behavior in MsgCreateClawbackVestingAccount,
 // that was disclosed as a potential attack vector in relation to the Barberry
 // security patch.