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.

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

Merge 1.8.x changes that aren't yet in main. #714

Merged
merged 31 commits into from
Mar 16, 2022

Conversation

dwedul-figure
Copy link
Contributor

Description

The release/v1.8.x branch has received some fixes that are not reflected in main. This brings them into main.

closes: #XXXX


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • 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 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
  • Review Codecov Report in the comment section below once CI passes

egaxhaj and others added 23 commits January 28, 2022 14:44
* add java distribution

* update changelog
…#636)

* add java distribution (#625)

* add java distribution

* update changelog

* Update gov module deposit requirements and add msg fee (#633)

* add deposit and msg fee updates for gov in upgrade

* changelog

* Allow attributes to be associated with scopes. (#634)

* [631]: Update NewAttribute to take in a string instead of an AccAddress.

* [631]: Update Attribute.ValidateBasic() to allow the address to be a scope metadata address.

* [631]: Update NewMsgAddAttributeRequest to take in a string for the account instead of an AccAddress in order to allow for scope metadata addresses.

* [631]: Update NewMsgUpdateAttributeRequest to take in a string for the account instead of an AccAddress in order to allow for scope metadata addresses.

* [631]: Update the attribute keeper methods to treat the Address as a string instead of AccAddress to allow it to be a scope metadata address.

* [631]: Update the attribute keys methods to not rely on the address being an account address.

* [631]: Lint fixes.

* [631]: Lint fixes in main that make lint is complaining about.

* [631]: Add changelog entry.

* [631]: Add some stuff that was missed like the delete messages and some extra context on returned errors.

* Fix message breaking unit test

Co-authored-by: Derek Adams <dadams@figure.com>
Co-authored-by: Derek Adams <derek.adams@sitewhere.com>
Co-authored-by: Ira Miller <72319+iramiller@users.noreply.github.com>

Co-authored-by: Ergels Gaxhaj <87285445+egaxhaj-figure@users.noreply.github.com>
Co-authored-by: Daniel Wedul <72031080+dwedul-figure@users.noreply.github.com>
Co-authored-by: Derek Adams <dadams@figure.com>
Co-authored-by: Derek Adams <derek.adams@sitewhere.com>
* Add msgfees to store added upgrades

* Add changelog entry
* 614 proto binding support with buf build (#630)

* initial attemp at using buf.build

* buf.build stuff

* buf workflow

* trigger on PR for testing

* fix breaking for third_party

* use existing workflow

* updated proto steps

* changelog entry

* fix bug with proto-all

* update proto script and protos

* update proto-all task

* fix typo

* fix bug with proto binding release version & combine workflows

* add protoBinding build step to release.yml workflow

* missed in git add on last commit

* fix lint errors

* fix buf braking
* fix release version reference

* update changelog
* Bump cosmwasm from v1.0.0-beta5 to v1.0.0-beta6, Add change log entry

* Add dockerfile cosmoswasm v1.0.0-beta5 direct download and validation

* Revert dockerfile changes
* Add iterator as a feature to wasm
* remove v from artifact version

* update changelog
* Change go.mod to use wasmd fork to support old address length

* Linked issue
* adding upgrade handler indigo.
Upgrade golangci-lint and fix lint errors
#705)

* backport: In release 1.8(not yet in mainnet), floor gas price should be checked for all Tx's ( currently only being checked for Tx which have additional Msg Fee),closes: #684
backport: fix owner array initialization size when creating scope mutation wasm msg
* simulation tests are running

* fixed record issue

* Add smart contract to github actions testing

* fixed determinism test

* cleanup

* make format

* cleanup

* make format

* lint changes

* more lint fixes

* fix tests

* reordered sims tests

* working on import tests

* fixed tests

* cleanup

* add changelog

* fix test name

* make format

* update linter

* lint error

* fix append errors

* lint fixes

* update lint version

* print line numbers

* use verbose output

* use work around for linter

* reverted name change

* more clenaup

* nolint comments

* more nolint comments

* updated linter for kErr

* update golint version

* nolint for gosec

* make format

* remove unused consts

* nolint cleanups

* make format

* update action version

* revert action change
* Skip max gas fees if tx contains MsgSubmitProposal msg (#711)

* Add jasmine upgrade handler
# Conflicts:
#	.github/workflows/proto.yml
#	.github/workflows/release.yml
#	CHANGELOG.md
#	app/upgrades.go
#	cmd/provenanced/config/manager.go
#	proto/provenance/msgfees/v1/msgfees.proto
#	x/msgfees/types/msgfees.pb.go
@codecov
Copy link

codecov bot commented Mar 8, 2022

Codecov Report

Merging #714 (03bf8da) into main (c88c267) will increase coverage by 0.00%.
The diff coverage is 53.57%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #714   +/-   ##
=======================================
  Coverage   56.74%   56.74%           
=======================================
  Files         177      177           
  Lines       21119    21132   +13     
=======================================
+ Hits        11983    11991    +8     
- Misses       8224     8231    +7     
+ Partials      912      910    -2     
Impacted Files Coverage Δ
app/upgrades.go 7.87% <0.00%> (+1.94%) ⬆️
internal/antewrapper/tx_gas_limit_decorator.go 9.52% <0.00%> (+0.43%) ⬆️
x/name/simulation/genesis.go 0.00% <0.00%> (ø)
app/app.go 87.09% <100.00%> (ø)
internal/antewrapper/handler.go 66.66% <100.00%> (ø)
internal/antewrapper/msg_fees_decorator.go 81.52% <100.00%> (ø)
x/attribute/simulation/operations.go 78.08% <100.00%> (+0.51%) ⬆️
x/marker/simulation/operations.go 63.95% <100.00%> (ø)
... and 1 more

Derek Adams and others added 3 commits March 9, 2022 11:54
* pre rc10 (new handler, gas fee 15/blk, ante reorder)

Co-authored-by: arnabmitra <arnabmitra.mitra@gmail.com>
# Conflicts:
#	.github/workflows/lint.yml
@dwedul-figure dwedul-figure changed the title Dwedul/merge 1.8.x after rc9 Dwedul/merge 1.8.x after rc10 Mar 11, 2022
@dwedul-figure dwedul-figure enabled auto-merge (squash) March 11, 2022 01:01
@dwedul-figure dwedul-figure changed the title Dwedul/merge 1.8.x after rc10 Merge 1.8.x changes that aren't yet in main. Mar 11, 2022
@dwedul-figure dwedul-figure merged commit cb3d987 into main Mar 16, 2022
@dwedul-figure dwedul-figure deleted the dwedul/merge-1.8.x-after-rc9 branch March 16, 2022 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants