Skip to content
GitLab
Commit 769c1c69 authored by Sunny Aggarwal's avatar Sunny Aggarwal
Browse files

in progress

parent 92ed4d96
Hide whitespace changes
Inline Side-by-side
Showing
with 194 additions and 31 deletions
+194 -31
proto/osmosis/gamm/v1beta1/genesis.proto
+ 10
- 0
View file @ 769c1c69
......@@ -13,6 +13,16 @@ message Params {
(gogoproto.moretags) = "yaml:\"pool_creation_fee\"",
(gogoproto.nullable) = false
];
string default_pool_swap_fee = 2 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.moretags) = "yaml:\"default_pool_swap_fee\"",
(gogoproto.nullable) = false
];
string default_pool_exit_fee = 3 [
(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
(gogoproto.moretags) = "yaml:\"default_pool_exit_fee\"",
(gogoproto.nullable) = false
];
}
option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types";
......
x/gamm/keeper/pool_service.go
+ 10
- 0
View file @ 769c1c69
......@@ -7,6 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/pkg/errors"
"github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/x/gamm/types"
......@@ -32,6 +33,15 @@ func (k Keeper) CreateBalancerPool(
// send pool creation fee to community pool
params := k.GetParams(ctx)
if !BalancerPoolParams.SwapFee.Equal(params.DefaultPoolSwapFee) {
return 0, errors.Wrapf(types.ErrInvalidSwapFee, "swap fee should be %s", params.DefaultPoolSwapFee)
}
if !BalancerPoolParams.ExitFee.Equal(params.DefaultPoolExitFee) {
return 0, errors.Wrapf(types.ErrInvalidExitFee, "exit fee should be %s", params.DefaultPoolExitFee)
}
err := k.distrKeeper.FundCommunityPool(ctx, params.PoolCreationFee, sender)
if err != nil {
return 0, err
......
x/gamm/types/errors.go
+ 2
- 0
View file @ 769c1c69
......@@ -24,6 +24,8 @@ var (
ErrNotPositiveCriteria = sdkerrors.Register(ModuleName, 29, "min out amount or max in amount should be positive")
ErrNotPositiveRequireAmount = sdkerrors.Register(ModuleName, 30, "required amount should be positive")
ErrTooManyTokensOut = sdkerrors.Register(ModuleName, 31, "tx is trying to get more tokens out of the pool than exist")
ErrInvalidSwapFee = sdkerrors.Register(ModuleName, 32, "swap fee is invalid")
ErrInvalidExitFee = sdkerrors.Register(ModuleName, 33, "exit fee is invalid")
ErrPoolParamsInvalidDenom = sdkerrors.Register(ModuleName, 50, "pool params' LBP params has an invalid denomination")
ErrPoolParamsInvalidNumDenoms = sdkerrors.Register(ModuleName, 51, "pool params' LBP doesn't have same number of params as underlying pool")
......
x/gamm/types/genesis.pb.go
+ 126
- 27
View file @ 769c1c69
......@@ -29,7 +29,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// Params holds parameters for the incentives module
type Params struct {
PoolCreationFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=pool_creation_fee,json=poolCreationFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"pool_creation_fee" yaml:"pool_creation_fee"`
PoolCreationFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=pool_creation_fee,json=poolCreationFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"pool_creation_fee" yaml:"pool_creation_fee"`
DefaultPoolSwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=default_pool_swap_fee,json=defaultPoolSwapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"default_pool_swap_fee" yaml:"default_pool_swap_fee"`
DefaultPoolExitFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=default_pool_exit_fee,json=defaultPoolExitFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"default_pool_exit_fee" yaml:"default_pool_exit_fee"`
}
func (m *Params) Reset() { *m = Params{} }
......@@ -143,32 +145,37 @@ func init() {
}
var fileDescriptor_5a324eb7f1dd793e = []byte{
// 390 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x3d, 0xeb, 0xd3, 0x40,
0x18, 0xcf, 0xf9, 0xff, 0xb7, 0x60, 0x2c, 0xbe, 0x84, 0x0e, 0x69, 0x87, 0xb4, 0x64, 0xca, 0x60,
0xef, 0x68, 0xc5, 0xc5, 0xcd, 0x14, 0x2a, 0x82, 0x48, 0x89, 0x9b, 0x4b, 0xb8, 0xc4, 0x6b, 0x0c,
0x26, 0xf7, 0x84, 0xdc, 0x55, 0x9a, 0x6f, 0x21, 0xb8, 0xbb, 0xb8, 0x39, 0xfb, 0x21, 0x8a, 0x53,
0x47, 0xa7, 0x2a, 0xed, 0x37, 0xf0, 0x13, 0xc8, 0xbd, 0x54, 0x0a, 0x4e, 0xc9, 0xef, 0x7e, 0x2f,
0xf7, 0x3c, 0xbf, 0xc4, 0x0d, 0x41, 0xd4, 0x20, 0x4a, 0x41, 0x0a, 0x5a, 0xd7, 0xe4, 0xe3, 0x3c,
0x63, 0x92, 0xce, 0x49, 0xc1, 0x38, 0x13, 0xa5, 0xc0, 0x4d, 0x0b, 0x12, 0xbc, 0x81, 0xd5, 0x60,
0xa5, 0x19, 0x0f, 0x0b, 0x28, 0x40, 0x13, 0x44, 0xbd, 0x19, 0xcd, 0x78, 0x54, 0x00, 0x14, 0x15,
0x23, 0x1a, 0x65, 0xdb, 0x0d, 0xa1, 0xbc, 0xbb, 0x50, 0xb9, 0xf6, 0xa7, 0xc6, 0x63, 0x80, 0xa5,
0x02, 0x83, 0x48, 0x46, 0x05, 0xfb, 0x77, 0x79, 0x0e, 0x25, 0x37, 0x7c, 0xf8, 0x05, 0xb9, 0xfd,
0x35, 0x6d, 0x69, 0x2d, 0xbc, 0xcf, 0xc8, 0x7d, 0xd4, 0x00, 0x54, 0x69, 0xde, 0x32, 0x2a, 0x4b,
0xe0, 0xe9, 0x86, 0x31, 0x1f, 0x4d, 0x6f, 0xa2, 0x7b, 0x8b, 0x11, 0xb6, 0xa9, 0x2a, 0x07, 0xdb,
0x1c, 0xbc, 0x84, 0x92, 0xc7, 0xaf, 0xf6, 0xc7, 0x89, 0xf3, 0xe7, 0x38, 0xf1, 0x3b, 0x5a, 0x57,
0xcf, 0xc2, 0xff, 0x12, 0xc2, 0x6f, 0xbf, 0x26, 0x51, 0x51, 0xca, 0xf7, 0xdb, 0x0c, 0xe7, 0x50,
0xdb, 0xf1, 0xec, 0x63, 0x26, 0xde, 0x7d, 0x20, 0xb2, 0x6b, 0x98, 0xd0, 0x61, 0x22, 0x79, 0xa0,
0xfc, 0x4b, 0x6b, 0x5f, 0x31, 0x16, 0x7e, 0x45, 0xee, 0xe0, 0x85, 0x29, 0xeb, 0x8d, 0xa4, 0x92,
0x79, 0x4f, 0xdd, 0x9e, 0xd2, 0x08, 0x3b, 0xd9, 0x10, 0x9b, 0x5e, 0xf0, 0xa5, 0x17, 0xfc, 0x9c,
0x77, 0xf1, 0xdd, 0x1f, 0xdf, 0x67, 0xbd, 0x35, 0x40, 0xf5, 0x32, 0x31, 0x6a, 0x2f, 0x72, 0x1f,
0x72, 0xb6, 0x93, 0xa9, 0x9e, 0x8f, 0x6f, 0xeb, 0x8c, 0xb5, 0xfe, 0x9d, 0x29, 0x8a, 0x6e, 0x93,
0xfb, 0xea, 0x5c, 0x69, 0x5f, 0xeb, 0x53, 0x6f, 0xe1, 0xf6, 0x1b, 0xdd, 0x88, 0x7f, 0x33, 0x45,
0xfa, 0x86, 0xeb, 0xaf, 0x83, 0x4d, 0x5b, 0xf1, 0xad, 0x5a, 0x3b, 0xb1, 0xca, 0x78, 0xb5, 0x3f,
0x05, 0xe8, 0x70, 0x0a, 0xd0, 0xef, 0x53, 0x80, 0x3e, 0x9d, 0x03, 0xe7, 0x70, 0x0e, 0x9c, 0x9f,
0xe7, 0xc0, 0x79, 0xfb, 0xf8, 0x6a, 0x75, 0x9b, 0x33, 0xab, 0x68, 0x26, 0x2e, 0x80, 0xec, 0xcc,
0x8f, 0xa1, 0x4b, 0xc8, 0xfa, 0x7a, 0x8b, 0x27, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x6a,
0x74, 0x74, 0x35, 0x02, 0x00, 0x00,
// 469 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
0x10, 0x8e, 0x49, 0x1b, 0xa9, 0x4b, 0xc5, 0x8f, 0x55, 0xa4, 0xb6, 0x42, 0x76, 0xe5, 0x03, 0xca,
0x81, 0xec, 0xaa, 0x45, 0x5c, 0xb8, 0xe1, 0x42, 0x10, 0x12, 0xaa, 0x2a, 0xf7, 0xc6, 0x25, 0x5a,
0xbb, 0x13, 0xb3, 0xc2, 0xde, 0xb1, 0xb2, 0x1b, 0x9a, 0x1c, 0x79, 0x03, 0x24, 0x1e, 0x01, 0x89,
0x03, 0x67, 0x1e, 0xa2, 0xe2, 0xd4, 0x23, 0xe2, 0x10, 0x50, 0xf2, 0x06, 0x7d, 0x02, 0xb4, 0x3f,
0x41, 0x45, 0xe4, 0xc0, 0xa1, 0x27, 0x7b, 0x66, 0xbe, 0xf9, 0xe6, 0x9b, 0xf1, 0x67, 0x92, 0xa0,
0xaa, 0x51, 0x09, 0xc5, 0x4a, 0x5e, 0xd7, 0xec, 0xdd, 0x7e, 0x0e, 0x9a, 0xef, 0xb3, 0x12, 0x24,
0x28, 0xa1, 0x68, 0x33, 0x42, 0x8d, 0xe1, 0xa6, 0xc7, 0x50, 0x83, 0xd9, 0xdd, 0x2a, 0xb1, 0x44,
0x5b, 0x60, 0xe6, 0xcd, 0x61, 0x76, 0x77, 0x4a, 0xc4, 0xb2, 0x02, 0x66, 0xa3, 0x7c, 0x3c, 0x64,
0x5c, 0x4e, 0x97, 0xa5, 0xc2, 0xf6, 0x0f, 0x5c, 0x8f, 0x0b, 0x7c, 0x29, 0x72, 0x11, 0xcb, 0xb9,
0x82, 0x3f, 0xc3, 0x0b, 0x14, 0xd2, 0xd5, 0x93, 0xcf, 0x6d, 0xd2, 0x39, 0xe6, 0x23, 0x5e, 0xab,
0xf0, 0x63, 0x40, 0xee, 0x36, 0x88, 0xd5, 0xa0, 0x18, 0x01, 0xd7, 0x02, 0xe5, 0x60, 0x08, 0xb0,
0x1d, 0xec, 0xb5, 0xbb, 0x37, 0x0f, 0x76, 0xa8, 0x67, 0x35, 0x3c, 0xd4, 0xf3, 0xd0, 0x43, 0x14,
0x32, 0x7d, 0x75, 0x3e, 0x8b, 0x5b, 0x97, 0xb3, 0x78, 0x7b, 0xca, 0xeb, 0xea, 0x49, 0xf2, 0x0f,
0x43, 0xf2, 0xe5, 0x67, 0xdc, 0x2d, 0x85, 0x7e, 0x33, 0xce, 0x69, 0x81, 0xb5, 0x97, 0xe7, 0x1f,
0x3d, 0x75, 0xfa, 0x96, 0xe9, 0x69, 0x03, 0xca, 0x92, 0xa9, 0xec, 0xb6, 0xe9, 0x3f, 0xf4, 0xed,
0x7d, 0x80, 0xf0, 0x7d, 0x40, 0xee, 0x9d, 0xc2, 0x90, 0x8f, 0x2b, 0x3d, 0xb0, 0xdc, 0xea, 0x8c,
0x37, 0x56, 0xd9, 0x8d, 0xbd, 0xa0, 0xbb, 0x91, 0x1e, 0x99, 0xf1, 0x3f, 0x66, 0xf1, 0x83, 0xff,
0x18, 0xf1, 0x0c, 0x8a, 0xcb, 0x59, 0x7c, 0xdf, 0x09, 0x5d, 0x49, 0x9a, 0x64, 0xa1, 0xcf, 0x1f,
0x23, 0x56, 0x27, 0x67, 0xbc, 0x59, 0xa9, 0x01, 0x26, 0x42, 0x5b, 0x0d, 0xed, 0x6b, 0xd4, 0xb0,
0x24, 0xfd, 0x5b, 0xc3, 0xf3, 0x89, 0xd0, 0x7d, 0x80, 0xe4, 0x53, 0x40, 0x36, 0x5f, 0x38, 0xd3,
0x9c, 0x68, 0xae, 0x21, 0x7c, 0x4c, 0xd6, 0x4d, 0x9b, 0xf2, 0x5f, 0x68, 0x8b, 0x3a, 0x7f, 0xd0,
0xa5, 0x3f, 0xe8, 0x53, 0x39, 0x4d, 0x37, 0xbe, 0x7d, 0xed, 0xad, 0x1b, 0x9a, 0x97, 0x99, 0x43,
0x87, 0x5d, 0x72, 0x47, 0xc2, 0xc4, 0x8f, 0x94, 0xe3, 0x3a, 0x87, 0x91, 0xbd, 0xe4, 0x5a, 0x76,
0xcb, 0xe4, 0x0d, 0xf6, 0xc8, 0x66, 0xc3, 0x03, 0xd2, 0x69, 0xac, 0x33, 0xec, 0x96, 0x66, 0xc2,
0x55, 0x97, 0x52, 0xe7, 0x9a, 0x74, 0xcd, 0xec, 0x9e, 0x79, 0x64, 0xda, 0x3f, 0x9f, 0x47, 0xc1,
0xc5, 0x3c, 0x0a, 0x7e, 0xcd, 0xa3, 0xe0, 0xc3, 0x22, 0x6a, 0x5d, 0x2c, 0xa2, 0xd6, 0xf7, 0x45,
0xd4, 0x7a, 0xfd, 0xf0, 0xca, 0x6d, 0x3c, 0x4f, 0xaf, 0xe2, 0xb9, 0x5a, 0x06, 0x6c, 0xe2, 0x7e,
0x10, 0x7b, 0xa5, 0xbc, 0x63, 0xb7, 0x78, 0xf4, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xd2, 0xc0,
0x0d, 0x3d, 0x03, 0x00, 0x00,
}
func (m *Params) Marshal() (dAtA []byte, err error) {
......@@ -191,6 +198,26 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
{
size := m.DefaultPoolExitFee.Size()
i -= size
if _, err := m.DefaultPoolExitFee.MarshalTo(dAtA[i:]); err != nil {
return 0, err
}
i = encodeVarintGenesis(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x1a
{
size := m.DefaultPoolSwapFee.Size()
i -= size
if _, err := m.DefaultPoolSwapFee.MarshalTo(dAtA[i:]); err != nil {
return 0, err
}
i = encodeVarintGenesis(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0x12
if len(m.PoolCreationFee) > 0 {
for iNdEx := len(m.PoolCreationFee) - 1; iNdEx >= 0; iNdEx-- {
{
......@@ -283,6 +310,10 @@ func (m *Params) Size() (n int) {
n += 1 + l + sovGenesis(uint64(l))
}
}
l = m.DefaultPoolSwapFee.Size()
n += 1 + l + sovGenesis(uint64(l))
l = m.DefaultPoolExitFee.Size()
n += 1 + l + sovGenesis(uint64(l))
return n
}
......@@ -375,6 +406,74 @@ func (m *Params) Unmarshal(dAtA []byte) error {
return err
}
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field DefaultPoolSwapFee", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenesis
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthGenesis
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthGenesis
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.DefaultPoolSwapFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field DefaultPoolExitFee", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenesis
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
stringLen |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
intStringLen := int(stringLen)
if intStringLen < 0 {
return ErrInvalidLengthGenesis
}
postIndex := iNdEx + intStringLen
if postIndex < 0 {
return ErrInvalidLengthGenesis
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.DefaultPoolExitFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipGenesis(dAtA[iNdEx:])
......
x/gamm/types/params.go
+ 46
- 4
View file @ 769c1c69
......@@ -10,7 +10,9 @@ import (
// Parameter store keys
var (
KeyPoolCreationFee = []byte("PoolCreationFee")
KeyPoolCreationFee = []byte("PoolCreationFee")
KeyDefaultPoolSwapFee = []byte("DefaultPoolSwapFee")
KeyDefaultPoolExitFee = []byte("DefaultPoolExitFee")
)
// ParamTable for gamm module.
......@@ -18,16 +20,20 @@ func ParamKeyTable() paramtypes.KeyTable {
return paramtypes.NewKeyTable().RegisterParamSet(&Params{})
}
func NewParams(poolCreationFee sdk.Coins) Params {
func NewParams(poolCreationFee sdk.Coins, defaultPoolSwapFee, defaultPoolExitFee sdk.Dec) Params {
return Params{
PoolCreationFee: poolCreationFee,
PoolCreationFee: poolCreationFee,
DefaultPoolSwapFee: defaultPoolSwapFee,
DefaultPoolExitFee: defaultPoolExitFee,
}
}
// default gamm module parameters
func DefaultParams() Params {
return Params{
PoolCreationFee: sdk.Coins{sdk.NewInt64Coin(appparams.BaseCoinUnit, 1000_000_000)}, // 1000 OSMO
PoolCreationFee: sdk.Coins{sdk.NewInt64Coin(appparams.BaseCoinUnit, 1000_000_000)}, // 1000 OSMO
DefaultPoolSwapFee: sdk.MustNewDecFromStr("0.02"), // 1000 OSMO
DefaultPoolExitFee: sdk.MustNewDecFromStr("0"), // 1000 OSMO
}
}
......@@ -37,6 +43,14 @@ func (p Params) Validate() error {
return err
}
if err := validateDefaultPoolSwapFee(p.DefaultPoolSwapFee); err != nil {
return err
}
if err := validateDefaultPoolExitFee(p.DefaultPoolExitFee); err != nil {
return err
}
return nil
}
......@@ -45,6 +59,8 @@ func (p Params) Validate() error {
func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
return paramtypes.ParamSetPairs{
paramtypes.NewParamSetPair(KeyPoolCreationFee, &p.PoolCreationFee, validatePoolCreationFee),
paramtypes.NewParamSetPair(KeyDefaultPoolSwapFee, &p.DefaultPoolSwapFee, validateDefaultPoolSwapFee),
paramtypes.NewParamSetPair(KeyDefaultPoolExitFee, &p.DefaultPoolExitFee, validateDefaultPoolExitFee),
}
}
......@@ -60,3 +76,29 @@ func validatePoolCreationFee(i interface{}) error {
return nil
}
func validateDefaultPoolSwapFee(i interface{}) error {
v, ok := i.(sdk.Dec)
if !ok {
return fmt.Errorf("invalid parameter type: %T", i)
}
if v.LT(sdk.ZeroDec()) || v.GT(sdk.OneDec()) {
return fmt.Errorf("invalid default pool swap fee: %+v", i)
}
return nil
}
func validateDefaultPoolExitFee(i interface{}) error {
v, ok := i.(sdk.Dec)
if !ok {
return fmt.Errorf("invalid parameter type: %T", i)
}
if v.LT(sdk.ZeroDec()) || v.GT(sdk.OneDec()) {
return fmt.Errorf("invalid default pool exit fee: %+v", i)
}
return nil
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment