Skip to content
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

Validator sdk #2572

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Validator sdk #2572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20b8608
update avago
arturrez Jan 22, 2025
1680cab
add staticFeeParams- tmp solution before proper dynamic fees are impl…
arturrez Jan 22, 2025
253cca8
fix pclient mocks, add example for pclient mock
arturrez Jan 23, 2025
22ae789
go mod tidy
arturrez Jan 23, 2025
060d6e3
lint
arturrez Jan 23, 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
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/add_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func addValidator(_ *cobra.Command, args []string) error {
clusterNameFlagValue = sc.Networks[network.Name()].ClusterName
}

fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.AddSubnetValidatorFee
fee := network.StaticFeeParams().AddSubnetValidatorFee
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
"to pay for transaction fees on P-Chain",
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/change_owner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func changeOwner(_ *cobra.Command, args []string) error {
return err
}

fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.TxFee
fee := network.StaticFeeParams().TxFee
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
"pay fees",
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/change_weight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func setWeight(_ *cobra.Command, args []string) error {
return err
}

fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.TxFee
fee := network.StaticFeeParams().TxFee
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
"to pay for transaction fees on P-Chain",
Expand Down
4 changes: 2 additions & 2 deletions cmd/blockchaincmd/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,10 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {

fee := uint64(0)
if !subnetOnly {
fee += network.GenesisParams().TxFeeConfig.StaticFeeConfig.CreateBlockchainTxFee
fee += network.StaticFeeParams().CreateBlockchainTxFee
}
if createSubnet {
fee += network.GenesisParams().TxFeeConfig.StaticFeeConfig.CreateSubnetTxFee
fee += network.StaticFeeParams().CreateSubnetTxFee
}

kc, err := keychain.GetKeychainFromCmdLineFlags(
Expand Down
4 changes: 2 additions & 2 deletions cmd/blockchaincmd/prompt_genesis_input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ func generateNewNodeAndBLS() (string, string, string, error) {
if err != nil {
return "", "", "", err
}
blsSignerKey, err := bls.NewSecretKey()
blsSigner, err := bls.NewSigner()
if err != nil {
return "", "", "", err
}
p := signer.NewProofOfPossession(blsSignerKey)
p := signer.NewProofOfPossession(blsSigner)
publicKey, err := formatting.Encode(formatting.HexNC, p.PublicKey[:])
if err != nil {
return "", "", "", err
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/remove_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func removeValidator(_ *cobra.Command, args []string) error {
if network.ClusterName != "" {
network = models.ConvertClusterToNetwork(network)
}
fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.TxFee
fee := network.StaticFeeParams().TxFee
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
"to pay for transaction fees on P-Chain",
Expand Down
2 changes: 1 addition & 1 deletion cmd/blockchaincmd/upgradecmd/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func applyLocalNetworkUpgrade(blockchainName, networkKey string, sc *models.Side
if print {
ux.Logger.PrintToUser("The --print flag is ignored on local networks. Continuing.")
}
precmpUpgrades, strNetUpgrades, err := validateUpgrade(blockchainName, networkKey, sc, force)
precmpUpgrades, _, err := validateUpgrade(blockchainName, networkKey, sc, force)
if err != nil {
return err
}
Expand Down
13 changes: 4 additions & 9 deletions cmd/keycmd/transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
"github.com/ava-labs/avalanchego/wallet/subnet/primary"
"github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
"github.com/ava-labs/coreth/plugin/evm"
"github.com/ava-labs/coreth/plugin/evm/atomic"
goethereumcommon "github.com/ethereum/go-ethereum/common"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -593,12 +593,7 @@ func pToPSend(
return err
}
pContext := wallet.P().Builder().Context()
var pFeeCalculator avagofee.Calculator
if pContext.GasPrice != 0 {
pFeeCalculator = avagofee.NewDynamicCalculator(pContext.ComplexityWeights, pContext.GasPrice)
} else {
pFeeCalculator = avagofee.NewStaticCalculator(pContext.StaticFeeConfig)
}
pFeeCalculator := avagofee.NewDynamicCalculator(pContext.ComplexityWeights, pContext.GasPrice)
txFee, err := pFeeCalculator.CalculateFee(unsignedTx)
if err != nil {
return err
Expand Down Expand Up @@ -809,7 +804,7 @@ func importIntoC(
if err != nil {
return fmt.Errorf("error building tx: %w", err)
}
tx := evm.Tx{UnsignedAtomicTx: unsignedTx}
tx := atomic.Tx{UnsignedAtomicTx: unsignedTx}
if err := wallet.C().Signer().SignAtomic(context.Background(), &tx); err != nil {
return fmt.Errorf("error signing tx: %w", err)
}
Expand Down Expand Up @@ -918,7 +913,7 @@ func exportFromC(
if err != nil {
return fmt.Errorf("error building tx: %w", err)
}
tx := evm.Tx{UnsignedAtomicTx: unsignedTx}
tx := atomic.Tx{UnsignedAtomicTx: unsignedTx}
if err := wallet.C().Signer().SignAtomic(context.Background(), &tx); err != nil {
return fmt.Errorf("error signing tx: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/nodecmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ func createNodes(cmd *cobra.Command, args []string) error {
return err
}
cloudConfigMap = models.CloudConfig{
"docker": {
"docker": models.RegionConfig{
InstanceIDs: dockerHostIDs,
PublicIPs: dockerNodesPublicIPs,
KeyPair: keyPairName,
Expand Down Expand Up @@ -406,7 +406,7 @@ func createNodes(cmd *cobra.Command, args []string) error {
monitoringDockerHostID := utils.GenerateDockerHostIDs(1)
dockerHostIDs = append(dockerHostIDs, monitoringDockerHostID[0])
monitoringCloudConfig := models.CloudConfig{
"monitoringDocker": {
"monitoringDocker": models.RegionConfig{
InstanceIDs: monitoringDockerHostID,
PublicIPs: []string{monitoringHostIP},
KeyPair: keyPairName,
Expand Down
2 changes: 1 addition & 1 deletion cmd/nodecmd/validate_primary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func validatePrimaryNetwork(_ *cobra.Command, args []string) error {
hosts := clusterConfig.GetValidatorHosts(allHosts) // exlude api nodes
defer node.DisconnectHosts(hosts)

fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.AddPrimaryNetworkValidatorFee * uint64(len(hosts))
fee := network.StaticFeeParams().AddPrimaryNetworkValidatorFee * uint64(len(hosts))
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
constants.PayTxsFeesMsg,
Expand Down
2 changes: 1 addition & 1 deletion cmd/nodecmd/validate_subnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func validateSubnet(_ *cobra.Command, args []string) error {
nonPrimaryValidators++
}
}
fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.AddPrimaryNetworkValidatorFee*uint64(nonPrimaryValidators) + network.GenesisParams().TxFeeConfig.StaticFeeConfig.AddSubnetValidatorFee*uint64(len(hosts))
fee := network.StaticFeeParams().AddPrimaryNetworkValidatorFee*uint64(nonPrimaryValidators) + network.StaticFeeParams().AddSubnetValidatorFee*uint64(len(hosts))
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
constants.PayTxsFeesMsg,
Expand Down
2 changes: 1 addition & 1 deletion cmd/primarycmd/add_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func addValidator(_ *cobra.Command, _ []string) error {
return fmt.Errorf("illegal weight, must be greater than or equal to %d: %d", minValStake, weight)
}

fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.AddPrimaryNetworkValidatorFee
fee := network.StaticFeeParams().AddPrimaryNetworkValidatorFee
kc, err := keychain.GetKeychain(app, false, useLedger, ledgerAddresses, keyName, network, fee)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/validatorcmd/increaseBalance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func increaseBalance(_ *cobra.Command, _ []string) error {
return fmt.Errorf("the specified node is not a L1 validator")
}

fee := network.GenesisParams().TxFeeConfig.StaticFeeConfig.TxFee
fee := network.StaticFeeParams().TxFee
kc, err := keychain.GetKeychainFromCmdLineFlags(
app,
constants.PayTxsFeesMsg,
Expand Down
36 changes: 18 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.22.10

require (
github.com/ava-labs/apm v1.0.0
github.com/ava-labs/avalanche-network-runner v1.8.4-0.20241130135139-a0946c5366be
github.com/ava-labs/avalanchego v1.12.1-0.20241210172525-c7ebd8fbae88
github.com/ava-labs/coreth v0.13.9-rc.1
github.com/ava-labs/icm-services v1.4.1-0.20250102154147-7d1e095dc849
github.com/ava-labs/subnet-evm v0.6.13-0.20241205165027-6c98da796f35
github.com/ava-labs/avalanche-network-runner v1.8.4-0.20250121195649-3bd77a0a3693
github.com/ava-labs/avalanchego v1.12.2-0.20250118011055-0e994f68ab7e
github.com/ava-labs/coreth v0.14.1-rc.0.0.20250122145100-a087e40bbcd7
github.com/ava-labs/icm-services v1.4.1-0.20250123192837-e99d8f7089eb
github.com/ava-labs/subnet-evm v0.7.1-rc.0.0.20250122111752-68711e03580d
github.com/aws/aws-sdk-go-v2 v1.33.0
github.com/aws/aws-sdk-go-v2/config v1.28.10
github.com/aws/aws-sdk-go-v2/config v1.29.1
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 Down Expand Up @@ -49,7 +49,7 @@ require (
golang.org/x/sync v0.10.0
golang.org/x/text v0.21.0
google.golang.org/api v0.216.0
google.golang.org/protobuf v1.36.2
google.golang.org/protobuf v1.36.3
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -69,17 +69,17 @@ require (
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/ava-labs/icm-contracts v1.0.9-0.20241231155804-0845b3c9fd39 // indirect
github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.51 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.54 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.37.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.37.13 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.11 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.10 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.9 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
Expand Down Expand Up @@ -138,7 +138,7 @@ require (
github.com/gorilla/rpc v1.2.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
github.com/hashicorp/go-bexpr v0.1.10 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
Expand Down Expand Up @@ -168,8 +168,8 @@ require (
github.com/moby/sys/reexec v0.1.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
github.com/otiai10/copy v1.11.0 // indirect
github.com/otiai10/copy v1.14.1 // indirect
github.com/otiai10/mint v1.6.3 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pires/go-proxyproto v0.6.2 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
Expand Down Expand Up @@ -222,9 +222,9 @@ require (
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.28.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // 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.69.2 // indirect
google.golang.org/grpc v1.69.4 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
Loading
Loading