Skip to content
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

Update gaia to master #108

Closed
wants to merge 70 commits into from
Closed

Update gaia to master #108

wants to merge 70 commits into from

Conversation

ethanfrey
Copy link
Member

@ethanfrey ethanfrey commented Apr 13, 2020 •
edited
Loading

This is a big merge, pulling in all the protobuf changes in master. A first step to updating for ibc compatibility. This now works thanks to @sahith-narahari

All commits are merged in, conflicts resolved (hopefully well), and some compiler errors fixed.

  • Update to protobuf types

  • go test ./x/wasm/internal/... passes (actually files moved from internal per new design)

  • go build ./x/wasm/... completes and doesn't revert go.mod

  • go test ./x/wasm/... passes

  • make test passes

  • manual test of the wasmd binaries

  • 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.

  • Wrote tests

  • Updated relevant documentation (docs/)

  • 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)

Alessio Treglia and others added 30 commits January 24, 2020 11:35
@alexanderbez
Merge PR #271: Build against cosmos-sdk 0.38.0
ab21a04
@alexanderbez
Merge PR #272: Bump to latest master
b2f5089
@okwme
Merge PR #273: Update validator-faq.md
bc96fe9
Merge PR #278: speed up reproducible builds
1c077d8
@okwme
Merge PR #276: Update bug-report.md
fe41b0d
Merge PR #280: Makefile: remove golangci-lint installation
04d6463
@alexanderbez
Merge PR #281: Bump SDK commit
fd3e113
@alexanderbez
Merge PR #282: Bump SDK master commit
4da5f36
@alexanderbez
Merge PR #284: Add v2.0.6 changelog entry
a0c3d3e
Merge PR #286: Remove replace statement
f806d1e
@dependabot-preview
Merge PR #291: Bump github.com/stretchr/testify from 1.4.0 to 1.5.0
245ca6d 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.4.0...v1.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
@dependabot-preview
Merge PR #292: Bump github.com/stretchr/testify from 1.5.0 to 1.5.1
ff53394 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.5.0...v1.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
@tac0turtle
Merge PR #279: docs: add pruning section
1ba51ae
@tac0turtle
Merge PR #285: update: gaia to master of the sdk
67af98d
@dependabot-preview
Merge PR #294: Bump github.com/spf13/cobra from 0.0.5 to 0.0.6
fc9884f 
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 0.0.5 to 0.0.6.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@0.0.5...v0.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
@tac0turtle
Merge PR #295: ci: add proto checks to ci
086ec8f
@liangping
add LOOK explorer (#296)
9358887
@alexanderbez
Merge PR #298: Bump SDK master commit
d5cc59a
@dependabot-preview
Bump github.com/tendermint/tm-db from 0.4.0 to 0.4.1 (#301)
b9808f1 
Bumps [github.com/tendermint/tm-db](https://github.com/tendermint/tm-db) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/tendermint/tm-db/releases)
- [Changelog](https://github.com/tendermint/tm-db/blob/master/CHANGELOG.md)
- [Commits](tendermint/tm-db@v0.4.0...v0.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Update CODEOWNERS as per @jaekwon's directives (#302)
b1dbb84 
[ci skip]
Merged PR #303: Update documentation gaiad.toml > app.toml
fa691b7
@alexanderbez
Merge PR #308: Bump SDK master commit
eb3f792
@dependabot-preview
Bump github.com/otiai10/copy from 1.0.2 to 1.1.1 (#313)
8a14b36 
Bumps [github.com/otiai10/copy](https://github.com/otiai10/copy) from 1.0.2 to 1.1.1.
- [Release notes](https://github.com/otiai10/copy/releases)
- [Commits](otiai10/copy@v1.0.2...v1.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Merge PR #317: Remove riot chat URL
6fa49d8
Merge PR #316: Build with Go 1.14
ec3c84a
@alexanderbez
Merge PR #319: Add changelog entries
bf7ec7c
@tac0turtle
Merge PR #312: proto: remove proto mentions
89e8df1
@jgimeno
Merge PR #323: Update cosmos sdk to last master branch
680bb19
@jgimeno
Merge PR #324: Add cosmos SDK to include PR 5810
0d38ee1
@alexanderbez
Revert "Merge PR #324: Add cosmos SDK to include PR 5810" (#325)
85ef9aa 
This reverts commit 0d38ee1.
Alessio Treglia and others added 22 commits April 15, 2020 19:09
ci: fix circleci docker jobs (#357)
bed7d14
@sahith-narahari
Migrated msgs to proto
4c8bad6
Install linter and code coverage as github actions (#362)
c4f6870
Makefile: parse GAIA_BUILD_OPTIONS (#363)
7eb955a 
Look for build otpions in the make's GAIA_BUILD_OPTIONS
variable, e.g.:

$ make install GAIA_BUILD_OPTIONS=nostrip

would customise the build and remove all symbols-stripping flags
from both LDFLAGS and compiler's command line.

Replace WITH_CLEVELDB variable with a cleveldb build option.

Strip debug symbols by default.
@dependabot-preview
Bump vuepress-theme-cosmos from 1.0.161 to 1.0.163 in /docs (#370)
f876884 
Bumps [vuepress-theme-cosmos](https://github.com/cosmos/vuepress-theme-cosmos) from 1.0.161 to 1.0.163.
- [Release notes](https://github.com/cosmos/vuepress-theme-cosmos/releases)
- [Commits](https://github.com/cosmos/vuepress-theme-cosmos/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@jackzampolin @fedekunze
@mossid @cwgoes @ancazamfir @tac0turtle @alexanderbez @AdityaSripal @golangcibot
Merge PR #288: IBC Alpha Updates
50be36d 
* IBC v1.0.0

* add demo readme

* update ibc-demo.md

* fix readme to match current state

* WIP connection handshake

* Merge PR #174: IBC demo fixes

* Fix branch in demo readme

* Fix branch in script

* Apply suggestions from code review

Co-Authored-By: Anca Zamfir <ancazamfir@users.noreply.github.com>

* Init ibc-alpha

* Update sdk version to incorporate codec changes

* Upstream codec changes

* Add --node flag to transfer commands

* Remove extra --from flag

* fix app.evidenceKeeper params

* point to 'misc-ibc-issues' SDK branch

* fix build

* target to ibc-alpha

* Update gaia to latest ibc-alpha

* IBC v1.0.0

* add demo readme

* update ibc-demo.md

* fix readme to match current state

* WIP connection handshake

* Merge PR #174: IBC demo fixes

* Fix branch in demo readme

* Fix branch in script

* Apply suggestions from code review

Co-Authored-By: Anca Zamfir <ancazamfir@users.noreply.github.com>

* Init ibc-alpha

* Update sdk version to incorporate codec changes

* Upstream codec changes

* Add --node flag to transfer commands

* Remove extra --from flag

* fix app.evidenceKeeper params

* point to 'misc-ibc-issues' SDK branch

* fix build

* target to ibc-alpha

* Update gaia to latest ibc-alpha

* Update to latest sdk:ibc-alpha and rebase onto master

* Fix broken tests

* update to v0.38.0 sdk

* Update to latest master, bank changes

* Update to latest SDK ibc-alpha

* update: gaia to master of the sdk

- updated gaia to use the master branch of the sdk
- when full proto?

Signed-off-by: Marko Baricevic <marbar3778@yahoo.com>

* bump to master

* Proto updates

* Update makefiles

* Fix codecs in cli tests

* Update CLI tests

* WIP fix deps

* Pin to IBC-alpha

* Updates to build, failing tests

* Update to latest ibc-alpha

* Push

* Update to latest ibc-alpha

* Update upstream SDK version to latest ibc-alpha

* Update to latest ibc-alpha

* Push go.sum changes

* enable historical info tracking

* Update to latest ibc-alpha

* Push latest ibc-alpha version

* Fix build, flags issue still present

* Working build

* Fix lint issue

* Update to latest sdk@ibc-alpha

* Update TM and SDK versions

* Change historical header numsaved to 1000 and update to latest ibc-alpha

* Update upstream SDK version

* Merge PR #318: Hook up 20-Transfer module to Gaia

* hookup transfer module to gaia

* Update upstream SDK version

Co-authored-by: Christopher Goes <cwgoes@pluranimity.org>

* Update upstream SDK version

* Fix commit

* bump sdk dependency

* Update sdk version

* update to tm@v0.33.2

* Update to latest cosmos-sdk

* Push ibc-alpha @jackzampolin: update sdk version

* Push ibc-alpha @jackzampolin: update sdk version

* Push ibc-alpha @jackzampolin: fix go version in dockerfile

* Merge PR #336: Add testing dockerfile for relayer

* Add test docker file for relayer and makefile build, tag and push commands

* add entrypoint on test docker image

* fix typo in makefile

* turn up speed on tests

* Back to 1s blocks

* Test fixes

* Push ibc-alpha @jackzampolin: ensure that tags are indexed

* Push ibc-alpha @jackzampolin: update to latest sdk@ibc-alpha

* Push ibc-alpha @jackzampolin: update sdk to latest ibc-alpha

* Push ibc-alpha @jackzampolin: update sdk version

* Add capability keeper to gaia

* Push ibc-alpha @jackzampolin: clean up go.sum

* Push ibc-alpha @jackzampolin: fix test failures

* Push ibc-alpha @jackzampolin: begin incorporating the port routing changes

* Push ibc-alpha @jackzampolin: begin incorporating the port routing changes

* Merge PR #349: Update to lastest SDK

* make gaia fixes

* Update to latest

* blah

* remove sdk replace

Co-authored-by: Jack Zampolin <jack.zampolin@gmail.com>

* Push ibc-alpha @jackzampolin: fix go.sum

* Push ibc-alpha @jackzampolin: fix test failure due to key refactor

* Passing cli tests?"

* Push ibc-alpha @jackzampolin: Update to latest SDK master

* Remove unnecessary import

* Passing multisig test

* Update go.mod

Co-Authored-By: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* Update lcd_test/helpers.go

Co-Authored-By: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* Update lcd_test/helpers.go

Co-Authored-By: Bot from GolangCI <42910462+golangcibot@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* Update app/app.go

Co-Authored-By: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* Apply suggestions from code review

* revert changes as suggested by @fedekunze

* run go mod tidy

* attempt to fix test-sim-multi-seed-short simulation

* Revert "attempt to fix test-sim-multi-seed-short simulation"

This reverts commit 1ff1a01.

* Push ibc-alpha @jackzampolin: address pr comments and clean up old ibc demo

* remove unnecessary replace statement

* Push ibc-alpha @jackzampolin: update to latest cosmos-sdk master and assoicated changes

* Push ibc-alpha @jackzampolin: update to latest SDK

* Push ibc-alpha @jackzampolin: fix test builds

* Push ibc-alpha @jackzampolin: fix packet send issue

* Push ibc-alpha @jackzampolin: update sdk to fix encoding issue on acks

* Push ibc-alpha @jackzampolin: update for supply removal and packet ack fixes

* Push ibc-alpha @jackzampolin: update to latest sdk master

* Fix test failures

* Push ibc-alpha @jackzampolin: fix gaia supply tests

* Push ibc-alpha @jackzampolin: fix lcd test failures

* WIP debugging

* Push ibc-alpha @jackzampolin: update to include capability fixes

* Push ibc-alpha @jackzampolin: fix test build issue

* add HistoricalInfoKey to skipped prefixes

* fix diff with SDK's Simapp

* typo

* update sim_test.go

* Bump sdk version

* update replay.go and helpers.go

* remove default param override

* Update Dockerfile

* Push ibc-alpha @jackzampolin: update to sdk master

* Push ibc-alpha @jackzampolin: address PR comments

* simplify makefile's docker target, remove remote push

* update .PHONY

remove go mod verify after lint, no longer needed

* Reduce diff size

* Push ibc-alpha @jackzampolin: re-add docker push to Makefile

* Push ibc-alpha @jackzampolin: incorporate historical entries change from SDK

* Address PR comment

Co-authored-by: Federico Kunze <federico.kunze94@gmail.com>
Co-authored-by: mossid <torecursedivine@gmail.com>
Co-authored-by: Christopher Goes <cwgoes@pluranimity.org>
Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Anca Zamfir <ancazamfir@users.noreply.github.com>
Co-authored-by: Marko Baricevic <marbar3778@yahoo.com>
Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
Co-authored-by: Aditya Sripal <adityasripal@gmail.com>
Co-authored-by: Alessio Treglia <alessio@tendermint.com>
Co-authored-by: Bot from GolangCI <42910462+golangcibot@users.noreply.github.com>
refresh againt cosmos-sdk master (#375)
20a071c 
fix panic on gaiacli status command
@sahith-narahari
Migrated codec to hybrid codec
c21ee19
@sahith-narahari
Merge gaia commit 20a071c
0ccd7fe
@sahith-narahari
Updated imports in client to latest
61b4282
@sahith-narahari
Fixed proto issue in MsgExecuteContract
5818c81
@sahith-narahari
Fixed merge conflicts
b678a16
@sahith-narahari
Updated tests to master
d548019
@sahith-narahari
Migrated keeper to use codec marshaler
a78288c
@sahith-narahari
Fix utils tests
2a56ce8
@sahith-narahari
Fix integration tests
f54a477
@ethanfrey
Re-enable and fix gas tests
fe4d815
@ethanfrey
Fix event emitting
b9fad93
@ethanfrey
Fix last test compile errors
c46ea53
@ethanfrey
Merge pull request #110 from CosmWasm/sahith/keeper-migration
7ee4baa 
Migrate wasm to proto
@ethanfrey
Disable linter that needs account
d49799a
@ethanfrey
Merge pull request #109 from CosmWasm/sahith/upstream-master
015802e 
Migrate messages to proto
@codecov-io
Copy link

codecov-io commented May 6, 2020 •
edited
Loading

Codecov Report

Merging #108 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #108   +/-   ##
=======================================
  Coverage   30.88%   30.88%           
=======================================
  Files          20       20           
  Lines        2678     2678           
=======================================
  Hits          827      827           
  Misses       1776     1776           
  Partials       75       75

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 015802e...015802e. Read the comment docs.

This was referenced Jun 3, 2020
Closed
Closed
@alpe alpe mentioned this pull request Jun 10, 2020
Merged
10 tasks
@ethanfrey
Copy link
Member Author

Replaced by #138 (newer wasmd - 0.9 branch newer cosmos-sdk goz-phase-3)

@ethanfrey ethanfrey closed this Jun 15, 2020
@alpe alpe mentioned this pull request Aug 25, 2020
Closed
@alpe alpe deleted the update-gaia branch December 22, 2021 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.