Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ The `pricefeeder` is a tool developed for Nibiru's [Oracle Module consensus](htt
- [Chainlink on B^2 Network](#chainlink-on-b2-network)
- [Eris Protocol for stNIBI price](#eris-protocol-for-stnibi-price)
- [Eris Protocol for stNIBI price](#eris-protocol-for-stnibi-price-1)
- [Avalon Finance for sUSDa, USDa](#avalon-finance-for-susda-usda)
- [Glossary](#glossary)

## Quick Start - Local Development
Expand Down Expand Up @@ -188,14 +187,6 @@ ERIS_PROTOCOL_CONTRACT_ADDRESS="nibi1udqqx30cw8nwjxtl4l28ym9hhrp933zlq8dqxfjzcdh
ERIS_PROTOCOL_CONTRACT_ADDRESS="nibi1keqw4dllsczlldd7pmzp25wyl04fw5anh3wxljhg4fjuqj9xnxuqa82rpg"
```

### Avalon Finance for sUSDa, USDa


[Avalon Finance](https://avalonfinance.xyz) is a CeDeFi lending project that
powers both USDa and sUSDa. The redeem rate between USDa and its yield-bearing variant, sUSDa, is retrieved from the API provided by Avalon Labs.

This data source adds queries for the "susda:usda" and "susda:usd" asset pairs.

### Chainlink on B^2 Network

Some token prices are retrieved from other chains Chainlink oracles.
Expand Down
4 changes: 0 additions & 4 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ var defaultExchangeSymbolsMap = map[string]map[asset.Pair]types.Symbol{
"ustnibi:unibi": "ustnibi:unibi", // this is the only pair supported by the Eris Protocol smart contract
},

sources.SourceNameUniswapV3: {
"usda:usd": "USDa:USDT",
},

sources.SourceNameChainLink: {
"b2btc:btc": "uBTC/BTC",
},
Expand Down
34 changes: 0 additions & 34 deletions feeder/priceprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,40 +251,6 @@ func (a AggregatePriceProvider) GetPrice(pair asset.Pair) types.Price {
}
}

case "susda:usd":
priceSusdaUsda := a.GetPrice("susda:usda")
if !priceSusdaUsda.Valid || priceSusdaUsda.Price <= 0 {
// if we can't find a valid susda:usda price, return an invalid price
a.logger.Warn().Str("pair", pairStr).Msg("no valid price found")
aggregatePriceProvider.WithLabelValues(pairStr, "missing", "false").Inc()
return types.Price{
SourceName: "missing",
Pair: pair,
Price: types.PriceAbstain,
Valid: false,
}
}

priceUsdaUsd := a.GetPrice("usda:usd")
if priceUsdaUsd.Valid && priceUsdaUsd.Price > 0 {
return types.Price{
Pair: pair,
Price: priceSusdaUsda.Price * priceUsdaUsd.Price,
SourceName: priceSusdaUsda.SourceName,
Valid: true,
}
}

// if either price is invalid, return an invalid price
a.logger.Warn().Str("pair", pairStr).Msg("no valid price found")
aggregatePriceProvider.WithLabelValues(pairStr, "missing", "false").Inc()
return types.Price{
SourceName: "missing",
Pair: pair,
Price: types.PriceAbstain,
Valid: false,
}

default:
// for all other price pairs, iterate randomly, if we find a valid price, we return it
// otherwise we go onto the next PriceProvider to ask for prices.
Expand Down
36 changes: 0 additions & 36 deletions feeder/priceprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/NibiruChain/nibiru/v2/x/common/asset"
"github.com/NibiruChain/nibiru/v2/x/common/denoms"
"github.com/rs/zerolog"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/NibiruChain/pricefeeder/sources"
Expand Down Expand Up @@ -191,39 +190,4 @@ func TestAggregatePriceProvider(t *testing.T) {
require.Equal(t, asset.NewPair("ustnibi", denoms.USD), price.Pair)
require.Equal(t, sources.SourceNameErisProtocol, price.SourceName)
})

t.Run(sources.SourceNameAvalon, func(t *testing.T) {
pp := NewAggregatePriceProvider(
map[string]map[asset.Pair]types.Symbol{
sources.SourceNameAvalon: {
"susda:usda": sources.Symbol_sUSDaUSDa,
},
sources.SourceNameUniswapV3: {
"usda:usd": sources.Symbol_UniswapV3_USDaUSD,
},
},
map[string]json.RawMessage{},
zerolog.New(io.Discard),
)
defer pp.Close()
<-time.After(sources.UpdateTick + 5*time.Second)

pair := asset.Pair("susda:usda")
price := pp.GetPrice(pair)
assert.Truef(t, price.Valid, "invalid price for %s", price.Pair)
assert.Equal(t, pair, price.Pair)
assert.Equal(t, sources.SourceNameAvalon, price.SourceName)

pair = asset.Pair("usda:usd")
price = pp.GetPrice(pair)
assert.Truef(t, price.Valid, "invalid price for %s", price.Pair)
assert.EqualValues(t, pair, price.Pair)
assert.Equal(t, sources.SourceNameUniswapV3, price.SourceName)

pair = asset.Pair("susda:usd")
price = pp.GetPrice(pair)
assert.Truef(t, price.Valid, "invalid price for %s", price.Pair)
assert.EqualValues(t, pair, price.Pair)
assert.Equal(t, sources.SourceNameAvalon, price.SourceName)
})
}
84 changes: 0 additions & 84 deletions sources/avalon_finance.go

This file was deleted.

19 changes: 0 additions & 19 deletions sources/avalon_finance_test.go

This file was deleted.

10 changes: 0 additions & 10 deletions sources/sources.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,6 @@ var allSources = []NamedSource{
return NewTickSource(symbols, ErisProtocolPriceUpdate, logger)
},
},
{
Name: SourceNameUniswapV3,
F: func(
symbols set.Set[types.Symbol],
_ json.RawMessage,
logger zerolog.Logger,
) types.Source {
return NewTickSource(symbols, UniswapV3PriceUpdate, logger)
},
},
{
Name: SourceNameChainLink,
F: func(
Expand Down