Skip to content

Commit

Permalink
fee whitelist
Browse files Browse the repository at this point in the history
  • Loading branch information
beer-1 committed Apr 16, 2024
1 parent 061dbd2 commit da5c155
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 64 deletions.
9 changes: 6 additions & 3 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ import (

opchild "github.com/initia-labs/OPinit/x/opchild"
opchildkeeper "github.com/initia-labs/OPinit/x/opchild/keeper"
opchildlanes "github.com/initia-labs/OPinit/x/opchild/lanes"
opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
initialanes "github.com/initia-labs/initia/app/lanes"

Expand All @@ -144,7 +145,6 @@ import (
appante "github.com/initia-labs/minimove/app/ante"
apphook "github.com/initia-labs/minimove/app/hook"
appkeepers "github.com/initia-labs/minimove/app/keepers"
applanes "github.com/initia-labs/minimove/app/lanes"

// unnamed import of statik for swagger UI support
_ "github.com/initia-labs/minimove/client/docs/statik"
Expand Down Expand Up @@ -714,7 +714,7 @@ func NewMinitiaApp(
app.keys[auctiontypes.StoreKey],
app.AccountKeeper,
app.BankKeeper,
applanes.NewRewardsAddressProvider(authtypes.FeeCollectorName),
opchildlanes.NewRewardsAddressProvider(authtypes.FeeCollectorName),
authorityAddr,
)
app.AuctionKeeper = &auctionKeeper
Expand Down Expand Up @@ -872,7 +872,10 @@ func NewMinitiaApp(
MaxTxs: 100,
SignerExtractor: signerExtractor,
}
freeLane := initialanes.NewFreeLane(freeConfig, applanes.FreeLaneMatchHandler())
freeLane := initialanes.NewFreeLane(
freeConfig,
opchildlanes.NewFreeLaneMatchHandler(ac, app.OPChildKeeper).MatchHandler(),
)

defaultLaneConfig := blockbase.LaneConfig{
Logger: app.Logger(),
Expand Down
29 changes: 0 additions & 29 deletions app/lanes/free.go

This file was deleted.

27 changes: 0 additions & 27 deletions app/lanes/mev.go

This file was deleted.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/cosmos/ibc-go/v8 v8.2.0
github.com/golang/mock v1.6.0
github.com/gorilla/mux v1.8.1
github.com/initia-labs/OPinit v0.2.3
github.com/initia-labs/OPinit v0.2.4
github.com/initia-labs/initia v0.2.4
// we also need to update `LIBMOVEVM_VERSION` of images/private/Dockerfile#5
github.com/initia-labs/movevm v0.2.5
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -722,10 +722,10 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/initia-labs/OPinit v0.2.3 h1:QWjYlHi2ibQ972PU1sJF03P3B/NWrZecVvrbm/CWbFE=
github.com/initia-labs/OPinit v0.2.3/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e h1:PxrLVIOox7+r2M1nV6KtlIZtVSEONdkh6oyklduJMHc=
github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
github.com/initia-labs/OPinit v0.2.4 h1:hb/7KzuwL8HK0lsXHaeAq6Y2XfaYkbzGlBKnlIQKkQY=
github.com/initia-labs/OPinit v0.2.4/go.mod h1:pr1BXooQo/vKwt1tGsaKMI0gH+bJ+FgUImE1uXwwGhc=
github.com/initia-labs/OPinit/api v0.2.4 h1:W4OxVmCLwgcK5paZLTWeFt3EaknBG54+5IEB57lVgcY=
github.com/initia-labs/OPinit/api v0.2.4/go.mod h1:wo2P41YSL9kQ+/PvHN5HIp5ICAmKvE39QQEQKbsxqm4=
github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf h1:7k3u0huB7OpiDfQKnfcwKUvByl7HyYs3itgROO/YpFg=
github.com/initia-labs/cometbft v0.0.0-20240104081544-34081fc84daf/go.mod h1:PIi48BpzwlHqtV3mzwPyQgOyOnU94BNBimLS2ebBHOg=
github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21 h1:AwqnO5IR+3LWzjqR33MzOkce38ExWLtQwlqrLZVrMyw=
Expand Down

0 comments on commit da5c155

Please sign in to comment.