From a68ef1f789640a8424101aba9d0141707d773c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=85=8D=E8=A7=92on?= <1171119472@qq.com> Date: Tue, 10 May 2022 16:20:03 +0800 Subject: [PATCH] Modification evm fee --- Makefile | 4 ++-- app/app.go | 20 +++++++++---------- app/export.go | 2 +- app/prefix.go | 2 +- cmd/plugchaind/cmd/genaccounts.go | 2 +- cmd/plugchaind/cmd/root.go | 8 ++++---- crypto/keyring/options.go | 2 +- docs/endpoints/grpc-client.md | 4 ++-- docs/zh/endpoints/grpc-client.md | 10 +++++----- go.mod | 2 +- go.sum | 4 ++-- rpc/ethereum/backend/backend.go | 6 +++--- rpc/ethereum/backend/feebackend.go | 2 +- rpc/ethereum/backend/utils.go | 2 +- rpc/ethereum/namespaces/debug/api.go | 2 +- rpc/ethereum/namespaces/eth/api.go | 6 +++--- rpc/ethereum/namespaces/eth/filters/api.go | 2 +- .../namespaces/eth/filters/filter_system.go | 2 +- rpc/ethereum/namespaces/net/api.go | 2 +- rpc/ethereum/namespaces/personal/api.go | 8 ++++---- rpc/ethereum/namespaces/rpc/eth.go | 4 ++-- rpc/ethereum/namespaces/rpc/prc20.go | 2 +- rpc/ethereum/namespaces/rpc/types.go | 6 +++--- rpc/ethereum/namespaces/rpc/utils.go | 2 +- rpc/ethereum/namespaces/txpool/api.go | 2 +- rpc/ethereum/namespaces/web3/api.go | 2 +- rpc/ethereum/types/block.go | 2 +- rpc/ethereum/types/query_client.go | 4 ++-- rpc/ethereum/types/types.go | 2 +- rpc/ethereum/types/utils.go | 4 ++-- rpc/websockets.go | 2 +- server/start.go | 2 +- .../crypto/v1/ethsecp256k1/keys.proto | 2 +- third_party/proto/ethermint/evm/v1/evm.proto | 2 +- .../proto/ethermint/evm/v1/genesis.proto | 2 +- .../proto/ethermint/evm/v1/query.proto | 2 +- third_party/proto/ethermint/evm/v1/tx.proto | 2 +- .../ethermint/feemarket/v1/feemarket.proto | 2 +- .../ethermint/feemarket/v1/genesis.proto | 2 +- .../proto/ethermint/feemarket/v1/query.proto | 2 +- .../proto/ethermint/types/v1/account.proto | 2 +- .../proto/ethermint/types/v1/web3.proto | 2 +- 42 files changed, 73 insertions(+), 73 deletions(-) diff --git a/Makefile b/Makefile index 809cf3faa..c941340b6 100644 --- a/Makefile +++ b/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 diff --git a/app/app.go b/app/app.go index b5c60c13b..c986d1c98 100644 --- a/app/app.go +++ b/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() { diff --git a/app/export.go b/app/export.go index 7b14aa0e7..b94423ef2 100644 --- a/app/export.go +++ b/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. diff --git a/app/prefix.go b/app/prefix.go index a64580c6f..3baf296ce 100644 --- a/app/prefix.go +++ b/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 ( diff --git a/cmd/plugchaind/cmd/genaccounts.go b/cmd/plugchaind/cmd/genaccounts.go index 0a4e183f1..cc5eef810 100644 --- a/cmd/plugchaind/cmd/genaccounts.go +++ b/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 ( diff --git a/cmd/plugchaind/cmd/root.go b/cmd/plugchaind/cmd/root.go index 75dc0acfc..926808e77 100644 --- a/cmd/plugchaind/cmd/root.go +++ b/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,6 +25,7 @@ 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" @@ -32,12 +33,11 @@ import ( 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 ( diff --git a/crypto/keyring/options.go b/crypto/keyring/options.go index 475c4df02..1e18f95e3 100644 --- a/crypto/keyring/options.go +++ b/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 ( diff --git a/docs/endpoints/grpc-client.md b/docs/endpoints/grpc-client.md index 89042c98e..9d3b6a4b7 100644 --- a/docs/endpoints/grpc-client.md +++ b/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} ``` diff --git a/docs/zh/endpoints/grpc-client.md b/docs/zh/endpoints/grpc-client.md index 8bcfdc045..ae23ab301 100644 --- a/docs/zh/endpoints/grpc-client.md +++ b/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} diff --git a/go.mod b/go.mod index f79c7eb20..8f060d7b3 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ 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 @@ -16,7 +17,6 @@ require ( 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 ) diff --git a/go.sum b/go.sum index 3a10ca6a5..12ea2a6bd 100644 --- a/go.sum +++ b/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= diff --git a/rpc/ethereum/backend/backend.go b/rpc/ethereum/backend/backend.go index edf899155..3efd21703 100755 --- a/rpc/ethereum/backend/backend.go +++ b/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. diff --git a/rpc/ethereum/backend/feebackend.go b/rpc/ethereum/backend/feebackend.go index 4c1685ce1..1ec287107 100755 --- a/rpc/ethereum/backend/feebackend.go +++ b/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 ( diff --git a/rpc/ethereum/backend/utils.go b/rpc/ethereum/backend/utils.go index af4a222fd..6087a449a 100755 --- a/rpc/ethereum/backend/utils.go +++ b/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 diff --git a/rpc/ethereum/namespaces/debug/api.go b/rpc/ethereum/namespaces/debug/api.go index 4c5b82b03..c7f5ad781 100755 --- a/rpc/ethereum/namespaces/debug/api.go +++ b/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" diff --git a/rpc/ethereum/namespaces/eth/api.go b/rpc/ethereum/namespaces/eth/api.go index edf8094b6..ac530891d 100755 --- a/rpc/ethereum/namespaces/eth/api.go +++ b/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. diff --git a/rpc/ethereum/namespaces/eth/filters/api.go b/rpc/ethereum/namespaces/eth/filters/api.go index 7d57743f1..df6aaf9b3 100755 --- a/rpc/ethereum/namespaces/eth/filters/api.go +++ b/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 diff --git a/rpc/ethereum/namespaces/eth/filters/filter_system.go b/rpc/ethereum/namespaces/eth/filters/filter_system.go index 550fb5aac..b30cb2a63 100755 --- a/rpc/ethereum/namespaces/eth/filters/filter_system.go +++ b/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 ( diff --git a/rpc/ethereum/namespaces/net/api.go b/rpc/ethereum/namespaces/net/api.go index a8e679ef3..7ac7fd4d6 100755 --- a/rpc/ethereum/namespaces/net/api.go +++ b/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. diff --git a/rpc/ethereum/namespaces/personal/api.go b/rpc/ethereum/namespaces/personal/api.go index ed6cabd62..4f750851b 100755 --- a/rpc/ethereum/namespaces/personal/api.go +++ b/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. diff --git a/rpc/ethereum/namespaces/rpc/eth.go b/rpc/ethereum/namespaces/rpc/eth.go index baa49c285..4de9707eb 100644 --- a/rpc/ethereum/namespaces/rpc/eth.go +++ b/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 diff --git a/rpc/ethereum/namespaces/rpc/prc20.go b/rpc/ethereum/namespaces/rpc/prc20.go index d14fb550c..3fa9c2d73 100644 --- a/rpc/ethereum/namespaces/rpc/prc20.go +++ b/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 diff --git a/rpc/ethereum/namespaces/rpc/types.go b/rpc/ethereum/namespaces/rpc/types.go index 6cd86e691..f8f844148 100644 --- a/rpc/ethereum/namespaces/rpc/types.go +++ b/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. diff --git a/rpc/ethereum/namespaces/rpc/utils.go b/rpc/ethereum/namespaces/rpc/utils.go index 6d4c73d0d..2465f45b6 100644 --- a/rpc/ethereum/namespaces/rpc/utils.go +++ b/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 diff --git a/rpc/ethereum/namespaces/txpool/api.go b/rpc/ethereum/namespaces/txpool/api.go index 2d77447ca..f4e41828d 100755 --- a/rpc/ethereum/namespaces/txpool/api.go +++ b/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 } diff --git a/rpc/ethereum/namespaces/web3/api.go b/rpc/ethereum/namespaces/web3/api.go index 54af350db..b999cbae8 100755 --- a/rpc/ethereum/namespaces/web3/api.go +++ b/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" diff --git a/rpc/ethereum/types/block.go b/rpc/ethereum/types/block.go index 0f407f908..c0bfb81c1 100755 --- a/rpc/ethereum/types/block.go +++ b/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 diff --git a/rpc/ethereum/types/query_client.go b/rpc/ethereum/types/query_client.go index b11ba3f7d..ed1100669 100755 --- a/rpc/ethereum/types/query_client.go +++ b/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: diff --git a/rpc/ethereum/types/types.go b/rpc/ethereum/types/types.go index ebde143f7..948beea9a 100755 --- a/rpc/ethereum/types/types.go +++ b/rpc/ethereum/types/types.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" ethtypes "github.com/ethereum/go-ethereum/core/types" - evmtypes "github.com/tharsis/ethermint/x/evm/types" + evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types" ) // Copied the Account and StorageResult types since they are registered under an diff --git a/rpc/ethereum/types/utils.go b/rpc/ethereum/types/utils.go index 4bfcd6cac..38823be1a 100755 --- a/rpc/ethereum/types/utils.go +++ b/rpc/ethereum/types/utils.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - 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" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" diff --git a/rpc/websockets.go b/rpc/websockets.go index 1e26ca20a..2065e293b 100755 --- a/rpc/websockets.go +++ b/rpc/websockets.go @@ -26,10 +26,10 @@ import ( rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" tmtypes "github.com/tendermint/tendermint/types" + evmtypes "github.com/oracleNetworkProtocol/ethermint/x/evm/types" rpcfilters "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/namespaces/eth/filters" "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/types" "github.com/oracleNetworkProtocol/plugchain/server/config" - evmtypes "github.com/tharsis/ethermint/x/evm/types" ) type WebsocketsServer interface { diff --git a/server/start.go b/server/start.go index b575d8305..f75b0e07e 100755 --- a/server/start.go +++ b/server/start.go @@ -42,10 +42,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ethlog "github.com/ethereum/go-ethereum/log" + "github.com/oracleNetworkProtocol/ethermint/log" ethdebug "github.com/oracleNetworkProtocol/plugchain/rpc/ethereum/namespaces/debug" "github.com/oracleNetworkProtocol/plugchain/server/config" srvflags "github.com/oracleNetworkProtocol/plugchain/server/flags" - "github.com/tharsis/ethermint/log" ) // StartCmd runs the service passed in, either stand-alone or in-process with diff --git a/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto b/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto index 788382abf..8844e2b5b 100644 --- a/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto +++ b/third_party/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto @@ -3,7 +3,7 @@ package ethermint.crypto.v1.ethsecp256k1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/crypto/ethsecp256k1"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/crypto/ethsecp256k1"; // PubKey defines a type alias for an ecdsa.PublicKey that implements // Tendermint's PubKey interface. It represents the 33-byte compressed public diff --git a/third_party/proto/ethermint/evm/v1/evm.proto b/third_party/proto/ethermint/evm/v1/evm.proto index a45a9512d..cb9cc15b2 100644 --- a/third_party/proto/ethermint/evm/v1/evm.proto +++ b/third_party/proto/ethermint/evm/v1/evm.proto @@ -3,7 +3,7 @@ package ethermint.evm.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/evm/types"; // Params defines the EVM module parameters message Params { diff --git a/third_party/proto/ethermint/evm/v1/genesis.proto b/third_party/proto/ethermint/evm/v1/genesis.proto index 65d27321d..a5596e5de 100644 --- a/third_party/proto/ethermint/evm/v1/genesis.proto +++ b/third_party/proto/ethermint/evm/v1/genesis.proto @@ -4,7 +4,7 @@ package ethermint.evm.v1; import "gogoproto/gogo.proto"; import "ethermint/evm/v1/evm.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/evm/types"; // GenesisState defines the evm module's genesis state. message GenesisState { diff --git a/third_party/proto/ethermint/evm/v1/query.proto b/third_party/proto/ethermint/evm/v1/query.proto index 11a1be2f7..5a80b42d4 100644 --- a/third_party/proto/ethermint/evm/v1/query.proto +++ b/third_party/proto/ethermint/evm/v1/query.proto @@ -8,7 +8,7 @@ import "ethermint/evm/v1/evm.proto"; import "ethermint/evm/v1/tx.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/evm/types"; // Query defines the gRPC querier service. service Query { diff --git a/third_party/proto/ethermint/evm/v1/tx.proto b/third_party/proto/ethermint/evm/v1/tx.proto index 1a2396895..434d3445e 100644 --- a/third_party/proto/ethermint/evm/v1/tx.proto +++ b/third_party/proto/ethermint/evm/v1/tx.proto @@ -7,7 +7,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "ethermint/evm/v1/evm.proto"; -option go_package = "github.com/tharsis/ethermint/x/evm/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/evm/types"; // Msg defines the evm Msg service. service Msg { diff --git a/third_party/proto/ethermint/feemarket/v1/feemarket.proto b/third_party/proto/ethermint/feemarket/v1/feemarket.proto index b8e56318f..4088ea4a5 100644 --- a/third_party/proto/ethermint/feemarket/v1/feemarket.proto +++ b/third_party/proto/ethermint/feemarket/v1/feemarket.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package ethermint.feemarket.v1; -option go_package = "github.com/tharsis/ethermint/x/feemarket/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/feemarket/types"; // Params defines the EVM module parameters message Params { diff --git a/third_party/proto/ethermint/feemarket/v1/genesis.proto b/third_party/proto/ethermint/feemarket/v1/genesis.proto index c659dd1e4..0d9623ba0 100644 --- a/third_party/proto/ethermint/feemarket/v1/genesis.proto +++ b/third_party/proto/ethermint/feemarket/v1/genesis.proto @@ -4,7 +4,7 @@ package ethermint.feemarket.v1; import "gogoproto/gogo.proto"; import "ethermint/feemarket/v1/feemarket.proto"; -option go_package = "github.com/tharsis/ethermint/x/feemarket/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/feemarket/types"; // GenesisState defines the feemarket module's genesis state. message GenesisState { diff --git a/third_party/proto/ethermint/feemarket/v1/query.proto b/third_party/proto/ethermint/feemarket/v1/query.proto index f8f8c7a7f..f87da3f0d 100644 --- a/third_party/proto/ethermint/feemarket/v1/query.proto +++ b/third_party/proto/ethermint/feemarket/v1/query.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "ethermint/feemarket/v1/feemarket.proto"; -option go_package = "github.com/tharsis/ethermint/x/feemarket/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/x/feemarket/types"; // Query defines the gRPC querier service. service Query { diff --git a/third_party/proto/ethermint/types/v1/account.proto b/third_party/proto/ethermint/types/v1/account.proto index 6beffb273..fe73ed983 100644 --- a/third_party/proto/ethermint/types/v1/account.proto +++ b/third_party/proto/ethermint/types/v1/account.proto @@ -5,7 +5,7 @@ import "cosmos/auth/v1beta1/auth.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/types"; // EthAccount implements the authtypes.AccountI interface and embeds an // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper. diff --git a/third_party/proto/ethermint/types/v1/web3.proto b/third_party/proto/ethermint/types/v1/web3.proto index 7bcab06d6..2701ea3a8 100644 --- a/third_party/proto/ethermint/types/v1/web3.proto +++ b/third_party/proto/ethermint/types/v1/web3.proto @@ -3,7 +3,7 @@ package ethermint.types.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/tharsis/ethermint/types"; +option go_package = "github.com/oracleNetworkProtocol/ethermint/types"; message ExtensionOptionsWeb3Tx { option (gogoproto.goproto_getters) = false;