Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
godismercilex committed Oct 9, 2023
1 parent dfeefb9 commit c399854
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 0 additions & 2 deletions proto/nibiru/perp/v2/genesis.proto
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ message GenesisState {
Discount discount = 2;
}

repeated nibiru.perp.v2.GenesisMarketLastVersion market_last_versions = 10
[ (gogoproto.nullable) = false ];
message Rebate {
string rebate = 1 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
Expand Down
3 changes: 2 additions & 1 deletion x/perp/v2/keeper/dnr.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import (

"cosmossdk.io/math"
"github.com/NibiruChain/collections"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/NibiruChain/nibiru/x/common/denoms"
"github.com/NibiruChain/nibiru/x/perp/v2/types"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/NibiruChain/nibiru/x/common/asset"
)
Expand Down

0 comments on commit c399854

Please sign in to comment.