Modification evm fee

Makefile

@@ -62,8 +62,8 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Version=$(AppVersion) \
  		  	  -X github.com/cosmos/cosmos-sdk/version.Name=onp \
 		  	  -X github.com/cosmos/cosmos-sdk/version.AppName=$(PLUGCHAIN_BINARY) \
 		  	  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-			  -X github.com/tharsis/ethermint/version.AppVersion=$(PLUGCHAIN_BINARY) \
-			  -X github.com/tharsis/ethermint/version.GitCommit=$(AppVersion) \
+			  -X github.com/oracleNetworkProtocol/ethermint/version.AppVersion=$(PLUGCHAIN_BINARY) \
+			  -X github.com/oracleNetworkProtocol/ethermint/version.GitCommit=$(AppVersion) \
 			  -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TMVERSION) \
 		 	    -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
 # DB backend selection

app/app.go

@@ -102,17 +102,17 @@ import (
 	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
 	feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module"
 
-	"github.com/tharsis/ethermint/x/feemarket"
-	feemarketkeeper "github.com/tharsis/ethermint/x/feemarket/keeper"
-	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
-
+	"github.com/oracleNetworkProtocol/ethermint/x/feemarket"
+	feemarketkeeper "github.com/oracleNetworkProtocol/ethermint/x/feemarket/keeper"
+	feemarkettypes "github.com/oracleNetworkProtocol/ethermint/x/feemarket/types"
+
+	"github.com/oracleNetworkProtocol/ethermint/app/ante"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
+	"github.com/oracleNetworkProtocol/ethermint/x/evm"
+	evmrest "github.com/oracleNetworkProtocol/ethermint/x/evm/client/rest"
+	evmkeeper "github.com/oracleNetworkProtocol/ethermint/x/evm/keeper"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	srvflags "github.com/oracleNetworkProtocol/plugchain/server/flags"
-	"github.com/tharsis/ethermint/app/ante"
-	ethermint "github.com/tharsis/ethermint/types"
-	"github.com/tharsis/ethermint/x/evm"
-	evmrest "github.com/tharsis/ethermint/x/evm/client/rest"
-	evmkeeper "github.com/tharsis/ethermint/x/evm/keeper"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 func init() {

app/export.go

@@ -12,7 +12,7 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
-	ethencoding "github.com/tharsis/ethermint/encoding"
+	ethencoding "github.com/oracleNetworkProtocol/ethermint/encoding"
 )
 
 // NewDefaultGenesisState generates the default state for the application.

app/prefix.go

@@ -2,8 +2,8 @@ package app
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
 	"github.com/oracleNetworkProtocol/plugchain/types"
-	ethermint "github.com/tharsis/ethermint/types"
 )
 
 const (

cmd/plugchaind/cmd/genaccounts.go

@@ -16,8 +16,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	"github.com/oracleNetworkProtocol/ethermint/crypto/hd"
 	"github.com/spf13/cobra"
-	"github.com/tharsis/ethermint/crypto/hd"
 )
 
 const (

cmd/plugchaind/cmd/root.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/cosmos/cosmos-sdk/snapshots"
-	"github.com/tharsis/ethermint/crypto/hd"
-	"github.com/tharsis/ethermint/encoding"
+	"github.com/oracleNetworkProtocol/ethermint/crypto/hd"
+	"github.com/oracleNetworkProtocol/ethermint/encoding"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -25,19 +25,19 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
+	"github.com/oracleNetworkProtocol/ethermint/client/debug"
 	"github.com/oracleNetworkProtocol/plugchain/app"
 	onptypes "github.com/oracleNetworkProtocol/plugchain/types"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
-	"github.com/tharsis/ethermint/client/debug"
 
 	// this line is used by starport scaffolding # stargate/root/import
+	ethermintclient "github.com/oracleNetworkProtocol/ethermint/client"
 	plugchainserver "github.com/oracleNetworkProtocol/plugchain/server"
 	servercfg "github.com/oracleNetworkProtocol/plugchain/server/config"
-	ethermintclient "github.com/tharsis/ethermint/client"
 )
 
 const (

crypto/keyring/options.go

@@ -3,7 +3,7 @@ package keyring
 import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 
-	"github.com/tharsis/ethermint/crypto/hd"
+	"github.com/oracleNetworkProtocol/ethermint/crypto/hd"
 )
 
 var (

docs/endpoints/grpc-client.md

@@ -81,7 +81,7 @@ import (
     "encoding/hex"
 	sdk "github.com/cosmos/cosmos-sdk/types"
     _ "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" 
-    "github.com/tharsis/ethermint/crypto/ethsecp256k1"   
+    "github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"   
 )
     chainID := "plugchain_520-1"
     addr1, _ := sdk.AccAddressFromBech32("gx1s65azh0yj7n8yn4u0q449wt50eqr4qtyjzmhed")
@@ -94,7 +94,7 @@ import (
 	//curl -X GET "http://8.210.180.240:1317/cosmos/auth/v1beta1/accounts/gx13udxpqpmq6herxqk9yqa3agln8a0va9whjuqe7" -H  "accept: application/json"
 	accountSeq := uint64(0)
 	acountNumber := uint64(8)
-	//EthAccount type, using package "github.com/tharsis/ethermint/crypto/ethsecp256k1"
+	//EthAccount type, using package "github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"
 	//BaseAccount type using package  "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	priv1 := ethsecp256k1.PrivKey{Key: priva}
 ```

docs/zh/endpoints/grpc-client.md

@@ -80,7 +80,7 @@ import (
     "encoding/hex"
 	sdk "github.com/cosmos/cosmos-sdk/types"
     _ "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" 
-    "github.com/tharsis/ethermint/crypto/ethsecp256k1"   
+    "github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"   
 )
     chainID := "plugchain_520-1"
     addr1, _ := sdk.AccAddressFromBech32("gx1s65azh0yj7n8yn4u0q449wt50eqr4qtyjzmhed")
@@ -93,7 +93,7 @@ import (
 	//curl -X GET "http://8.210.180.240:1317/cosmos/auth/v1beta1/accounts/gx13udxpqpmq6herxqk9yqa3agln8a0va9whjuqe7" -H  "accept: application/json"
 	accountSeq := uint64(0)
 	acountNumber := uint64(8)
-	//EthAccount 类型， 使用包 "github.com/tharsis/ethermint/crypto/ethsecp256k1"
+	//EthAccount 类型， 使用包 "github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"
 	//BaseAccount 类型 ，使用包 "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	priv1 := ethsecp256k1.PrivKey{Key: priva}
 ```
@@ -279,8 +279,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	plugchainapp "github.com/oracleNetworkProtocol/plugchain/app"
-	"github.com/tharsis/ethermint/crypto/ethsecp256k1"
-	ethencoding "github.com/tharsis/ethermint/encoding"
+	"github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"
+	ethencoding "github.com/oracleNetworkProtocol/ethermint/encoding"
 	"google.golang.org/grpc"
 )
 
@@ -301,7 +301,7 @@ func main() {
 	//curl -X GET "http://8.210.180.240:1317/cosmos/auth/v1beta1/accounts/gx13udxpqpmq6herxqk9yqa3agln8a0va9whjuqe7" -H  "accept: application/json"
 	accountSeq := uint64(0)
 	acountNumber := uint64(8)
-	//EthAccount 类型， 使用包 "github.com/tharsis/ethermint/crypto/ethsecp256k1"
+	//EthAccount 类型， 使用包 "github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"
 	//BaseAccount 类型 ，使用包 "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	priv1 := ethsecp256k1.PrivKey{Key: priva}
 

go.mod

@@ -9,14 +9,14 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
+	github.com/oracleNetworkProtocol/ethermint v0.9.3
 	github.com/oracleNetworkProtocol/liquidity v0.2.1
 	github.com/regen-network/cosmos-proto v0.3.1
 	github.com/spf13/cast v1.4.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/tendermint/tendermint v0.34.15
 	github.com/tendermint/tm-db v0.6.6
-	github.com/tharsis/ethermint v0.9.0
 	google.golang.org/genproto v0.0.0-20211116182654-e63d96a377c4
 	google.golang.org/grpc v1.42.0
 )

go.sum

@@ -848,6 +848,8 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
+github.com/oracleNetworkProtocol/ethermint v0.9.3 h1:O5gVIi9yHITkRXQw/P/ebRj4idefEz3R89jDNB82P6k=
+github.com/oracleNetworkProtocol/ethermint v0.9.3/go.mod h1:d5u7laSkNb1PVQck/EXijVyZ+wMwDvlrZuRw60V3518=
 github.com/oracleNetworkProtocol/liquidity v0.2.1 h1:jDFYdDmBLKpI5WDn1OZaNqWzsLwCmCDRabmmfLUbxII=
 github.com/oracleNetworkProtocol/liquidity v0.2.1/go.mod h1:dqNLhq4Jw1vGdAnXSaH6Hx67cmBA762U+0xSquctu+c=
 github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
@@ -1070,8 +1072,6 @@ github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFN
 github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw=
 github.com/tendermint/tm-db v0.6.6 h1:EzhaOfR0bdKyATqcd5PNeyeq8r+V4bRPHBfyFdD9kGM=
 github.com/tendermint/tm-db v0.6.6/go.mod h1:wP8d49A85B7/erz/r4YbKssKw6ylsO/hKtFk7E1aWZI=
-github.com/tharsis/ethermint v0.9.0 h1:axCG+4PS5+vFnh+YlquXEbiHNEOsc3KsNwXC7SdjTRE=
-github.com/tharsis/ethermint v0.9.0/go.mod h1:5Nukk6Aobxjnx7HAJTUHqyd7s7zSxbtZ4EWlwGb3pFc=
 github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

rpc/ethereum/backend/backend.go

@@ -33,12 +33,12 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
+	feemarkettypes "github.com/oracleNetworkProtocol/ethermint/x/feemarket/types"
 	"github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/namespaces/eth/filters"
 	"github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
 	"github.com/oracleNetworkProtocol/plugchain/server/config"
-	ethermint "github.com/tharsis/ethermint/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
-	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
 )
 
 // Backend implements the functionality shared within namespaces.

rpc/ethereum/backend/feebackend.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/rpc"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	rpctypes "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
 	tmrpctypes "github.com/tendermint/tendermint/rpc/core/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 type (

rpc/ethereum/backend/utils.go

@@ -15,8 +15,8 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	"github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 // SetTxDefaults populates tx message with default values in case they are not

rpc/ethereum/namespaces/debug/api.go

@@ -16,7 +16,7 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	tmrpctypes "github.com/tendermint/tendermint/rpc/core/types"
 
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	stderrors "github.com/pkg/errors"

rpc/ethereum/namespaces/eth/api.go

@@ -31,11 +31,11 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 
+	"github.com/oracleNetworkProtocol/ethermint/crypto/hd"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	"github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/backend"
 	rpctypes "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
-	"github.com/tharsis/ethermint/crypto/hd"
-	ethermint "github.com/tharsis/ethermint/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 // PublicAPI is the eth_ prefixed set of APIs in the Web3 JSON-RPC spec.

rpc/ethereum/namespaces/eth/filters/api.go

@@ -19,7 +19,7 @@ import (
 	"github.com/ethereum/go-ethereum/eth/filters"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 )
 
 // Backend defines the methods requided by the PublicFilterAPI backend

rpc/ethereum/namespaces/eth/filters/filter_system.go

@@ -22,8 +22,8 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	"github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/pubsub"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 var (

rpc/ethereum/namespaces/net/api.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/cosmos/cosmos-sdk/client"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
 	rpcclient "github.com/tendermint/tendermint/rpc/client"
-	ethermint "github.com/tharsis/ethermint/types"
 )
 
 // PublicAPI is the eth_ prefixed set of APIs in the Web3 JSON-RPC spec.

rpc/ethereum/namespaces/personal/api.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 
-	"github.com/tharsis/ethermint/crypto/hd"
-	ethermint "github.com/tharsis/ethermint/types"
+	"github.com/oracleNetworkProtocol/ethermint/crypto/hd"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
 
 	"github.com/tendermint/tendermint/libs/log"
 
@@ -24,8 +24,8 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	"github.com/tharsis/ethermint/crypto/ethsecp256k1"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
+	"github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 )
 
 // PrivateAccountAPI is the personal_ prefixed set of APIs in the Web3 JSON-RPC spec.

rpc/ethereum/namespaces/rpc/eth.go

@@ -23,9 +23,9 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	rpctypes "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
-	ethermint "github.com/tharsis/ethermint/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 // ClientCtx returns client context

rpc/ethereum/namespaces/rpc/prc20.go

@@ -19,8 +19,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	rpctypes "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 // BalanceOf returns prc20 balance

rpc/ethereum/namespaces/rpc/types.go

@@ -14,11 +14,11 @@ import (
 
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
+	"github.com/oracleNetworkProtocol/ethermint/crypto/hd"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 	"github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/backend"
 	rpctypes "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types"
-	"github.com/tharsis/ethermint/crypto/hd"
-	ethermint "github.com/tharsis/ethermint/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 // PublicAPI is the rpc_ prefixed set of APIs in the Web3 JSON-RPC spec.

rpc/ethereum/namespaces/rpc/utils.go

@@ -6,7 +6,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
 )
 
 // TxLogsFromEvents parses ethereum logs from cosmos events

rpc/ethereum/namespaces/txpool/api.go

@@ -9,7 +9,7 @@ import (
 )
 
 // PublicAPI offers and API for the transaction pool. It only operates on data that is non-confidential.
-// NOTE: For more info about the current status of this endpoints see https://github.com/tharsis/ethermint/issues/124
+// NOTE: For more info about the current status of this endpoints see https://github.com/oracleNetworkProtocol/ethermint/issues/124
 type PublicAPI struct {
 	logger log.Logger
 }

rpc/ethereum/namespaces/web3/api.go

@@ -1,7 +1,7 @@
 package web3
 
 import (
-	"github.com/tharsis/ethermint/version"
+	"github.com/oracleNetworkProtocol/ethermint/version"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"

rpc/ethereum/types/block.go

@@ -17,7 +17,7 @@ import (
 
 	grpctypes "github.com/cosmos/cosmos-sdk/types/grpc"
 
-	ethermint "github.com/tharsis/ethermint/types"
+	ethermint "github.com/oracleNetworkProtocol/ethermint/types"
 )
 
 // BlockNumber represents decoding hex string to block values

rpc/ethereum/types/query_client.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
-	feemarkettypes "github.com/tharsis/ethermint/x/feemarket/types"
+	evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types"
+	feemarkettypes "github.com/oracleNetworkProtocol/ethermint/x/feemarket/types"
 )
 
 // QueryClient defines a gRPC Client used for: