Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow protorev to receive tokens #6932

Closed
wants to merge 5 commits into from
Closed

feat: allow protorev to receive tokens #6932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b84007
allow protorev to recieve tokens
czarcas7ic Nov 28, 2023
5a76c8d
changelog
czarcas7ic Nov 28, 2023
5ffba70
Merge branch 'main' into adam/protorev-allow-recieve-tokens
czarcas7ic Nov 29, 2023
dad348b
Merge branch 'main' into adam/protorev-allow-recieve-tokens
czarcas7ic Nov 30, 2023
cf4d1fc
chore: remove printing of accounts
PaddyMc Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* [#6836](https://github.com/osmosis-labs/osmosis/pull/6836) Add DenomsMetadata to stargate whitelist and fixs the DenomMetadata response type
* [#6814](https://github.com/osmosis-labs/osmosis/pull/6814) Add EstimateTradeBasedOnPriceImpact to stargate whitelist
* [#6859](https://github.com/osmosis-labs/osmosis/pull/6859) Add hooks to core CL operations (position creation/withdrawal and swaps)
* [#6932](https://github.com/osmosis-labs/osmosis/pull/6932) Allow protorev module to receive tokens
* [#6937](https://github.com/osmosis-labs/osmosis/pull/6937) Update wasmd to v0.45.0 and wasmvm to v1.5.0
* [#6949](https://github.com/osmosis-labs/osmosis/pull/6949) Valset withdraw rewards now considers all validators user is delegated to instead of valset

Expand Down
4 changes: 3 additions & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ import (
authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
"github.com/cosmos/cosmos-sdk/x/crisis"

protorevtypes "github.com/osmosis-labs/osmosis/v21/x/protorev/types"

"github.com/osmosis-labs/osmosis/v21/app/keepers"
"github.com/osmosis-labs/osmosis/v21/app/upgrades"
v10 "github.com/osmosis-labs/osmosis/v21/app/upgrades/v10"
Expand Down Expand Up @@ -110,7 +112,7 @@ var (
maccPerms = moduleAccountPermissions

// module accounts that are allowed to receive tokens.
allowedReceivingModAcc = map[string]bool{}
allowedReceivingModAcc = map[string]bool{authtypes.NewModuleAddress(protorevtypes.ModuleName).String(): true}

// TODO: Refactor wasm items into a wasm.go file
// WasmProposalsEnabled enables all x/wasm proposals when it's value is "true"
Expand Down