Skip to content

Commit 84dd9bd

Browse files
m-Peterm-Peter
authored
Merge pull request #859 from onflow/mpeter/replace-geth-fork
Replace Geth fork with original Geth
2 parents 4c69cf8 + 56427f2 commit 84dd9bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+341
-347
lines changed

‎api/api.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
"fmt"
66
"math/big"
77

8-
"github.com/onflow/go-ethereum/common"
9-
"github.com/onflow/go-ethereum/common/hexutil"
10-
"github.com/onflow/go-ethereum/common/math"
11-
"github.com/onflow/go-ethereum/core/types"
12-
"github.com/onflow/go-ethereum/eth/filters"
13-
"github.com/onflow/go-ethereum/rlp"
14-
"github.com/onflow/go-ethereum/rpc"
8+
"github.com/ethereum/go-ethereum/common"
9+
"github.com/ethereum/go-ethereum/common/hexutil"
10+
"github.com/ethereum/go-ethereum/common/math"
11+
"github.com/ethereum/go-ethereum/core/types"
12+
"github.com/ethereum/go-ethereum/eth/filters"
13+
"github.com/ethereum/go-ethereum/rlp"
14+
"github.com/ethereum/go-ethereum/rpc"
1515
"github.com/rs/zerolog"
1616

1717
evmTypes "github.com/onflow/flow-go/fvm/evm/types"

‎api/debug.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import (
66
"fmt"
77
"strings"
88

9+
gethCommon "github.com/ethereum/go-ethereum/common"
10+
gethTypes "github.com/ethereum/go-ethereum/core/types"
11+
"github.com/ethereum/go-ethereum/eth/tracers"
12+
"github.com/ethereum/go-ethereum/eth/tracers/logger"
13+
gethParams "github.com/ethereum/go-ethereum/params"
14+
"github.com/ethereum/go-ethereum/rpc"
915
"github.com/goccy/go-json"
1016
"github.com/onflow/flow-go/fvm/evm/emulator"
1117
"github.com/onflow/flow-go/fvm/evm/offchain/query"
1218
"github.com/onflow/flow-go/fvm/evm/types"
13-
gethCommon "github.com/onflow/go-ethereum/common"
14-
gethTypes "github.com/onflow/go-ethereum/core/types"
15-
"github.com/onflow/go-ethereum/eth/tracers"
16-
"github.com/onflow/go-ethereum/eth/tracers/logger"
17-
gethParams "github.com/onflow/go-ethereum/params"
18-
"github.com/onflow/go-ethereum/rpc"
1919
"github.com/rs/zerolog"
2020

2121
"github.com/onflow/flow-evm-gateway/config"
@@ -33,8 +33,8 @@ import (
3333

3434
// this import is needed for side-effects, because the
3535
// tracers.DefaultDirectory is relying on the init function
36-
_ "github.com/onflow/go-ethereum/eth/tracers/js"
37-
_ "github.com/onflow/go-ethereum/eth/tracers/native"
36+
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
37+
_ "github.com/ethereum/go-ethereum/eth/tracers/native"
3838
)
3939

4040
// txTraceResult is the result of a single transaction trace.

‎api/net.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package api
33
import (
44
"fmt"
55

6+
"github.com/ethereum/go-ethereum/common/hexutil"
67
"github.com/onflow/flow-evm-gateway/config"
7-
"github.com/onflow/go-ethereum/common/hexutil"
88
)
99

1010
// NetAPI offers network related RPC methods

‎api/pool.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package api
22

33
import (
4-
"github.com/onflow/go-ethereum/common"
5-
"github.com/onflow/go-ethereum/common/hexutil"
4+
"github.com/ethereum/go-ethereum/common"
5+
"github.com/ethereum/go-ethereum/common/hexutil"
66
)
77

88
type TxPool struct{}

‎api/pull.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/onflow/go-ethereum/common"
11-
gethTypes "github.com/onflow/go-ethereum/core/types"
12-
"github.com/onflow/go-ethereum/eth/filters"
13-
"github.com/onflow/go-ethereum/rpc"
10+
"github.com/ethereum/go-ethereum/common"
11+
gethTypes "github.com/ethereum/go-ethereum/core/types"
12+
"github.com/ethereum/go-ethereum/eth/filters"
13+
"github.com/ethereum/go-ethereum/rpc"
1414
"github.com/rs/zerolog"
1515

1616
"github.com/onflow/flow-evm-gateway/config"

‎api/pull_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55
"time"
66

7+
"github.com/ethereum/go-ethereum/rpc"
78
"github.com/onflow/flow-evm-gateway/config"
8-
"github.com/onflow/go-ethereum/rpc"
99
"github.com/stretchr/testify/require"
1010
)
1111

‎api/rate_limiter.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/rs/zerolog"
88
"github.com/sethvargo/go-limiter"
99

10-
"github.com/onflow/go-ethereum/rpc"
10+
"github.com/ethereum/go-ethereum/rpc"
1111

1212
"github.com/onflow/flow-evm-gateway/metrics"
1313
errs "github.com/onflow/flow-evm-gateway/models/errors"

‎api/server.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"strings"
2020
"time"
2121

22-
gethLog "github.com/onflow/go-ethereum/log"
23-
"github.com/onflow/go-ethereum/rpc"
22+
gethLog "github.com/ethereum/go-ethereum/log"
23+
"github.com/ethereum/go-ethereum/rpc"
2424
"github.com/rs/cors"
2525
"github.com/rs/zerolog"
2626
slogzerolog "github.com/samber/slog-zerolog"

‎api/stream.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/ethereum/go-ethereum/common/hexutil"
8+
gethTypes "github.com/ethereum/go-ethereum/core/types"
9+
"github.com/ethereum/go-ethereum/eth/filters"
10+
"github.com/ethereum/go-ethereum/rpc"
711
evmTypes "github.com/onflow/flow-go/fvm/evm/types"
8-
"github.com/onflow/go-ethereum/common/hexutil"
9-
gethTypes "github.com/onflow/go-ethereum/core/types"
10-
"github.com/onflow/go-ethereum/eth/filters"
11-
"github.com/onflow/go-ethereum/rpc"
1212
"github.com/rs/zerolog"
1313

1414
"github.com/onflow/flow-evm-gateway/config"

‎api/utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"fmt"
77
"strings"
88

9+
"github.com/ethereum/go-ethereum/common"
10+
"github.com/ethereum/go-ethereum/core"
11+
"github.com/ethereum/go-ethereum/rpc"
912
"github.com/onflow/flow-evm-gateway/metrics"
1013
errs "github.com/onflow/flow-evm-gateway/models/errors"
1114
"github.com/onflow/flow-evm-gateway/storage"
12-
"github.com/onflow/go-ethereum/common"
13-
"github.com/onflow/go-ethereum/core"
14-
"github.com/onflow/go-ethereum/rpc"
1515
"github.com/rs/zerolog"
1616
)
1717

0 commit comments

Comments
 (0)