Skip to content

Commit

Permalink
Add local cache inside the takerfee (#8148)
Browse files Browse the repository at this point in the history
* Add local cache inside the takerfee

* add error handling

* Add Changelog

* Fix cache per @adam's comment

* Update x/poolmanager/taker_fee.go
  • Loading branch information
ValarDragon authored May 13, 2024
1 parent 4e2949c commit b8fd642
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

* [#8128](https://github.com/osmosis-labs/osmosis/pull/8128) Cache the result for poolmanager.GetPoolModule
* [#8148](https://github.com/osmosis-labs/osmosis/pull/8148) Remove the deserialization time for GetDefaultTakerFee()

## v25.0.0

Expand Down
3 changes: 3 additions & 0 deletions x/poolmanager/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ type Keeper struct {
poolModules []types.PoolModuleI

paramSpace paramtypes.Subspace

defaultTakerFeeBz []byte
defaultTakerFeeVal sdk.Dec
}

func NewKeeper(storeKey storetypes.StoreKey, paramSpace paramtypes.Subspace, gammKeeper types.PoolModuleI, concentratedKeeper types.PoolModuleI, cosmwasmpoolKeeper types.PoolModuleI, bankKeeper types.BankI, accountKeeper types.AccountI, communityPoolKeeper types.CommunityPoolI, stakingKeeper types.StakingKeeper, protorevKeeper types.ProtorevKeeper) *Keeper {
Expand Down
18 changes: 14 additions & 4 deletions x/poolmanager/taker_fee.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package poolmanager

import (
"bytes"
"encoding/json"
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand All @@ -12,10 +14,18 @@ import (
txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types"
)

func (k Keeper) GetDefaultTakerFee(ctx sdk.Context) sdk.Dec {
var defaultTakerFee sdk.Dec
k.paramSpace.Get(ctx, types.KeyDefaultTakerFee, &defaultTakerFee)
return defaultTakerFee
func (k *Keeper) GetDefaultTakerFee(ctx sdk.Context) sdk.Dec {
defaultTakerFeeBz := k.paramSpace.GetRaw(ctx, types.KeyDefaultTakerFee)
if !bytes.Equal(defaultTakerFeeBz, k.defaultTakerFeeBz) {
var defaultTakerFeeValue sdk.Dec
err := json.Unmarshal(defaultTakerFeeBz, &defaultTakerFeeValue)
if err != nil {
defaultTakerFeeValue = sdk.ZeroDec()
}
k.defaultTakerFeeBz = defaultTakerFeeBz
k.defaultTakerFeeVal = defaultTakerFeeValue
}
return k.defaultTakerFeeVal
}

// SetDenomPairTakerFee sets the taker fee for the given trading pair.
Expand Down

0 comments on commit b8fd642

Please sign in to comment.