Stargate

.clang-format

@@ -113,4 +113,3 @@ Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never
 ...
-

.github/workflows/test.yml

@@ -12,6 +12,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:
@@ -56,6 +59,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:
@@ -92,6 +98,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:
@@ -128,6 +137,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:
@@ -164,6 +176,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:
@@ -199,6 +214,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:

CHANGELOG.md

@@ -49,6 +49,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (evm) [\#674](https://github.com/cosmos/ethermint/issues/674) Reset all cache after account data has been committed in `EndBlock` to make sure every node state consistent.
 * (evm) [\#672](https://github.com/cosmos/ethermint/issues/672) Fix panic of `wrong Block.Header.AppHash` when restart a node with snapshot.
 
+### Features
+* (api) [\#825](https://github.com/cosmos/ethermint/pull/825) Individually enable the api modules. Will be implemented in the latest version of ethermint with the upcoming stargate upgrade.
+
 ## [v0.4.0] - 2020-12-15
 
 ### API Breaking

Dockerfile

@@ -25,7 +25,6 @@ WORKDIR /root
 
 # Copy over binaries from the build-env
 COPY --from=build-env /go/src/github.com/cosmos/ethermint/build/ethermintd /usr/bin/ethermintd
-COPY --from=build-env /go/src/github.com/cosmos/ethermint/build/ethermintcli /usr/bin/ethermintcli
 
 # Run ethermintd by default
 CMD ["ethermintd"]

app/ante/ante.go

@@ -55,9 +55,6 @@ func NewAnteHandler(
 				authante.NewRejectExtensionOptionsDecorator(),
 				NewEthMempoolFeeDecorator(evmKeeper),
 				authante.NewValidateBasicDecorator(),
-				// TODO: add timeout for MsgEthereumTx
-				// authante.TxTimeoutHeightDecorator{},
-				// authante.NewValidateMemoDecorator(ak),
 				NewEthSigVerificationDecorator(),
 				NewAccountVerificationDecorator(ak, bankKeeper, evmKeeper),
 				NewNonceVerificationDecorator(ak),
@@ -102,7 +99,7 @@ func DefaultSigVerificationGasConsumer(
 	switch pubkey := pubkey.(type) {
 	case *ed25519.PubKey:
 		meter.ConsumeGas(params.SigVerifyCostED25519, "ante verify: ed25519")
-		return sdkerrors.Wrap(sdkerrors.ErrInvalidPubKey, "ED25519 public keys are unsupported")
+		return nil
 
 	case *secp256k1.PubKey:
 		meter.ConsumeGas(params.SigVerifyCostSecp256k1, "ante verify: secp256k1")
@@ -123,7 +120,6 @@ func DefaultSigVerificationGasConsumer(
 			return err
 		}
 		return nil
-
 	default:
 		return sdkerrors.Wrapf(sdkerrors.ErrInvalidPubKey, "unrecognized public key type: %T", pubkey)
 	}

app/ethermint.go

@@ -29,7 +29,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
@@ -87,9 +86,6 @@ import (
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 
 	"github.com/cosmos/ethermint/app/ante"
-	"github.com/cosmos/ethermint/server"
-	"github.com/cosmos/ethermint/server/api"
-	"github.com/cosmos/ethermint/server/config"
 	ethermint "github.com/cosmos/ethermint/types"
 	"github.com/cosmos/ethermint/x/evm"
 
@@ -161,8 +157,8 @@ var (
 )
 
 var (
-	_ simapp.App         = (*EthermintApp)(nil)
-	_ server.Application = (*EthermintApp)(nil)
+	_ simapp.App              = (*EthermintApp)(nil)
+	_ servertypes.Application = (*EthermintApp)(nil)
 )
 
 // EthermintApp implements an extended ABCI application. It is an application
@@ -406,10 +402,12 @@ func NewEthermintApp(
 	app.mm.SetOrderInitGenesis(
 		// SDK modules
 		capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, stakingtypes.ModuleName,
-		slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, crisistypes.ModuleName,
+		slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName,
 		ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, ibctransfertypes.ModuleName,
 		// Ethermint modules
 		evmtypes.ModuleName,
+		// NOTE: crisis module must go at the end to check for invariants on each module
+		crisistypes.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)
@@ -589,14 +587,10 @@ func (app *EthermintApp) RegisterAPIRoutes(apiSvr *sdkapi.Server, apiConfig sdkc
 	clientCtx := apiSvr.ClientCtx
 	rpc.RegisterRoutes(clientCtx, apiSvr.Router)
 	evmrest.RegisterTxRoutes(clientCtx, apiSvr.Router)
-	authrest.RegisterTxRoutes(clientCtx, apiSvr.Router)
 
 	ModuleBasics.RegisterRESTRoutes(clientCtx, apiSvr.Router)
 	ModuleBasics.RegisterGRPCGatewayRoutes(apiSvr.ClientCtx, apiSvr.GRPCGatewayRouter)
 
-	// // Register Ethereum namespaces
-	// ethermintrpc.RegisterEthereum(clientCtx, apiSvr.Router)
-
 	// register swagger API from root so that other applications can override easily
 	if apiConfig.Swagger {
 		simapp.RegisterSwaggerAPI(clientCtx, apiSvr.Router)
@@ -613,25 +607,6 @@ func (app *EthermintApp) RegisterTendermintService(clientCtx client.Context) {
 	tmservice.RegisterTendermintService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.interfaceRegistry)
 }
 
-// RegisterEthereumServers registers all application ethereum routes with the provided
-// API server.
-func (app *EthermintApp) RegisterEthereumServers(apiSvr *api.Server, apiConfig config.EthereumConfig) {
-	// clientCtx := apiSvr.ClientCtx
-	// rpc.RegisterRoutes(clientCtx, apiSvr.Router)
-	// authrest.RegisterTxRoutes(clientCtx, apiSvr.Router)
-
-	// ModuleBasics.RegisterRESTRoutes(clientCtx, apiSvr.Router)
-	// ModuleBasics.RegisterGRPCRoutes(apiSvr.ClientCtx, apiSvr.GRPCRouter)
-
-	// // Register Ethereum namespaces
-	// // ethermintrpc.RegisterRoutes(clientCtx, apiSvr.Router)
-
-	// // register swagger API from root so that other applications can override easily
-	// if apiConfig.Swagger {
-	// 	simapp.RegisterSwaggerAPI(clientCtx, apiSvr.Router)
-	// }
-}
-
 // GetMaccPerms returns a copy of the module account permissions
 func GetMaccPerms() map[string][]string {
 	dupMaccPerms := make(map[string][]string)

client/testnet.go

@@ -25,7 +25,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/server"
-	srvconfig "github.com/cosmos/cosmos-sdk/server/config"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -40,6 +39,7 @@ import (
 	ethcrypto "github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/cosmos/ethermint/crypto/hd"
+	srvconfig "github.com/cosmos/ethermint/server/config"
 	ethermint "github.com/cosmos/ethermint/types"
 	evmtypes "github.com/cosmos/ethermint/x/evm/types"
 )

cmd/ethermintd/cmd_test.go

@@ -7,8 +7,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 	"github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 
+	"github.com/cosmos/ethermint/app"
 	ethermintd "github.com/cosmos/ethermint/cmd/ethermintd"
 )
 
@@ -21,6 +23,6 @@ func TestInitCmd(t *testing.T) {
 		fmt.Sprintf("--%s=%s", flags.FlagChainID, "ethermint-1"),
 	})
 
-	err := ethermintd.Execute(rootCmd)
+	err := svrcmd.Execute(rootCmd, app.DefaultNodeHome)
 	require.NoError(t, err)
 }

cmd/ethermintd/genaccounts.go

@@ -165,6 +165,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 			bankGenState := banktypes.GetGenesisStateFromAppState(depCdc, appState)
 			bankGenState.Balances = append(bankGenState.Balances, balances)
 			bankGenState.Balances = banktypes.SanitizeGenesisBalances(bankGenState.Balances)
+			bankGenState.Supply = bankGenState.Supply.Add(balances.Coins...)
 
 			bankGenStateBz, err := cdc.MarshalJSON(bankGenState)
 			if err != nil {

cmd/ethermintd/main.go

@@ -2,11 +2,23 @@ package main
 
 import (
 	"os"
+
+	"github.com/cosmos/cosmos-sdk/server"
+	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
+
+	"github.com/cosmos/ethermint/app"
 )
 
 func main() {
 	rootCmd, _ := NewRootCmd()
-	if err := Execute(rootCmd); err != nil {
-		os.Exit(1)
+
+	if err := svrcmd.Execute(rootCmd, app.DefaultNodeHome); err != nil {
+		switch e := err.(type) {
+		case server.ErrorCode:
+			os.Exit(e.Code)
+
+		default:
+			os.Exit(1)
+		}
 	}
 }