Skip to content

Commit

Permalink
Move crypto to erigon-lib (#13653)
Browse files Browse the repository at this point in the history
  • Loading branch information
shohamc1 authored Feb 1, 2025
1 parent 5e5c1a1 commit 5b3dce5
Show file tree
Hide file tree
Showing 366 changed files with 2,950 additions and 2,948 deletions.
2 changes: 1 addition & 1 deletion accounts/abi/abi.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

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

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

// The ABI holds information about a contract's context and available
Expand Down
5 changes: 3 additions & 2 deletions accounts/abi/abi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ import (
"testing"

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"
"github.com/erigontech/erigon/common/math"
"github.com/erigontech/erigon/crypto"
)

const jsondata = `
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

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

"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/crypto"
)

// ErrNoChainID is returned whenever the user failed to specify a chain id.
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/backends/simulated.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
types2 "github.com/erigontech/erigon-lib/types"

ethereum "github.com/erigontech/erigon"
"github.com/erigontech/erigon-lib/common/math"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/common/math"
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/consensus"
"github.com/erigontech/erigon/consensus/ethash"
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/backends/simulated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (

ethereum "github.com/erigontech/erigon"
libcommon "github.com/erigontech/erigon-lib/common"
"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/crypto"
"github.com/erigontech/erigon/params"
"github.com/holiman/uint256"
)
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/holiman/uint256"

ethereum "github.com/erigontech/erigon"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/event"
)

Expand Down
7 changes: 4 additions & 3 deletions accounts/abi/bind/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,21 @@ package bind_test

import (
"context"
"github.com/erigontech/erigon-lib/common/hexutil"
"math/big"
"reflect"
"strings"
"testing"

"github.com/erigontech/erigon-lib/common/hexutil"
"github.com/erigontech/erigon-lib/rlp"

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

ethereum "github.com/erigontech/erigon"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/accounts/abi"
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/rlp"
)

type mockCaller struct {
Expand Down
36 changes: 18 additions & 18 deletions accounts/abi/bind/bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -346,7 +346,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -392,7 +392,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -450,7 +450,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind/backends"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -498,7 +498,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -564,7 +564,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -696,7 +696,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -746,7 +746,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind/backends"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -821,7 +821,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -915,7 +915,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind/backends"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -1105,7 +1105,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -1240,7 +1240,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,

`
Expand Down Expand Up @@ -1382,7 +1382,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -1448,7 +1448,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Initialize test accounts
Expand Down Expand Up @@ -1535,7 +1535,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/core"
`,
`
Expand Down Expand Up @@ -1598,7 +1598,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/core"
`,
`
Expand Down Expand Up @@ -1661,7 +1661,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
// Generate a new random account and a funded simulator
Expand Down Expand Up @@ -1722,7 +1722,7 @@ var bindTests = []struct {
"github.com/erigontech/erigon/accounts/abi/bind"
"github.com/erigontech/erigon/accounts/abi/bind/backends"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon-lib/crypto"
`,
`
key, _ := crypto.GenerateKey()
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/bind/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
"time"

libcommon "github.com/erigontech/erigon-lib/common"
"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/crypto"
"github.com/erigontech/erigon/params"
)

Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

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

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

type Error struct {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

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

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

// Event is an event potentially triggered by the EVM's LOG mechanism. The Event
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

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

var jsonEventTransfer = []byte(`{
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/method.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

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

// FunctionType represents different types of functions a contract might have.
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/pack.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"reflect"

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

// packBytesSlice packs the given bytes as [L, V] as the canonical representation
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/topics.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/length"

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

// MakeTopics converts a filter query argument list into a filter topic set.
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/topics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

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

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

func TestMakeTopics(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cl/sentinel/handlers/heartbeats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"github.com/stretchr/testify/require"

libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/cltypes"
"github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services"
"github.com/erigontech/erigon/cl/sentinel/communication"
"github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy"
"github.com/erigontech/erigon/cl/sentinel/handshake"
"github.com/erigontech/erigon/cl/sentinel/peers"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
)
Expand Down
2 changes: 1 addition & 1 deletion cl/sentinel/sentinel.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"
"github.com/go-chi/chi/v5"

"github.com/erigontech/erigon-lib/crypto"
sentinelrpc "github.com/erigontech/erigon-lib/gointerfaces/sentinel"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/cltypes"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/p2p/discover"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
Expand Down
2 changes: 1 addition & 1 deletion cl/sentinel/service/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"strings"
"time"

"github.com/erigontech/erigon-lib/common/math"
"github.com/erigontech/erigon/cl/gossip"
"github.com/erigontech/erigon/cl/persistence/blob_storage"
"github.com/erigontech/erigon/cl/phase1/forkchoice"
"github.com/erigontech/erigon/cl/sentinel"
"github.com/erigontech/erigon/cl/utils/eth_clock"
"github.com/erigontech/erigon/common/math"
"github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"

"github.com/erigontech/erigon-lib/direct"
Expand Down
2 changes: 1 addition & 1 deletion cmd/abigen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import (
"github.com/erigontech/erigon-lib/log/v3"
"github.com/urfave/cli/v2"

"github.com/erigontech/erigon-lib/crypto"
"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/crypto"
"github.com/erigontech/erigon/params"
cli2 "github.com/erigontech/erigon/turbo/cli"
)
Expand Down
Loading

0 comments on commit 5b3dce5

Please sign in to comment.