Skip to content

Commit

Permalink
feat(txfees): added charge fees method (#76)
Browse files Browse the repository at this point in the history
Co-authored-by: Omri <[email protected]>
  • Loading branch information
keruch and omritoptix authored Nov 4, 2024
1 parent 20c9dec commit 91342c9
Show file tree
Hide file tree
Showing 23 changed files with 1,156 additions and 255 deletions.
5 changes: 4 additions & 1 deletion app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,9 @@ func New(
appCodec, keys[gammtypes.StoreKey],
app.GetSubspace(gammtypes.ModuleName),
app.AccountKeeper,
app.BankKeeper, app.DistrKeeper)
app.BankKeeper,
app.DistrKeeper,
)
app.GAMMKeeper = &gammKeeper

app.PoolManagerKeeper = poolmanagerkeeper.NewKeeper(
Expand All @@ -472,6 +474,7 @@ func New(
app.BankKeeper,
app.PoolManagerKeeper,
app.GAMMKeeper,
app.DistrKeeper,
)
app.TxFeesKeeper = &txfeeskeeper
app.GAMMKeeper.SetPoolManager(app.PoolManagerKeeper)
Expand Down
45 changes: 24 additions & 21 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
module github.com/osmosis-labs/osmosis/v15

go 1.21
go 1.22.4

toolchain go1.22.4
toolchain go1.23.2

require (
cosmossdk.io/math v1.3.0
cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d
github.com/cometbft/cometbft v0.37.5
github.com/cometbft/cometbft-db v0.11.0
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.47.12
github.com/cosmos/cosmos-sdk v0.47.13
github.com/cosmos/iavl v0.20.1
github.com/dymensionxyz/sdk-utils v0.2.12
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/golangci/golangci-lint v1.51.2
Expand All @@ -24,20 +25,20 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe
google.golang.org/grpc v1.62.1
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v2 v2.4.0
mvdan.cc/gofumpt v0.4.0
)

require (
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.25.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/storage v1.36.0 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
cloud.google.com/go/storage v1.38.0 // indirect
cosmossdk.io/errors v1.0.1 // indirect
github.com/Abirdcfly/dupword v0.0.9 // indirect
github.com/Djarvur/go-err113 v0.1.0 // indirect
Expand Down Expand Up @@ -69,9 +70,9 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-getter v1.7.1 // indirect
github.com/hashicorp/go-getter v1.7.5 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.2 // indirect
Expand Down Expand Up @@ -111,11 +112,11 @@ require (
go.uber.org/goleak v1.1.12 // indirect
go.uber.org/multierr v1.10.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/oauth2 v0.16.0 // indirect
google.golang.org/api v0.155.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
google.golang.org/api v0.169.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Expand Down Expand Up @@ -187,7 +188,7 @@ require (
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-toolsmith/astcast v1.1.0 // indirect
github.com/go-toolsmith/astcopy v1.0.3 // indirect
Expand Down Expand Up @@ -334,11 +335,11 @@ require (
gitlab.com/bosi/decorder v0.2.3 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 // indirect
golang.org/x/mod v0.12.0 // indirect
Expand Down Expand Up @@ -371,5 +372,7 @@ replace (
// broken goleveldb
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29

golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
)
Loading

0 comments on commit 91342c9

Please sign in to comment.