Skip to content

Commit 4c8428b

Browse files
sukantoraymondsukantoraymond
authored
Remove support for non acp 99 functionalities (#2988)
* remove non acp 99 * update tooling sdk * remove acp99 node local * refactor register validator * Revert "refactor register validator" This reverts commit 937c473. * refactor register validator * Revert "refactor register validator" This reverts commit 2b9345e. * lint * lint * update go mod * fix lint * fix lint --------- Signed-off-by: sukantoraymond <rsukanto@umich.edu>
1 parent 15ff460 commit 4c8428b

File tree

21 files changed

+67
-466
lines changed

21 files changed

+67
-466
lines changed

‎cmd/blockchaincmd/add_validator.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -543,11 +543,7 @@ func CallAddValidator(
543543
}
544544
}
545545

546-
if sc.UseACP99 {
547-
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: V2"))
548-
} else {
549-
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: v1.0.0"))
550-
}
546+
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: V2"))
551547

552548
if !pos {
553549
ux.Logger.PrintToUser(logging.Yellow.Wrap("Validation manager owner %s pays for the initialization of the validator's registration (Blockchain gas token)"), validatorManagerOwner)
@@ -679,7 +675,6 @@ func CallAddValidator(
679675
common.HexToAddress(rewardsRecipientAddr),
680676
validatorManagerBlockchainID,
681677
validatorManagerAddress,
682-
sc.UseACP99,
683678
initiateTxHash,
684679
signatureAggregatorEndpoint,
685680
pChainEpoch.PChainHeight,

‎cmd/blockchaincmd/change_weight.go‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/ava-labs/avalanche-cli/pkg/constants"
1313
"github.com/ava-labs/avalanche-cli/pkg/contract"
1414
"github.com/ava-labs/avalanche-cli/pkg/duallogger"
15-
"github.com/ava-labs/avalanche-cli/pkg/key"
1615
"github.com/ava-labs/avalanche-cli/pkg/keychain"
1716
"github.com/ava-labs/avalanche-cli/pkg/models"
1817
"github.com/ava-labs/avalanche-cli/pkg/networkoptions"
@@ -27,11 +26,7 @@ import (
2726
"github.com/ava-labs/avalanche-tooling-sdk-go/validator"
2827
validatormanagersdk "github.com/ava-labs/avalanche-tooling-sdk-go/validatormanager"
2928
"github.com/ava-labs/avalanchego/ids"
30-
"github.com/ava-labs/avalanchego/utils/crypto/bls"
31-
"github.com/ava-labs/avalanchego/utils/formatting"
32-
"github.com/ava-labs/avalanchego/utils/formatting/address"
3329
"github.com/ava-labs/avalanchego/utils/logging"
34-
"github.com/ava-labs/avalanchego/utils/units"
3530
"github.com/ava-labs/avalanchego/vms/platformvm"
3631
"github.com/ava-labs/libevm/common"
3732

@@ -215,19 +210,6 @@ func setWeight(_ *cobra.Command, args []string) error {
215210
return nil
216211
}
217212

218-
if !sc.UseACP99 {
219-
if float64(validatorInfo.Weight) > allowedChange {
220-
return fmt.Errorf("can't make change: current validator weight %d exceeds max allowed weight change of %d", validatorInfo.Weight, uint64(allowedChange))
221-
}
222-
allowedChange = float64((currentWeightInfo.TotalWeight-validatorInfo.Weight)*uint64(currentWeightInfo.MaximumPercentage)) / 100.0
223-
allowedWeightFunction = func(v uint64) error {
224-
if v > uint64(allowedChange) {
225-
return fmt.Errorf("new weight exceeds max allowed weight change of %d", uint64(allowedChange))
226-
}
227-
return nil
228-
}
229-
}
230-
231213
if newWeight == 0 {
232214
ux.Logger.PrintToUser("Current validator weight is %d", validatorInfo.Weight)
233215
newWeight, err = app.Prompt.CaptureWeight(
@@ -246,92 +228,18 @@ func setWeight(_ *cobra.Command, args []string) error {
246228

247229
deployer := subnet.NewPublicDeployer(kc, network)
248230

249-
if sc.UseACP99 {
250-
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: V2"))
251-
return changeWeightACP99(
252-
deployer,
253-
network,
254-
blockchainName,
255-
nodeID,
256-
newWeight,
257-
changeWeightFlags.SigAggFlags.SignatureAggregatorEndpoint,
258-
initiateTxHash,
259-
)
260-
} else {
261-
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: v1.0.0"))
262-
}
263-
264-
publicKey, err = formatting.Encode(formatting.HexNC, bls.PublicKeyToCompressedBytes(validatorInfo.PublicKey))
265-
if err != nil {
266-
return err
267-
}
268-
269-
if pop == "" {
270-
_, pop, err = promptProofOfPossession(false, true)
271-
if err != nil {
272-
return err
273-
}
274-
}
275-
276-
var remainingBalanceOwnerAddr, disableOwnerAddr string
277-
hrp := key.GetHRP(network.ID)
278-
if validatorInfo.RemainingBalanceOwner != nil && len(validatorInfo.RemainingBalanceOwner.Addrs) > 0 {
279-
remainingBalanceOwnerAddr, err = address.Format("P", hrp, validatorInfo.RemainingBalanceOwner.Addrs[0][:])
280-
if err != nil {
281-
return err
282-
}
283-
}
284-
if validatorInfo.DeactivationOwner != nil && len(validatorInfo.DeactivationOwner.Addrs) > 0 {
285-
disableOwnerAddr, err = address.Format("P", hrp, validatorInfo.DeactivationOwner.Addrs[0][:])
286-
if err != nil {
287-
return err
288-
}
289-
}
290-
291-
// first remove the validator from subnet
292-
err = removeValidatorSOV(
231+
return changeWeight(
293232
deployer,
294233
network,
295234
blockchainName,
296235
nodeID,
297-
0, // automatic uptime
298-
isBootstrapValidatorForNetwork(nodeID, sc.Networks[network.Name()]),
299-
false, // don't force
300-
changeWeightFlags.SigAggFlags.SignatureAggregatorEndpoint,
301-
)
302-
if err != nil {
303-
return err
304-
}
305-
306-
balance := validatorInfo.Balance
307-
if validatorInfo.RemainingBalanceOwner != nil && len(validatorInfo.RemainingBalanceOwner.Addrs) > 0 {
308-
availableBalance, err := utils.GetNetworkBalance([]ids.ShortID{validatorInfo.RemainingBalanceOwner.Addrs[0]}, network.Endpoint)
309-
if err != nil {
310-
ux.Logger.RedXToUser("failure checking remaining balance of validator: %s. continuing with default value", err)
311-
} else if availableBalance < balance {
312-
balance = availableBalance
313-
}
314-
}
315-
316-
// add back validator to subnet with updated weight
317-
return CallAddValidator(
318-
deployer,
319-
network,
320-
kc,
321-
blockchainName,
322-
nodeID.String(),
323-
publicKey,
324-
pop,
325236
newWeight,
326-
float64(balance)/float64(units.Avax),
327-
remainingBalanceOwnerAddr,
328-
disableOwnerAddr,
329-
sc,
330237
changeWeightFlags.SigAggFlags.SignatureAggregatorEndpoint,
238+
initiateTxHash,
331239
)
332240
}
333241

334-
func changeWeightACP99(
242+
func changeWeight(
335243
deployer *subnet.PublicDeployer,
336244
network models.Network,
337245
blockchainName string,

‎cmd/blockchaincmd/convert.go‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,11 @@ func InitializeValidatorManager(
159159
validatorManagerOwnerAddressStr string,
160160
specializedValidatorManagerAddressStr string,
161161
proxyOwnerAddressStr string,
162-
useACP99 bool,
163162
useLocalMachine bool,
164163
signatureAggregatorFlags flags.SignatureAggregatorFlags,
165164
proofOfStakeFlags flags.POSFlags,
166165
) (bool, error) {
167-
if useACP99 {
168-
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: V2"))
169-
} else {
170-
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: v1.0.0"))
171-
}
166+
ux.Logger.PrintToUser("%s", logging.Yellow.Wrap("Validator Manager Protocol: V2"))
172167

173168
var err error
174169
clusterName := clusterNameFlagValue
@@ -217,14 +212,13 @@ func InitializeValidatorManager(
217212
validatorManagerRPCEndpoint,
218213
proxyOwnerAddressStr,
219214
pos,
220-
useACP99,
221215
); err != nil {
222216
return tracked, err
223217
}
224218
}
225219

226220
if specializedValidatorManagerAddressStr == "" {
227-
if useACP99 && pos {
221+
if pos {
228222
specializedValidatorManagerAddress, err := app.Prompt.CaptureAddress("What is the address of the Specialized Validator Manager?")
229223
if err != nil {
230224
return tracked, err
@@ -373,7 +367,6 @@ func InitializeValidatorManager(
373367
RewardCalculatorAddress: validatormanagerSDK.RewardCalculatorAddress,
374368
UptimeBlockchainID: blockchainID,
375369
},
376-
useACP99,
377370
signatureAggregatorEndpoint,
378371
nativeMinterSigner,
379372
); err != nil {
@@ -386,7 +379,6 @@ func InitializeValidatorManager(
386379
app.Log,
387380
signer,
388381
aggregatorLogger,
389-
useACP99,
390382
signatureAggregatorEndpoint,
391383
); err != nil {
392384
return tracked, err
@@ -761,7 +753,6 @@ func convertBlockchain(cmd *cobra.Command, args []string) error {
761753
sidecar.ValidatorManagerOwner,
762754
specializedValidatorManagerAddressStr,
763755
sidecar.ProxyContractOwner,
764-
sidecar.UseACP99,
765756
convertFlags.LocalMachineFlags.UseLocalMachine,
766757
convertFlags.SigAggFlags,
767758
convertFlags.ProofOfStakeFlags,

‎cmd/blockchaincmd/create.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ type CreateFlags struct {
6262
validatorManagerOwner string
6363
proxyContractOwner string
6464
enableDebugging bool
65-
useACP99 bool
6665
Network networkoptions.NetworkFlags
6766
}
6867

@@ -107,7 +106,6 @@ configuration, pass the -f flag.`,
107106
cmd.Flags().BoolVar(&createFlags.enableDebugging, "debug", true, "enable blockchain debugging")
108107

109108
sovGroup := flags.RegisterFlagGroup(cmd, "Subnet-Only-Validators (SOV) Flags", "show-sov-flags", true, func(set *pflag.FlagSet) {
110-
set.BoolVar(&createFlags.useACP99, "acp99", true, "use ACP99 contracts instead of v1.0.0 for validator managers")
111109
set.BoolVar(&createFlags.proofOfAuthority, "proof-of-authority", false, "use proof of authority(PoA) for validator management")
112110
set.BoolVar(&createFlags.proofOfStake, "proof-of-stake", false, "use proof of stake(PoS) for validator management")
113111
set.StringVar(&createFlags.validatorManagerOwner, "validator-manager-owner", "", "EVM address that controls Validator Manager Owner")
@@ -363,7 +361,6 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
363361
createFlags.addICMRegistryToGenesis,
364362
sc.ProxyContractOwner,
365363
createFlags.rewardBasisPoints,
366-
createFlags.useACP99,
367364
)
368365
if err != nil {
369366
return err
@@ -377,7 +374,6 @@ func createBlockchainConfig(cmd *cobra.Command, args []string) error {
377374
tokenSymbol,
378375
true,
379376
sovereign,
380-
createFlags.useACP99,
381377
); err != nil {
382378
return err
383379
}

‎cmd/blockchaincmd/deploy.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,6 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
10571057
sidecar.ValidatorManagerOwner,
10581058
specializedValidatorManagerAddressStr,
10591059
sidecar.ProxyContractOwner,
1060-
sidecar.UseACP99,
10611060
deployFlags.LocalMachineFlags.UseLocalMachine,
10621061
deployFlags.SigAggFlags,
10631062
deployFlags.ProofOfStakeFlags,

‎cmd/blockchaincmd/describe.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,8 @@ func printSmartContracts(sc models.Sidecar, genesis core.Genesis) {
364364
} else {
365365
description = "Native Token Staking Manager"
366366
}
367-
if sc.UseACP99 {
368-
description = "ACP99 Compatible " + description
369-
} else {
370-
description = "v1.0.0 Compatible " + description
371-
}
367+
description = "v2.0.0 Compatible " + description
368+
372369
case address == common.HexToAddress(validatorManagerSDK.ValidatorProxyContractAddress):
373370
description = "Validator Transparent Proxy"
374371
case address == common.HexToAddress(validatorManagerSDK.ValidatorProxyAdminContractAddress):

‎cmd/blockchaincmd/export_test.go‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)