Merge branch 'main' into adam/tests

umee-network · Aug 30, 2022 · d69a209 · d69a209
2 parents f19ad73 + cdb582c
commit d69a209
Show file tree

Hide file tree

Showing 11 changed files with 470 additions and 13 deletions.
diff --git a/price-feeder/CHANGELOG.md b/price-feeder/CHANGELOG.md
@@ -70,6 +70,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 - [#1175](https://github.com/umee-network/umee/pull/1175) Add ProviderName type to facilitate the reading of maps.
 - [#1215](https://github.com/umee-network/umee/pull/1215) Moved ProviderName to Name in provider package.
 - [#1274](https://github.com/umee-network/umee/pull/1274) Add option to set config by env variables.
+- [#1299](https://github.com/umee-network/umee/pull/1299) Add FTX as a provider.
 
 ## [v0.2.5](https://github.com/umee-network/umee/releases/tag/price-feeder%2Fv0.2.5) - 2022-07-28
 

diff --git a/price-feeder/README.md b/price-feeder/README.md
@@ -29,6 +29,7 @@ The list of current supported providers:
 
 - [Binance](https://www.binance.com/en)
 - [Coinbase](https://www.coinbase.com/)
+- [FTX](https://ftx.com/)
 - [Gate](https://www.gate.io/)
 - [Huobi](https://www.huobi.com/en-us/)
 - [Kraken](https://www.kraken.com/en-us/)

diff --git a/price-feeder/config/config.go b/price-feeder/config/config.go
@@ -38,6 +38,7 @@ var (
 		provider.ProviderHuobi:    {},
 		provider.ProviderGate:     {},
 		provider.ProviderCoinbase: {},
+		provider.ProviderFTX:      {},
 		provider.ProviderMock:     {},
 	}
 

diff --git a/price-feeder/oracle/oracle.go b/price-feeder/oracle/oracle.go
@@ -277,7 +277,6 @@ func GetComputedPrices(
 	providerPairs map[provider.Name][]types.CurrencyPair,
 	deviations map[string]sdk.Dec,
 ) (prices map[string]sdk.Dec, err error) {
-
 	// convert any non-USD denominated candles into USD
 	convertedCandles, err := convertCandlesToUSD(
 		logger,
@@ -467,6 +466,9 @@ func NewProvider(
 	case provider.ProviderGate:
 		return provider.NewGateProvider(ctx, logger, endpoint, providerPairs...)
 
+	case provider.ProviderFTX:
+		return provider.NewFTXProvider(ctx, logger, endpoint, providerPairs...), nil
+
 	case provider.ProviderMock:
 		return provider.NewMockProvider(), nil
 	}

diff --git a/price-feeder/oracle/provider/coinbase.go b/price-feeder/oracle/provider/coinbase.go
@@ -24,7 +24,7 @@ const (
 	coinbasePingCheck = time.Second * 28 // should be < 30
 	coinbaseRestHost  = "https://api.exchange.coinbase.com"
 	coinbaseRestPath  = "/products"
-	timeLayout        = "2006-01-02T15:04:05.000000Z"
+	coinbaseTimeFmt   = "2006-01-02T15:04:05.000000Z"
 	unixMinute        = 60000
 )
 
@@ -408,7 +408,7 @@ func (p *CoinbaseProvider) messageReceived(messageType int, bz []byte) {
 
 // timeToUnix converts a Time in format "2006-01-02T15:04:05.000000Z" to unix
 func (tr CoinbaseTradeResponse) timeToUnix() int64 {
-	t, err := time.Parse(timeLayout, tr.Time)
+	t, err := time.Parse(coinbaseTimeFmt, tr.Time)
 	if err != nil {
 		return 0
 	}