Merge branch 'master' into kevin/fix-security-deps

app/setup_handlers.go

@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
-const releaseVersion = "1.0-beta.5"
+const releaseVersion = "1.0-beta.6"
 
 func SetupHandlers(app *SifchainApp) {
 	app.UpgradeKeeper.SetUpgradeHandler(releaseVersion, func(ctx sdk.Context, plan types.Plan, vm m.VersionMap) (m.VersionMap, error) {
@@ -21,7 +21,7 @@ func SetupHandlers(app *SifchainApp) {
 	}
 	if upgradeInfo.Name == releaseVersion && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
-			Added: []string{"margin"},
+			// Added: []string{},
 		}
 		// Use upgrade store loader for the initial loading of all stores when app starts,
 		// it checks if version == upgradeHeight and applies store upgrades before loading the stores,

proto/sifnode/margin/v1/types.proto

@@ -33,36 +33,36 @@ message Params {
   ];
   int64 epoch_length = 7;
   repeated string pools = 8;
-  string removal_queue_threshold = 9 [
+  string removal_queue_threshold = 10 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  uint64 max_open_positions = 10;
-  string pool_open_threshold = 11 [
+  uint64 max_open_positions = 11;
+  string pool_open_threshold = 12 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  string force_close_fund_percentage = 12 [
+  string force_close_fund_percentage = 13 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  string force_close_fund_address = 13;
-  string incremental_interest_payment_fund_percentage = 14 [
+  string force_close_fund_address = 14;
+  string incremental_interest_payment_fund_percentage = 15 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  string incremental_interest_payment_fund_address = 15;
-  string sq_modifier = 16 [
+  string incremental_interest_payment_fund_address = 16;
+  string sq_modifier = 17 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  string safety_factor = 17 [
+  string safety_factor = 18 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  repeated string closed_pools = 18;
-  bool incremental_interest_payment_enabled = 19;
-  bool whitelisting_enabled = 20;
+  repeated string closed_pools = 19;
+  bool incremental_interest_payment_enabled = 20;
+  bool whitelisting_enabled = 21;
 }
 
 enum Position {

version

@@ -1 +1 @@
-1.0-beta.5
+1.0-beta.6

x/margin/client/cli/admin_tx.go

@@ -37,7 +37,7 @@ func GetAdminCloseAllCmd() *cobra.Command {
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
 		},
 	}
-	cmd.Flags().String("take_margin_fund", "", "boolean value to indicate weather margin fund will be deducted on close")
+	cmd.Flags().Bool("take_margin_fund", true, "boolean value to indicate weather margin fund will be deducted on close")
 	_ = cmd.MarkFlagRequired("take_margin_fund")
 	flags.AddTxFlagsToCmd(cmd)
 	return cmd
@@ -87,7 +87,7 @@ func GetAdminCloseCmd() *cobra.Command {
 	cmd.Flags().Uint64("id", 0, "id of the position")
 	_ = cmd.MarkFlagRequired("mtp_address")
 	_ = cmd.MarkFlagRequired("id")
-	cmd.Flags().String("take_margin_fund", "", "boolean value to indicate weather margin fund will be deducted on close")
+	cmd.Flags().Bool("take_margin_fund", true, "boolean value to indicate weather margin fund will be deducted on close")
 	_ = cmd.MarkFlagRequired("take_margin_fund")
 	flags.AddTxFlagsToCmd(cmd)
 	return cmd