Skip to content

Commit

Permalink
Revert "Move turbo/trie and core/types/accounts to erigon-lib (#… (#1…
Browse files Browse the repository at this point in the history 
…2903)

…#12879)"

This reverts commit bc03aef.

Has to be reverted due to RLP decoding related issue in ForkchoicUpdate
and MiningLoop
  • Loading branch information
@somnathb1
somnathb1 authored Nov 28, 2024
1 parent 1823fa2 commit cd418eb
Show file tree
Hide file tree
Showing 381 changed files with 2,952 additions and 1,875 deletions.
2 changes: 1 addition & 1 deletion accounts/abi/abi_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"strings"
"testing"

"github.com/erigontech/erigon-lib/common"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/math"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/common"
)

const jsondata = `
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/backends/simulated.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/hexutility"
"github.com/erigontech/erigon-lib/common/math"
"github.com/erigontech/erigon-lib/common/u256"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/log/v3"
state2 "github.com/erigontech/erigon-lib/state"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/consensus"
"github.com/erigontech/erigon/consensus/ethash"
"github.com/erigontech/erigon/consensus/misc"
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/bind/backends/simulated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ import (
"github.com/stretchr/testify/require"

ethereum "github.com/erigontech/erigon"
"github.com/erigontech/erigon-lib/common"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/u256"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/params"
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/base_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/hexutil"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/rlp"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/rlp"
)

type mockCaller struct {
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/bind/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
"testing"
"time"

"github.com/erigontech/erigon-lib/common"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/u256"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/params"
)
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/erigontech/erigon-lib/common"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/common"
)

var jsonEventTransfer = []byte(`{
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/pack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"math/big"
"reflect"

"github.com/erigontech/erigon-lib/common"
common2 "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/math"
"github.com/erigontech/erigon/common"
)

// packBytesSlice packs the given bytes as [L, V] as the canonical representation
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/pack_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

libcommon "github.com/erigontech/erigon-lib/common"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/common"
)

// TestPack tests the general pack/unpack tests in packing_test.go
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/stretchr/testify/require"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/common"
)

// TestUnpack tests the general pack/unpack tests in packing_test.go
Expand Down
2 changes: 1 addition & 1 deletion cl/beacon/handler/rewards_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (

"github.com/stretchr/testify/require"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/cltypes/solid"
"github.com/erigontech/erigon/common"
)

func TestGetBlockRewards(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cl/beacon/handler/states_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (

"github.com/stretchr/testify/require"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/cltypes/solid"
"github.com/erigontech/erigon/cl/phase1/core/state"
"github.com/erigontech/erigon/common"
)

func TestGetStateFork(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cl/beacon/handler/validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"net/http/httptest"
"testing"

"github.com/erigontech/erigon-lib/common"
libcommon "github.com/erigontech/erigon-lib/common"
mockaggregation "github.com/erigontech/erigon/cl/aggregation/mock_services"
"github.com/erigontech/erigon/cl/beacon/beacon_router_configuration"
"github.com/erigontech/erigon/cl/cltypes/solid"
"github.com/erigontech/erigon/cl/pool"
"github.com/erigontech/erigon/common"
"github.com/stretchr/testify/suite"
"go.uber.org/mock/gomock"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/abigen/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ import (
"github.com/urfave/cli/v2"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/compiler"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/common/compiler"
"github.com/erigontech/erigon/params"
cli2 "github.com/erigontech/erigon/turbo/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/capcli/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import (
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/metrics"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/cl/antiquary"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/clparams/initial_state"
Expand All @@ -61,6 +60,7 @@ import (
"github.com/erigontech/erigon/cl/rpc"
"github.com/erigontech/erigon/cl/utils/eth_clock"
"github.com/erigontech/erigon/cmd/caplin/caplin1"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/eth/ethconfig"
"github.com/erigontech/erigon/eth/ethconfig/estimate"
"github.com/erigontech/erigon/turbo/debug"
Expand Down
2 changes: 1 addition & 1 deletion cmd/caplin/caplincli/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (

"github.com/urfave/cli/v2"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/datadir"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cmd/caplin/caplinflags"
"github.com/erigontech/erigon/cmd/sentinel/sentinelcli"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/common"
)

type CaplinCliCfg struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/devnet/contracts/gen_subscription.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/devnet/services/polygon/heimdallsim/heimdall_simulator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (

libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/downloader/snaptype"
"github.com/erigontech/erigon-lib/rlp"
"github.com/erigontech/erigon/eth/ethconfig"
"github.com/erigontech/erigon/polygon/bridge"
"github.com/erigontech/erigon/polygon/heimdall"
"github.com/erigontech/erigon/rlp"
"github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/devnet/services/polygon/proofgenerator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/hexutility"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/rlp"
"github.com/erigontech/erigon-lib/trie"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/cl/merkle_tree"
"github.com/erigontech/erigon/cmd/devnet/devnet"
"github.com/erigontech/erigon/cmd/devnet/requests"
"github.com/erigontech/erigon/core/types"
bortypes "github.com/erigontech/erigon/polygon/bor/types"
"github.com/erigontech/erigon/rlp"
"github.com/erigontech/erigon/rpc"
"github.com/erigontech/erigon/turbo/jsonrpc"
"github.com/erigontech/erigon/turbo/trie"
)

var ErrTokenIndexOutOfRange = errors.New("index is grater than the number of tokens in transaction")
Expand Down
2 changes: 1 addition & 1 deletion cmd/devnet/services/polygon/proofgenerator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/erigontech/erigon-lib/kv/memdb"
"github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/rlp"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/cmd/devnet/blocks"
"github.com/erigontech/erigon/cmd/devnet/requests"
Expand All @@ -50,6 +49,7 @@ import (
"github.com/erigontech/erigon/core/vm"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/polygon/bor"
"github.com/erigontech/erigon/rlp"
"github.com/erigontech/erigon/rpc"
"github.com/erigontech/erigon/turbo/jsonrpc"
"github.com/erigontech/erigon/turbo/services"
Expand Down
2 changes: 1 addition & 1 deletion cmd/downloader/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ import (
"github.com/erigontech/erigon-lib/kv/mdbx"
"github.com/erigontech/erigon-lib/log/v3"

"github.com/erigontech/erigon-lib/common/paths"
"github.com/erigontech/erigon/cmd/downloader/downloadernat"
"github.com/erigontech/erigon/cmd/hack/tool"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/common/paths"
"github.com/erigontech/erigon/p2p/nat"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/turbo/debug"
Expand Down
2 changes: 1 addition & 1 deletion cmd/evm/internal/t8ntool/execution.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/erigontech/erigon-lib/kv"
state3 "github.com/erigontech/erigon-lib/state"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/consensus/ethash"
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/tracing"
Expand Down
2 changes: 1 addition & 1 deletion cmd/evm/internal/t8ntool/gen_stenv.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/evm/internal/t8ntool/transition.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import (
"github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/kv/temporal/temporaltest"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/rlp"
libstate "github.com/erigontech/erigon-lib/state"
"github.com/erigontech/erigon/consensus/ethash"
"github.com/erigontech/erigon/consensus/merge"
Expand All @@ -54,6 +53,7 @@ import (
"github.com/erigontech/erigon/core/vm"
"github.com/erigontech/erigon/eth/consensuschain"
trace_logger "github.com/erigontech/erigon/eth/tracers/logger"
"github.com/erigontech/erigon/rlp"
"github.com/erigontech/erigon/tests"
"github.com/erigontech/erigon/turbo/jsonrpc"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/hack/db/lmdb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"strconv"
"strings"

"github.com/erigontech/erigon-lib/common/debug"
"github.com/erigontech/erigon-lib/kv"
kv2 "github.com/erigontech/erigon-lib/kv/mdbx"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/common/debug"
)

var logger = log.New()
Expand Down
2 changes: 1 addition & 1 deletion cmd/hack/flow/flow.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (

"github.com/erigontech/erigon-lib/common/dbg"

"github.com/erigontech/erigon-lib/common/debug"
"github.com/erigontech/erigon/cmd/hack/tool"
"github.com/erigontech/erigon/common/debug"
"github.com/erigontech/erigon/core/vm"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/hack/hack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ import (
"github.com/erigontech/erigon-lib/recsplit/eliasfano32"
"github.com/erigontech/erigon-lib/seg"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/rlp"
hackdb "github.com/erigontech/erigon/cmd/hack/db"
"github.com/erigontech/erigon/cmd/hack/flow"
"github.com/erigontech/erigon/cmd/hack/tool"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/rawdb/blockio"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/eth/ethconfig"
"github.com/erigontech/erigon/eth/stagedsync/stages"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rlp"
"github.com/erigontech/erigon/turbo/debug"
"github.com/erigontech/erigon/turbo/logging"
"github.com/erigontech/erigon/turbo/services"
Expand Down
2 changes: 1 addition & 1 deletion cmd/integration/commands/refetence_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
mdbx2 "github.com/erigontech/erigon-lib/kv/mdbx"
"github.com/erigontech/erigon-lib/log/v3"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/turbo/debug"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/integration/commands/state_stages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon/cmd/hack/tool/fromdb"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/common/debugprint"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/core/debugprint"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/eth/ethconfig"
"github.com/erigontech/erigon/eth/stagedsync"
Expand Down
4 changes: 2 additions & 2 deletions cmd/observer/observer/handshake.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ import (
"net"
"time"

"github.com/erigontech/erigon-lib/common"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/direct"
"github.com/erigontech/erigon-lib/rlp"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/core/forkid"
"github.com/erigontech/erigon/eth/protocols/eth"
"github.com/erigontech/erigon/p2p"
"github.com/erigontech/erigon/p2p/rlpx"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rlp"
)

// https://github.com/ethereum/devp2p/blob/master/rlpx.md#p2p-capability
Expand Down
2 changes: 1 addition & 1 deletion cmd/observer/observer/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (

"github.com/erigontech/erigon-lib/log/v3"

"github.com/erigontech/erigon-lib/common/debug"
"github.com/erigontech/erigon/cmd/utils"
"github.com/erigontech/erigon/common/debug"
"github.com/erigontech/erigon/core/forkid"
"github.com/erigontech/erigon/eth/protocols/eth"
"github.com/erigontech/erigon/p2p"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pics/contracts/gen_token.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit cd418eb

Please sign in to comment.