From b7878fd6f125ba5e8f553ceca6ab0d62d2ab7305 Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Wed, 29 Jun 2022 19:08:28 +0200 Subject: [PATCH 1/3] fix goreleaser (#1160) * impr(init.sh): remove increase block time * bug(goreleaser): update docker image --- Makefile | 6 +++--- init.sh | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b87b7bd783..2e1eeaa5a0 100755 --- a/Makefile +++ b/Makefile @@ -165,8 +165,8 @@ release-dry-run: -v `pwd`:/go/src/$(PACKAGE_NAME) \ -v ${GOPATH}/pkg:/go/pkg \ -w /go/src/$(PACKAGE_NAME) \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ - --rm-dist --skip-validate --skip-publish + ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ + --rm-dist --skip-validate --skip-publish --snapshot release: @if [ ! -f ".release-env" ]; then \ @@ -181,7 +181,7 @@ release: -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ release --rm-dist --skip-validate .PHONY: release-dry-run release diff --git a/init.sh b/init.sh index de11d28139..4f6eac6314 100755 --- a/init.sh +++ b/init.sh @@ -33,9 +33,6 @@ cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["crisis"]["constant_f cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="aphoton"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json cat $HOME/.ethermintd/config/genesis.json | jq '.app_state["mint"]["params"]["mint_denom"]="aphoton"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json -# increase block time (?) -cat $HOME/.ethermintd/config/genesis.json | jq '.consensus_params["block"]["time_iota_ms"]="1000"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json - # Set gas limit in genesis cat $HOME/.ethermintd/config/genesis.json | jq '.consensus_params["block"]["max_gas"]="10000000"' > $HOME/.ethermintd/config/tmp_genesis.json && mv $HOME/.ethermintd/config/tmp_genesis.json $HOME/.ethermintd/config/genesis.json From 31c3660951d0ab654a39de649f3be7fa6ee90e79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 15:41:32 +0200 Subject: [PATCH 2/3] build(deps): bump github.com/stretchr/testify from 1.7.5 to 1.8.0 (#1163) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.5 to 1.8.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.7.5...v1.8.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e84cabcef4..0cd465af82 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/spf13/cobra v1.5.0 github.com/spf13/viper v1.12.0 github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969 - github.com/stretchr/testify v1.7.5 + github.com/stretchr/testify v1.8.0 github.com/tendermint/tendermint v0.34.20-0.20220517115723-e6f071164839 github.com/tendermint/tm-db v0.6.7 github.com/tyler-smith/go-bip39 v1.1.0 diff --git a/go.sum b/go.sum index 122ff7a2ca..52a45b1766 100644 --- a/go.sum +++ b/go.sum @@ -1068,8 +1068,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= From 4a66ff95d9f5cbaba8aacec44e69879de9c42e0e Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Fri, 1 Jul 2022 13:55:19 +0200 Subject: [PATCH 3/3] feemarket(specs): add hint on different gas terminology for gas in Cosmos and Ethereum (#1165) --- CHANGELOG.md | 6 ++++++ Makefile | 2 +- x/feemarket/spec/01_concepts.md | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb1b502d6..640f2ce2fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,12 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## Unreleased + +### Improvements + +* (feemarket) [\#1165](https://github.com/evmos/ethermint/pull/1165) Add hint in specs about different gas terminology for gas in Cosmos and Ethereum. + ## [v0.17.0] - 2022-06-27 ### State Machine Breaking diff --git a/Makefile b/Makefile index 2e1eeaa5a0..1f183ab729 100755 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ build-all: tools build lint test ############################################################################### PACKAGE_NAME:=github.com/evmos/ethermint -GOLANG_CROSS_VERSION = v1.18 +GOLANG_CROSS_VERSION = v1.18 GOPATH ?= '$(HOME)/go' release-dry-run: docker run \ diff --git a/x/feemarket/spec/01_concepts.md b/x/feemarket/spec/01_concepts.md index 878ccf637a..12071d7b5b 100644 --- a/x/feemarket/spec/01_concepts.md +++ b/x/feemarket/spec/01_concepts.md @@ -24,6 +24,10 @@ fee = (baseFee + priorityTip) * gasLimit , where `baseFee` is the fixed-per-block network fee per gas and `priorityTip` is an additional fee per gas that can be set optionally. Note, that both the base fee and the priority tip are a gas prices. To submit a transaction with EIP-1559, the signer needs to specify the `gasFeeCap` a maximum fee per gas they are willing to pay total and optionally the `priorityTip` , which covers both the priority fee and the block's network fee per gas (aka: base fee). +::: tip +The Cosmos SDK uses a different terminology for `gas` than Ethereum. What is called `gasLimit` on Ethereum is called `gasWanted` on Cosmos. You might encounter both terminologies on Evmos since it builds Ethereum on top of the SDK, e.g. when using different wallets like Keplr for Cosmos and Metamask for Ethereum. +::: + ## Base Fee The base fee per gas (aka base fee) is a global gas price defined at the consensus level. It is stored as a module parameter and is adjusted at the end of each block based on the total gas used in the previous block and gas target (`block gas limit / elasticity multiplier`):