mirror of
				https://github.com/0glabs/0g-chain.git
				synced 2025-11-04 08:27:51 +00:00 
			
		
		
		
	Merge pull request #63 from Solovyov1796/local-dev
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Continuous Integration (Commit) / lint (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Continuous Integration (Commit) / lint (push) Has been cancelled
				
			add conuncil back
This commit is contained in:
		
						commit
						568ff70ad7
					
				@ -669,6 +669,7 @@ func NewApp(
 | 
				
			|||||||
		evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper, app.accountKeeper),
 | 
							evmutil.NewAppModule(app.evmutilKeeper, app.bankKeeper, app.accountKeeper),
 | 
				
			||||||
		// nil InflationCalculationFn, use SDK's default inflation function
 | 
							// nil InflationCalculationFn, use SDK's default inflation function
 | 
				
			||||||
		mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace),
 | 
							mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace),
 | 
				
			||||||
 | 
							council.NewAppModule(app.CouncilKeeper),
 | 
				
			||||||
		ibcwasm.NewAppModule(app.ibcWasmClientKeeper),
 | 
							ibcwasm.NewAppModule(app.ibcWasmClientKeeper),
 | 
				
			||||||
		dasigners.NewAppModule(app.dasignersKeeper, *app.stakingKeeper),
 | 
							dasigners.NewAppModule(app.dasignersKeeper, *app.stakingKeeper),
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
@ -712,6 +713,7 @@ func NewApp(
 | 
				
			|||||||
		paramstypes.ModuleName,
 | 
							paramstypes.ModuleName,
 | 
				
			||||||
		authz.ModuleName,
 | 
							authz.ModuleName,
 | 
				
			||||||
		evmutiltypes.ModuleName,
 | 
							evmutiltypes.ModuleName,
 | 
				
			||||||
 | 
							counciltypes.ModuleName,
 | 
				
			||||||
		consensusparamtypes.ModuleName,
 | 
							consensusparamtypes.ModuleName,
 | 
				
			||||||
		packetforwardtypes.ModuleName,
 | 
							packetforwardtypes.ModuleName,
 | 
				
			||||||
		ibcwasmtypes.ModuleName,
 | 
							ibcwasmtypes.ModuleName,
 | 
				
			||||||
@ -747,6 +749,7 @@ func NewApp(
 | 
				
			|||||||
		authz.ModuleName,
 | 
							authz.ModuleName,
 | 
				
			||||||
		evmutiltypes.ModuleName,
 | 
							evmutiltypes.ModuleName,
 | 
				
			||||||
		minttypes.ModuleName,
 | 
							minttypes.ModuleName,
 | 
				
			||||||
 | 
							counciltypes.ModuleName,
 | 
				
			||||||
		consensusparamtypes.ModuleName,
 | 
							consensusparamtypes.ModuleName,
 | 
				
			||||||
		packetforwardtypes.ModuleName,
 | 
							packetforwardtypes.ModuleName,
 | 
				
			||||||
		ibcwasmtypes.ModuleName,
 | 
							ibcwasmtypes.ModuleName,
 | 
				
			||||||
@ -780,6 +783,7 @@ func NewApp(
 | 
				
			|||||||
		paramstypes.ModuleName,
 | 
							paramstypes.ModuleName,
 | 
				
			||||||
		upgradetypes.ModuleName,
 | 
							upgradetypes.ModuleName,
 | 
				
			||||||
		validatorvestingtypes.ModuleName,
 | 
							validatorvestingtypes.ModuleName,
 | 
				
			||||||
 | 
							counciltypes.ModuleName,
 | 
				
			||||||
		consensusparamtypes.ModuleName,
 | 
							consensusparamtypes.ModuleName,
 | 
				
			||||||
		packetforwardtypes.ModuleName,
 | 
							packetforwardtypes.ModuleName,
 | 
				
			||||||
		crisistypes.ModuleName, // runs the invariants at genesis, should run after other modules
 | 
							crisistypes.ModuleName, // runs the invariants at genesis, should run after other modules
 | 
				
			||||||
 | 
				
			|||||||
@ -12,7 +12,6 @@ import (
 | 
				
			|||||||
	sdk "github.com/cosmos/cosmos-sdk/types"
 | 
						sdk "github.com/cosmos/cosmos-sdk/types"
 | 
				
			||||||
	"github.com/cosmos/cosmos-sdk/types/module"
 | 
						"github.com/cosmos/cosmos-sdk/types/module"
 | 
				
			||||||
	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 | 
						simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 | 
				
			||||||
	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 | 
					 | 
				
			||||||
	"github.com/gorilla/mux"
 | 
						"github.com/gorilla/mux"
 | 
				
			||||||
	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 | 
						"github.com/grpc-ecosystem/grpc-gateway/runtime"
 | 
				
			||||||
	"github.com/spf13/cobra"
 | 
						"github.com/spf13/cobra"
 | 
				
			||||||
@ -97,18 +96,18 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command {
 | 
				
			|||||||
type AppModule struct {
 | 
					type AppModule struct {
 | 
				
			||||||
	AppModuleBasic
 | 
						AppModuleBasic
 | 
				
			||||||
	keeper keeper.Keeper
 | 
						keeper keeper.Keeper
 | 
				
			||||||
	sk     stakingkeeper.Keeper
 | 
						// sk     stakingkeeper.Keeper
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// NewAppModule creates a new AppModule Object
 | 
					// NewAppModule creates a new AppModule Object
 | 
				
			||||||
func NewAppModule(
 | 
					func NewAppModule(
 | 
				
			||||||
	k keeper.Keeper,
 | 
						k keeper.Keeper,
 | 
				
			||||||
	sk stakingkeeper.Keeper,
 | 
						// sk stakingkeeper.Keeper,
 | 
				
			||||||
) AppModule {
 | 
					) AppModule {
 | 
				
			||||||
	return AppModule{
 | 
						return AppModule{
 | 
				
			||||||
		AppModuleBasic: AppModuleBasic{},
 | 
							AppModuleBasic: AppModuleBasic{},
 | 
				
			||||||
		keeper:         k,
 | 
							keeper:         k,
 | 
				
			||||||
		sk:             sk,
 | 
							// sk:             sk,
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user