refactor(oracle): remove dead code from asset registry (#2353)

* chore(oracle): add USDa stable coin to the oracle registry

* fix: linter

* fix: linter

* Update x/common/denoms/denoms.go

Co-authored-by: Unique Divine <[email protected]>

* fix(asset-registry): make "uusd" denoms.UUSD and add denoms.USDA

* chore: linter and the remainder of dead code changes

---------

Co-authored-by: Unique Divine <[email protected]>
Co-authored-by: Unique Divine <[email protected]>

Author: onikonychev

CHANGELOG.md

@@ -46,6 +46,8 @@ changelog format](https://keepachangelog.com/en/1.0.0/).
 See https://github.com/dangoslen/changelog-enforcer.
 -->
 
+- [#2353](https://github.com/NibiruChain/nibiru/pull/2353) - refactor(oracle): remove dead code from asset registry 
+
 ### Dependencies
 - Bump `base-x` from 3.0.10 to 3.0.11 ([#2355](https://github.com/NibiruChain/nibiru/pull/2355))
 
@@ -59,6 +61,7 @@ See https://github.com/dangoslen/changelog-enforcer.
 - [#2348](https://github.com/NibiruChain/nibiru/pull/2348) - fix(oracle): max expiration a label rather than an invalidation for additional query liveness
 - [#2350](https://github.com/NibiruChain/nibiru/pull/2350) - fix(simapp): sim tests with empty validator set panic
 - [#2352](https://github.com/NibiruChain/nibiru/pull/2352) - chore(token-registry): Add bank coin versions of USDC and USDT from Stargate and LayerZero, and update ErisEvm.sol to fix redeem
+- [#2354](https://github.com/NibiruChain/nibiru/pull/2354) - chore: linter upgrade to v2
 - [#2357](https://github.com/NibiruChain/nibiru/pull/2357) - fix: proper statedb isolation in nibiru bank_extension
 
 ### Dependencies

INSTALL.md

@@ -10,8 +10,7 @@ This guide will explain how to install the Nibiru Chain binary, `nibid`, onto yo
 - [4. Clone the Nibiru Repository](#4-clone-the-nibiru-repository)
 - [Upgrade](#upgrade)
 - [Troubleshooting](#troubleshooting)
-- [Contributing](#contributing)
-- [Troubleshooting](#troubleshooting-1)
+  - [Contributing](#contributing)
   - [Error when running `make install` on MacOS](#error-when-running-make-install-on-macos)
 
 ## 1. Update the system
@@ -86,7 +85,7 @@ export PATH=$PATH:$(go env GOPATH)/bin
 
 B. New commands you've made on the `nibid` don't show up. Your `nibid` probably just isn't updated again after the code changes, to recompile nibid run `make install` in the root
 
-## Contributing
+### Contributing
 
 The code for `nibid` is located in the `/cmd/nibid` folder.
 
@@ -110,8 +109,6 @@ nibid tx --help
 nibid query oracle --help
 ```
 
-## Troubleshooting
-
 ### Error when running `make install` on MacOS
 
 If you get an error like this when running `make install` on MacOS:

eth/chain_id_test.go

@@ -40,7 +40,7 @@ func TestParseChainID_Happy(t *testing.T) {
 	for _, tc := range testCases {
 		chainIDEpoch, err := ParseEthChainIDStrict(tc.chainID)
 		require.NoError(t, err, tc.name)
-		var errMsg = ""
+		errMsg := ""
 		if err != nil {
 			errMsg = err.Error()
 		}

eth/rpc/rpcapi/tx_info.go

@@ -266,7 +266,7 @@ func (b *Backend) GetTransactionReceipt(hash gethcommon.Hash) (*TransactionRecei
 	}
 	cumulativeGasUsed += res.CumulativeGasUsed
 
-	var status = gethcore.ReceiptStatusSuccessful
+	status := gethcore.ReceiptStatusSuccessful
 	if res.Failed {
 		status = gethcore.ReceiptStatusFailed
 	}

gosdk/gosdk_test.go

@@ -135,7 +135,7 @@ func (s *TestSuite) DoTestBroadcastMsgsGrpc() (txHashHex string) {
 	txHashHex = s.AssertTxResponseSuccess(txResp)
 
 	base := 10
-	var txRespCode = strconv.FormatUint(uint64(txResp.Code), base)
+	txRespCode := strconv.FormatUint(uint64(txResp.Code), base)
 	s.EqualValuesf(txResp.Code, 0,
 		"code: %v\nraw log: %s", txRespCode, txResp.RawLog)
 	return txHashHex

x/common/asset/registry.go

@@ -2,79 +2,12 @@ package asset
 
 import (
 	"github.com/NibiruChain/nibiru/v2/x/common/denoms"
-	"github.com/NibiruChain/nibiru/v2/x/common/set"
 )
 
-type registry map[string]set.Set[string]
-
-var Registry registry
-
-func init() {
-	// map of base asset to supported quote assets
-	// quote assets are usually stables
-	Registry = map[string]set.Set[string]{
-		denoms.BTC:  set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.ETH:  set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.NIBI: set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.ATOM: set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.OSMO: set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.AVAX: set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.SOL:  set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.BNB:  set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.ADA:  set.New(denoms.USDC, denoms.NUSD, denoms.USD, denoms.USDT),
-		denoms.NUSD: set.New(denoms.USD, denoms.USDC),
-		denoms.USDC: set.New(denoms.USD, denoms.NUSD),
-		denoms.USDT: set.New(denoms.USD, denoms.NUSD, denoms.USDC),
-	}
-}
-
-func (r registry) Pair(base string, quote string) Pair {
-	for q := range r[base] {
-		if q == quote {
-			return NewPair(string(base), string(quote))
-		}
-	}
-
-	return ""
-}
-
-// Returns all supported base denoms
-func (r registry) BaseDenoms() set.Set[string] {
-	baseSet := make(set.Set[string])
-	for d := range r {
-		baseSet.Add(d)
-	}
-	return baseSet
-}
-
-// Returns all supported quote denoms
-func (r registry) QuoteDenoms() set.Set[string] {
-	quoteSet := make(set.Set[string])
-	for base := range r {
-		for q := range r[base] {
-			quoteSet.Add(q)
-		}
-	}
-	return quoteSet
-}
-
-// Checks if the provided denom is a supported base denom
-func (r registry) IsSupportedBaseDenom(denom string) bool {
-	_, ok := r[denom]
-	return ok
-}
-
-// Checks if the provided denom is a supported quote denom
-func (r registry) IsSupportedQuoteDenom(denom string) bool {
-	return r.QuoteDenoms().Has(denom)
-}
-
-// Checks if the provided denom is a supported denom
-func (r registry) IsSupportedDenom(denom string) bool {
-	return r.IsSupportedBaseDenom(string(denom)) || r.IsSupportedQuoteDenom(string(denom))
-}
-
-// Checks if the provided base and quote denoms are a supported pair
-func (r registry) IsSupportedPair(base string, quote string) bool {
-	return r.IsSupportedBaseDenom(base) && r.IsSupportedQuoteDenom(quote)
-}
+const (
+	PAIR_BTC  Pair = denoms.BTC + ":" + denoms.UUSD
+	PAIR_ETH  Pair = denoms.ETH + ":" + denoms.UUSD
+	PAIR_ATOM Pair = denoms.ATOM + ":" + denoms.UUSD
+	PAIR_USDC Pair = denoms.USDC + ":" + denoms.UUSD
+	PAIR_USDT Pair = denoms.USDT + ":" + denoms.UUSD
+)

x/common/asset/registry_test.go

@@ -54,7 +54,7 @@ func MustSqrtDec(dec sdkmath.LegacyDec) sdkmath.LegacyDec {
 // large as 10**99.
 func SqrtDec(dec sdkmath.LegacyDec) (sdkmath.LegacyDec, error) {
 	var sqrtDec sdkmath.LegacyDec
-	var panicErr = TryCatch(func() {
+	panicErr := TryCatch(func() {
 		sqrtDec = MustSqrtDec(dec)
 	})()
 	return sqrtDec, panicErr
@@ -71,7 +71,7 @@ func MustSqrtBigInt(i *big.Int) *big.Int {
 // SqrtBigInt is the panic-safe version of MustSqrtBigInt
 func SqrtBigInt(i *big.Int) (*big.Int, error) {
 	sqrtInt := new(big.Int)
-	var panicErr = TryCatch(func() {
+	panicErr := TryCatch(func() {
 		*sqrtInt = *MustSqrtBigInt(i)
 	})()
 	return sqrtInt, panicErr

x/common/dec.go

@@ -1,9 +1,21 @@
 package denoms
 
+// Post Nibiru v2.6.0
+const (
+	// NOTE: US dollars. Use `denoms.USD` instead of `denoms.UUSD` going forward.
+	USD = "usd"
+	// Avalon Finance overcollateralized stablecoin.
+	// https://github.com/NibiruChain/pricefeeder/pull/64
+	USDA  = "usda"
+	SUSDA = "susda"
+)
+
+// Legacy denoms - These each include an unnecessary "u" prefix for micro.
+
 const ( // stablecoins
 	USDC = "uusdc"
 	NUSD = "unusd"
-	USD  = "uusd"
+	UUSD = "uusd"
 	USDT = "uusdt"
 )
 

x/common/denoms/denoms.go

@@ -88,13 +88,16 @@ func TestCombineErrorsGeneric(t *testing.T) {
 		{name: "type=[]string | mixed", in: []string{"", "abc", ""}, out: errors.New(": abc: ")},
 
 		// cases: fmt.Stringer
-		{name: "type=fmt.Stringer |", in: asset.Registry.Pair(denoms.USDC, denoms.NUSD), out: errors.New("uusdc:unusd")},
+		{name: "type=fmt.Stringer |", in: asset.NewPair(denoms.USDC, denoms.NUSD), out: errors.New("uusdc:unusd")},
 
 		// cases: []fmt.Stringer
 		{
 			name: "type=[]fmt.Stringer | happy",
-			in:   []fmt.Stringer{asset.Registry.Pair(denoms.BTC, denoms.NUSD), asset.Registry.Pair(denoms.ETH, denoms.NUSD)},
-			out:  errors.New("ubtc:unusd: ueth:unusd"),
+			in: []fmt.Stringer{
+				asset.NewPair(denoms.BTC, denoms.NUSD),
+				asset.NewPair(denoms.ETH, denoms.NUSD),
+			},
+			out: errors.New("ubtc:unusd: ueth:unusd"),
 		},
 		{name: "type=[]fmt.Stringer | empty", in: []fmt.Stringer{}, out: nil},
 	}