Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TRA-617] Fix calculation for atomic resolution #2360

Merged
merged 18 commits into from
Sep 26, 2024
Merged

[TRA-617] Fix calculation for atomic resolution #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
25d99e0
Add TransferToVault keeper method
shrenujb Sep 23, 2024
a03943b
Merge branch 'main' into tra617
shrenujb Sep 23, 2024
c6bb787
change name
shrenujb Sep 23, 2024
3c6074a
fix merge
shrenujb Sep 23, 2024
d40ab11
Integrate PML and Megavault
shrenujb Sep 24, 2024
84f1ebb
indexer gen
shrenujb Sep 24, 2024
e1d0d6c
fix lint and pregenesis json
shrenujb Sep 24, 2024
a2bcb7b
fix tests
shrenujb Sep 24, 2024
68f7397
fix new vault deposit amount
shrenujb Sep 25, 2024
2e94210
address comments and fix tests
shrenujb Sep 25, 2024
f82e1a6
fix some tests
shrenujb Sep 25, 2024
ab9aebd
change func name
shrenujb Sep 25, 2024
9aa85a3
Merge branch 'main' into tra617
shrenujb Sep 25, 2024
f976558
fix atomic resolution calculation
shrenujb Sep 25, 2024
8543977
fix test
shrenujb Sep 26, 2024
608b3f2
Merge branch 'main' into tra617
shrenujb Sep 26, 2024
3e7ba78
meh
shrenujb Sep 26, 2024
2f3eae2
Update protocol/x/listing/keeper/listing_test.go
shrenujb Sep 26, 2024
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
5 changes: 4 additions & 1 deletion protocol/x/listing/keeper/listing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ func (k Keeper) CreatePerpetual(
}

// calculate atomic resolution from reference price
atomicResolution := types.ResolutionOffset - int32(math.Floor(math.Log10(float64(metadata.ReferencePrice))))
// atomic resolution = -6 - (log10(referencePrice) - decimals)
atomicResolution := types.ResolutionOffset -
(int32(math.Floor(math.Log10(float64(metadata.ReferencePrice)))) -
int32(marketMapDetails.Ticker.Decimals))
shrenujb marked this conversation as resolved.
Show resolved Hide resolved

// Create a new perpetual
perpetual, err := k.PerpetualsKeeper.CreatePerpetual(
Expand Down
6 changes: 3 additions & 3 deletions protocol/x/listing/keeper/listing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func TestCreatePerpetual(t *testing.T) {
market := marketmaptypes.Market{
Ticker: marketmaptypes.Ticker{
CurrencyPair: oracletypes.CurrencyPair{Base: "TEST", Quote: "USD"},
Decimals: 6,
Decimals: 10,
MinProviderCount: 2,
Enabled: false,
Metadata_JSON: string(dydxMetadata),
Expand Down Expand Up @@ -185,8 +185,8 @@ func TestCreatePerpetual(t *testing.T) {
require.Equal(t, uint32(10), perpetual.GetId())
require.Equal(t, marketId, perpetual.Params.MarketId)
require.Equal(t, tc.ticker, perpetual.Params.Ticker)
// Expected resolution = -6 - Floor(log10(1000000000)) = -15
require.Equal(t, int32(-15), perpetual.Params.AtomicResolution)
// Expected resolution = -6 - (Floor(log10(1000000000))-10) = -5
require.Equal(t, int32(-5), perpetual.Params.AtomicResolution)
require.Equal(t, int32(types.DefaultFundingPpm), perpetual.Params.DefaultFundingPpm)
require.Equal(t, uint32(types.LiquidityTier_Isolated), perpetual.Params.LiquidityTier)
require.Equal(
Expand Down
Loading