-
Notifications
You must be signed in to change notification settings - Fork 201
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: create asset registry * refactor: move denoms to separate file * refactor: use AssetRegistry instead of hard-coded constants * chore: update changelog * refactor(denom): move denoms to separate package * refactor(asset_registry): Use `set[string]` instead of slice `[]string`, since it covers both use cases (#1159) * refactor(asset_registry): Use StringSet instead of []slice, since it covers both use cases * feat: add generic sets (#1160) * feat(set): use a generic set instead of StringSet * chore: update changelog Co-authored-by: Kevin Yang <[email protected]> * refactor: remove redundant Denom name * refactor: AssetRegistry in asset package * refactor: rename AssetRegistry to Registry Co-authored-by: Unique Divine <[email protected]>
- Loading branch information
1 parent
fc2e00c
commit ab96d89
Showing
80 changed files
with
1,680 additions
and
1,424 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ import ( | |
| "github.com/tendermint/tendermint/types" | ||
| tmtime "github.com/tendermint/tendermint/types/time" | ||
|
|
||
| "github.com/NibiruChain/nibiru/x/common" | ||
| "github.com/NibiruChain/nibiru/x/common/denoms" | ||
| ) | ||
|
|
||
| var ( | ||
|
|
@@ -89,7 +89,7 @@ Example: | |
| cmd.Flags().String(flagNodeDaemonHome, "nibid", "Home directory of the node's daemon configuration") | ||
| cmd.Flags().String(flagStartingIPAddress, "192.168.0.1", "Starting IP address (192.168.0.1 results in persistent peers list [email protected]:46656, [email protected]:46656, ...)") | ||
| cmd.Flags().String(flags.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created") | ||
| cmd.Flags().String(server.FlagMinGasPrices, fmt.Sprintf("0.000006%s", common.DenomNIBI), "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001stake)") | ||
| cmd.Flags().String(server.FlagMinGasPrices, fmt.Sprintf("0.000006%s", denoms.NIBI), "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001stake)") | ||
| cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|test)") | ||
| cmd.Flags().String(flags.FlagKeyAlgorithm, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") | ||
|
|
||
|
|
@@ -200,8 +200,8 @@ func InitTestnet( | |
| accTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction) | ||
| accStakingTokens := sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction) | ||
| coins := sdk.Coins{ | ||
| sdk.NewCoin(common.DenomNUSD, accTokens), | ||
| sdk.NewCoin(common.DenomNIBI, accStakingTokens), | ||
| sdk.NewCoin(denoms.NUSD, accTokens), | ||
| sdk.NewCoin(denoms.NIBI, accStakingTokens), | ||
| } | ||
|
|
||
| genBalances = append(genBalances, banktypes.Balance{Address: addr.String(), Coins: coins.Sort()}) | ||
|
|
@@ -211,7 +211,7 @@ func InitTestnet( | |
| createValMsg, err := stakingtypes.NewMsgCreateValidator( | ||
| sdk.ValAddress(addr), | ||
| valPubKeys[i], | ||
| sdk.NewCoin(common.DenomNIBI, valTokens), | ||
| sdk.NewCoin(denoms.NIBI, valTokens), | ||
| stakingtypes.NewDescription(nodeDirName, "", "", "", ""), | ||
| stakingtypes.NewCommissionRates(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()), | ||
| sdk.OneInt(), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package asset | ||
|
|
||
| import ( | ||
| "github.com/NibiruChain/nibiru/x/common" | ||
| "github.com/NibiruChain/nibiru/x/common/denoms" | ||
| "github.com/NibiruChain/nibiru/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) common.AssetPair { | ||
| for q := range r[base] { | ||
| if q == quote { | ||
| return common.NewAssetPair(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) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package asset | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/NibiruChain/nibiru/x/common" | ||
| "github.com/NibiruChain/nibiru/x/common/denoms" | ||
| ) | ||
|
|
||
| func TestIsSupportedPair(t *testing.T) { | ||
| for base := range Registry { | ||
| for quote := range Registry[base] { | ||
| require.Truef(t, Registry.IsSupportedPair(base, quote), "%s:%s should be supported", base, quote) | ||
| } | ||
| } | ||
|
|
||
| t.Log("test an unsupported pair") | ||
| require.False(t, Registry.IsSupportedPair(denoms.ATOM, denoms.OSMO)) | ||
| } | ||
|
|
||
| func TestPair(t *testing.T) { | ||
| for base := range Registry { | ||
| for quote := range Registry[base] { | ||
| require.Equal(t, common.NewAssetPair(base, quote), Registry.Pair(base, quote)) | ||
| } | ||
| } | ||
|
|
||
| t.Log("test an unsupported pair") | ||
| require.Equal(t, common.AssetPair(""), Registry.Pair(denoms.ATOM, denoms.OSMO)) | ||
|
|
||
| t.Log("test an unsupported base asset") | ||
| require.Equal(t, common.AssetPair(""), Registry.Pair("unsuported_denom", denoms.USDC)) | ||
|
|
||
| t.Log("test an unsupported quote asset") | ||
| require.Equal(t, common.AssetPair(""), Registry.Pair(denoms.ATOM, "unsupported_denom")) | ||
| } | ||
|
|
||
| func TestBaseDenoms(t *testing.T) { | ||
| for base := range Registry { | ||
| require.Contains(t, Registry.BaseDenoms(), base) | ||
| } | ||
| } | ||
|
|
||
| func TestIsSupportedBaseDenom(t *testing.T) { | ||
| for base := range Registry { | ||
| require.True(t, Registry.IsSupportedBaseDenom(base)) | ||
| } | ||
| require.False(t, Registry.IsSupportedBaseDenom("unsupported_denom")) | ||
| } | ||
|
|
||
| func TestQuoteDenoms(t *testing.T) { | ||
| for base := range Registry { | ||
| for quote := range Registry[base] { | ||
| require.True(t, Registry.QuoteDenoms().Has(quote)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestIsSupportedQuoteDenom(t *testing.T) { | ||
| for base := range Registry { | ||
| for quote := range Registry[base] { | ||
| require.True(t, Registry.IsSupportedQuoteDenom(quote)) | ||
| } | ||
| } | ||
|
|
||
| require.False(t, Registry.IsSupportedQuoteDenom("unsupported_denom")) | ||
| } | ||
|
|
||
| func TestIsSupportedDenom(t *testing.T) { | ||
| for base := range Registry.BaseDenoms() { | ||
| require.True(t, Registry.IsSupportedDenom(base)) | ||
| } | ||
|
|
||
| for quote := range Registry.QuoteDenoms() { | ||
| require.True(t, Registry.IsSupportedDenom(quote)) | ||
| } | ||
|
|
||
| t.Log("test an unsupported denom") | ||
| require.False(t, Registry.IsSupportedDenom("unsupported_denom")) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package denoms | ||
|
|
||
| const ( // stablecoins | ||
| USDC = "uusdc" | ||
| NUSD = "unusd" | ||
| USD = "uusd" | ||
| USDT = "uusdt" | ||
| ) | ||
|
|
||
| const ( // volatile assets | ||
| NIBI = "unibi" | ||
| BTC = "ubtc" | ||
| ETH = "ueth" | ||
| ATOM = "uatom" | ||
| OSMO = "uosmo" | ||
| AVAX = "uavax" | ||
| SOL = "usol" | ||
| BNB = "ubnb" | ||
| ADA = "uada" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.