Skip to content
This repository was archived by the owner on Nov 30, 2021. It is now read-only.

stargate: fix conflicts #650

Merged
merged 33 commits into from
Dec 14, 2020
Merged

stargate: fix conflicts #650

merged 33 commits into from
Dec 14, 2020
+1,922 −543

Conversation

fedekunze
Copy link
Contributor

Closes: #XXX

Description

For contributor use:

  • Targeted PR against correct branch (see CONTRIBUTING.md)
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the module structure standards.
  • Wrote unit and integration tests
  • Updated relevant documentation (docs/) or specification (x/<module>/spec/)
  • Added relevant godoc comments.
  • Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

For admin use:

  • Added appropriate labels to PR (ex. WIP, R4R, docs, etc)
  • Reviewers assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

Sorry, something went wrong.

Alessio Treglia and others added 30 commits November 20, 2020 19:04
deps: update to cosmos-sdk v0.39.2-rc3 (#608)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
e4b9ea2 
* update to cosmos-sdk v0.39.2

* fix HD path test
@fedekunze
changelog (#609)
d6b9447
@fedekunze
build: require go 1.15+ (#610)
6f76341
@fedekunze
evm: state transitions enabled params (#603)
ca476d0 
* changelog

* evm: state transitions enabled params

* changelog entry

* changelog
@fedekunze
deps: bump cosmos-sdk version to v0.39.2 (#615)
ef4193b 
* deps: bump cosmos-sdk version to v0.39.2

* changelog
@fedekunze
rpc: fix deadlock (#614)
3072376
@fedekunze
update tools configs (#611)
66d1918 
* update tools configs

* minor updates
@araskachoi
add jq (#616)
4eccac8
@dependabot
build(deps): bump gopkg.in/yaml.v2 from 2.3.0 to 2.4.0 (#622)
34a6011 
Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/go-yaml/yaml/releases)
- [Commits](go-yaml/yaml@v2.3.0...v2.4.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@fedekunze
app: fix export genesis (#619)
048a8bd 
* v0.3.1 changes

* fix export genesis

* changelog

* evm: fix genesis format mismatch (#623)

* evm: fix genesis format mismatch

* genesis tests

* fix test

* changelog

* nolint
@araskachoi @fedekunze
force build-ethermint and cleanup stdout (#628)
31b5909 
Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
@araskachoi
join network doc (#606)
7efd10e 
* join network doc

* include faucet instructions

* add rpc instructions

* edit persistent peers

* update to latest testnet
@fedekunze
evm: implement vm.GetHashFn (#620)
c4a3c0a 
* evm: implement vm.GetHashFn

* check nil case

* test

* handle 3 cases

* use switch statement

* stateDB tests

* abci changes

* fix LGTM issue

* final tests

* changelog

* remove epoch

* update test

* clean test

* rm epoch
@summerpro
open Istanbul and MuirGlacier from ChainConfig (#645)
9cc464b 
* open Istanbul and MuirGlacier

* fix ut

* fix ut
@fedekunze
evm: extra eips param (#643)
3bb76e8 
* evm: extra eips param

* changelog
@fedekunze
rpc: protocol version (#575)
ef1bef1 
* evm: protocol version

* changelog

* version

* fix

* support latest version only
@fedekunze
evm: module specification (#538)
6e1c166 
* evm: module specification

* params and events

* readme and messages

* minor updates

* concepts

* genesis state concept

* begin and end block

* update parameters and genesis

* state objects

* state table

* use permalink

* init and export genesis

* update abci

* extra eips param

* review comments

* precision

* link to photon doc
@dependabot
build(deps): bump gaurav-nelson/github-action-markdown-link-check (#649)
f7f9cd9 
Bumps [gaurav-nelson/github-action-markdown-link-check](https://github.com/gaurav-nelson/github-action-markdown-link-check) from 1.0.8 to 1.0.9.
- [Release notes](https://github.com/gaurav-nelson/github-action-markdown-link-check/releases)
- [Commits](gaurav-nelson/github-action-markdown-link-check@1.0.8...7481451)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@fedekunze
stargate: fix conflicts
7fc1ba8
@fedekunze
more fixes
7ca3860
@fedekunze
proto changes
75b6d7d
@fedekunze
more tendermint changes
cee9c91
@fedekunze
conflicts
29149d0
@fedekunze
test fixes
192c9cf
@fedekunze @okwme
atlas: evm module (#651)
5782821 
* atlas: evm module

* typos

* update toml

* update description

* Update x/evm/atlas/atlas-v0.3.1.md

* Update x/evm/atlas/atlas-v0.3.1.md

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
@dependabot
build(deps): bump actions/setup-node from v2.1.2 to v2.1.3 (#653)
de0d685 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.2 to v2.1.3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v2.1.2...27082ce)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @fedekunze
build(deps): bump github.com/ethereum/go-ethereum from 1.9.24 to 1.9.…
1d24ef7 
…25 (#654)

* build(deps): bump github.com/ethereum/go-ethereum from 1.9.24 to 1.9.25

Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.9.24 to 1.9.25.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.9.24...v1.9.25)

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

* fixes

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Kunze <federico.kunze94@gmail.com>
@dependabot @fedekunze
build(deps): bump gaurav-nelson/github-action-markdown-link-check (#652)
8f3016c 
Bumps [gaurav-nelson/github-action-markdown-link-check](https://github.com/gaurav-nelson/github-action-markdown-link-check) from 1.0.9 to 1.0.10.
- [Release notes](https://github.com/gaurav-nelson/github-action-markdown-link-check/releases)
- [Commits](gaurav-nelson/github-action-markdown-link-check@1.0.9...72d871b)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
@araskachoi
update peers (#656)
c1a233b 
* update peers

* update chainid in cmd
@dependabot
build(deps): bump gaurav-nelson/github-action-markdown-link-check (#659)
217104f 
Bumps [gaurav-nelson/github-action-markdown-link-check](https://github.com/gaurav-nelson/github-action-markdown-link-check) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/gaurav-nelson/github-action-markdown-link-check/releases)
- [Commits](gaurav-nelson/github-action-markdown-link-check@1.0.10...2a60e0f)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 2 commits December 14, 2020 14:50
@dependabot
build(deps): bump ini from 1.3.5 to 1.3.8 in /docs (#658)
88c3b71 
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@fedekunze
conflicts
15863d5
@lgtm-com
Copy link

lgtm-com bot commented Dec 14, 2020

This pull request introduces 2 alerts when merging 15863d5 into 4ee7eea - view on LGTM.com

new alerts:

  • 2 for Useless assignment to local variable

@fedekunze fedekunze marked this pull request as ready for review December 14, 2020 14:22
@fedekunze fedekunze requested a review from noot as a code owner December 14, 2020 14:22
@fedekunze fedekunze merged commit ede2dbc into stargate Dec 14, 2020
@fedekunze fedekunze deleted the stargate-conflicts branch December 14, 2020 14:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@noot noot

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@fedekunze @araskachoi @summerpro