Merge branch 'main' into deps/bump-block-explorer-rpc-cosmos-v1.1.2

.github/workflows/changelog.yml

@@ -0,0 +1,44 @@
+# This workflow will add a changelog to the repository when a new commit is pushed to the main branch.
+# E.g., manually edit the commit message to align with conventional commit messages, such as:
+# feat(database): add new indexing capabilities
+# This update introduces advanced indexing options for handling complex queries more efficiently.
+
+name: Changelog Update
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize, reopened]
+
+permissions: write-all
+
+jobs:
+  update_changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "18"
+
+      - name: Install conventional-changelog-cli
+        run: npm install -g conventional-changelog-cli
+
+      - name: Generate changelog diff
+        run: |
+          git fetch origin main:main
+          conventional-changelog -p angular -i CHANGELOG.md -s -r 0 > changelog_diff.md
+          echo "::set-output name=changelog::$(cat changelog_diff.md)"
+      - name: Commit and push changelog update
+        run: |
+          git config user.name 'github-actions'
+          git config user.email '[email protected]'
+          git add CHANGELOG.md
+          git commit -m "Update CHANGELOG.md"
+          git push origin HEAD:refs/heads/${{ github.head_ref }}

CHANGELOG.md

@@ -1,72 +1,79 @@
-<!--
-Guiding Principles:
+# [](https://github.com/dymensionxyz/rollapp-evm/compare/v2.2.0-alpha...v) (2024-04-25)
 
-Changelogs are for humans, not machines.
-There should be an entry for every single version.
-The same types of changes should be grouped.
-Versions and sections should be linkable.
-The latest version comes first.
-The release date of each version is displayed.
-Mention whether you follow Semantic Versioning.
 
-Usage:
+### Bug Fixes
 
-Change log entries are to be added to the Unreleased section under the
-appropriate stanza (see below). Each entry should ideally include a tag and
-the GitHub issue reference in the following format:
+* **app:** fixed bech32 on account keeper to not be hardcoded  ([#165](https://github.com/dymensionxyz/rollapp-evm/issues/165)) ([750d1e7](https://github.com/dymensionxyz/rollapp-evm/commit/750d1e70ad052daf7b2942bcecaf0dddfbc17d90))
+* **deps:** bumps `block-explorer-rpc-cosmos v1.0.3` & `evm-block-explorer-rpc-cosmos` v1.0.3 ([#142](https://github.com/dymensionxyz/rollapp-evm/issues/142)) ([ea5e5fd](https://github.com/dymensionxyz/rollapp-evm/commit/ea5e5fdc854d5a4fa4079c4d79b79732e78cf9d8))
+* multiple fixes to advance readme features ([#141](https://github.com/dymensionxyz/rollapp-evm/issues/141)) ([469d39f](https://github.com/dymensionxyz/rollapp-evm/commit/469d39fc79591cdae4455839db1546cc5bd9c053))
+* **readme:** broken links have been renewed. ([#78](https://github.com/dymensionxyz/rollapp-evm/issues/78)) ([c7df6f2](https://github.com/dymensionxyz/rollapp-evm/commit/c7df6f29c8b9981d7a998be4091d2e96c19647a3))
+* **scripts:** add an option to skip evm base fees ([#162](https://github.com/dymensionxyz/rollapp-evm/issues/162)) ([ea51eee](https://github.com/dymensionxyz/rollapp-evm/commit/ea51eee8d66dbba587d6ec00395418a1f08b99a8))
+* **scripts:** fix hubgenesis tokens in update genesis ([#172](https://github.com/dymensionxyz/rollapp-evm/issues/172)) ([8d37db8](https://github.com/dymensionxyz/rollapp-evm/commit/8d37db874902eb483293894333416d54bd051e72))
+* **scripts:** remove redundant line in setup ibc script ([#161](https://github.com/dymensionxyz/rollapp-evm/issues/161)) ([57d4f17](https://github.com/dymensionxyz/rollapp-evm/commit/57d4f170779dbaeac0e877d1005709d48a4df2f0))
+* **test scripts:** make alice and bob keys in .rollap dir ([#147](https://github.com/dymensionxyz/rollapp-evm/issues/147)) ([b6ee646](https://github.com/dymensionxyz/rollapp-evm/commit/b6ee64640af1b528728414bded6a70216a4b5fdf))
+* updated block size and evm `no_base_fee` ([#160](https://github.com/dymensionxyz/rollapp-evm/issues/160)) ([876ccad](https://github.com/dymensionxyz/rollapp-evm/commit/876ccad96765d0d3bd279903c552ab483ecf6b9a))
 
-* (<tag>) \#<issue-number> message
 
-Tag must include `sql` if having any changes relate to schema
+### Features
 
-The issue numbers will later be link-ified during the release process,
-so you do not have to worry about including a link manually, but you can if you wish.
+* add swagger config and make scripts ([#130](https://github.com/dymensionxyz/rollapp-evm/issues/130)) ([41718e4](https://github.com/dymensionxyz/rollapp-evm/commit/41718e4d4098e6bf18117c31b514b2cc226a331f))
+* **be:** integrate block explorer Json-RPC server ([#132](https://github.com/dymensionxyz/rollapp-evm/issues/132)) ([d73b1c4](https://github.com/dymensionxyz/rollapp-evm/commit/d73b1c451b93f04a1db5a73c4c8c78fc21729208))
+* **ci:** add addtional changelog log auto update workflow ([327f375](https://github.com/dymensionxyz/rollapp-evm/commit/327f375cdb7e33c431a8d5f0a710a52b641e7eca))
 
-Types of changes (Stanzas):
 
-"Features" for new features.
-"Improvements" for changes in existing functionality.
-"Deprecated" for soon-to-be removed features.
-"Bug Fixes" for any bug fixes.
-"Client Breaking" for breaking CLI commands and REST routes used by end-users.
-"API Breaking" for breaking exported APIs used by developers building on SDK.
-"State Machine Breaking" for any changes that result in a different AppState
-given same genesisState and txList.
+### Improvement
 
-If any PR belong to multiple types of change, reference it into all types with only ticket id, no need description (convention)
+* **deps:** bumps `block-explorer-rpc-cosmos v1.0.2` & `evm-block-explorer-rpc-cosmos v1.0.2` ([#138](https://github.com/dymensionxyz/rollapp-evm/issues/138)) ([7de2875](https://github.com/dymensionxyz/rollapp-evm/commit/7de2875a28a45458d718be6b14885548f76dee62))
+* **deps:** bumps `block-explorer-rpc-cosmos v1.1.0` & `evm-block-explorer-rpc-cosmos v1.1.0` ([#151](https://github.com/dymensionxyz/rollapp-evm/issues/151)) ([6cb3046](https://github.com/dymensionxyz/rollapp-evm/commit/6cb3046f703c8c8fcbceb0c49c575c29c78fc19a))
+* **deps:** bumps `block-explorer-rpc-cosmos v1.1.2`([#167](https://github.com/dymensionxyz/rollapp-evm/issues/167))
 
-Ref: https://keepachangelog.com/en/1.0.0/
--->
 
-<!--
-Templates for Unreleased:
 
-## Unreleased
+# [2.2.0-alpha](https://github.com/dymensionxyz/rollapp-evm/compare/v2.1.0-alpha...v2.2.0-alpha) (2024-03-26)
 
-### Features
 
-### Improvements
+### Bug Fixes
+
+* updated init.sh to set gensis operator address ([#123](https://github.com/dymensionxyz/rollapp-evm/issues/123)) ([7cb34f8](https://github.com/dymensionxyz/rollapp-evm/commit/7cb34f84740a244fb168a2c2864303cbdcffe827))
+
+
+
+# [2.1.0-alpha](https://github.com/dymensionxyz/rollapp-evm/compare/v2.0.0-beta...v2.1.0-alpha) (2024-03-22)
+
 
 ### Bug Fixes
 
-### Client Breaking
+* update local setup scripts ([#100](https://github.com/dymensionxyz/rollapp-evm/issues/100)) ([8e8accc](https://github.com/dymensionxyz/rollapp-evm/commit/8e8accc602449481a3188dfe23c147e4ade48877))
+* Update README.md rollapp_id env var ([1cf5795](https://github.com/dymensionxyz/rollapp-evm/commit/1cf57952a39db11623a437b5d9c518da3635aff2))
+* Updated libp2p to use our fork  ([#90](https://github.com/dymensionxyz/rollapp-evm/issues/90)) ([1bc2110](https://github.com/dymensionxyz/rollapp-evm/commit/1bc21109927dcd649e3c04cd624da36f5b3c232c))
 
-### API Breaking
 
-### State Machine Breaking
 
--->
+# [2.0.0-beta](https://github.com/dymensionxyz/rollapp-evm/compare/v1.0.0-beta...v2.0.0-beta) (2024-01-15)
+
+
+### Bug Fixes
 
-# Changelog
+* cleaning file descriptors ([#69](https://github.com/dymensionxyz/rollapp-evm/issues/69)) ([18f7558](https://github.com/dymensionxyz/rollapp-evm/commit/18f7558455b74ee097c525fc418375456b90bb00))
+* hotfix for ibc-go due to val-set hotfix done on hub for froopyland. ([#73](https://github.com/dymensionxyz/rollapp-evm/issues/73)) ([40c6ec4](https://github.com/dymensionxyz/rollapp-evm/commit/40c6ec4c3f899268bd93cf95dee98aa00410fe18))
 
-## Unreleased
 
-### Improvements
 
-- (deps) [#138](https://github.com/dymensionxyz/rollapp-evm/issues/138) Bumps `block-explorer-rpc-cosmos v1.0.2` & `evm-block-explorer-rpc-cosmos v1.0.2`
-- (deps) [#151](https://github.com/dymensionxyz/rollapp-evm/issues/151) Bumps `block-explorer-rpc-cosmos v1.1.0` & `evm-block-explorer-rpc-cosmos v1.1.0`
-- (deps) [#167](https://github.com/dymensionxyz/rollapp-evm/issues/167) Bumps `block-explorer-rpc-cosmos v1.1.2`
+# [1.0.0-beta](https://github.com/dymensionxyz/rollapp-evm/compare/v0.1.0-rc3...v1.0.0-beta) (2023-10-19)
+
+
 
 ### Bug Fixes
 
-- (deps) [#142](https://github.com/dymensionxyz/rollapp-evm/issues/142) Bumps `block-explorer-rpc-cosmos v1.0.3` & `evm-block-explorer-rpc-cosmos v1.0.3`
+* reverted bad deps ([#38](https://github.com/dymensionxyz/rollapp-evm/issues/38)) ([545a367](https://github.com/dymensionxyz/rollapp-evm/commit/545a367643d7b1f6e2dbdce1cdb436fdb56000fe))
+
+
+
+# [0.1.0-rc2](https://github.com/dymensionxyz/rollapp-evm/compare/v0.1.0-rc1...v0.1.0-rc2) (2023-07-31)
+
+
+
+# 0.1.0-rc1 (2023-07-27)
+
+
+

README.md

@@ -36,6 +36,7 @@ export EXECUTABLE="rollapp-evm"
 export ROLLAPP_CHAIN_ID="rollappevm_1234-1"
 export KEY_NAME_ROLLAPP="rol-user"
 export BASE_DENOM="arax"
+export BECH32="rol"
 export DENOM=$(echo "$BASE_DENOM" | sed 's/^.//')
 export MONIKER="$ROLLAPP_CHAIN_ID-sequencer"
 

app/app.go

@@ -7,6 +7,9 @@ import (
 	"path/filepath"
 	"sort"
 
+	"github.com/cosmos/cosmos-sdk/x/authz"
+	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
+	authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
 	"github.com/gorilla/mux"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
@@ -25,7 +28,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	simapp "github.com/cosmos/cosmos-sdk/simapp"
+	"github.com/cosmos/cosmos-sdk/simapp"
 	"github.com/cosmos/cosmos-sdk/store/streaming"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
@@ -48,6 +51,9 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	"github.com/cosmos/cosmos-sdk/x/feegrant"
+	feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
+	feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/cosmos-sdk/x/gov"
@@ -92,13 +98,14 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
 	ibctestingtypes "github.com/cosmos/ibc-go/v6/testing/types"
 
-	rollappparams "github.com/dymensionxyz/rollapp-evm/app/params"
 	srvflags "github.com/evmos/evmos/v12/server/flags"
 
+	rollappparams "github.com/dymensionxyz/rollapp-evm/app/params"
+
 	// unnamed import of statik for swagger UI support
 	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 
-	staking "github.com/dymensionxyz/dymension-rdk/x/staking"
+	"github.com/dymensionxyz/dymension-rdk/x/staking"
 	stakingkeeper "github.com/dymensionxyz/dymension-rdk/x/staking/keeper"
 
 	"github.com/dymensionxyz/dymension-rdk/x/sequencers"
@@ -137,13 +144,13 @@ import (
 )
 
 const (
-	AccountAddressPrefix = "ethm"
-	Name                 = "rollapp_evm"
+	Name = "rollapp_evm"
 )
 
 var (
 	kvstorekeys = []string{
-		authtypes.StoreKey, banktypes.StoreKey,
+		authtypes.StoreKey, authzkeeper.StoreKey,
+		feegrant.StoreKey, banktypes.StoreKey,
 		stakingtypes.StoreKey, seqtypes.StoreKey,
 		minttypes.StoreKey, distrtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey,
@@ -186,6 +193,7 @@ var (
 	// and genesis verification.
 	ModuleBasics = module.NewBasicManager(
 		auth.AppModuleBasic{},
+		authzmodule.AppModuleBasic{},
 		genutil.AppModuleBasic{},
 		bank.AppModuleBasic{},
 		capability.AppModuleBasic{},
@@ -196,6 +204,7 @@ var (
 		distr.AppModuleBasic{},
 		gov.NewAppModuleBasic(getGovProposalHandlers()),
 		params.AppModuleBasic{},
+		feegrantmodule.AppModuleBasic{},
 		upgrade.AppModuleBasic{},
 		ibc.AppModuleBasic{},
 		vesting.AppModuleBasic{},
@@ -214,6 +223,7 @@ var (
 	// module account permissions
 	maccPerms = map[string][]string{
 		authtypes.FeeCollectorName:          nil,
+		authz.ModuleName:                    nil,
 		distrtypes.ModuleName:               nil,
 		minttypes.ModuleName:                {authtypes.Minter},
 		stakingtypes.BondedPoolName:         {authtypes.Burner, authtypes.Staking},
@@ -272,6 +282,7 @@ type App struct {
 
 	// keepers
 	AccountKeeper    authkeeper.AccountKeeper
+	AuthzKeeper      authzkeeper.Keeper
 	BankKeeper       bankkeeper.Keeper
 	CapabilityKeeper *capabilitykeeper.Keeper
 	StakingKeeper    stakingkeeper.Keeper
@@ -285,6 +296,7 @@ type App struct {
 	ParamsKeeper     paramskeeper.Keeper
 	IBCKeeper        *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
 	TransferKeeper   transferkeeper.Keeper
+	FeeGrantKeeper   feegrantkeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
@@ -393,7 +405,14 @@ func NewRollapp(
 		app.GetSubspace(authtypes.ModuleName),
 		ethermint.ProtoAccount,
 		maccPerms,
-		sdk.Bech32PrefixAccAddr, //Bech32MainPrefix
+		sdk.GetConfig().GetBech32AccountAddrPrefix(),
+	)
+
+	app.AuthzKeeper = authzkeeper.NewKeeper(
+		keys[authzkeeper.StoreKey],
+		appCodec,
+		app.MsgServiceRouter(),
+		app.AccountKeeper,
 	)
 
 	app.BankKeeper = bankkeeper.NewBaseKeeper(
@@ -432,6 +451,7 @@ func NewRollapp(
 		&stakingKeeper, &app.SequencersKeeper, authtypes.FeeCollectorName, app.ModuleAccountAddrs(),
 	)
 
+	app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper)
 	app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp, authtypes.NewModuleAddress(govtypes.ModuleName).String())
 
 	// register the staking hooks
@@ -525,6 +545,7 @@ func NewRollapp(
 		appCodec,
 		keys[denommetadatamoduletypes.StoreKey],
 		app.BankKeeper,
+		app.TransferKeeper,
 		denomMetadataHooks,
 		app.GetSubspace(denommetadatamoduletypes.ModuleName),
 	)
@@ -576,9 +597,11 @@ func NewRollapp(
 			encodingConfig.TxConfig,
 		),
 		auth.NewAppModule(appCodec, app.AccountKeeper, nil),
+		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		vesting.NewAppModule(app.AccountKeeper, app.BankKeeper),
 		bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper),
+		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
 		gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
 		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, app.BankKeeper),
 		distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
@@ -620,11 +643,13 @@ func NewRollapp(
 		ibchost.ModuleName,
 		ibctransfertypes.ModuleName,
 		authtypes.ModuleName,
+		authz.ModuleName,
 		banktypes.ModuleName,
 		govtypes.ModuleName,
 		erc20types.ModuleName,
 		claimstypes.ModuleName,
 		genutiltypes.ModuleName,
+		feegrant.ModuleName,
 		epochstypes.ModuleName,
 		paramstypes.ModuleName,
 		hubgentypes.ModuleName,
@@ -640,13 +665,15 @@ func NewRollapp(
 		feemarkettypes.ModuleName,
 		capabilitytypes.ModuleName,
 		authtypes.ModuleName,
+		authz.ModuleName,
 		banktypes.ModuleName,
 		distrtypes.ModuleName,
 		vestingtypes.ModuleName,
 		minttypes.ModuleName,
 		erc20types.ModuleName,
 		claimstypes.ModuleName,
 		genutiltypes.ModuleName,
+		feegrant.ModuleName,
 		epochstypes.ModuleName,
 		paramstypes.ModuleName,
 		upgradetypes.ModuleName,
@@ -666,6 +693,7 @@ func NewRollapp(
 	initGenesisList := []string{
 		capabilitytypes.ModuleName,
 		authtypes.ModuleName,
+		authz.ModuleName,
 		banktypes.ModuleName,
 		evmtypes.ModuleName,
 		feemarkettypes.ModuleName,
@@ -684,6 +712,7 @@ func NewRollapp(
 		paramstypes.ModuleName,
 		upgradetypes.ModuleName,
 		ibctransfertypes.ModuleName,
+		feegrant.ModuleName,
 		hubgentypes.ModuleName,
 		denommetadatamoduletypes.ModuleName,
 	}
@@ -745,7 +774,7 @@ func (app *App) setAnteHandler(txConfig client.TxConfig, maxGasWanted uint64) {
 		ExtensionOptionChecker: ethermint.HasDynamicFeeExtensionOption,
 		EvmKeeper:              app.EvmKeeper,
 		StakingKeeper:          app.StakingKeeper,
-		FeegrantKeeper:         nil,
+		FeegrantKeeper:         app.FeeGrantKeeper,
 		DistributionKeeper:     app.DistrKeeper,
 		IBCKeeper:              app.IBCKeeper,
 		FeeMarketKeeper:        app.FeeMarketKeeper,
@@ -793,7 +822,7 @@ func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.Res
 		panic(err)
 	}
 
-	//Passing the dymint sequencers to the sequencer module from RequestInitChain
+	// Passing the dymint sequencers to the sequencer module from RequestInitChain
 	if len(req.Validators) == 0 {
 		panic("Dymint have no sequencers defined on InitChain")
 	}