upgrade v6 to v7 (#15989)

* upgrade v6 to v7

* changelog

* update-go-ssz
This commit is contained in:
Bastin
2025-11-06 17:16:23 +01:00
committed by GitHub
parent d6005026e0
commit 92bd211e4d
3030 changed files with 15365 additions and 15362 deletions

View File

@@ -17,7 +17,7 @@ go_library(
"wallet_create.go",
"wallet_recover.go",
],
importpath = "github.com/OffchainLabs/prysm/v6/validator/accounts",
importpath = "github.com/OffchainLabs/prysm/v7/validator/accounts",
visibility = [
"//cmd/validator:__subpackages__",
"//validator:__pkg__",

View File

@@ -1,7 +1,7 @@
package accounts
import (
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
)
var (

View File

@@ -8,8 +8,8 @@ import (
"os"
"path/filepath"
"github.com/OffchainLabs/prysm/v6/io/file"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/io/file"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"
)

View File

@@ -5,9 +5,9 @@ import (
"fmt"
"strings"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/io/prompt"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/io/prompt"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/pkg/errors"
)

View File

@@ -4,11 +4,11 @@ import (
"bytes"
"testing"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
"github.com/OffchainLabs/prysm/v6/testing/assert"
"github.com/OffchainLabs/prysm/v6/testing/require"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/local"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
"github.com/OffchainLabs/prysm/v7/testing/assert"
"github.com/OffchainLabs/prysm/v7/testing/require"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/local"
"github.com/ethereum/go-ethereum/common/hexutil"
logTest "github.com/sirupsen/logrus/hooks/test"
)

View File

@@ -8,16 +8,16 @@ import (
"path"
"strings"
"github.com/OffchainLabs/prysm/v6/beacon-chain/core/blocks"
fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
"github.com/OffchainLabs/prysm/v6/config/params"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/io/file"
eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v6/validator/client"
beacon_api "github.com/OffchainLabs/prysm/v6/validator/client/beacon-api"
"github.com/OffchainLabs/prysm/v6/validator/client/iface"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/beacon-chain/core/blocks"
fieldparams "github.com/OffchainLabs/prysm/v7/config/fieldparams"
"github.com/OffchainLabs/prysm/v7/config/params"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/io/file"
eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v7/validator/client"
beacon_api "github.com/OffchainLabs/prysm/v7/validator/client/beacon-api"
"github.com/OffchainLabs/prysm/v7/validator/client/iface"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/emptypb"

View File

@@ -6,15 +6,15 @@ import (
"path"
"testing"
"github.com/OffchainLabs/prysm/v6/api/server/structs"
"github.com/OffchainLabs/prysm/v6/build/bazel"
fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
"github.com/OffchainLabs/prysm/v6/config/params"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/io/file"
eth "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v6/testing/assert"
"github.com/OffchainLabs/prysm/v6/testing/require"
"github.com/OffchainLabs/prysm/v7/api/server/structs"
"github.com/OffchainLabs/prysm/v7/build/bazel"
fieldparams "github.com/OffchainLabs/prysm/v7/config/fieldparams"
"github.com/OffchainLabs/prysm/v7/config/params"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/io/file"
eth "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v7/testing/assert"
"github.com/OffchainLabs/prysm/v7/testing/require"
"github.com/sirupsen/logrus/hooks/test"
)

View File

@@ -7,13 +7,13 @@ import (
"strconv"
"strings"
"github.com/OffchainLabs/prysm/v6/cmd/validator/flags"
fieldparams "github.com/OffchainLabs/prysm/v6/config/fieldparams"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/io/prompt"
"github.com/OffchainLabs/prysm/v6/validator/accounts/petnames"
"github.com/OffchainLabs/prysm/v6/validator/accounts/userprompt"
"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
fieldparams "github.com/OffchainLabs/prysm/v7/config/fieldparams"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/io/prompt"
"github.com/OffchainLabs/prysm/v7/validator/accounts/petnames"
"github.com/OffchainLabs/prysm/v7/validator/accounts/userprompt"
"github.com/logrusorgru/aurora"
"github.com/manifoldco/promptui"
"github.com/pkg/errors"

View File

@@ -11,12 +11,12 @@ import (
"strconv"
"strings"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/io/file"
"github.com/OffchainLabs/prysm/v6/io/prompt"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/io/file"
"github.com/OffchainLabs/prysm/v7/io/prompt"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/google/uuid"
"github.com/pkg/errors"
keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4"

View File

@@ -8,14 +8,14 @@ import (
"sort"
"testing"
"github.com/OffchainLabs/prysm/v6/config/params"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/testing/assert"
"github.com/OffchainLabs/prysm/v6/testing/require"
"github.com/OffchainLabs/prysm/v6/validator/accounts/iface"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/local"
"github.com/OffchainLabs/prysm/v7/config/params"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/testing/assert"
"github.com/OffchainLabs/prysm/v7/testing/require"
"github.com/OffchainLabs/prysm/v7/validator/accounts/iface"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/local"
)
func TestImportAccounts_NoPassword(t *testing.T) {

View File

@@ -5,10 +5,10 @@ import (
"fmt"
"math"
ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v6/validator/client/iface"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v7/validator/client/iface"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/pkg/errors"
)

View File

@@ -11,18 +11,18 @@ import (
"strings"
"testing"
"github.com/OffchainLabs/prysm/v6/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v6/config/params"
types "github.com/OffchainLabs/prysm/v6/consensus-types/primitives"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
ethpb "github.com/OffchainLabs/prysm/v6/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v6/testing/assert"
"github.com/OffchainLabs/prysm/v6/testing/require"
validatormock "github.com/OffchainLabs/prysm/v6/testing/validator-mock"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/local"
constant "github.com/OffchainLabs/prysm/v6/validator/testing"
"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v7/config/params"
types "github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
"github.com/OffchainLabs/prysm/v7/testing/assert"
"github.com/OffchainLabs/prysm/v7/testing/require"
validatormock "github.com/OffchainLabs/prysm/v7/testing/validator-mock"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/local"
constant "github.com/OffchainLabs/prysm/v7/validator/testing"
"github.com/google/uuid"
"github.com/urfave/cli/v2"
keystorev4 "github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4"

View File

@@ -7,16 +7,16 @@ import (
"os"
"time"
grpcutil "github.com/OffchainLabs/prysm/v6/api/grpc"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
beaconApi "github.com/OffchainLabs/prysm/v6/validator/client/beacon-api"
iface "github.com/OffchainLabs/prysm/v6/validator/client/iface"
nodeClientFactory "github.com/OffchainLabs/prysm/v6/validator/client/node-client-factory"
validatorClientFactory "github.com/OffchainLabs/prysm/v6/validator/client/validator-client-factory"
validatorHelpers "github.com/OffchainLabs/prysm/v6/validator/helpers"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/derived"
grpcutil "github.com/OffchainLabs/prysm/v7/api/grpc"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
beaconApi "github.com/OffchainLabs/prysm/v7/validator/client/beacon-api"
iface "github.com/OffchainLabs/prysm/v7/validator/client/iface"
nodeClientFactory "github.com/OffchainLabs/prysm/v7/validator/client/node-client-factory"
validatorClientFactory "github.com/OffchainLabs/prysm/v7/validator/client/validator-client-factory"
validatorHelpers "github.com/OffchainLabs/prysm/v7/validator/helpers"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/derived"
"github.com/pkg/errors"
"google.golang.org/grpc"
)

View File

@@ -4,9 +4,9 @@ import (
"io"
"time"
"github.com/OffchainLabs/prysm/v6/crypto/bls"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/crypto/bls"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"google.golang.org/grpc"
)

View File

@@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["wallet.go"],
importpath = "github.com/OffchainLabs/prysm/v6/validator/accounts/iface",
importpath = "github.com/OffchainLabs/prysm/v7/validator/accounts/iface",
visibility = [
"//cmd:__subpackages__",
"//validator:__pkg__",

View File

@@ -3,8 +3,8 @@ package iface
import (
"context"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
remoteweb3signer "github.com/OffchainLabs/prysm/v6/validator/keymanager/remote-web3signer"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
remoteweb3signer "github.com/OffchainLabs/prysm/v7/validator/keymanager/remote-web3signer"
)
// InitKeymanagerConfig defines configuration options for initializing a keymanager.

View File

@@ -3,7 +3,7 @@ load("@prysm//tools/go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["names.go"],
importpath = "github.com/OffchainLabs/prysm/v6/validator/accounts/petnames",
importpath = "github.com/OffchainLabs/prysm/v7/validator/accounts/petnames",
visibility = [
"//cmd/validator:__subpackages__",
"//validator:__subpackages__",

View File

@@ -3,8 +3,8 @@ package petnames
import (
"strings"
"github.com/OffchainLabs/prysm/v6/crypto/hash"
"github.com/OffchainLabs/prysm/v6/crypto/rand"
"github.com/OffchainLabs/prysm/v7/crypto/hash"
"github.com/OffchainLabs/prysm/v7/crypto/rand"
)
var (

View File

@@ -4,7 +4,7 @@ go_library(
name = "go_default_library",
testonly = 1,
srcs = ["mock.go"],
importpath = "github.com/OffchainLabs/prysm/v6/validator/accounts/testing",
importpath = "github.com/OffchainLabs/prysm/v7/validator/accounts/testing",
visibility = [
"//validator:__pkg__",
"//validator:__subpackages__",

View File

@@ -9,8 +9,8 @@ import (
"strings"
"sync"
"github.com/OffchainLabs/prysm/v6/validator/accounts/iface"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/accounts/iface"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
)
// Wallet contains an in-memory, simulated wallet implementation.

View File

@@ -6,7 +6,7 @@ go_library(
"log.go",
"prompt.go",
],
importpath = "github.com/OffchainLabs/prysm/v6/validator/accounts/userprompt",
importpath = "github.com/OffchainLabs/prysm/v7/validator/accounts/userprompt",
visibility = [
"//cmd:__subpackages__",
"//validator:__subpackages__",

View File

@@ -1,9 +1,9 @@
package userprompt
import (
"github.com/OffchainLabs/prysm/v6/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v6/io/file"
"github.com/OffchainLabs/prysm/v6/io/prompt"
"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v7/io/file"
"github.com/OffchainLabs/prysm/v7/io/prompt"
"github.com/logrusorgru/aurora"
"github.com/manifoldco/promptui"
"github.com/pkg/errors"

View File

@@ -6,7 +6,7 @@ go_library(
"log.go",
"wallet.go",
],
importpath = "github.com/OffchainLabs/prysm/v6/validator/accounts/wallet",
importpath = "github.com/OffchainLabs/prysm/v7/validator/accounts/wallet",
visibility = [
"//cmd:__subpackages__",
"//tools:__subpackages__",

View File

@@ -8,16 +8,16 @@ import (
"path/filepath"
"strings"
"github.com/OffchainLabs/prysm/v6/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v6/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v6/io/file"
"github.com/OffchainLabs/prysm/v6/io/prompt"
"github.com/OffchainLabs/prysm/v6/validator/accounts/iface"
accountsprompt "github.com/OffchainLabs/prysm/v6/validator/accounts/userprompt"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/local"
remoteweb3signer "github.com/OffchainLabs/prysm/v6/validator/keymanager/remote-web3signer"
"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
"github.com/OffchainLabs/prysm/v7/io/file"
"github.com/OffchainLabs/prysm/v7/io/prompt"
"github.com/OffchainLabs/prysm/v7/validator/accounts/iface"
accountsprompt "github.com/OffchainLabs/prysm/v7/validator/accounts/userprompt"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/local"
remoteweb3signer "github.com/OffchainLabs/prysm/v7/validator/keymanager/remote-web3signer"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

View File

@@ -8,14 +8,14 @@ import (
"reflect"
"testing"
"github.com/OffchainLabs/prysm/v6/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v6/config/params"
"github.com/OffchainLabs/prysm/v6/testing/assert"
"github.com/OffchainLabs/prysm/v6/testing/require"
"github.com/OffchainLabs/prysm/v6/validator/accounts/iface"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
remoteweb3signer "github.com/OffchainLabs/prysm/v6/validator/keymanager/remote-web3signer"
"github.com/OffchainLabs/prysm/v7/cmd/validator/flags"
"github.com/OffchainLabs/prysm/v7/config/params"
"github.com/OffchainLabs/prysm/v7/testing/assert"
"github.com/OffchainLabs/prysm/v7/testing/require"
"github.com/OffchainLabs/prysm/v7/validator/accounts/iface"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
remoteweb3signer "github.com/OffchainLabs/prysm/v7/validator/keymanager/remote-web3signer"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"

View File

@@ -4,10 +4,10 @@ import (
"context"
"encoding/json"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/local"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/local"
"github.com/pkg/errors"
)

View File

@@ -4,9 +4,9 @@ import (
"context"
"strings"
"github.com/OffchainLabs/prysm/v6/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v6/validator/keymanager"
"github.com/OffchainLabs/prysm/v6/validator/keymanager/derived"
"github.com/OffchainLabs/prysm/v7/validator/accounts/wallet"
"github.com/OffchainLabs/prysm/v7/validator/keymanager"
"github.com/OffchainLabs/prysm/v7/validator/keymanager/derived"
"github.com/pkg/errors"
)

View File

@@ -5,7 +5,7 @@ package accounts_test
import (
"testing"
"github.com/OffchainLabs/prysm/v6/validator/accounts"
"github.com/OffchainLabs/prysm/v7/validator/accounts"
)
func FuzzValidateMnemonic(f *testing.F) {