genesis: PublicTreasuryPool capacity default value fix; DVM stdlib v0…

….7 update (#213)
dfinance · Oct 7, 2020 · 4096f03 · 4096f03
1 parent 7969d14
commit 4096f03
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 36 deletions.
diff --git a/cmd/config/genesis/defaults/common_defaults.go b/cmd/config/genesis/defaults/common_defaults.go
@@ -11,19 +11,26 @@ const (
 	StakingDenom           = "sxfi"
 	LiquidityProviderDenom = "lpt"
 
-	FeeAmount               = "100000000000000"        // 0.0001
-	GovMinDepositAmount     = "1000000000000000000000" // 1000.0
+	// Min TX fee
+	FeeAmount = "100000000000000" // 0.0001
+	// Governance: deposit amount
+	GovMinDepositAmount = "1000000000000000000000" // 1000.0
+	// Staking: min self-delegation amount
 	MinSelfDelegationAmount = "2500000000000000000000" // 2500.0
-	InvariantCheckAmount    = "1000000000000000000000" // 1000.0
+	// Crisis: invariants check TX fee
+	InvariantCheckAmount = "1000000000000000000000" // 1000.0
+	// Distribution: PublicTreasuryPool capacity
+	PublicTreasuryPoolAmount = "250000000000000000000000" // 250000.0
 
 	MaxGas = 10000000
 )
 
 var (
-	FeeCoin               sdk.Coin
-	GovMinDepositCoin     sdk.Coin
-	MinSelfDelegationCoin sdk.Coin
-	InvariantCheckCoin    sdk.Coin
+	FeeCoin                    sdk.Coin
+	GovMinDepositCoin          sdk.Coin
+	MinSelfDelegationCoin      sdk.Coin
+	InvariantCheckCoin         sdk.Coin
+	PublicTreasuryPoolCapacity sdk.Int
 )
 
 func init() {
@@ -50,4 +57,10 @@ func init() {
 	} else {
 		InvariantCheckCoin = sdk.NewCoin(MainDenom, value)
 	}
+
+	if value, ok := sdk.NewIntFromString(PublicTreasuryPoolAmount); !ok {
+		panic("distribution defaults: PublicTreasuryPoolAmount conversion failed")
+	} else {
+		PublicTreasuryPoolCapacity = value
+	}
 }
diff --git a/cmd/config/genesis/genesis.go b/cmd/config/genesis/genesis.go
@@ -67,7 +67,7 @@ func OverrideGenesisStateDefaults(cdc *codec.Codec, genState map[string]json.Raw
 		moduleState.Params.PublicTreasuryPoolTax = sdk.NewDecWithPrec(15, 3)       // 1.5%
 		moduleState.Params.HARPTax = sdk.NewDecWithPrec(2, 2)                      // 2%
 		//
-		moduleState.Params.PublicTreasuryPoolCapacity = sdk.NewInt(250000) // 250000.0
+		moduleState.Params.PublicTreasuryPoolCapacity = defaults.PublicTreasuryPoolCapacity // 250000.0
 		//
 		moduleState.Params.BaseProposerReward = sdk.NewDecWithPrec(1, 2)  // 1%
 		moduleState.Params.BonusProposerReward = sdk.NewDecWithPrec(4, 2) // 4%
@@ -101,6 +101,7 @@ func OverrideGenesisStateDefaults(cdc *codec.Codec, genState map[string]json.Raw
 		//
 		moduleState.Params.BondDenom = defaults.StakingDenom
 		moduleState.Params.LPDenom = defaults.LiquidityProviderDenom
+		moduleState.Params.LPDistrRatio = sdk.NewDecWithPrec(1, 0) // 100%
 		//
 		moduleState.Params.MinSelfDelegationLvl = defaults.MinSelfDelegationCoin.Amount // 2500.0
 		moduleState.Params.MaxDelegationsRatio = sdk.NewDecWithPrec(10, 0)              // 10.0