refactor: merge

NibiruChain · May 22, 2024 · a7731b7 · a7731b7
1 parent 9001ade
commit a7731b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/app/app.go b/app/app.go
@@ -149,14 +149,6 @@ func NewNibiruApp(
 		app.SetProcessProposal(handler.ProcessProposalHandler())
 	})
 
-	baseAppOptions = append(baseAppOptions, func(app *baseapp.BaseApp) {
-		mp := mempool.NoOpMempool{}
-		app.SetMempool(mp)
-		handler := baseapp.NewDefaultProposalHandler(mp, app)
-		app.SetPrepareProposal(handler.PrepareProposalHandler())
-		app.SetProcessProposal(handler.ProcessProposalHandler())
-	})
-
 	bApp := baseapp.NewBaseApp(
 		appName, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...)
 	bApp.SetCommitMultiStoreTracer(traceStore)

diff --git a/app/appconst/appconst.go b/app/appconst/appconst.go
@@ -24,18 +24,6 @@ var (
 	GoArch    = ""
 )
 
-// EVM Chain ID Map
-var EVMChainIDs = map[string]*big.Int{
-	"cataclysm-1":       big.NewInt(100),
-	"nibiru-localnet-0": big.NewInt(1000),
-	"nibiru-devnet-1":   big.NewInt(2000),
-	"nibiru-devnet-2":   big.NewInt(3000),
-	"nibiru-testnet-1":  big.NewInt(3000),
-	"nibiru-testnet-2":  big.NewInt(4000),
-	// other test chains will default to 10000
-}
-var DefaultEVMChainID = big.NewInt(10000)
-
 func init() {
 	if len(AppVersion) == 0 {
 		AppVersion = "dev"

diff --git a/x/evm/keeper/grpc_query.go b/x/evm/keeper/grpc_query.go
@@ -7,14 +7,8 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
-
-	"github.com/NibiruChain/nibiru/eth"
-	"github.com/NibiruChain/nibiru/x/evm/statedb"
-
 	grpccodes "google.golang.org/grpc/codes"
 	grpcstatus "google.golang.org/grpc/status"
 
@@ -23,16 +17,19 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/NibiruChain/nibiru/eth"
+	"github.com/NibiruChain/nibiru/x/evm"
+	"github.com/NibiruChain/nibiru/x/evm/statedb"
+
 	gethcommon "github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core"
 	gethcore "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 	gethparams "github.com/ethereum/go-ethereum/params"
 
-	"github.com/NibiruChain/nibiru/x/evm"
-
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
 )