wip: state migration msg

evmd/app.go

@@ -512,8 +512,11 @@ func NewExampleApp(
 		app.AccountKeeper,
 		app.PreciseBankKeeper,
 		app.StakingKeeper,
+		app.FeeGrantKeeper,
+		app.AuthzKeeper,
 		app.FeeMarketKeeper,
 		&app.Erc20Keeper,
+		baseapp.NewMsgServiceRouter(),
 		tracer,
 	)
 

proto/cosmos/evm/vm/v1/tx.proto

@@ -24,6 +24,9 @@ service Msg {
   // parameters. The authority is hard-coded to the Cosmos SDK x/gov module
   // account
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
+
+  //todo: comments
+  rpc MigrateAccount(MsgMigrateAccount) returns (MsgMigrateAccountResponse);
 }
 
 // MsgEthereumTx encapsulates an Ethereum transaction as an SDK message.
@@ -208,3 +211,17 @@ message MsgUpdateParams {
 // MsgUpdateParamsResponse defines the response structure for executing a
 // MsgUpdateParams message.
 message MsgUpdateParamsResponse {}
+
+// todo: comments
+message MsgMigrateAccount {
+  option (amino.name) = "cosmos/evm/x/vm/MsgMigrateAccount";
+  option (cosmos.msg.v1.signer) = "original_address";
+
+  // original_address is the address of the account that is migrating to a new state
+  string original_address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  // new_address is the address of the account that is being migrated to from the old account
+  string new_address = 2 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+}
+
+message MsgMigrateAccountResponse {}

testutil/integration/common/grpc/feegrant.go

@@ -0,0 +1,22 @@
+package grpc
+
+import (
+	"context"
+	"cosmossdk.io/x/feegrant"
+)
+
+// GetGrants returns the grants for the given grantee and granter combination.
+//
+// NOTE: To extract the concrete authorizations, use the GetAuthorizations method.
+func (gqh *IntegrationHandler) Allowance(grantee, granter string) (*feegrant.QueryAllowanceResponse, error) {
+	feegrantClient := gqh.network.GetFeeGrantClient()
+	res, err := feegrantClient.Allowance(context.Background(), &feegrant.QueryAllowanceRequest{
+		Grantee: grantee,
+		Granter: granter,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

testutil/integration/common/grpc/grpc.go

@@ -1,6 +1,7 @@
 package grpc
 
 import (
+	"cosmossdk.io/x/feegrant"
 	"github.com/cosmos/evm/testutil/integration/common/network"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -46,6 +47,9 @@
 	GetValidatorOutstandingRewards(validatorAddress string) (*distrtypes.QueryValidatorOutstandingRewardsResponse, error)
 	GetCommunityPool() (*distrtypes.QueryCommunityPoolResponse, error)
 	GetBondedValidators() (*stakingtypes.QueryValidatorsResponse, error)
+
+	// Feegrant methods
+	Allowance(granter, grantee string) (*feegrant.QueryAllowanceResponse, error)
 }
 
 var _ Handler = (*IntegrationHandler)(nil)

testutil/integration/common/network/network.go

@@ -1,6 +1,7 @@
 package network
 
 import (
+	"cosmossdk.io/x/feegrant"
 	"testing"
 	"time"
 
@@ -39,6 +40,7 @@
 	GetBankClient() banktypes.QueryClient
 	GetStakingClient() stakingtypes.QueryClient
 	GetDistrClient() distrtypes.QueryClient
+	GetFeeGrantClient() feegrant.QueryClient
 
 	BroadcastTxSync(txBytes []byte) (abcitypes.ExecTxResult, error)
 	Simulate(txBytes []byte) (*txtypes.SimulateResponse, error)

testutil/integration/os/network/clients.go

@@ -1,6 +1,7 @@
 package network
 
 import (
+	"cosmossdk.io/x/feegrant"
 	erc20types "github.com/cosmos/evm/x/erc20/types"
 	feemarkettypes "github.com/cosmos/evm/x/feemarket/types"
 	precisebankkeeper "github.com/cosmos/evm/x/precisebank/keeper"
@@ -74,6 +75,12 @@ func (n *IntegrationNetwork) GetAuthzClient() authz.QueryClient {
 	return authz.NewQueryClient(queryHelper)
 }
 
+func (n *IntegrationNetwork) GetFeeGrantClient() feegrant.QueryClient {
+	queryHelper := getQueryHelper(n.GetContext(), n.GetEncodingConfig())
+	feegrant.RegisterQueryServer(queryHelper, n.app.FeeGrantKeeper)
+	return feegrant.NewQueryClient(queryHelper)
+}
+
 func (n *IntegrationNetwork) GetStakingClient() stakingtypes.QueryClient {
 	queryHelper := getQueryHelper(n.GetContext(), n.GetEncodingConfig())
 	stakingtypes.RegisterQueryServer(queryHelper, stakingkeeper.Querier{Keeper: n.app.StakingKeeper})

x/precisebank/keeper/keeper.go

@@ -2,6 +2,7 @@
 
 import (
 	"context"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	"github.com/cosmos/evm/x/precisebank/types"
 	evmtypes "github.com/cosmos/evm/x/vm/types"
@@ -24,6 +25,18 @@
 	ak types.AccountKeeper
 }
 
+func (k Keeper) GetAllBalances(ctx context.Context, addr sdk.AccAddress) sdk.Coins {
+	return k.bk.GetAllBalances(ctx, addr)
+}
+
+func (k Keeper) SpendableBalances(ctx context.Context, req *banktypes.QuerySpendableBalancesRequest) (*banktypes.QuerySpendableBalancesResponse, error) {
+	return k.bk.SpendableBalances(ctx, req)
+}
+
+func (k Keeper) BlockedAddr(addr sdk.AccAddress) bool {
+	return k.bk.BlockedAddr(addr)
+}
+
 // NewKeeper creates a new keeper
 func NewKeeper(
 	cdc codec.BinaryCodec,

x/precisebank/types/interfaces.go

@@ -2,6 +2,7 @@
 
 import (
 	"context"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -20,6 +21,7 @@
 	GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin
 	GetSupply(ctx context.Context, denom string) sdk.Coin
 	SpendableCoin(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin
+	SpendableBalances(ctx context.Context, req *banktypes.QuerySpendableBalancesRequest) (*banktypes.QuerySpendableBalancesResponse, error)
 
 	BlockedAddr(addr sdk.AccAddress) bool