From af5eaa8d0a759bda92f2a3ac451a5d3b5eaba61c Mon Sep 17 00:00:00 2001 From: Jacky Wang Date: Tue, 11 Jan 2022 21:17:28 -0800 Subject: [PATCH] [RPC] Replace go-ethereum/rpc module with harmony/eth/rpc (#3983) * [rpc] fix some test cases * fix test cases * [rpc] use harmony/eth/rpc for customized changes * [RPC] replace one more use of RPC at accounts module * [RPC] fix test cases --- accounts/external/backend.go | 2 +- api/service/manager_test.go | 2 +- eth/rpc/json.go | 3 +-- eth/rpc/types.go | 4 +--- eth/rpc/types_test.go | 12 ++++++------ hmy/blockchain.go | 2 +- hmy/gasprice.go | 2 +- hmy/staking.go | 2 +- hmy/tracer.go | 2 +- hmy/transaction.go | 2 +- node/api.go | 2 +- rosetta/services/account.go | 2 +- rosetta/services/block.go | 8 ++++---- rosetta/services/call_service.go | 2 +- rosetta/services/construction_check.go | 5 ++--- rosetta/services/network.go | 2 +- rpc/blockchain.go | 2 +- rpc/contract.go | 2 +- rpc/eth/rpc.go | 2 +- rpc/filters/api.go | 2 +- rpc/filters/filter.go | 2 +- rpc/filters/filter_criteria.go | 2 +- rpc/filters/filter_system.go | 2 +- rpc/harmony.go | 2 +- rpc/net.go | 2 +- rpc/pool.go | 2 +- rpc/private_debug.go | 2 +- rpc/public_debug.go | 2 +- rpc/rpc.go | 2 +- rpc/staking.go | 5 ++--- rpc/tracer.go | 2 +- rpc/tracerParity.go | 2 +- rpc/transaction.go | 6 +++--- rpc/types.go | 2 +- rpc/v1/legacy.go | 2 +- rpc/v2/legacy.go | 2 +- rpc/web3.go | 2 +- 37 files changed, 49 insertions(+), 54 deletions(-) diff --git a/accounts/external/backend.go b/accounts/external/backend.go index c21736522..dbfdd39d5 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -26,10 +26,10 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/signer/core" "github.com/harmony-one/harmony/accounts" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" ) // ExternalBackend is a struct for external backend diff --git a/api/service/manager_test.go b/api/service/manager_test.go index 3b964b3f3..21df5f72b 100644 --- a/api/service/manager_test.go +++ b/api/service/manager_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" ) func TestManager_StartServices(t *testing.T) { diff --git a/eth/rpc/json.go b/eth/rpc/json.go index 48bdef388..61631a3d7 100644 --- a/eth/rpc/json.go +++ b/eth/rpc/json.go @@ -20,7 +20,6 @@ import ( "bytes" "context" "encoding/json" - std_json "encoding/json" "errors" "fmt" "io" @@ -240,7 +239,7 @@ func parseMessage(raw json.RawMessage) ([]*jsonrpcMessage, bool) { json.Unmarshal(raw, &msgs[0]) return msgs, false } - dec := std_json.NewDecoder(bytes.NewReader(raw)) + dec := json.NewDecoder(bytes.NewReader(raw)) dec.Token() // skip '[' var msgs []*jsonrpcMessage for dec.More() { diff --git a/eth/rpc/types.go b/eth/rpc/types.go index c8a42bac8..dc9248d0f 100644 --- a/eth/rpc/types.go +++ b/eth/rpc/types.go @@ -21,7 +21,6 @@ import ( "encoding/json" "fmt" "math" - "strconv" "strings" "github.com/ethereum/go-ethereum/common" @@ -93,8 +92,7 @@ func (bn *BlockNumber) UnmarshalJSON(data []byte) error { return nil } - input = strings.TrimPrefix(strings.ToLower(input), "0x") - blckNum, err := strconv.ParseInt(input, 10, 64) + blckNum, err := hexutil.DecodeUint64(input) if err != nil { return err } diff --git a/eth/rpc/types_test.go b/eth/rpc/types_test.go index 4edcd1455..89b0c9171 100644 --- a/eth/rpc/types_test.go +++ b/eth/rpc/types_test.go @@ -33,13 +33,13 @@ func TestBlockNumberJSONUnmarshal(t *testing.T) { 0: {`"0x"`, true, BlockNumber(0)}, 1: {`"0x0"`, false, BlockNumber(0)}, 2: {`"0X1"`, false, BlockNumber(1)}, - 3: {`"0x00"`, false, BlockNumber(0)}, - 4: {`"0x01"`, false, BlockNumber(1)}, + 3: {`"0x00"`, true, BlockNumber(0)}, + 4: {`"0x01"`, true, BlockNumber(0)}, 5: {`"0x1"`, false, BlockNumber(1)}, - 6: {`"0x12"`, false, BlockNumber(12)}, - 7: {`"0x7fffffffffffffff"`, true, BlockNumber(0)}, - 8: {`"0x8000000000000000"`, false, BlockNumber(8000000000000000)}, - 9: {"0", false, BlockNumber(0)}, + 6: {`"0x12"`, false, BlockNumber(18)}, + 7: {`"0x7fffffffffffffff"`, false, BlockNumber(math.MaxInt64)}, + 8: {`"0x8000000000000000"`, true, BlockNumber(0)}, + 9: {"0", true, BlockNumber(0)}, 10: {`"ff"`, true, BlockNumber(0)}, 11: {`"pending"`, false, PendingBlockNumber}, 12: {`"latest"`, false, LatestBlockNumber}, diff --git a/hmy/blockchain.go b/hmy/blockchain.go index 606a4b46a..c9338af90 100644 --- a/hmy/blockchain.go +++ b/hmy/blockchain.go @@ -8,7 +8,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/bloombits" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/rawdb" @@ -16,6 +15,7 @@ import ( "github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/crypto/bls" internal_bls "github.com/harmony-one/harmony/crypto/bls" + "github.com/harmony-one/harmony/eth/rpc" internal_common "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/internal/params" "github.com/harmony-one/harmony/internal/utils" diff --git a/hmy/gasprice.go b/hmy/gasprice.go index 91163513f..8c2693663 100644 --- a/hmy/gasprice.go +++ b/hmy/gasprice.go @@ -23,8 +23,8 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/internal/utils" "github.com/ethereum/go-ethereum/common" diff --git a/hmy/staking.go b/hmy/staking.go index 7ed930f17..d5bfbecfa 100644 --- a/hmy/staking.go +++ b/hmy/staking.go @@ -7,11 +7,11 @@ import ( "sync" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" "github.com/harmony-one/harmony/consensus/quorum" "github.com/harmony-one/harmony/core/rawdb" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/internal/chain" internalCommon "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/numeric" diff --git a/hmy/tracer.go b/hmy/tracer.go index 5f292e06c..4def0c166 100644 --- a/hmy/tracer.go +++ b/hmy/tracer.go @@ -30,12 +30,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/trie" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/vm" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy/tracers" "github.com/harmony-one/harmony/internal/utils" ) diff --git a/hmy/transaction.go b/hmy/transaction.go index d63a1aa05..eadfe2ea2 100644 --- a/hmy/transaction.go +++ b/hmy/transaction.go @@ -4,10 +4,10 @@ import ( "context" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/rawdb" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" ) // SendTx ... diff --git a/node/api.go b/node/api.go index f2f14902c..903858693 100644 --- a/node/api.go +++ b/node/api.go @@ -1,9 +1,9 @@ package node import ( - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/consensus/quorum" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" "github.com/harmony-one/harmony/rosetta" hmy_rpc "github.com/harmony-one/harmony/rpc" diff --git a/rosetta/services/account.go b/rosetta/services/account.go index 5c8177e5a..7866b5150 100644 --- a/rosetta/services/account.go +++ b/rosetta/services/account.go @@ -8,9 +8,9 @@ import ( "github.com/coinbase/rosetta-sdk-go/server" "github.com/coinbase/rosetta-sdk-go/types" ethCommon "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" hmyTypes "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internalCommon "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/rosetta/common" diff --git a/rosetta/services/block.go b/rosetta/services/block.go index dde2262f0..6128ac8e0 100644 --- a/rosetta/services/block.go +++ b/rosetta/services/block.go @@ -14,9 +14,9 @@ import ( "github.com/harmony-one/harmony/core/rawdb" hmytypes "github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/vm" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" "github.com/harmony-one/harmony/rosetta/common" - "github.com/harmony-one/harmony/rpc" stakingTypes "github.com/harmony-one/harmony/staking/types" ) @@ -67,7 +67,7 @@ func (s *BlockAPI) Block( if blk.NumberU64() == 0 { prevBlockID = currBlockID } else { - prevBlock, err := s.hmy.BlockByNumber(ctx, rpc.BlockNumber(blk.Number().Int64()-1).EthBlockNumber()) + prevBlock, err := s.hmy.BlockByNumber(ctx, rpc.BlockNumber(blk.Number().Int64()-1)) if err != nil { return nil, common.NewError(common.CatchAllError, map[string]interface{}{ "message": err.Error(), @@ -157,7 +157,7 @@ func (s *BlockAPI) BlockTransaction( } return response, rosettaError2 } - state, _, err := s.hmy.StateAndHeaderByNumber(ctx, rpc.BlockNumber(request.BlockIdentifier.Index).EthBlockNumber()) + state, _, err := s.hmy.StateAndHeaderByNumber(ctx, rpc.BlockNumber(request.BlockIdentifier.Index)) if state == nil || err != nil { return nil, common.NewError(common.BlockNotFoundError, map[string]interface{}{ "message": fmt.Sprintf("block state not found for block %v", request.BlockIdentifier.Index), @@ -320,7 +320,7 @@ func getBlock( requestBlockHash := ethcommon.HexToHash(*blockID.Hash) blk, err = hmy.GetBlock(ctx, requestBlockHash) } else if blockID.Index != nil { - blk, err = hmy.BlockByNumber(ctx, rpc.BlockNumber(*blockID.Index).EthBlockNumber()) + blk, err = hmy.BlockByNumber(ctx, rpc.BlockNumber(*blockID.Index)) } else { return nil, &common.BlockNotFoundError } diff --git a/rosetta/services/call_service.go b/rosetta/services/call_service.go index 7149e5e8a..ab0b11c3a 100644 --- a/rosetta/services/call_service.go +++ b/rosetta/services/call_service.go @@ -6,7 +6,7 @@ import ( "github.com/coinbase/rosetta-sdk-go/server" "github.com/coinbase/rosetta-sdk-go/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internal_common "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/rosetta/common" diff --git a/rosetta/services/construction_check.go b/rosetta/services/construction_check.go index b12b55466..f53ddd6b5 100644 --- a/rosetta/services/construction_check.go +++ b/rosetta/services/construction_check.go @@ -6,14 +6,13 @@ import ( "fmt" "math/big" - "github.com/harmony-one/harmony/core" - "github.com/coinbase/rosetta-sdk-go/types" ethCommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - ethRpc "github.com/ethereum/go-ethereum/rpc" "github.com/pkg/errors" + "github.com/harmony-one/harmony/core" + ethRpc "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/internal/params" "github.com/harmony-one/harmony/rosetta/common" "github.com/harmony-one/harmony/rpc" diff --git a/rosetta/services/network.go b/rosetta/services/network.go index 06e9d8e68..c15047e48 100644 --- a/rosetta/services/network.go +++ b/rosetta/services/network.go @@ -9,10 +9,10 @@ import ( "github.com/coinbase/rosetta-sdk-go/server" "github.com/coinbase/rosetta-sdk-go/types" - "github.com/ethereum/go-ethereum/rpc" "github.com/libp2p/go-libp2p-core/peer" "github.com/harmony-one/harmony/block" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" nodeconfig "github.com/harmony-one/harmony/internal/configs/node" "github.com/harmony-one/harmony/rosetta/common" diff --git a/rpc/blockchain.go b/rpc/blockchain.go index 18b107547..36bf452e6 100644 --- a/rpc/blockchain.go +++ b/rpc/blockchain.go @@ -13,7 +13,6 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" lru "github.com/hashicorp/golang-lru" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" @@ -21,6 +20,7 @@ import ( "github.com/harmony-one/harmony/core/types" internal_bls "github.com/harmony-one/harmony/crypto/bls" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" "github.com/harmony-one/harmony/internal/chain" internal_common "github.com/harmony-one/harmony/internal/common" diff --git a/rpc/contract.go b/rpc/contract.go index c47705e57..0313630ca 100644 --- a/rpc/contract.go +++ b/rpc/contract.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/common/denominations" "github.com/harmony-one/harmony/core" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" hmyCommon "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/internal/utils" diff --git a/rpc/eth/rpc.go b/rpc/eth/rpc.go index 4a728e2bc..1725b4107 100644 --- a/rpc/eth/rpc.go +++ b/rpc/eth/rpc.go @@ -4,7 +4,7 @@ import ( "context" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internal_common "github.com/harmony-one/harmony/internal/common" ) diff --git a/rpc/filters/api.go b/rpc/filters/api.go index 076557f4d..fcf545f45 100644 --- a/rpc/filters/api.go +++ b/rpc/filters/api.go @@ -8,9 +8,9 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" hmy_rpc "github.com/harmony-one/harmony/rpc" ) diff --git a/rpc/filters/filter.go b/rpc/filters/filter.go index 70ea64405..5c4e35464 100644 --- a/rpc/filters/filter.go +++ b/rpc/filters/filter.go @@ -26,10 +26,10 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" ) // Backend provides the APIs needed for filter diff --git a/rpc/filters/filter_criteria.go b/rpc/filters/filter_criteria.go index 265bd674a..32eece382 100644 --- a/rpc/filters/filter_criteria.go +++ b/rpc/filters/filter_criteria.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" ) // FilterCriteria represents a request to create a new filter. diff --git a/rpc/filters/filter_system.go b/rpc/filters/filter_system.go index 6593109d8..915e6ec46 100644 --- a/rpc/filters/filter_system.go +++ b/rpc/filters/filter_system.go @@ -28,11 +28,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/rawdb" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" ) // Type determines the kind of filter and is used to put the filter in to diff --git a/rpc/harmony.go b/rpc/harmony.go index 86dc17706..a52acd097 100644 --- a/rpc/harmony.go +++ b/rpc/harmony.go @@ -5,7 +5,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" ) diff --git a/rpc/net.go b/rpc/net.go index f4777a202..4dc67469d 100644 --- a/rpc/net.go +++ b/rpc/net.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" nodeconfig "github.com/harmony-one/harmony/internal/configs/node" "github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/p2p" diff --git a/rpc/pool.go b/rpc/pool.go index 1ea0870c3..2fa0ab58c 100644 --- a/rpc/pool.go +++ b/rpc/pool.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" common2 "github.com/harmony-one/harmony/internal/common" nodeconfig "github.com/harmony-one/harmony/internal/configs/node" diff --git a/rpc/private_debug.go b/rpc/private_debug.go index af79f58fb..921d6645d 100644 --- a/rpc/private_debug.go +++ b/rpc/private_debug.go @@ -3,7 +3,7 @@ package rpc import ( "context" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" ) diff --git a/rpc/public_debug.go b/rpc/public_debug.go index 448d286f4..08283b834 100644 --- a/rpc/public_debug.go +++ b/rpc/public_debug.go @@ -4,7 +4,7 @@ import ( "context" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" "github.com/harmony-one/harmony/internal/utils" ) diff --git a/rpc/rpc.go b/rpc/rpc.go index 8676f29ef..b51cdb642 100644 --- a/rpc/rpc.go +++ b/rpc/rpc.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" nodeconfig "github.com/harmony-one/harmony/internal/configs/node" "github.com/harmony-one/harmony/internal/utils" diff --git a/rpc/staking.go b/rpc/staking.go index 96afa348f..844a1ee8d 100644 --- a/rpc/staking.go +++ b/rpc/staking.go @@ -5,14 +5,13 @@ import ( "math/big" "reflect" + lru "github.com/hashicorp/golang-lru" "github.com/prometheus/client_golang/prometheus" "golang.org/x/time/rate" - lru "github.com/hashicorp/golang-lru" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internal_common "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/shard" diff --git a/rpc/tracer.go b/rpc/tracer.go index 8a3ecd407..48f7f0e8a 100644 --- a/rpc/tracer.go +++ b/rpc/tracer.go @@ -25,10 +25,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/rawdb" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" ) diff --git a/rpc/tracerParity.go b/rpc/tracerParity.go index fd9cbfd0e..011463948 100644 --- a/rpc/tracerParity.go +++ b/rpc/tracerParity.go @@ -6,7 +6,7 @@ import ( "errors" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" ) diff --git a/rpc/transaction.go b/rpc/transaction.go index cb3562d2c..06e482850 100644 --- a/rpc/transaction.go +++ b/rpc/transaction.go @@ -6,16 +6,16 @@ import ( "math/big" "strings" - "github.com/pkg/errors" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/pkg/errors" + "github.com/harmony-one/harmony/accounts/abi" "github.com/harmony-one/harmony/core" "github.com/harmony-one/harmony/core/rawdb" "github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/vm" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internal_common "github.com/harmony-one/harmony/internal/common" "github.com/harmony-one/harmony/internal/params" diff --git a/rpc/types.go b/rpc/types.go index e7f8970a1..a70507200 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -17,9 +17,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/math" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" "github.com/harmony-one/harmony/block" "github.com/harmony-one/harmony/core/types" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/internal/utils" "github.com/harmony-one/harmony/numeric" "github.com/harmony-one/harmony/shard" diff --git a/rpc/v1/legacy.go b/rpc/v1/legacy.go index 072fa8bce..408715b29 100644 --- a/rpc/v1/legacy.go +++ b/rpc/v1/legacy.go @@ -4,7 +4,7 @@ import ( "context" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internal_common "github.com/harmony-one/harmony/internal/common" ) diff --git a/rpc/v2/legacy.go b/rpc/v2/legacy.go index 6513b4282..b08f5ce9c 100644 --- a/rpc/v2/legacy.go +++ b/rpc/v2/legacy.go @@ -4,7 +4,7 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" "github.com/harmony-one/harmony/hmy" internal_common "github.com/harmony-one/harmony/internal/common" ) diff --git a/rpc/web3.go b/rpc/web3.go index 3e425e21a..497e30c8d 100644 --- a/rpc/web3.go +++ b/rpc/web3.go @@ -3,7 +3,7 @@ package rpc import ( "context" - "github.com/ethereum/go-ethereum/rpc" + "github.com/harmony-one/harmony/eth/rpc" nodeconfig "github.com/harmony-one/harmony/internal/configs/node" )