From 6b840078cb4842b651f83debca1652b77a880bfb Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Mon, 27 Nov 2023 19:34:32 -0700 Subject: [PATCH 1/3] allow protorev to recieve tokens --- app/app.go | 4 +++- app/blocked.go | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index 7179f312154..14e32da8b8a 100644 --- a/app/app.go +++ b/app/app.go @@ -70,6 +70,8 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" "github.com/cosmos/cosmos-sdk/x/crisis" + protorevtypes "github.com/osmosis-labs/osmosis/v20/x/protorev/types" + "github.com/osmosis-labs/osmosis/v20/app/keepers" "github.com/osmosis-labs/osmosis/v20/app/upgrades" v10 "github.com/osmosis-labs/osmosis/v20/app/upgrades/v10" @@ -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" diff --git a/app/blocked.go b/app/blocked.go index 71c43d936cd..f36d6086acd 100644 --- a/app/blocked.go +++ b/app/blocked.go @@ -1,6 +1,7 @@ package app import ( + "fmt" "strings" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -11,6 +12,7 @@ import ( func (app *OsmosisApp) BlockedAddrs() map[string]bool { blockedAddrs := make(map[string]bool) for acc := range maccPerms { + fmt.Println("acc: ", acc) blockedAddrs[authtypes.NewModuleAddress(acc).String()] = !allowedReceivingModAcc[acc] } From 5a76c8d08c06d7ec0a4f93596a7374f826b36e71 Mon Sep 17 00:00:00 2001 From: Adam Tucker Date: Mon, 27 Nov 2023 19:36:38 -0700 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e846c5e568..813f564069c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,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 ### Misc Improvements From cf4d1fc552761dd7c26a2d179babda29fed20325 Mon Sep 17 00:00:00 2001 From: PaddyMc Date: Thu, 30 Nov 2023 13:10:40 +0000 Subject: [PATCH 3/3] chore: remove printing of accounts --- app/blocked.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/blocked.go b/app/blocked.go index f36d6086acd..71c43d936cd 100644 --- a/app/blocked.go +++ b/app/blocked.go @@ -1,7 +1,6 @@ package app import ( - "fmt" "strings" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -12,7 +11,6 @@ import ( func (app *OsmosisApp) BlockedAddrs() map[string]bool { blockedAddrs := make(map[string]bool) for acc := range maccPerms { - fmt.Println("acc: ", acc) blockedAddrs[authtypes.NewModuleAddress(acc).String()] = !allowedReceivingModAcc[acc] }