Skip to content

Bump aggregator #2686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
felipemadero wants to merge 7 commits into from
Closed

Bump aggregator #2686

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30a5914
Merge branch 'main' into bump-aggregator
felipemadero Mar 13, 2025
1fff4f2
lint
felipemadero Mar 13, 2025
59d48f0
copilot alert
felipemadero Mar 13, 2025
ecac1f4
nit
felipemadero Mar 13, 2025
f9b0de2
force fuji versions on local
felipemadero Mar 13, 2025
ab90f8a
Merge branch 'update-avago' into bump-aggregator
sukantoraymond Mar 13, 2025
f7d839c
for fuji only
sukantoraymond Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://golangci-lint.run/usage/configuration/
run:
go: "1.21.7"
go: "1.23.7"
timeout: 10m

issues:
Expand All @@ -19,7 +19,7 @@ linters:
- depguard
- errcheck
- errorlint
- exportloopref
- copyloopvar
- goconst
- gocritic
- gofmt
Expand Down Expand Up @@ -105,6 +105,7 @@ linters-settings:
excludes:
- G107 # https://securego.io/docs/rules/g107.html
- G204
- G115 # TODO: include it again
depguard:
rules:
packages:
Expand Down
10 changes: 7 additions & 3 deletions cmd/blockchaincmd/prompt_genesis_input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ package blockchaincmd
import (
"fmt"

"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"

"github.com/ava-labs/avalanche-cli/pkg/blockchain"

"github.com/ava-labs/avalanche-cli/pkg/application"
Expand All @@ -15,7 +17,6 @@ import (
"github.com/ava-labs/avalanche-cli/pkg/ux"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/staking"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/formatting"
"github.com/ava-labs/avalanchego/vms/platformvm/signer"
)
Expand Down Expand Up @@ -105,11 +106,14 @@ func generateNewNodeAndBLS() (string, string, string, error) {
if err != nil {
return "", "", "", err
}
blsSignerKey, err := bls.NewSigner()
blsSignerKey, err := localsigner.New()
if err != nil {
return "", "", "", err
}
p, err := signer.NewProofOfPossession(blsSignerKey)
if err != nil {
return "", "", "", err
}
p := signer.NewProofOfPossession(blsSignerKey)
publicKey, err := formatting.Encode(formatting.HexNC, p.PublicKey[:])
if err != nil {
return "", "", "", err
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/prompt_owners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
if threshold == 0 && subnetAuthKeys != nil {
threshold = uint32(len(subnetAuthKeys))
}
if threshold > uint32(len(controlKeys)) {
if int(threshold) > len(controlKeys) {
return nil, 0, fmt.Errorf("given threshold is greater than number of control keys")
}
if threshold == 0 {
Expand Down
34 changes: 26 additions & 8 deletions cmd/nodecmd/create_devnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@ import (
_ "embed"
"encoding/json"
"fmt"
"math/big"
"os"
"path/filepath"
"strconv"
"strings"
"sync"
"time"

"github.com/ava-labs/avalanche-cli/pkg/node"

"golang.org/x/exp/slices"

"github.com/ava-labs/avalanche-cli/pkg/ansible"
"github.com/ava-labs/avalanche-cli/pkg/constants"
"github.com/ava-labs/avalanche-cli/pkg/key"
"github.com/ava-labs/avalanche-cli/pkg/models"
"github.com/ava-labs/avalanche-cli/pkg/node"
"github.com/ava-labs/avalanche-cli/pkg/ssh"
"github.com/ava-labs/avalanche-cli/pkg/utils"
"github.com/ava-labs/avalanche-cli/pkg/ux"
"github.com/ava-labs/avalanchego/config"
avago_upgrade "github.com/ava-labs/avalanchego/upgrade"
avago_constants "github.com/ava-labs/avalanchego/utils/constants"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
"github.com/ava-labs/avalanchego/utils/formatting"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/vms/platformvm/signer"
coreth_params "github.com/ava-labs/coreth/params"

"golang.org/x/exp/maps"
"golang.org/x/exp/slices"
)

// difference between unlock schedule locktime and startime in original genesis
Expand All @@ -48,8 +48,23 @@ const (
var upgradeBytes []byte

func generateCustomCchainGenesis() ([]byte, error) {
chainConfig := &coreth_params.ChainConfig{
ChainID: coreth_params.AvalancheLocalChainID,
HomesteadBlock: big.NewInt(0),
DAOForkBlock: big.NewInt(0),
DAOForkSupport: true,
EIP150Block: big.NewInt(0),
EIP155Block: big.NewInt(0),
EIP158Block: big.NewInt(0),
ByzantiumBlock: big.NewInt(0),
ConstantinopleBlock: big.NewInt(0),
PetersburgBlock: big.NewInt(0),
IstanbulBlock: big.NewInt(0),
MuirGlacierBlock: big.NewInt(0),
NetworkUpgrades: coreth_params.GetNetworkUpgrades(avago_upgrade.GetConfig(avago_constants.LocalID)),
}
cChainGenesisMap := map[string]interface{}{}
cChainGenesisMap["config"] = coreth_params.GetChainConfig(avago_upgrade.GetConfig(avago_constants.LocalID), coreth_params.AvalancheLocalChainID)
cChainGenesisMap["config"] = chainConfig
cChainGenesisMap["nonce"] = hexa0Str
cChainGenesisMap["timestamp"] = hexa0Str
cChainGenesisMap["extraData"] = "0x00"
Expand Down Expand Up @@ -95,11 +110,14 @@ func generateCustomGenesis(
if err != nil {
return nil, err
}
blsSk, err := bls.SecretKeyFromBytes(blsKey)
blsSk, err := localsigner.FromBytes(blsKey)
if err != nil {
return nil, err
}
p, err := signer.NewProofOfPossession(blsSk)
if err != nil {
return nil, err
}
p := signer.NewProofOfPossession(blsSk)
pk, err := formatting.Encode(formatting.HexNC, p.PublicKey[:])
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion cmd/nodecmd/dynamic_ips.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func updatePublicIPs(clusterName string) error {
changed++
}
node.ElasticIP = publicIPMap[node.NodeID]
if err := app.CreateNodeCloudConfigFile(node.NodeID, &node); err != nil { //nolint:gosec
if err := app.CreateNodeCloudConfigFile(node.NodeID, &node); err != nil {
return err
}
}
Expand Down
14 changes: 9 additions & 5 deletions cmd/nodecmd/validate_primary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ import (
"strconv"
"time"

"github.com/ava-labs/avalanche-cli/pkg/node"

blockchaincmd "github.com/ava-labs/avalanche-cli/cmd/blockchaincmd"
"github.com/ava-labs/avalanche-cli/pkg/ansible"
"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
"github.com/ava-labs/avalanche-cli/pkg/constants"
"github.com/ava-labs/avalanche-cli/pkg/keychain"
"github.com/ava-labs/avalanche-cli/pkg/models"
"github.com/ava-labs/avalanche-cli/pkg/node"
"github.com/ava-labs/avalanche-cli/pkg/subnet"
"github.com/ava-labs/avalanche-cli/pkg/utils"
"github.com/ava-labs/avalanche-cli/pkg/ux"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/utils/crypto/bls"
"github.com/ava-labs/avalanchego/utils/crypto/bls/signer/localsigner"
"github.com/ava-labs/avalanchego/utils/units"
"github.com/ava-labs/avalanchego/vms/platformvm"
"github.com/ava-labs/avalanchego/vms/platformvm/signer"

"github.com/spf13/cobra"
"golang.org/x/exp/maps"
)
Expand Down Expand Up @@ -122,7 +122,11 @@ func joinAsPrimaryNetworkValidator(
if err != nil {
return err
}
blsSk, err := bls.SecretKeyFromBytes(blsKeyBytes)
blsSk, err := localsigner.FromBytes(blsKeyBytes)
if err != nil {
return err
}
proofOfPossession, err := signer.NewProofOfPossession(blsSk)
if err != nil {
return err
}
Expand All @@ -136,7 +140,7 @@ func joinAsPrimaryNetworkValidator(
recipientAddr,
delegationFee,
nil,
signer.NewProofOfPossession(blsSk),
proofOfPossession,
); err != nil {
return err
}
Expand Down
84 changes: 43 additions & 41 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
module github.com/ava-labs/avalanche-cli

go 1.22.10
go 1.23.6

toolchain go1.23.7

require (
github.com/ava-labs/apm v1.0.0
github.com/ava-labs/avalanche-network-runner v1.8.4-0.20250219173912-dbb9afce58c1
github.com/ava-labs/avalanchego v1.12.3-0.20250131150857-54ad8e645d65
github.com/ava-labs/coreth v0.14.1-rc.1
github.com/ava-labs/icm-services v1.4.1-0.20250207174027-616890e0c1ca
github.com/ava-labs/subnet-evm v0.7.1
github.com/aws/aws-sdk-go-v2 v1.36.1
github.com/aws/aws-sdk-go-v2/config v1.29.6
github.com/ava-labs/avalanche-network-runner v1.8.4-0.20250311204312-28fbf1672296
github.com/ava-labs/avalanchego v1.13.0-fuji-rc.2.0.20250313194317-c78027fe41c9
github.com/ava-labs/coreth v0.14.1-rc.2
github.com/ava-labs/icm-services v1.4.1-0.20250313194621-b5eac197b0d8
github.com/ava-labs/subnet-evm v0.7.2
github.com/aws/aws-sdk-go-v2 v1.36.3
github.com/aws/aws-sdk-go-v2/config v1.29.8
github.com/aws/aws-sdk-go-v2/service/ec2 v1.200.0
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/chelnak/ysmrr v0.5.0
Expand All @@ -27,28 +29,28 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1
github.com/okteto/remote v0.0.0-20210428052247-99de42c04148
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/ginkgo/v2 v2.23.0
github.com/onsi/gomega v1.36.2
github.com/otiai10/copy v1.14.1
github.com/pborman/ansi v1.0.0
github.com/pingcap/errors v0.11.4
github.com/posthog/posthog-go v1.2.24
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/client_golang v1.21.1
github.com/schollz/progressbar/v3 v3.17.1
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/spf13/afero v1.12.0
github.com/spf13/cobra v1.8.1
github.com/spf13/cobra v1.9.1
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.10.0
go.uber.org/mock v0.5.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.32.0
golang.org/x/crypto v0.36.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/mod v0.22.0
golang.org/x/net v0.34.0
golang.org/x/mod v0.24.0
golang.org/x/net v0.37.0
golang.org/x/oauth2 v0.25.0
golang.org/x/sync v0.11.0
golang.org/x/text v0.21.0
golang.org/x/sync v0.12.0
golang.org/x/text v0.23.0
google.golang.org/api v0.216.0
google.golang.org/protobuf v1.36.5
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -68,19 +70,19 @@ require (
github.com/ProtonMail/go-crypto v1.1.3 // indirect
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/ava-labs/icm-contracts v1.0.9-0.20250204232902-ae24f1f2636f // indirect
github.com/ava-labs/icm-contracts v1.0.9-0.20250307173936-f6a36b902f4f // indirect
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.59 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.37.18 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.61 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.38.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.25.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.16 // indirect
github.com/aws/smithy-go v1.22.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
Expand All @@ -97,7 +99,7 @@ require (
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
github.com/creack/pty v1.1.11 // indirect
Expand Down Expand Up @@ -159,7 +161,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
Expand Down Expand Up @@ -187,7 +189,7 @@ require (
github.com/pkg/sftp v1.13.7 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.13.1 // indirect
Expand Down Expand Up @@ -218,23 +220,23 @@ require (
github.com/zondax/ledger-go v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.29.0 // indirect
golang.org/x/tools v0.31.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/grpc v1.71.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
Expand Down
Loading
Loading