Merge pull request #32 from terra-money/develop

feat: merge develop to main
terra-money · Jul 4, 2023 · 8d707c0 · 8d707c0
2 parents 7fcf437 + 608ccf1
commit 8d707c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ start-alliance-rebalance-feeder:
 start-price-server:
 	go run ./cmd/price-server/price_server.go
 
-.PHONY: start-feeder start-price-server
+.PHONY: start-alliance-oracle-feeder start-alliance-rebalance-feeder start-price-server
 
 
 #################################################

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

diff --git a/params.json b/params.json
@@ -3,16 +3,12 @@
         "price_server_port": "8532",
         "oracle_address": "",
         "alliance_hub_contract_address": "",
-        "feeder_retries": 4,
-        "chain_id": "phoenix-1
-        "station_api": "https://phoenix-api.terra.dev"
+        "feeder_retries": 4
     },
     "develop": {
         "price_server_port": "8532",
-        "oracle_address": "terra19y3kv8r4ef4wjfvw5fzqnkff8fut0f4y3lt46k4ce0a0cwpscuqqg39mvq",
+        "oracle_address": "terra1jf3nndysevley5p3wnajkjvjxcql9d00gpj4en3xwp7yrkrdqess48rr27",
         "alliance_hub_contract_address" : "terra1majrm6e6n0eg760n9fs4g5jvwzh4ytp8e2d99mfgzv2e7mjmdwxse0ty73",
-        "feeder_retries": 4,
-        "chain_id": "pisco-1",
-        "station_api": "https://pisco-api.terra.dev"
+        "feeder_retries": 4
     }
 }