Skip to content

Commit e3bc02f

Browse files
committed
add fee-burn module
1 parent e56e870 commit e3bc02f

28 files changed

+2312
-164
lines changed

Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,11 @@ install: go.sum
9292

9393
build:
9494
go build $(BUILD_FLAGS) -o bin/migalood ./cmd/migalood
95+
96+
containerProtoVer=0.13.0
97+
containerProtoImage=ghcr.io/cosmos/proto-builder:$(containerProtoVer)
98+
99+
proto-gen:
100+
@echo "Generating Protobuf files"
101+
@$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(containerProtoImage) \
102+
sh ./scripts/protocgen.sh;

app/app.go

+21
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@ import (
103103
bank "github.com/terra-money/alliance/custom/bank"
104104
custombankkeeper "github.com/terra-money/alliance/custom/bank/keeper"
105105

106+
feeburnmodule "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/x/feeburn"
107+
feeburnmodulekeeper "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/x/feeburn/keeper"
108+
feeburnmoduletypes "github.com/White-Whale-Defi-Platform/migaloo-chain/v3/x/feeburn/types"
109+
106110
// use TFL's ibc-hooks from Osmosis' ibc-hooks
107111
ibchooks "github.com/terra-money/core/v2/x/ibc-hooks"
108112
ibchookskeeper "github.com/terra-money/core/v2/x/ibc-hooks/keeper"
@@ -240,6 +244,7 @@ var (
240244
ibcfee.AppModuleBasic{},
241245
ibchooks.AppModuleBasic{},
242246
globalfee.AppModule{},
247+
feeburnmodule.AppModule{},
243248
)
244249

245250
// module account permissions
@@ -302,6 +307,7 @@ type MigalooApp struct {
302307
TokenFactoryKeeper tokenfactorykeeper.Keeper
303308
FeeGrantKeeper feegrantkeeper.Keeper
304309
AuthzKeeper authzkeeper.Keeper
310+
FeeburnKeeper feeburnmodulekeeper.Keeper
305311
WasmKeeper wasm.Keeper
306312
RouterKeeper routerkeeper.Keeper
307313

@@ -594,6 +600,13 @@ func NewMigalooApp(
594600
// For wasmd we use the demo controller from https://github.com/cosmos/interchain-accounts but see notes below
595601
app.InterTxKeeper = intertxkeeper.NewKeeper(appCodec, keys[intertxtypes.StoreKey], app.ICAControllerKeeper, scopedInterTxKeeper)
596602

603+
app.FeeburnKeeper = *feeburnmodulekeeper.NewKeeper(
604+
appCodec,
605+
keys[feeburnmoduletypes.StoreKey],
606+
keys[feeburnmoduletypes.MemStoreKey],
607+
authtypes.NewModuleAddress(govtypes.ModuleName),
608+
)
609+
597610
// create evidence keeper with router
598611
evidenceKeeper := evidencekeeper.NewKeeper(
599612
appCodec,
@@ -754,6 +767,7 @@ func NewMigalooApp(
754767
router.NewAppModule(&app.RouterKeeper),
755768
ibchooks.NewAppModule(app.AccountKeeper),
756769
globalfee.NewAppModule(app.GetSubspace(globalfee.ModuleName)),
770+
feeburnmodule.NewAppModule(appCodec, app.FeeburnKeeper, app.AccountKeeper, app.BankKeeper),
757771
crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), // always be last to make sure that it checks for all invariants and not only part of them
758772
)
759773

@@ -778,6 +792,7 @@ func NewMigalooApp(
778792
feegrant.ModuleName,
779793
paramstypes.ModuleName,
780794
vestingtypes.ModuleName,
795+
feeburnmoduletypes.ModuleName,
781796
// additional non simd modules
782797
routertypes.ModuleName,
783798
ibctransfertypes.ModuleName,
@@ -809,6 +824,7 @@ func NewMigalooApp(
809824
paramstypes.ModuleName,
810825
upgradetypes.ModuleName,
811826
vestingtypes.ModuleName,
827+
feeburnmoduletypes.ModuleName,
812828
// additional non simd modules
813829
routertypes.ModuleName,
814830
ibctransfertypes.ModuleName,
@@ -847,6 +863,7 @@ func NewMigalooApp(
847863
paramstypes.ModuleName,
848864
upgradetypes.ModuleName,
849865
vestingtypes.ModuleName,
866+
feeburnmoduletypes.ModuleName,
850867
// additional non simd modules
851868
routertypes.ModuleName,
852869
ibctransfertypes.ModuleName,
@@ -893,6 +910,7 @@ func NewMigalooApp(
893910
ibc.NewAppModule(app.IBCKeeper),
894911
icaModule,
895912
transfer.NewAppModule(app.TransferKeeper),
913+
feeburnmodule.NewAppModule(appCodec, app.FeeburnKeeper, app.AccountKeeper, app.BankKeeper),
896914
alliancemodule.NewAppModule(appCodec, app.AllianceKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
897915
)
898916

@@ -935,6 +953,8 @@ func NewMigalooApp(
935953
GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName),
936954
StakingSubspace: app.GetSubspace(stakingtypes.ModuleName),
937955
TXCounterStoreKey: keys[wasm.StoreKey],
956+
BankKeeper: app.BankKeeper,
957+
FeeburnKeeper: &app.FeeburnKeeper,
938958
},
939959
)
940960
if err != nil {
@@ -1197,6 +1217,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
11971217
paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
11981218
paramsKeeper.Subspace(wasm.ModuleName)
11991219
paramsKeeper.Subspace(routertypes.ModuleName)
1220+
paramsKeeper.Subspace(feeburnmoduletypes.ModuleName)
12001221
paramsKeeper.Subspace(alliancemoduletypes.ModuleName)
12011222
paramsKeeper.Subspace(globalfee.ModuleName)
12021223

0 commit comments

Comments
 (0)