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

Add AllDenomMetadata BankQuery (backport #1703) #1745

Merged
merged 17 commits into from
Jun 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

This is an automatic backport of pull request #1703 done by Mergify.
Cherry-pick of 4bac1e3 has failed:

On branch mergify/bp/release/1.3/pr-1703
Your branch is up to date with 'origin/release/1.3'.

You are currently cherry-picking commit 4bac1e3c.
  (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:   .circleci/config.yml
	modified:   MIGRATING.md
	modified:   docs/CAPABILITIES-BUILT-IN.md
	modified:   packages/check/src/main.rs
	modified:   packages/std/Cargo.toml
	modified:   packages/std/src/exports.rs
	modified:   packages/std/src/lib.rs
	new file:   packages/std/src/metadata.rs
	modified:   packages/std/src/query/bank.rs
	modified:   packages/std/src/query/mod.rs
	modified:   packages/std/src/testing/mock.rs
	modified:   packages/std/src/traits.rs
	modified:   packages/vm/src/testing/instance.rs

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

Cherry-pick of 7e96644 has failed:

On branch mergify/bp/release/1.3/pr-1703
Your branch is ahead of 'origin/release/1.3' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7e96644e.
  (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:   contracts/cyberpunk/Cargo.toml
	modified:   contracts/cyberpunk/src/msg.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   contracts/cyberpunk/src/contract.rs

Cherry-pick of feab42e has failed:

On branch mergify/bp/release/1.3/pr-1703
Your branch is ahead of 'origin/release/1.3' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit feab42e4.
  (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:   contracts/cyberpunk/src/msg.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   contracts/cyberpunk/src/contract.rs

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

nik-suri and others added 16 commits June 22, 2023 15:38
(cherry picked from commit 4bac1e3)

# Conflicts:
#	CHANGELOG.md
#	docs/USING_COSMWASM_STD.md
… BankQuery::DenomMetadata also gated by cosmwasm_1_3 feature flag

(cherry picked from commit 71c5a07)
(cherry picked from commit 83baec3)
(cherry picked from commit 5e146b0)
(cherry picked from commit ea6d82c)
Co-authored-by: Simon Warta <[email protected]>
(cherry picked from commit ebec623)
(cherry picked from commit 0a9b745)
(cherry picked from commit c5717a7)
(cherry picked from commit 7e96644)

# Conflicts:
#	contracts/cyberpunk/src/contract.rs
(cherry picked from commit feab42e)

# Conflicts:
#	contracts/cyberpunk/src/contract.rs
(cherry picked from commit 0d0f819)
@mergify mergify bot added the conflicts label Jun 22, 2023
@webmaster128 webmaster128 merged commit d492b16 into release/1.3 Jun 22, 2023
@webmaster128 webmaster128 deleted the mergify/bp/release/1.3/pr-1703 branch June 22, 2023 17:03
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.

3 participants