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

fix(ics20): Extract grant checking and updating functions for reuse (backport #1850) #1872

Merged
merged 4 commits into from
Oct 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 16, 2023

This is an automatic backport of pull request #1850 done by Mergify.
Cherry-pick of 6d2d0f1 has failed:

On branch mergify/bp/release/v15.0.x/pr-1850
Your branch is up to date with 'origin/release/v15.0.x'.

You are currently cherry-picking commit 6d2d0f1f.
  (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:   precompiles/authorization/events.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   precompiles/ics20/events.go
	both modified:   precompiles/ics20/tx.go
	both modified:   precompiles/ics20/types.go

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

…1850)

* fix: add some of the refactors

* add CHANGELOG

* fix: common approval logic and test refactor to use the new event emitting

* fix: extract check and update grant functions for case when smart contracts are calling

* CHANGELOG

* CHANGELOG

* fix: added back changes needed

* fix: remove unused event

* CHANGELOG

* format and lint

* Apply suggestions from code review

Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>

---------

Co-authored-by: Tom <54514587+GAtom22@users.noreply.github.com>
Co-authored-by: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com>
(cherry picked from commit 6d2d0f1)

# Conflicts:
#	CHANGELOG.md
#	precompiles/ics20/events.go
#	precompiles/ics20/tx.go
#	precompiles/ics20/types.go
@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

Merging #1872 (5062f9a) into release/v15.0.x (08d355a) will increase coverage by 0.20%.
The diff coverage is 93.93%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release/v15.0.x    #1872      +/-   ##
===================================================
+ Coverage            70.42%   70.63%   +0.20%     
===================================================
  Files                  315      315              
  Lines                23428    23375      -53     
===================================================
+ Hits                 16500    16510      +10     
+ Misses                6112     6049      -63     
  Partials               816      816              
Files Coverage Δ
precompiles/authorization/events.go 0.00% <ø> (ø)
precompiles/ics20/events.go 70.96% <ø> (+34.30%) ⬆️
precompiles/ics20/types.go 71.05% <100.00%> (+3.56%) ⬆️
precompiles/ics20/tx.go 75.00% <75.00%> (-7.36%) ⬇️

@Vvaradinov Vvaradinov merged commit 8b9f4cc into release/v15.0.x Oct 16, 2023
22 of 23 checks passed
@Vvaradinov Vvaradinov deleted the mergify/bp/release/v15.0.x/pr-1850 branch October 16, 2023 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant