.github/workflows/codeql.yml

@@ -35,7 +35,7 @@ jobs:
           queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality
 
       - name: Build
-        run: make build
+        run: make build BECH32_PREFIX=ethm
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

CHANGELOG.md

@@ -1,76 +1,83 @@
-# [](https://github.com/dymensionxyz/rollapp-evm/compare/v2.2.0-alpha...v) (2024-04-27)
-
-
-### Bug Fixes
-
+<!--
+Guiding Principles:
+
+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:
+
+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))
-* **app:** initialize transferkeeper before denommetadatakeeper to avoid nil pointer error ([#194](https://github.com/dymensionxyz/rollapp-evm/issues/194)) ([8050f59](https://github.com/dymensionxyz/rollapp-evm/commit/8050f59de96fde9130b00738048462860ce51be8))
 * **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))
 * **init scripts:** update account-prefix in ibc script ([#190](https://github.com/dymensionxyz/rollapp-evm/issues/190)) ([25be6c3](https://github.com/dymensionxyz/rollapp-evm/commit/25be6c3dda7885870d514438548e10daad45f4d7))
 * **local script:** updated default genesis created on extended guide with EIP 3855 ([#183](https://github.com/dymensionxyz/rollapp-evm/issues/183)) ([d201be4](https://github.com/dymensionxyz/rollapp-evm/commit/d201be4ee6757c912ecae568207c1ea358387cae))
-* make sure that accounts are not double funded during eibc channel creation ([#191](https://github.com/dymensionxyz/rollapp-evm/issues/191)) ([0d6bb2d](https://github.com/dymensionxyz/rollapp-evm/commit/0d6bb2de7c667191352bdac8e00631165b675250))
+* make sure that accounts are not double funded during eibc channel creation ([6e5b6f1](https://github.com/dymensionxyz/rollapp-evm/commit/6e5b6f1ac826ccf926815e7d0d73fe004b5f5842))
 * 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))
-* remove deprecated denommetadata param ([#189](https://github.com/dymensionxyz/rollapp-evm/issues/189)) ([927f7f9](https://github.com/dymensionxyz/rollapp-evm/commit/927f7f92ab7c84d39931a1923780d8c373dfce74))
 * **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
 
-### Features
+Tag must include `sql` if having any changes relate to schema
 
-* 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 changelog log auto update workflow ([#176](https://github.com/dymensionxyz/rollapp-evm/issues/176)) ([f58feaa](https://github.com/dymensionxyz/rollapp-evm/commit/f58feaaea83b17d2258d1025a72c9b832922b7a9))
+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.
 
+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.
 
-# [2.2.0-alpha](https://github.com/dymensionxyz/rollapp-evm/compare/v2.1.0-alpha...v2.2.0-alpha) (2024-03-26)
+If any PR belong to multiple types of change, reference it into all types with only ticket id, no need description (convention)
 
+Ref: https://keepachangelog.com/en/1.0.0/
+-->
 
-### Bug Fixes
+<!--
+Templates for Unreleased:
 
-* 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))
+## Unreleased
 
+### Features
 
-
-# [2.1.0-alpha](https://github.com/dymensionxyz/rollapp-evm/compare/v2.0.0-beta...v2.1.0-alpha) (2024-03-22)
-
+### Improvements
 
 ### Bug Fixes
 
-* 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))
-
-
+### Client Breaking
 
-# [2.0.0-beta](https://github.com/dymensionxyz/rollapp-evm/compare/v1.0.0-beta...v2.0.0-beta) (2024-01-15)
+### API Breaking
 
+### State Machine Breaking
 
-### Bug Fixes
-
-* 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))
+-->
 
+# Changelog
 
+## Unreleased
 
-# [1.0.0-beta](https://github.com/dymensionxyz/rollapp-evm/compare/v0.1.0-rc3...v1.0.0-beta) (2023-10-19)
+### 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.0.2` & `evm-block-explorer-rpc-cosmos v1.1.0`
 
 ### Bug Fixes
 
-* 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)
-
-
-
+- (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`

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.1-alpine3.18 as go-builder
+FROM golang:1.22.2-alpine3.18 as go-builder
 
 WORKDIR /app
 
@@ -12,7 +12,7 @@ ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3
 
 RUN apk add --no-cache $PACKAGES
 
-RUN make build
+RUN make build BECH32_PREFIX=ethm
 
 FROM alpine:3.16.1
 

Makefile

@@ -3,6 +3,11 @@
 PROJECT_NAME=rollappd
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 COMMIT := $(shell git log -1 --format='%H')
+LEDGER_ENABLED ?= true
+
+ifndef BECH32_PREFIX
+    $(error BECH32_PREFIX is not set)
+endif
 
 # don't override user values
 ifeq (,$(VERSION))
@@ -22,22 +27,56 @@ TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::
 
 export GO111MODULE = on
 
+build_tags = netgo
+ifeq ($(LEDGER_ENABLED),true)
+  ifeq ($(OS),Windows_NT)
+    GCCEXE = $(shell where gcc.exe 2> NUL)
+    ifeq ($(GCCEXE),)
+      $(error gcc.exe not installed for ledger support, please install or set LEDGER_ENABLED=false)
+    else
+      build_tags += ledger
+    endif
+  else
+    UNAME_S = $(shell uname -s)
+    ifeq ($(UNAME_S),OpenBSD)
+      $(warning OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988))
+    else
+      GCC = $(shell command -v gcc 2> /dev/null)
+      ifeq ($(GCC),)
+        $(error gcc not installed for ledger support, please install or set LEDGER_ENABLED=false)
+      else
+        build_tags += ledger
+      endif
+    endif
+  endif
+endif
+
+build_tags += $(BUILD_TAGS)
+build_tags := $(strip $(build_tags))
+
+whitespace :=
+whitespace += $(whitespace)
+comma := ,
+build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
+
 # process linker flags
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=dymension-rdk \
 		  -X github.com/cosmos/cosmos-sdk/version.AppName=rollapp-evm \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
+		  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-	      -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION)
+	      -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION) \
+		  -X github.com/dymensionxyz/rollapp-evm/app.AccountAddressPrefix=$(BECH32_PREFIX)
 
 
-
-BUILD_FLAGS := -ldflags '$(ldflags)'
+BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
 
 
 ###########
 # Install #
 ###########
 
+
 all: install
 
 .PHONY: install

README.md

@@ -23,7 +23,8 @@ It uses Cosmos-SDK's [simapp](https://github.com/cosmos/cosmos-sdk/tree/main/sim
 Build and install the ```rollapp-evm``` binary:
 
 ```shell
-make install
+export BECH32_PREFIX=ethm
+make install BECH32_PREFIX=$BECH32_PREFIX
 ```
 
 ### Initial configuration
@@ -32,11 +33,10 @@ export the following variables:
 
 ```shell
 export EXECUTABLE="rollapp-evm"
-
+export BECH32_PREFIX="ethm"
 export ROLLAPP_CHAIN_ID="rollappevm_1234-1"
 export KEY_NAME_ROLLAPP="rol-user"
 export BASE_DENOM="arax"
-export BECH32="ethm"
 export DENOM=$(echo "$BASE_DENOM" | sed 's/^.//')
 export MONIKER="$ROLLAPP_CHAIN_ID-sequencer"
 
@@ -166,11 +166,31 @@ sed -i '' 's|rollapp_id =.*|rollapp_id = '\"$ROLLAPP_CHAIN_ID\"'|' "${ROLLAPP_HO
 sh scripts/update_genesis_file.sh
 ```
 
+Validate genesis file:
+
+```shell
+rollapp-evm validate-genesis
+```
+
 ```shell
 # this script automatically adds 2 vesting accounts, adjust the timestampts to your liking or skip this step
 sh scripts/add_vesting_accounts_to_genesis_file.sh
 ```
 
+### Change to 3s block time for ibc connection initialization
+
+Linux:
+
+```shell
+sed -i 's/empty_blocks_max_time = "1h0m0s"/empty_blocks_max_time = "3s"/' ${ROLLAPP_HOME_DIR}/config/dymint.toml
+```
+
+Mac:
+
+```shell
+sed -i '' 's/empty_blocks_max_time = "1h0m0s"/empty_blocks_max_time = "3s"/' ${ROLLAPP_HOME_DIR}/config/dymint.toml
+```
+
 ### Run rollapp locally
 
 ```shell
@@ -188,20 +208,6 @@ cd go-relayer && make install
 
 ### Establish IBC channel
 
-Setup block time to be 3s for easy ibc channel establishment
-
-Linux:
-
-```shell
-sed -i 's/empty_blocks_max_time = "1h0m0s"/empty_blocks_max_time = "3s"/' "${ROLLAPP_HOME_DIR}/config/dymint.toml"
-```
-
-Mac:
-
-```shell
-sed -i '' 's/empty_blocks_max_time = "1h0m0s"/empty_blocks_max_time = "3s"/' "${ROLLAPP_HOME_DIR}/config/dymint.toml"
-```
-
 Verify you have all the environment variables defined earlier set.
 while the rollapp and the local dymension hub node running, run:
 
@@ -219,18 +225,16 @@ Stop the rollapp:
 kill $(pgrep rollapp-evm)
 ```
 
-Change back to 1hr block time:
-
 Linux:
 
 ```shell
-sed -i 's/empty_blocks_max_time = "3s"/empty_blocks_max_time = "1h0m0s"/' ${ROLLAPP_HOME_DIR}/config/dymint.toml
+sed -i 's/empty_blocks_max_time = "3s"/empty_blocks_max_time = "3600s"/' ${ROLLAPP_HOME_DIR}/config/dymint.toml
 ```
 
 Mac:
 
 ```shell
-sed -i '' 's/empty_blocks_max_time = "3s"/empty_blocks_max_time = "1h0m0s"/' ${ROLLAPP_HOME_DIR}/config/dymint.toml
+sed -i '' 's/empty_blocks_max_time = "3s"/empty_blocks_max_time = "3600s"/' ${ROLLAPP_HOME_DIR}/config/dymint.toml
 ```
 
 Start the rollapp: