From e3c6ae63bf7dd9ea2824190f5f52a500fc5be0f7 Mon Sep 17 00:00:00 2001 From: Dreamer <745124335@qq.com> Date: Tue, 11 Jul 2023 14:17:25 +0800 Subject: [PATCH 1/9] fix upgrade error --- app/app.go | 226 +++++++++++++++++++++++++++++++++++++++++++-------- app/patch.go | 33 ++++++++ 2 files changed, 223 insertions(+), 36 deletions(-) create mode 100644 app/patch.go diff --git a/app/app.go b/app/app.go index cc4d9205..5ebf6121 100644 --- a/app/app.go +++ b/app/app.go @@ -196,7 +196,10 @@ var ( sidechaintypes.ModuleName: nil, // evm - evmtypes.ModuleName: {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account + evmtypes.ModuleName: { + authtypes.Minter, + authtypes.Burner, + }, // used for secure addition and subtraction of balance using module account } // module accounts that are allowed to receive tokens allowedReceivingModAcc = map[string]bool{} @@ -284,12 +287,21 @@ type IritaApp struct { // module configurator configurator module.Configurator + bte *BlockTimerExecutor } // NewIritaApp returns a reference to an initialized IritaApp. func NewIritaApp( - logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool, - homePath string, invCheckPeriod uint, encodingConfig simappparams.EncodingConfig, appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp), + logger log.Logger, + db dbm.DB, + traceStore io.Writer, + loadLatest bool, + skipUpgradeHeights map[int64]bool, + homePath string, + invCheckPeriod uint, + encodingConfig simappparams.EncodingConfig, + appOpts servertypes.AppOptions, + baseAppOptions ...func(*baseapp.BaseApp), ) *IritaApp { // TODO: Remove cdc in favor of appCodec once all modules are migrated. @@ -299,7 +311,12 @@ func NewIritaApp( cdc := encodingConfig.Amino interfaceRegistry := encodingConfig.InterfaceRegistry - bApp := baseapp.NewBaseApp(appName, logger, db, encodingConfig.TxConfig.TxDecoder(), baseAppOptions...) + bApp := baseapp.NewBaseApp( + appName, + logger, + db, + encodingConfig.TxConfig.TxDecoder(), + baseAppOptions...) bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetVersion(version.Version) bApp.SetInterfaceRegistry(interfaceRegistry) @@ -343,30 +360,69 @@ func NewIritaApp( keys: keys, tkeys: tkeys, memKeys: memKeys, + bte: NewBlockTimerExecutor(), } - app.paramsKeeper = initParamsKeeper(appCodec, cdc, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey]) + app.paramsKeeper = initParamsKeeper( + appCodec, + cdc, + keys[paramstypes.StoreKey], + tkeys[paramstypes.TStoreKey], + ) // set the BaseApp's parameter store - bApp.SetParamStore(app.paramsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramskeeper.ConsensusParamsKeyTable())) + bApp.SetParamStore( + app.paramsKeeper.Subspace(baseapp.Paramspace). + WithKeyTable(paramskeeper.ConsensusParamsKeyTable()), + ) // add keepers app.accountKeeper = authkeeper.NewAccountKeeper( - appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, + appCodec, + keys[authtypes.StoreKey], + app.GetSubspace(authtypes.ModuleName), + authtypes.ProtoBaseAccount, + maccPerms, ) app.bankKeeper = bankkeeper.NewBaseKeeper( - appCodec, keys[banktypes.StoreKey], app.accountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), + appCodec, + keys[banktypes.StoreKey], + app.accountKeeper, + app.GetSubspace(banktypes.ModuleName), + app.ModuleAccountAddrs(), + ) + app.nodeKeeper = node.NewKeeper( + appCodec, + keys[nodetypes.StoreKey], + app.GetSubspace(node.ModuleName), ) - app.nodeKeeper = node.NewKeeper(appCodec, keys[nodetypes.StoreKey], app.GetSubspace(node.ModuleName)) app.slashingKeeper = slashingkeeper.NewKeeper( - appCodec, keys[slashingtypes.StoreKey], &app.nodeKeeper, app.GetSubspace(slashingtypes.ModuleName), + appCodec, + keys[slashingtypes.StoreKey], + &app.nodeKeeper, + app.GetSubspace(slashingtypes.ModuleName), ) app.crisisKeeper = crisiskeeper.NewKeeper( - app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.bankKeeper, authtypes.FeeCollectorName, + app.GetSubspace( + crisistypes.ModuleName, + ), + invCheckPeriod, + app.bankKeeper, + authtypes.FeeCollectorName, + ) + app.feeGrantKeeper = feegrantkeeper.NewKeeper( + appCodec, + keys[feegrant.StoreKey], + app.accountKeeper, ) - app.feeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.accountKeeper) - sdkUpgradeKeeper := sdkupgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp) + sdkUpgradeKeeper := sdkupgradekeeper.NewKeeper( + skipUpgradeHeights, + keys[upgradetypes.StoreKey], + appCodec, + homePath, + app.BaseApp, + ) app.upgradeKeeper = upgradekeeper.NewKeeper(sdkUpgradeKeeper) // create evidence keeper with router @@ -386,8 +442,15 @@ func NewIritaApp( app.mtKeeper = mtkeeper.NewKeeper(appCodec, keys[mttypes.StoreKey]) app.serviceKeeper = servicekeeper.NewKeeper( - appCodec, keys[servicetypes.StoreKey], app.accountKeeper, app.bankKeeper, - app.GetSubspace(servicetypes.ModuleName), app.ModuleAccountAddrs(), opbtypes.PointTokenFeeCollectorName, + appCodec, + keys[servicetypes.StoreKey], + app.accountKeeper, + app.bankKeeper, + app.GetSubspace( + servicetypes.ModuleName, + ), + app.ModuleAccountAddrs(), + opbtypes.PointTokenFeeCollectorName, ) app.oracleKeeper = oraclekeeper.NewKeeper( @@ -395,7 +458,12 @@ func NewIritaApp( app.serviceKeeper, ) - app.randomKeeper = randomkeeper.NewKeeper(appCodec, keys[randomtypes.StoreKey], app.bankKeeper, app.serviceKeeper) + app.randomKeeper = randomkeeper.NewKeeper( + appCodec, + keys[randomtypes.StoreKey], + app.bankKeeper, + app.serviceKeeper, + ) app.nodeKeeper = *app.nodeKeeper.SetHooks( stakingtypes.NewMultiStakingHooks(app.slashingKeeper.Hooks()), @@ -413,7 +481,11 @@ func NewIritaApp( ) sidechainPermKeeper := sidechainmodule.NewPermKeeper(appCodec, app.permKeeper) - app.sidechainKeeper = sidechainkeeper.NewKeeper(appCodec, keys[sidechaintypes.StoreKey], app.accountKeeper) + app.sidechainKeeper = sidechainkeeper.NewKeeper( + appCodec, + keys[sidechaintypes.StoreKey], + app.accountKeeper, + ) // evm tracer := cast.ToString(appOpts.Get(srvflags.EVMTracer)) @@ -423,8 +495,14 @@ func NewIritaApp( appCodec, keys[feemarkettypes.StoreKey], app.GetSubspace(feemarkettypes.ModuleName), ) app.EvmKeeper = evmkeeper.NewKeeper( - appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], app.GetSubspace(evmtypes.ModuleName), - app.accountKeeper, app.bankKeeper, appkeeper.WNodeKeeper{Keeper: app.nodeKeeper}, app.FeeMarketKeeper, + appCodec, + keys[evmtypes.StoreKey], + tkeys[evmtypes.TransientKey], + app.GetSubspace(evmtypes.ModuleName), + app.accountKeeper, + app.bankKeeper, + appkeeper.WNodeKeeper{Keeper: app.nodeKeeper}, + app.FeeMarketKeeper, tracer, // debug EVM based on Baseapp options ) @@ -432,7 +510,10 @@ func NewIritaApp( // register the proposal types tibccorekeeper := tibccorekeeper.NewKeeper( - appCodec, keys[tibchost.StoreKey], app.GetSubspace(tibchost.ModuleName), stakingkeeper.Keeper{}, + appCodec, + keys[tibchost.StoreKey], + app.GetSubspace(tibchost.ModuleName), + stakingkeeper.Keeper{}, ) app.tibcKeeper = tibckeeper.NewKeeper(tibccorekeeper) app.nftTransferKeeper = tibcnfttransferkeeper.NewKeeper( @@ -490,12 +571,29 @@ func NewIritaApp( // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. app.mm = module.NewManager( - genutil.NewAppModule(app.accountKeeper, app.nodeKeeper, app.BaseApp.DeliverTx, encodingConfig.TxConfig), + genutil.NewAppModule( + app.accountKeeper, + app.nodeKeeper, + app.BaseApp.DeliverTx, + encodingConfig.TxConfig, + ), auth.NewAppModule(appCodec, app.accountKeeper, authsims.RandomGenesisAccounts), bank.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper), crisis.NewAppModule(&app.crisisKeeper, skipGenesisInvariants), - feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry), - cslashing.NewAppModule(appCodec, cslashing.NewKeeper(app.slashingKeeper, app.nodeKeeper), app.accountKeeper, app.bankKeeper, app.nodeKeeper), + feegrantmodule.NewAppModule( + appCodec, + app.accountKeeper, + app.bankKeeper, + app.feeGrantKeeper, + app.interfaceRegistry, + ), + cslashing.NewAppModule( + appCodec, + cslashing.NewKeeper(app.slashingKeeper, app.nodeKeeper), + app.accountKeeper, + app.bankKeeper, + app.nodeKeeper, + ), upgrade.NewAppModule(app.upgradeKeeper), evidence.NewAppModule(app.evidenceKeeper), params.NewAppModule(app.paramsKeeper), @@ -655,7 +753,11 @@ func NewIritaApp( app.mm.RegisterInvariants(&app.crisisKeeper) app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) - app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter()) + app.configurator = module.NewConfigurator( + app.appCodec, + app.MsgServiceRouter(), + app.GRPCQueryRouter(), + ) app.mm.RegisterServices(app.configurator) // create the simulation manager and define the order of the modules for deterministic simulations @@ -665,8 +767,20 @@ func NewIritaApp( app.sm = module.NewSimulationManager( auth.NewAppModule(appCodec, app.accountKeeper, authsims.RandomGenesisAccounts), bank.NewAppModule(appCodec, app.bankKeeper, app.accountKeeper), - feegrantmodule.NewAppModule(appCodec, app.accountKeeper, app.bankKeeper, app.feeGrantKeeper, app.interfaceRegistry), - cslashing.NewAppModule(appCodec, cslashing.NewKeeper(app.slashingKeeper, app.nodeKeeper), app.accountKeeper, app.bankKeeper, app.nodeKeeper), + feegrantmodule.NewAppModule( + appCodec, + app.accountKeeper, + app.bankKeeper, + app.feeGrantKeeper, + app.interfaceRegistry, + ), + cslashing.NewAppModule( + appCodec, + cslashing.NewKeeper(app.slashingKeeper, app.nodeKeeper), + app.accountKeeper, + app.bankKeeper, + app.nodeKeeper, + ), params.NewAppModule(app.paramsKeeper), cparams.NewAppModule(appCodec, app.paramsKeeper), record.NewAppModule(appCodec, app.recordKeeper, app.accountKeeper, app.bankKeeper), @@ -729,7 +843,8 @@ func NewIritaApp( // ) app.RegisterUpgradePlan( - "v3.2.0-wenchangchain", store.StoreUpgrades{ + "v3.2.0-wenchangchain", + store.StoreUpgrades{ Added: []string{tibcmttypes.StoreKey}, }, func(ctx sdk.Context, plan sdkupgrade.Plan, fromVM module.VersionMap) (module.VersionMap, error) { @@ -778,7 +893,8 @@ func NewIritaApp( //) app.RegisterUpgradePlan( - "v3.4.0-wenchangchain-tianzhou", store.StoreUpgrades{ + "v3.4.0-wenchangchain-tianzhou", + store.StoreUpgrades{ Added: []string{sidechaintypes.StoreKey}, }, func(ctx sdk.Context, plan sdkupgrade.Plan, fromVM module.VersionMap) (module.VersionMap, error) { @@ -809,6 +925,11 @@ func NewIritaApp( return app.mm.RunMigrations(ctx, app.configurator, fromVM) }, ) + app.AddPatch(700, func(ctx sdk.Context) error { + app.mtKeeper.SetDenomSequence(ctx, uint64(2000)) + app.mtKeeper.SetMTSequence(ctx, uint64(20000)) + return nil + }) // set peer filter by node ID app.SetIDPeerFilter(app.nodeKeeper.FilterNodeByID) @@ -835,7 +956,11 @@ func NewIritaApp( func (app *IritaApp) Name() string { return app.BaseApp.Name() } // BeginBlocker application updates every begin block -func (app *IritaApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { +func (app *IritaApp) BeginBlocker( + ctx sdk.Context, + req abci.RequestBeginBlock, +) abci.ResponseBeginBlock { + app.bte.Start(ctx) chainID, _ := ethermint.ParseChainID(req.GetHeader().ChainID) if app.EvmKeeper.Signer == nil { app.EvmKeeper.Signer = crypto.NewSm2Signer(chainID) @@ -852,7 +977,10 @@ func (app *IritaApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci. } // InitChainer application update at chain initialization -func (app *IritaApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { +func (app *IritaApp) InitChainer( + ctx sdk.Context, + req abci.RequestInitChain, +) abci.ResponseInitChain { var genesisState GenesisState app.cdc.MustUnmarshalJSON(req.AppStateBytes, &genesisState) @@ -863,9 +991,18 @@ func (app *IritaApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abc chainID, _ := ethermint.ParseChainID(req.ChainId) app.EvmKeeper.Signer = crypto.NewSm2Signer(chainID) - serviceGenState.Definitions = append(serviceGenState.Definitions, servicetypes.GenOraclePriceSvcDefinition()) - serviceGenState.Bindings = append(serviceGenState.Bindings, servicetypes.GenOraclePriceSvcBinding(tokentypes.GetNativeToken().MinUnit)) - serviceGenState.Definitions = append(serviceGenState.Definitions, randomtypes.GetSvcDefinition()) + serviceGenState.Definitions = append( + serviceGenState.Definitions, + servicetypes.GenOraclePriceSvcDefinition(), + ) + serviceGenState.Bindings = append( + serviceGenState.Bindings, + servicetypes.GenOraclePriceSvcBinding(tokentypes.GetNativeToken().MinUnit), + ) + serviceGenState.Definitions = append( + serviceGenState.Definitions, + randomtypes.GetSvcDefinition(), + ) genesisState[servicetypes.ModuleName] = app.appCodec.MustMarshalJSON(&serviceGenState) return app.mm.InitGenesis(ctx, app.appCodec, genesisState) @@ -876,9 +1013,17 @@ func (app *IritaApp) LoadHeight(height int64) error { return app.LoadVersion(height) } +func (app *IritaApp) AddPatch(height int64, patch Execute) { + app.bte.add(height, patch) +} + // RegisterTendermintService implements the Application.RegisterTendermintService method. func (app *IritaApp) RegisterTendermintService(clientCtx client.Context) { - tmservice.RegisterTendermintService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.interfaceRegistry) + tmservice.RegisterTendermintService( + app.BaseApp.GRPCQueryRouter(), + clientCtx, + app.interfaceRegistry, + ) } // ModuleAccountAddrs returns all the app's module account addresses. @@ -972,7 +1117,12 @@ func (app *IritaApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIC // RegisterTxService implements the Application.RegisterTxService method. func (app *IritaApp) RegisterTxService(clientCtx client.Context) { - authtx.RegisterTxService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.BaseApp.Simulate, app.interfaceRegistry) + authtx.RegisterTxService( + app.BaseApp.GRPCQueryRouter(), + clientCtx, + app.BaseApp.Simulate, + app.interfaceRegistry, + ) } // RegisterUpgradePlan implements the upgrade execution logic of the upgrade module @@ -1002,7 +1152,11 @@ func GetMaccPerms() map[string][]string { } // initParamsKeeper init params keeper and its subspaces -func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey sdk.StoreKey) paramskeeper.Keeper { +func initParamsKeeper( + appCodec codec.BinaryCodec, + legacyAmino *codec.LegacyAmino, + key, tkey sdk.StoreKey, +) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) paramsKeeper.Subspace(authtypes.ModuleName) diff --git a/app/patch.go b/app/patch.go new file mode 100644 index 00000000..db1dad81 --- /dev/null +++ b/app/patch.go @@ -0,0 +1,33 @@ +package app + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// Execute is responsible for checking the permission to execute patches +type Execute = func(ctx sdk.Context) error + +// BlockTimerExecutor is responsible for checking the permission to execute patches +type BlockTimerExecutor struct { + patches map[int64]Execute +} + +func NewBlockTimerExecutor() *BlockTimerExecutor { + return &BlockTimerExecutor{ + patches: make(map[int64]Execute), + } +} + +func (bte *BlockTimerExecutor) add(height int64, patch Execute) { + bte.patches[height] = patch +} + +func (bte *BlockTimerExecutor) Start(ctx sdk.Context) { + exec := bte.patches[ctx.BlockHeight()] + if exec != nil { + ctx.Logger().Info("Execute patch", "height", ctx.BlockHeight()) + if err := exec(ctx); err != nil { + panic(err) + } + } +} From 9821a880516b7aa999b215eedffc534684c4a1e7 Mon Sep 17 00:00:00 2001 From: Dreamer <745124335@qq.com> Date: Tue, 11 Jul 2023 14:44:20 +0800 Subject: [PATCH 2/9] update patch height --- app/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index 5ebf6121..de2f27e4 100644 --- a/app/app.go +++ b/app/app.go @@ -925,7 +925,7 @@ func NewIritaApp( return app.mm.RunMigrations(ctx, app.configurator, fromVM) }, ) - app.AddPatch(700, func(ctx sdk.Context) error { + app.AddPatch(12568900, func(ctx sdk.Context) error { app.mtKeeper.SetDenomSequence(ctx, uint64(2000)) app.mtKeeper.SetMTSequence(ctx, uint64(20000)) return nil From b4c7f8a5ce8725a5e209ec47212ec40f8cc2a2b3 Mon Sep 17 00:00:00 2001 From: yuandu Date: Thu, 20 Jul 2023 16:51:36 +0800 Subject: [PATCH 3/9] feat: enhance side-chain query --- app/ante/ante.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- modules/side-chain/keeper.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/ante/ante.go b/app/ante/ante.go index 037bfde0..8db7819a 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -196,9 +196,9 @@ func RegisterAccessControl(permKeeper perm.Keeper) perm.Keeper { permKeeper.RegisterMsgAuth(&tibctypes.MsgSetRoutingRules{}, perm.RoleRootAdmin, perm.RoleNodeAdmin) // side-chain auth - permKeeper.RegisterMsgAuth(&sidechaintypes.MsgCreateSpace{}, perm.RoleRootAdmin, perm.RoleLayer2User) - permKeeper.RegisterMsgAuth(&sidechaintypes.MsgTransferSpace{}, perm.RoleRootAdmin, perm.RoleLayer2User) - permKeeper.RegisterMsgAuth(&sidechaintypes.MsgCreateBlockHeader{}, perm.RoleRootAdmin, perm.RoleLayer2User) + permKeeper.RegisterMsgAuth(&sidechaintypes.MsgCreateSpace{}, perm.RoleRootAdmin, perm.RoleSideChainUser) + permKeeper.RegisterMsgAuth(&sidechaintypes.MsgTransferSpace{}, perm.RoleRootAdmin, perm.RoleSideChainUser) + permKeeper.RegisterMsgAuth(&sidechaintypes.MsgCreateBlockHeader{}, perm.RoleRootAdmin, perm.RoleSideChainUser) return permKeeper } diff --git a/go.mod b/go.mod index 66032025..d180356b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.2.1-0.20230613082613-3fb58cc1f431 + github.com/bianjieai/iritamod v1.4.1-0.20230720085038-d575c6569545 github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 44c3f9be..11f3f73d 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.2.1-0.20230613082613-3fb58cc1f431 h1:IvgtaLostSVc2FzaU8sdspbHiIV5VHZMGgq0DTp1oqQ= -github.com/bianjieai/iritamod v1.2.1-0.20230613082613-3fb58cc1f431/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230720085038-d575c6569545 h1:q5zZHcdZh2c/MKAkK4IEa+pEYuXLNTcTELDGTE5h1Yk= +github.com/bianjieai/iritamod v1.4.1-0.20230720085038-d575c6569545/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok= diff --git a/modules/side-chain/keeper.go b/modules/side-chain/keeper.go index 7624b319..49b959df 100644 --- a/modules/side-chain/keeper.go +++ b/modules/side-chain/keeper.go @@ -20,7 +20,7 @@ func (k PermKeeper) HasSideChainUserRole(ctx sdk.Context, addr sdk.AccAddress) b return true } - if err := k.perm.Access(ctx, addr, perm.RoleLayer2User.Auth()); err != nil { + if err := k.perm.Access(ctx, addr, perm.RoleSideChainUser.Auth()); err != nil { return false } return true From 6a8c16af6b70a582e215866399a2d1a6607c9b86 Mon Sep 17 00:00:00 2001 From: yuandu Date: Fri, 21 Jul 2023 14:24:38 +0800 Subject: [PATCH 4/9] bump-up: iritamod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d180356b..05000e3e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.4.1-0.20230720085038-d575c6569545 + github.com/bianjieai/iritamod v1.4.1-0.20230721061738-75323600e835 github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 11f3f73d..20b8e4a5 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.4.1-0.20230720085038-d575c6569545 h1:q5zZHcdZh2c/MKAkK4IEa+pEYuXLNTcTELDGTE5h1Yk= -github.com/bianjieai/iritamod v1.4.1-0.20230720085038-d575c6569545/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230721061738-75323600e835 h1:4it9aGQwJouLQifHYKzL0KRWWW9Ff2sPuwCCtm/K8Jo= +github.com/bianjieai/iritamod v1.4.1-0.20230721061738-75323600e835/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok= From a875595dd0869d95ea81e9b602735818b620db5c Mon Sep 17 00:00:00 2001 From: yuandu Date: Fri, 21 Jul 2023 16:10:46 +0800 Subject: [PATCH 5/9] bump-up: iritamod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 05000e3e..36ebc55e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.4.1-0.20230721061738-75323600e835 + github.com/bianjieai/iritamod v1.4.1-0.20230721080920-c06f54d204b3 github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 20b8e4a5..98bc45cd 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.4.1-0.20230721061738-75323600e835 h1:4it9aGQwJouLQifHYKzL0KRWWW9Ff2sPuwCCtm/K8Jo= -github.com/bianjieai/iritamod v1.4.1-0.20230721061738-75323600e835/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230721080920-c06f54d204b3 h1:NksHCPO7HC/Y/ZMoWZjVtl6XJtfGYWAlIzbSjsBj1yw= +github.com/bianjieai/iritamod v1.4.1-0.20230721080920-c06f54d204b3/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok= From bc301fffbfa3c53da201ea3b5639b69f8c028437 Mon Sep 17 00:00:00 2001 From: yuandu Date: Mon, 24 Jul 2023 11:20:52 +0800 Subject: [PATCH 6/9] bump-up: iritamod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 36ebc55e..45eb4e63 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.4.1-0.20230721080920-c06f54d204b3 + github.com/bianjieai/iritamod v1.4.1-0.20230724031753-54327e706023 github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 98bc45cd..622e1170 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.4.1-0.20230721080920-c06f54d204b3 h1:NksHCPO7HC/Y/ZMoWZjVtl6XJtfGYWAlIzbSjsBj1yw= -github.com/bianjieai/iritamod v1.4.1-0.20230721080920-c06f54d204b3/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230724031753-54327e706023 h1:cXmYjUNyQlYOAC5IORD/at3BnISwYRxMawzVz/STO2E= +github.com/bianjieai/iritamod v1.4.1-0.20230724031753-54327e706023/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok= From 84870da2b7ab3990f0d57002005729e5ce82f4ef Mon Sep 17 00:00:00 2001 From: yuandu Date: Mon, 24 Jul 2023 11:33:14 +0800 Subject: [PATCH 7/9] bump-up: iritamod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 45eb4e63..c8d6c660 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.4.1-0.20230724031753-54327e706023 + github.com/bianjieai/iritamod v1.4.1-0.20230724033146-81ad442ac898 github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 622e1170..6de42c13 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.4.1-0.20230724031753-54327e706023 h1:cXmYjUNyQlYOAC5IORD/at3BnISwYRxMawzVz/STO2E= -github.com/bianjieai/iritamod v1.4.1-0.20230724031753-54327e706023/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230724033146-81ad442ac898 h1:JmpqHpaRBGpjf0IbvE+Xk5JmKQfm22HlOkFg/2zzTh4= +github.com/bianjieai/iritamod v1.4.1-0.20230724033146-81ad442ac898/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok= From efdc95f5651629ce39b537c6451232c4b1d48a6c Mon Sep 17 00:00:00 2001 From: yuandu Date: Tue, 25 Jul 2023 10:13:00 +0800 Subject: [PATCH 8/9] bump-up: iritamod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c8d6c660..56502579 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.4.1-0.20230724033146-81ad442ac898 + github.com/bianjieai/iritamod v1.4.1-0.20230725020914-8b8a27c4f40c github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 6de42c13..383f26b8 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.4.1-0.20230724033146-81ad442ac898 h1:JmpqHpaRBGpjf0IbvE+Xk5JmKQfm22HlOkFg/2zzTh4= -github.com/bianjieai/iritamod v1.4.1-0.20230724033146-81ad442ac898/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230725020914-8b8a27c4f40c h1:ZMga4+0pBuXO+3G1mm7m8sPgMo1MOZxWUpw062Y2u0E= +github.com/bianjieai/iritamod v1.4.1-0.20230725020914-8b8a27c4f40c/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok= From f91ccf19aee4ee7023227bdb7dc10c0e7d3bfdf9 Mon Sep 17 00:00:00 2001 From: yuandu Date: Tue, 25 Jul 2023 11:20:15 +0800 Subject: [PATCH 9/9] bump-up: iritamod --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 56502579..441f033f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/99designs/keyring v1.1.6 github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 - github.com/bianjieai/iritamod v1.4.1-0.20230725020914-8b8a27c4f40c + github.com/bianjieai/iritamod v1.4.1-0.20230725031853-7bbe782aef6f github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 github.com/cosmos/cosmos-sdk v0.45.2 github.com/cosmos/go-bip39 v1.0.0 diff --git a/go.sum b/go.sum index 383f26b8..d71264b4 100644 --- a/go.sum +++ b/go.sum @@ -649,8 +649,8 @@ github.com/bianjieai/ethermint v0.10.2-irita-20230315 h1:OzTtBrRh42b6GqBY/0ec9Nf github.com/bianjieai/ethermint v0.10.2-irita-20230315/go.mod h1:wY1g0XkLenjcgfuok56QprJPZk8/1Z2DKiDsjqnZWso= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a h1:X194E93U/8RIgpLTY/OlUZC53MUrHe5DzaNLkSnL4Kk= github.com/bianjieai/irismod v1.6.2-0.20230512022607-41a6e9a7ba6a/go.mod h1:fTZ5IAvcxJPtlPp9PFJi2+IePJ+BewrSwT40YJPoFq4= -github.com/bianjieai/iritamod v1.4.1-0.20230725020914-8b8a27c4f40c h1:ZMga4+0pBuXO+3G1mm7m8sPgMo1MOZxWUpw062Y2u0E= -github.com/bianjieai/iritamod v1.4.1-0.20230725020914-8b8a27c4f40c/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= +github.com/bianjieai/iritamod v1.4.1-0.20230725031853-7bbe782aef6f h1:nEOZj5xuvlX/GzNtQzwMdt+aOgOUZ1hs6D3j3ft3mV8= +github.com/bianjieai/iritamod v1.4.1-0.20230725031853-7bbe782aef6f/go.mod h1:5woISMgARzwIysP3WFP5WZ2eod2dDcAGgRGVfpuT08Q= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3 h1:M4C+ilCPiP2c2yMdeYaZLwquEBfFa4Uvt1BDviSYD0E= github.com/bianjieai/tendermint v0.34.8-irita-210413.0.20211012090339-cee6e09e8ae3/go.mod h1:2u6xthTnwDYLhO38cDYp8CxzKq7hwJFvCXeK1pEErtM= github.com/bianjieai/tibc-go v0.3.1-0.20220412124234-9b75094ff868 h1:dPS+AcwCQsWTMXRgZwO+Yy2rY8y9G+X38MA7toAivok=