feat(x/erc20): add allowance state

evmd/allowance.go

@@ -0,0 +1,23 @@
+package evmd
+
+import (
+	"cosmossdk.io/math"
+
+	erc20types "github.com/cosmos/evm/x/erc20/types"
+)
+
+const (
+	ExampleSpender = "0x1e0DE5DB1a39F99cBc67B00fA3415181b3509e42"
+	ExampleOwner   = "0x0AFc8e15F0A74E98d0AEC6C67389D2231384D4B2"
+)
+
+// ExampleAllowances creates a slice of allowance, that contains an allowance for the native denom of the example chain
+// implementation.
+var ExampleAllowances = []erc20types.Allowance{
+	{
+		Erc20Address: WEVMOSContractMainnet,
+		Owner:        ExampleOwner,
+		Spender:      ExampleSpender,
+		Value:        math.NewInt(100),
+	},
+}

proto/cosmos/evm/erc20/v1/erc20.proto

@@ -32,6 +32,27 @@ message TokenPair {
   Owner contract_owner = 4;
 }
 
+//Allowance is a token allowance only for erc20 precompile
+message Allowance {
+  option (gogoproto.equal) = false;
+
+  // erc20_address is the hex address of ERC20 contract
+  string erc20_address = 1;
+
+  // owner is the address of the owner account
+  string owner = 2;
+
+  // spender is the address that is allowed to spend the allowance
+  string spender = 3;
+
+  // value specifies the maximum amount of tokens that can be spent
+  // by this token allowance and will be updated as tokens are spent.
+  string value = 4 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+}
+
 // protolint:disable MESSAGES_HAVE_COMMENT
 
 // Deprecated: RegisterCoinProposal is a gov Content type to register a token

proto/cosmos/evm/erc20/v1/genesis.proto

@@ -16,6 +16,9 @@ message GenesisState {
   // token_pairs is a slice of the registered token pairs at genesis
   repeated TokenPair token_pairs = 2
       [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
+  // allowances is a slice of the registered allowances at genesis
+  repeated Allowance allowances = 3
+      [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
 }
 
 // Params defines the erc20 module params

testutil/constants/constants.go

@@ -29,6 +29,10 @@ const (
 	WEVMOSContractMainnet = "0xD4949664cD82660AaE99bEdc034a0deA8A0bd517"
 	// WEVMOSContractTestnet is the WEVMOS contract address for testnet
 	WEVMOSContractTestnet = "0xcc491f589b45d4a3c679016195b3fb87d7848210"
+	// ExampleEvmAddress1 is the example EVM address
+	ExampleEvmAddressAlice = "0x1e0DE5DB1a39F99cBc67B00fA3415181b3509e42"
+	// ExampleEvmAddress2 is the example EVM address
+	ExampleEvmAddressBob = "0x0AFc8e15F0A74E98d0AEC6C67389D2231384D4B2"
 )
 
 var (

x/erc20/genesis.go

@@ -2,9 +2,11 @@ package erc20
 
 import (
 	"fmt"
+	"math/big"
 
 	"github.com/cosmos/evm/x/erc20/keeper"
 	"github.com/cosmos/evm/x/erc20/types"
+	"github.com/ethereum/go-ethereum/common"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
@@ -31,12 +33,23 @@ func InitGenesis(
 	for _, pair := range data.TokenPairs {
 		k.SetToken(ctx, pair)
 	}
+
+	var erc20, owner, spender common.Address
+	var value *big.Int
+	for _, allowance := range data.Allowances {
+		erc20 = common.HexToAddress(allowance.Erc20Address)
+		owner = common.HexToAddress(allowance.Owner)
+		spender = common.HexToAddress(allowance.Spender)
+		value = allowance.Value.BigInt()
+		k.SetAllowance(ctx, erc20, owner, spender, value)
+	}
 }
 
 // ExportGenesis export module status
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	return &types.GenesisState{
 		Params:     k.GetParams(ctx),
 		TokenPairs: k.GetTokenPairs(ctx),
+		Allowances: k.GetAllowances(ctx),
 	}
 }

x/erc20/genesis_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"cosmossdk.io/math"
 	"github.com/stretchr/testify/suite"
 
 	"github.com/cometbft/cometbft/crypto/tmhash"
@@ -29,7 +30,7 @@ type GenesisTestSuite struct {
 	genesis types.GenesisState
 }
 
-const osmoERC20ContractAddr = "0x5dCA2483280D9727c80b5518faC4556617fb19ZZ"
+const osmoERC20ContractAddr = "0x5D87876250185593977a6F94aF98877a5E7eD60E"
 
 var osmoDenomTrace = transfertypes.DenomTrace{
 	BaseDenom: "uosmo",
@@ -99,6 +100,29 @@ func (suite *GenesisTestSuite) TestERC20InitGenesis() {
 						ContractOwner: types.OWNER_MODULE,
 					},
 				},
+				[]types.Allowance{},
+			),
+		},
+		{
+			name: "custom genesis",
+			genesisState: types.NewGenesisState(
+				types.DefaultParams(),
+				[]types.TokenPair{
+					{
+						Erc20Address:  osmoERC20ContractAddr,
+						Denom:         osmoDenomTrace.IBCDenom(),
+						Enabled:       true,
+						ContractOwner: types.OWNER_MODULE,
+					},
+				},
+				[]types.Allowance{
+					{
+						Erc20Address: osmoERC20ContractAddr,
+						Owner:        utiltx.GenerateAddress().String(),
+						Spender:      utiltx.GenerateAddress().String(),
+						Value:        math.NewInt(100),
+					},
+				},
 			),
 		},
 	}
@@ -120,6 +144,13 @@ func (suite *GenesisTestSuite) TestERC20InitGenesis() {
 		} else {
 			suite.Require().Len(tc.genesisState.TokenPairs, 0, tc.name)
 		}
+
+		allowances := nw.App.Erc20Keeper.GetAllowances(nw.GetContext())
+		if len(allowances) > 0 {
+			suite.Require().Equal(tc.genesisState.Allowances, allowances, tc.name)
+		} else {
+			suite.Require().Len(tc.genesisState.Allowances, 0, tc.name)
+		}
 	}
 }
 
@@ -148,6 +179,7 @@ func (suite *GenesisTestSuite) TestErc20ExportGenesis() {
 						ContractOwner: types.OWNER_MODULE,
 					},
 				},
+				[]types.Allowance{},
 			),
 		},
 	}

x/erc20/keeper/allowance.go

@@ -4,39 +4,160 @@ import (
 	"math/big"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
+
+	errorsmod "cosmossdk.io/errors"
+	"cosmossdk.io/store/prefix"
+	storetypes "cosmossdk.io/store/types"
+
 	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/cosmos/evm/x/erc20/types"
 )
 
+// GetAllowance returns the allowance of the given owner and spender
+// on the given erc20 precompile address.
 func (k Keeper) GetAllowance(
 	ctx sdk.Context,
 	erc20 common.Address,
 	owner common.Address,
 	spender common.Address,
 ) (*big.Int, error) {
+	allowanceKey := types.AllowanceKey(erc20, owner, spender)
+	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixAllowance)
 
-	// TODO: implement this function
-	return big.NewInt(0), nil
+	var allowance types.Allowance
+	bz := store.Get(allowanceKey)
+	if bz == nil {
+		return big.NewInt(0), nil
+	}
+
+	k.cdc.MustUnmarshal(bz, &allowance)
+
+	return allowance.Value.BigInt(), nil
 }
 
+// SetAllowance sets the allowance of the given owner and spender
+// on the given erc20 precompile address.
 func (k Keeper) SetAllowance(
 	ctx sdk.Context,
 	erc20 common.Address,
 	owner common.Address,
 	spender common.Address,
 	value *big.Int,
 ) error {
+	return k.setAllowance(ctx, erc20, owner, spender, value)
+}
+
+// DeleteAllowance deletes the allowance of the given owner and spender
+// on the given erc20 precompile address.
+func (k Keeper) DeleteAllowance(
+	ctx sdk.Context,
+	erc20 common.Address,
+	owner common.Address,
+	spender common.Address,
+) error {
+	return k.setAllowance(ctx, erc20, owner, spender, common.Big0)
+}
+
+func (k Keeper) setAllowance(
+	ctx sdk.Context,
+	erc20 common.Address,
+	owner common.Address,
+	spender common.Address,
+	value *big.Int,
+) error {
+	if err := k.checkAddressesNonZero(erc20, owner, spender); err != nil {
+		return err
+	}
+
+	if err := k.checkTokenPair(ctx, erc20); err != nil {
+		return err
+	}
+
+	allowanceKey := types.AllowanceKey(erc20, owner, spender)
+	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixAllowance)
+	switch {
+	case value == nil || value.Sign() == 0:
+		store.Delete(allowanceKey)
+	case value.Sign() < 0:
+		return errorsmod.Wrapf(types.ErrInvalidAllowance, "value '%s' is less than zero", value)
+	default:
+		allowance := types.NewAllowance(erc20, owner, spender, value)
+		bz := k.cdc.MustMarshal(&allowance)
+		store.Set(allowanceKey, bz)
+	}
 
-	// TODO: implement this function
 	return nil
 }
 
-func (k Keeper) DeleteAllowance(
+// GetAllowances returns all allowances stored on the given erc20 precompile address.
+func (k Keeper) GetAllowances(
+	ctx sdk.Context,
+) []types.Allowance {
+	allowances := []types.Allowance{}
+
+	k.IterateAllowances(ctx, func(allowance types.Allowance) (stop bool) {
+		allowances = append(allowances, allowance)
+		return false
+	})
+
+	return allowances
+}
+
+// IterateAllowances iterates through all allowances stored on the given erc20 precompile address.
+func (k Keeper) IterateAllowances(
 	ctx sdk.Context,
+	cb func(allowance types.Allowance) (stop bool),
+) {
+	store := ctx.KVStore(k.storeKey)
+	iterator := storetypes.KVStorePrefixIterator(store, types.KeyPrefixAllowance)
+	defer iterator.Close()
+
+	for ; iterator.Valid(); iterator.Next() {
+		var allowance types.Allowance
+		k.cdc.MustUnmarshal(iterator.Value(), &allowance)
+
+		if cb(allowance) {
+			break
+		}
+	}
+}
+
+func (k Keeper) checkAddressesNonZero(
 	erc20 common.Address,
 	owner common.Address,
 	spender common.Address,
 ) error {
+	if erc20 == (common.Address{}) {
+		return errorsmod.Wrapf(errortypes.ErrInvalidAddress, "invalid erc20 address: '%s'", erc20)
+	}
+
+	if owner == (common.Address{}) {
+		return errorsmod.Wrapf(errortypes.ErrInvalidAddress, "invalid owner address: '%s'", owner)
+	}
+
+	if spender == (common.Address{}) {
+		return errorsmod.Wrapf(errortypes.ErrInvalidAddress, "invalid spender address: '%s'", spender)
+	}
+
+	return nil
+}
+
+func (k Keeper) checkTokenPair(ctx sdk.Context, erc20 common.Address) error {
+	tokenPairID := k.GetERC20Map(ctx, erc20)
+	tokenPair, found := k.GetTokenPair(ctx, tokenPairID)
+	if !found {
+		return errorsmod.Wrapf(
+			types.ErrTokenPairNotFound, "token pair for address '%s' not registered", erc20,
+		)
+	}
+
+	if !tokenPair.Enabled {
+		return errorsmod.Wrapf(
+			types.ErrERC20TokenPairDisabled, "token pair for address '%s' is disabled", erc20,
+		)
+	}
 
-	// TODO: implement this function
 	return nil
-}
+}