Merge remote-tracking branch 'origin/develop' into feat/enable-cors

terra-money · Oct 25, 2023 · be5969a · be5969a
2 parents 8bc2b9b + de88013
commit be5969a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cmd/price-server/price_server.go b/cmd/price-server/price_server.go
@@ -17,7 +17,7 @@ import (
 func main() {
 	err := godotenv.Load()
 	if err != nil {
-		log.Print("Error loading .env file:", err)
+		log.Print("Error loading .env file: ", err)
 	}
 	ctx := context.Background()
 
@@ -42,7 +42,7 @@ 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[0].ChainId = "narwhal-1"
 		// allianceProtocolRes.UpdateChainsInfo.ChainsInfo.ProtocolsInfo[1].ChainId = "harpoon-4"
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, err)

diff --git a/config/alliance_default_config.go b/config/alliance_default_config.go
@@ -6,7 +6,7 @@ var KUJIRA_GRPC = "kujira-grpc.polkachu.com:11890"
 var CARBON_GRPC = "carbon-grpc.terra.dev:443"
 
 var AllianceDefaultConfig = AllianceConfig{
-	GRPCUrls: []string{MIGALOO_GRPC, KUJIRA_GRPC, CARBON_GRPC},
+	GRPCUrls: []string{MIGALOO_GRPC, KUJIRA_GRPC},
 	LSTSData: []LSTData{
 		// Whale
 		{ // Eris Protocol ampLUNA https://chainsco.pe/terra2/address/terra1ecgazyd0waaj3g7l9cmy5gulhxkps2gmxu9ghducvuypjq68mq2s5lvsct

diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.20
 require (
 	github.com/CosmWasm/wasmd v0.41.0
 	github.com/cosmos/cosmos-sdk v0.47.5
+	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-gonic/gin v1.9.0
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/gorilla/websocket v1.5.0
@@ -68,7 +69,6 @@ require (
 	github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/getsentry/sentry-go v0.23.0 // indirect
-	github.com/gin-contrib/cors v1.4.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect

diff --git a/internal/provider/alliance/alliance_querier.go b/internal/provider/alliance/alliance_querier.go
@@ -52,6 +52,7 @@ func (a alliancesQuerierProvider) QueryAndSubmitOnChain(ctx context.Context) (st
 	if err != nil {
 		return "", fmt.Errorf("ERROR querying alliances data %w", err)
 	}
+
 	return a.transactionsProvider.SubmitAlliancesTransaction(ctx, res)
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	if err != nil {
     		return "", fmt.Errorf("ERROR querying alliances data %w", err)
     	}
     	return a.transactionsProvider.SubmitAlliancesTransaction(ctx, res)
     }
@@ Expand Down @@