Skip to content

Sdk to not use pkg ux #2712

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

Merged
felipemadero merged 3 commits into from
Apr 10, 2025
Merged

Sdk to not use pkg ux #2712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fbc7ec
remove sdk dependence on pkg/ux
felipemadero Mar 28, 2025
568123e
lint
felipemadero Mar 28, 2025
75531a0
address RS comments
felipemadero Apr 10, 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: 2 additions & 0 deletions cmd/blockchaincmd/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ func InitializeValidatorManager(
ux.Logger.PrintToUser("Initializing Native Token Proof of Stake Validator Manager contract on blockchain %s ...", blockchainName)
if err := subnetSDK.InitializeProofOfStake(
aggregatorCtx,
app.Log,
network,
genesisPrivateKey,
extraAggregatorPeers,
Expand All @@ -410,6 +411,7 @@ func InitializeValidatorManager(
ux.Logger.PrintToUser("Initializing Proof of Authority Validator Manager contract on blockchain %s ...", blockchainName)
if err := subnetSDK.InitializeProofOfAuthority(
aggregatorCtx,
app.Log,
network,
genesisPrivateKey,
extraAggregatorPeers,
Expand Down
2 changes: 2 additions & 0 deletions cmd/contractcmd/init_validator_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ func initValidatorManager(_ *cobra.Command, args []string) error {
ux.Logger.PrintToUser(logging.Yellow.Wrap("Initializing Proof of Authority Validator Manager contract on blockchain %s"), blockchainName)
if err := validatormanager.SetupPoA(
aggregatorCtx,
app.Log,
subnetSDK,
network,
privateKey,
Expand Down Expand Up @@ -246,6 +247,7 @@ func initValidatorManager(_ *cobra.Command, args []string) error {
}
if err := validatormanager.SetupPoS(
aggregatorCtx,
app.Log,
subnetSDK,
network,
privateKey,
Expand Down
4 changes: 4 additions & 0 deletions pkg/validatormanager/validatormanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ func AddRewardCalculatorToAllocations(
// to set as the owner of the PoA manager
func SetupPoA(
ctx context.Context,
log logging.Logger,
subnet blockchainSDK.Subnet,
network models.Network,
privateKey string,
Expand All @@ -206,6 +207,7 @@ func SetupPoA(
) error {
return subnet.InitializeProofOfAuthority(
ctx,
log,
network,
privateKey,
aggregatorExtraPeerEndpoints,
Expand All @@ -223,6 +225,7 @@ func SetupPoA(
// to set as the owner of the PoA manager
func SetupPoS(
ctx context.Context,
log logging.Logger,
subnet blockchainSDK.Subnet,
network models.Network,
privateKey string,
Expand All @@ -234,6 +237,7 @@ func SetupPoS(
) error {
return subnet.InitializeProofOfStake(
ctx,
log,
network,
privateKey,
aggregatorExtraPeerEndpoints,
Expand Down
29 changes: 14 additions & 15 deletions sdk/blockchain/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,22 @@ import (

"github.com/ava-labs/avalanche-cli/pkg/evm"
"github.com/ava-labs/avalanche-cli/pkg/models"
"github.com/ava-labs/avalanche-cli/pkg/ux"
"github.com/ava-labs/avalanche-cli/sdk/validatormanager"
"github.com/ava-labs/avalanchego/api/info"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ethereum/go-ethereum/common"

"github.com/ava-labs/avalanchego/vms/platformvm/txs"

"github.com/ava-labs/avalanche-cli/sdk/multisig"
utilsSDK "github.com/ava-labs/avalanche-cli/sdk/utils"
"github.com/ava-labs/avalanche-cli/sdk/wallet"

"github.com/ava-labs/avalanche-cli/sdk/validatormanager"
"github.com/ava-labs/avalanche-cli/sdk/vm"

"github.com/ava-labs/avalanche-cli/sdk/wallet"
"github.com/ava-labs/avalanchego/api/info"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/vms/platformvm/txs"
commonAvago "github.com/ava-labs/avalanchego/wallet/subnet/primary/common"
"github.com/ava-labs/subnet-evm/commontype"
"github.com/ava-labs/subnet-evm/core"
"github.com/ava-labs/subnet-evm/params"

"github.com/ethereum/go-ethereum/common"
"go.uber.org/zap"
)

var (
Expand Down Expand Up @@ -344,6 +341,7 @@ func (c *Subnet) Commit(ms multisig.Multisig, wallet wallet.Wallet, waitForTxAcc
// to set as the owner of the PoA manager
func (c *Subnet) InitializeProofOfAuthority(
ctx context.Context,
log logging.Logger,
network models.Network,
privateKey string,
aggregatorExtraPeerEndpoints []info.Peer,
Expand Down Expand Up @@ -376,7 +374,7 @@ func (c *Subnet) InitializeProofOfAuthority(
c.RPC,
privateKey,
); err != nil {
ux.Logger.RedXToUser("failure setting proposer VM on L1: %s", err)
log.Error("failure setting proposer VM on L1", zap.Error(err))
}
managerAddress := common.HexToAddress(validatorManagerAddressStr)
tx, _, err := validatormanager.PoAValidatorManagerInitialize(
Expand All @@ -391,7 +389,7 @@ func (c *Subnet) InitializeProofOfAuthority(
if !errors.Is(err, validatormanager.ErrAlreadyInitialized) {
return evm.TransactionError(tx, err, "failure initializing poa validator manager")
}
ux.Logger.PrintToUser("Warning: the PoA contract is already initialized.")
log.Info("the PoA contract is already initialized, skipping initializing Proof of Authority contract")
}

subnetConversionSignedMessage, err := validatormanager.GetPChainSubnetToL1ConversionMessage(
Expand Down Expand Up @@ -428,6 +426,7 @@ func (c *Subnet) InitializeProofOfAuthority(

func (c *Subnet) InitializeProofOfStake(
ctx context.Context,
log logging.Logger,
network models.Network,
privateKey string,
aggregatorExtraPeerEndpoints []info.Peer,
Expand All @@ -440,7 +439,7 @@ func (c *Subnet) InitializeProofOfStake(
c.RPC,
privateKey,
); err != nil {
ux.Logger.RedXToUser("failure setting proposer VM on L1: %s", err)
log.Error("failure setting proposer VM on L1", zap.Error(err))
}
managerAddress := common.HexToAddress(validatorManagerAddressStr)
tx, _, err := validatormanager.PoSValidatorManagerInitialize(
Expand All @@ -454,7 +453,7 @@ func (c *Subnet) InitializeProofOfStake(
if !errors.Is(err, validatormanager.ErrAlreadyInitialized) {
return evm.TransactionError(tx, err, "failure initializing native PoS validator manager")
}
ux.Logger.PrintToUser("Warning: the PoS contract is already initialized.")
log.Info("the PoS contract is already initialized, skipping initializing Proof of Stake contract")
}
subnetConversionSignedMessage, err := validatormanager.GetPChainSubnetToL1ConversionMessage(
ctx,
Expand Down
12 changes: 11 additions & 1 deletion tests/e2e/testcases/validatormanager/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,17 @@ var _ = ginkgo.Describe("[Validator Manager POA Set Up]", ginkgo.Ordered, func()

ctx, cancel := utils.GetSignatureAggregatorContext()
defer cancel()
err = subnetSDK.InitializeProofOfAuthority(ctx, network, k.PrivKeyHex(), extraAggregatorPeers, true, logging.NoLog{}, ProxyContractAddress, true)
err = subnetSDK.InitializeProofOfAuthority(
ctx,
logging.NoLog{},
network,
k.PrivKeyHex(),
extraAggregatorPeers,
true,
logging.NoLog{},
ProxyContractAddress,
true,
)
gomega.Expect(err).Should(gomega.BeNil())
})
})
Loading