0xPolygon · marcello33 · Apr 8, 2024 · Oct 11, 2023 · Feb 14, 2024 · Feb 15, 2024
diff --git a/api/cosmos/gov/v1beta1/gov.pulsar.go b/api/cosmos/gov/v1beta1/gov.pulsar.go
diff --git a/api/cosmos/staking/v1beta1/staking.pulsar.go b/api/cosmos/staking/v1beta1/staking.pulsar.go
diff --git a/api/cosmos/staking/v1beta1/tx.pulsar.go b/api/cosmos/staking/v1beta1/tx.pulsar.go
diff --git a/proto/cosmos/gov/v1beta1/gov.proto b/proto/cosmos/gov/v1beta1/gov.proto
@@ -45,8 +45,9 @@ message WeightedVoteOption {
   ];
 }
 
-// TextProposal defines a standard text proposal whose changes need to be
-// manually updated in case of approval.
+// TODO HV2: TextProposals are disabled in heimdall. Remove it and re-implement all tests?
+
+// TextProposal defines a standard text proposal whose changes need to be manually updated in case of approval.
 message TextProposal {
   option (cosmos_proto.implements_interface) = "cosmos.gov.v1beta1.Content";
   option (amino.name)                        = "cosmos-sdk/TextProposal";

diff --git a/proto/cosmos/staking/v1beta1/staking.proto b/proto/cosmos/staking/v1beta1/staking.proto
@@ -79,6 +79,8 @@ message Description {
   string details = 5;
 }
 
+// HV2: heimdall uses a different version of `Validator` in staking module, which will implement the ValidatorI
+
 // Validator defines a validator, together with the total amount of the
 // Validator's bond shares and their exchange rate to coins. Slashing results in
 // a decrease in the exchange rate, allowing correct calculation of future
@@ -91,7 +93,7 @@ message Validator {
   option (gogoproto.equal)           = false;
   option (gogoproto.goproto_getters) = false;
 
-  // operator_address defines the address of the validator's operator; bech encoded in JSON.
+  // operator_address defines the address of the validator's operator; hex encoded in JSON.
   string operator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
   // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any.
   google.protobuf.Any consensus_pubkey = 2 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"];

diff --git a/proto/cosmos/staking/v1beta1/tx.proto b/proto/cosmos/staking/v1beta1/tx.proto
@@ -65,7 +65,7 @@ message MsgCreateValidator {
   ];
   // Deprecated: Use of Delegator Address in MsgCreateValidator is deprecated.
   // The validator address bytes and delegator address bytes refer to the same account while creating validator (defer
-  // only in bech32 notation).
+  // only in hex notation).
   string                   delegator_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", deprecated = true];
   string                   validator_address = 5 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"];
   google.protobuf.Any      pubkey            = 6 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"];

diff --git a/proto/cosmos/upgrade/v1beta1/upgrade.proto b/proto/cosmos/upgrade/v1beta1/upgrade.proto
@@ -43,6 +43,10 @@ message Plan {
   google.protobuf.Any upgraded_client_state = 5 [deprecated = true];
 }
 
+// HV2: this was deleted from heimdall's gov/types/proposal.go.
+// Did not remove it as it's only used in tests. Also it's marked as deprecated.
+// Furthermore it's part of upgrade module heimdall won't use
+
 // SoftwareUpgradeProposal is a gov Content type for initiating a software
 // upgrade.
 // Deprecated: This legacy proposal is deprecated in favor of Msg-based gov

diff --git a/tests/e2e/gov/tx.go b/tests/e2e/gov/tx.go
@@ -545,7 +545,8 @@ func (s *E2ETestSuite) TestNewCmdWeightedVote() {
 	for _, tc := range testCases {
 		tc := tc
 		s.Run(tc.name, func() {
-			cmd := cli.NewCmdWeightedVote()
+			// TODO HV2: changed from NewCmdWeightedVote to NewCmdVote. Fix tests accordingly.
+			cmd := cli.NewCmdVote()
 			clientCtx := val.ClientCtx
 			var txResp sdk.TxResponse
 

diff --git a/tests/integration/staking/keeper/common_test.go b/tests/integration/staking/keeper/common_test.go
@@ -134,7 +134,7 @@ func initFixture(t testing.TB) *fixture {
 
 	stakingKeeper := stakingkeeper.NewKeeper(cdc, runtime.NewKVStoreService(keys[types.StoreKey]), accountKeeper, bankKeeper, authority.String(), addresscodec.NewHexCodec(), addresscodec.NewHexCodec())
 	// TODO HV2: init processors with proper supply.AccountProcessor (supply module has been merged with bank module upstream)
-	authModule := auth.NewAppModule(cdc, accountKeeper, authsims.RandomGenesisAccounts, nil, []authtypes.AccountProcessor{})
+	authModule := auth.NewAppModule(cdc, accountKeeper, authsims.RandomGenesisAccounts, nil /*[]authtypes.AccountProcessor{}*/)
 	bankModule := bank.NewAppModule(cdc, bankKeeper, accountKeeper, nil)
 	stakingModule := staking.NewAppModule(cdc, stakingKeeper, accountKeeper, bankKeeper, nil)
 

diff --git a/types/staking.go b/types/staking.go
@@ -21,7 +21,7 @@ var (
 	DefaultBondDenom = "matic"
 
 	// DefaultPowerReduction is the default amount of staking tokens required for 1 unit of consensus-engine power
-	DefaultPowerReduction = sdkmath.NewIntFromUint64(1000000)
+	DefaultPowerReduction = sdkmath.NewIntFromUint64(1000000000000000000)
 )
 
 // TokensToConsensusPower - convert input tokens to potential consensus-engine power

diff --git a/x/feegrant/client/cli/tx_test.go b/x/feegrant/client/cli/tx_test.go
@@ -694,7 +694,8 @@ func (s *CLITestSuite) msgVote(clientCtx client.Context, from, id, vote string,
 	}, commonArgs...)
 
 	args = append(args, extraArgs...)
-	cmd := govcli.NewCmdWeightedVote()
+	// TODO HV2: changed from NewCmdWeightedVote to NewCmdVote. Fix tests accordingly.
+	cmd := govcli.NewCmdVote()
 
 	out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd, args)