Merge branch 'develop' into feat/rewards/rebalance

terra-money · Jul 11, 2023 · 837abf0 · 837abf0
2 parents 4a45710 + baa95a8
commit 837abf0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/cmd/price-server/price_server.go b/cmd/price-server/price_server.go
@@ -34,6 +34,8 @@ func main() {
 	})
 	r.GET("/alliance/protocol", func(c *gin.Context) {
 		allianceProtocolRes, err := allianceProvider.GetProtocolsInfo(ctx)
+		allianceProtocolRes.UpdateChainsInfo.ChainsInfo.ProtocolsInfo[0].ChainId = "narwhal-1"
+		allianceProtocolRes.UpdateChainsInfo.ChainsInfo.ProtocolsInfo[1].ChainId = "harpoon-4"
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, err)
 			return

diff --git a/config/default_config.go b/config/default_config.go
@@ -1445,7 +1445,7 @@ var DefaultPriceServerConfig = Config{
 var DefaultAllianceConfig = AllianceConfig{
 	GRPCUrls: []string{
 		"migaloo-grpc.polkachu.com:20790",
-		// "kujira-grpc.polkachu.com:11890",
+		"kujira-grpc.polkachu.com:11890",
 		"query-grpc.carbon.network:443",
 	},
 	LSTSData: []LSTData{
@@ -1473,7 +1473,21 @@ var DefaultAllianceConfig = AllianceConfig{
 			CounterpartyChainId: "migaloo-1",
 			LSTData: LSTData{
 				IBCDenom:     "ibc/623CD0B9778AD974713317EA0438A0CCAA72AF0BBE7BEE002205BCA25F1CA3BA",
-				RebaseFactor: sdktypes.OneDec(),
+				RebaseFactor: sdktypes.MustNewDecFromStr("1.04"),
+			},
+		},
+		{
+			CounterpartyChainId: "migaloo-1",
+			LSTData: LSTData{
+				IBCDenom:     "factory/terra1zdpgj8am5nqqvht927k3etljyl6a52kwqup0je/stDeck",
+				RebaseFactor: sdktypes.MustNewDecFromStr("1.01"),
+			},
+		},
+		{
+			CounterpartyChainId: "carbon-1",
+			LSTData: LSTData{
+				IBCDenom:     "factory/terra1zdpgj8am5nqqvht927k3etljyl6a52kwqup0je/stOracle",
+				RebaseFactor: sdktypes.MustNewDecFromStr("1.07"),
 			},
 		},
 	},