8000 Fix `evmosd version` (backport #151) by mergify[bot] · Pull Request #154 · evmos/evmos · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix evmosd version (backport #151) #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Dec 7, 2021
Merged

Fix evmosd version (backport #151) #154

merged 2 commits into from
Dec 7, 2021

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Dec 7, 2021

This is an automatic backport of pull request #151 done by Mergify.
Cherry-pick of 5061449 has failed:

On branch mergify/bp/release/v0.4.x/pr-151
Your branch is up to date with 'origin/release/v0.4.x'.

You are currently cherry-picking commit 5061449.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@prajjwol
Fix evmosd version (#151)
65ad245 
* build(deps): bump github.com/cosmos/ibc-go/v2 from 2.0.0 to 2.0.1 (#150)

Bumps [github.com/cosmos/ibc-go/v2](https://github.com/cosmos/ibc-go) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v2.0.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build fix evmosd command

* Update CHANGELOG.md

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit 5061449)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Dec 7, 2021
@github-actions github-actions bot added the build label Dec 7, 2021
fedekunze
fedekunze reviewed Dec 7, 2021
View reviewed changes
@fedekunze fedekunze merged commit 8d4105a into release/v0.4.x Dec 7, 2021
@fedekunze fedekunze deleted the 8000 mergify/bp/release/v0.4.x/pr-151 branch December 7, 2021 23:01
faddat referenced this pull request in notional-labs/evmos Dec 9, 2021
@fedekunze
evm: fix types unit tests (#154)
8a2a8d3 
* tests: fix evm unit tests

* lint
fedekunze added a commit that referenced this pull request Dec 12, 2021
@fedekunze @danburck
@mergify @prajjwol @odeke-em @drohit-cb @dependabot @giansalex
fix: intrarelayer testnet bugs (#169)
882999d 
* release: v0.4.0 changelog (#138)

* release(evmos): Update CHANGELOG

* Update CHANGELOG.md

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* Fix `evmosd version`  (backport #151) (#154)

* Fix `evmosd version`  (#151)

* build(deps): bump github.com/cosmos/ibc-go/v2 from 2.0.0 to 2.0.1 (#150)

Bumps [github.com/cosmos/ibc-go/v2](https://github.com/cosmos/ibc-go) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v2.0.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build fix evmosd command

* Update CHANGELOG.md

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit 5061449)

# Conflicts:
#	CHANGELOG.md

* Update CHANGELOG.md

Co-authored-by: Prajjwol Gautam <prajjwol@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* app: fix typo in calculation of failed transactions in TPS value (#149) (#155)

Noticed while I was auditing through evmosd code that inside
the code that records TPS, that we have a typo in the calculation
of nFailed, that instead used latestNSuccessful, of which if enough
time is spent and the successful transactions have grown, while
the number of failed transactions stays still, this can cause
wrong TPS values to be reported.

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
(cherry picked from commit 7603acd)

Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>

* Release CHANGELOG v0.4.1 (#157)

* docs(evmos): update latest version to v0.4.0 (#139)

* docs: change `ethermintd` -> `evmosd` (#142)

* docs: migrate cosmovisor and genesis validator instructions (#141)

* docs(evmos): Add upgrade node with cosmovisor instructions

* docs(evmos): Add Incorporate changes from Cosmos Hub Vega Upgrade

* Apply suggestions from code review

* go mod tidy

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>

* build: added build-reproducible to Makefile (#143)

* release: v0.4.0 changelog (#138)

* release(evmos): Update CHANGELOG

* Update CHANGELOG.md

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* (build): added build-reproducible to makefile

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>

* docs: Add link to consensus problems if you don't upgrade your node (#146)

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* deps: bump SDK version (#147)

* deps: bump SDK version

* norace

* build(deps): bump github.com/cosmos/ibc-go/v2 from 2.0.0 to 2.0.1 (#150)

Bumps [github.com/cosmos/ibc-go/v2](https://github.com/cosmos/ibc-go) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v2.0.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: mergify changes (#152)

* Fix `evmosd version`  (#151)

* build(deps): bump github.com/cosmos/ibc-go/v2 from 2.0.0 to 2.0.1 (#150)

Bumps [github.com/cosmos/ibc-go/v2](https://github.com/cosmos/ibc-go) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v2.0.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build fix evmosd command

* Update CHANGELOG.md

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* app: fix typo in calculation of failed transactions in TPS value (#149)

Noticed while I was auditing through evmosd code that inside
the code that records TPS, that we have a typo in the calculation
of nFailed, that instead used latestNSuccessful, of which if enough
time is spent and the successful transactions have grown, while
the number of failed transactions stays still, this can cause
wrong TPS values to be reported.

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* Update .goreleaser.yml (#156)

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Rohit Durvasula <88731568+rohitbison@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>
Co-authored-by: Prajjwol Gautam <prajjwol@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>

* fix: upgrade handler for v0.4.1 (#166)

* release: handler fix changelog (#167)

* docs(evmos): update latest version to v0.4.0 (#139)

* docs: change `ethermintd` -> `evmosd` (#142)

* docs: migrate cosmovisor and genesis validator instructions (#141)

* docs(evmos): Add upgrade node with cosmovisor instructions

* docs(evmos): Add Incorporate changes from Cosmos Hub Vega Upgrade

* Apply suggestions from code review

* go mod tidy

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>

* build: added build-reproducible to Makefile (#143)

* release: v0.4.0 changelog (#138)

* release(evmos): Update CHANGELOG

* Update CHANGELOG.md

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* (build): added build-reproducible to makefile

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>

* docs: Add link to consensus problems if you don't upgrade your node (#146)

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* deps: bump SDK version (#147)

* deps: bump SDK version

* norace

* build(deps): bump github.com/cosmos/ibc-go/v2 from 2.0.0 to 2.0.1 (#150)

Bumps [github.com/cosmos/ibc-go/v2](https://github.com/cosmos/ibc-go) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v2.0.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* ci: mergify changes (#152)

* Fix `evmosd version`  (#151)

* build(deps): bump github.com/cosmos/ibc-go/v2 from 2.0.0 to 2.0.1 (#150)

Bumps [github.com/cosmos/ibc-go/v2](https://github.com/cosmos/ibc-go) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v2.0.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build fix evmosd command

* Update CHANGELOG.md

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* app: fix typo in calculation of failed transactions in TPS value (#149)

Noticed while I was auditing through evmosd code that inside
the code that records TPS, that we have a typo in the calculation
of nFailed, that instead used latestNSuccessful, of which if enough
time is spent and the successful transactions have grown, while
the number of failed transactions stays still, this can cause
wrong TPS values to be reported.

Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>

* Update .goreleaser.yml (#156)

* docs: block explorer (#158)

* docs: quick facts table (#159)

* docs: quick facts table

* Update docs/basics/chain_id.md

* changelog

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: Rohit Durvasula <88731568+rohitbison@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Federico Kunze Küllmer <federico.kunze94@gmail.com>
Co-authored-by: Prajjwol Gautam <prajjwol@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>

* fix: intrarelayer testnet fixes

* fix tests

* lint

* comments

Co-authored-by: Daniel Burckhardt <daniel.m.burckhardt@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Prajjwol Gautam <prajjwol@gmail.com>
Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>
Co-authored-by: Joe Schmoe <64335177+jolube@users.noreply.github.com>
Co-authored-by: Rohit Durvasula <88731568+rohitbison@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Giancarlos Salas <giansalex@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fedekunze fedekunze fedekunze approved these changes

@jolube jolube Awaiting requested review from jolube

@khoslaventures khoslaventures Awaiting requested review from khoslaventures

Assignees
No one assigned
Labels
build conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fedekunze @prajjwol
0