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

chore!: pull main v1.x #1876

Merged
merged 22 commits into from
Jun 5, 2023
Merged

chore!: pull main v1.x #1876

merged 22 commits into from
Jun 5, 2023

Conversation

evan-forbes
Copy link
Member

Overview

pull all changes from main to the v1.x branch, this is blocking the next release candidate.

Should be merged or rebased, not squashed

Checklist

  • New and updated code has appropriate documentation
  • New and updated code has new and/or updated testing
  • Required CI checks are passing
  • Visual proof for any user facing features like CLI or documentation updates
  • Linked issues closed with keywords

rach-id and others added 22 commits May 25, 2023 13:47
<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

<!-- 
Please provide an explanation of the PR, including the appropriate
context,
background, goal, and rationale. If there is an issue with this
information,
please provide a tl;dr and link the issue. 
-->

Handles
#1799 (comment)

## Checklist

<!-- 
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords
Closes: #1625

---------

Co-authored-by: CHAMI Rachid <chamirachid1@gmail.com>
Co-authored-by: Rootul P <rootulp@gmail.com>
<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

<!-- 
Please provide an explanation of the PR, including the appropriate
context,
background, goal, and rationale. If there is an issue with this
information,
please provide a tl;dr and link the issue. 
-->

QGB module go docs reformat 

Closes: #1819

## Checklist

<!-- 
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords

---------

Co-authored-by: Rootul P <rootulp@gmail.com>
Part of investigating
#1816

Note: an implementation change isn't necessary b/c the bug was already
fixed by #1662
…o 24.0.0+incompatible (#1780)

Bumps [github.com/docker/docker](https://github.com/docker/docker) from
23.0.6+incompatible to 24.0.0+incompatible.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/docker/releases">github.com/docker/docker's
releases</a>.</em></p>
<blockquote>
<h2>v24.0.0</h2>
<h2>24.0.0</h2>
<p>For a full list of pull requests and changes in this release, refer
to the relevant GitHub milestones:</p>
<ul>
<li><a
href="https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A24.0.0">docker/cli,
24.0.0 milestone</a></li>
<li><a
href="https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A24.0.0">moby/moby,
24.0.0 milestone</a></li>
</ul>
<h3>New</h3>
<ul>
<li>Introduce experimental support for containerd as the content store
(replacing the existing storage drivers). <a
href="https://redirect.github.com/moby/moby/pull/43735">moby/moby#43735</a>,
<a
href="https://github.com/moby/moby/pulls?q=is%3Apr+is%3Amerged+milestone%3A24.0.0+-label%3Aprocess%2Fcherry-picked+label%3Acontainerd-integration+">other
moby/moby pull requests</a></li>
<li>The <code>--host</code> CLI flag now supports a path component in a
<code>ssh://</code> host address, allowing use of an alternate socket
path without configuration on the remote host. <a
href="https://redirect.github.com/docker/cli/pull/4073">docker/cli#4073</a></li>
<li>The <code>docker info</code> CLI command now reports a version and
platform field. <a
href="https://redirect.github.com/docker/cli/pull/4180">docker/cli#4180</a></li>
<li>Introduce the daemon flag <code>--default-network-opt</code> to
configure options for newly created networks. <a
href="https://redirect.github.com/moby/moby/pull/43197">moby/moby#43197</a></li>
<li>Restrict access to <code>AF_VSOCK</code> in the
<code>socket(2)</code> family of syscalls in the default seccomp
profile. <a
href="https://redirect.github.com/moby/moby/pull/44562">moby/moby#44562</a></li>
<li>Introduce support for setting OCI runtime annotations on containers.
<a
href="https://redirect.github.com/docker/cli/pull/4156">docker/cli#45025</a>,
<a
href="https://redirect.github.com/moby/moby/pull/45025">moby/moby#45025</a></li>
<li>Alternative runtimes can now be configured in
<code>daemon.json</code>, enabling runtime names to be aliased and
options to be passed. <a
href="https://redirect.github.com/moby/moby/pull/45032">moby/moby#45032</a></li>
<li>The <code>docker-init</code> binary will now be discovered in
FHS-compliant libexec directories, in addition to the <code>PATH</code>.
<a
href="https://redirect.github.com/moby/moby/pull/45198">moby/moby#45198</a></li>
<li>API: Surface the daemon-level <code>--no-new-privileges</code> in
<code>GET /info</code>. <a
href="https://redirect.github.com/moby/moby/pull/45320">moby/moby#45320</a></li>
</ul>
<h3>Removed</h3>
<ul>
<li><code>docker info</code> no longer reports
<code>IndexServiceAddress</code>. <a
href="https://redirect.github.com/docker/cli/pull/4204">docker/cli#4204</a></li>
<li>libnetwork: Remove fallback code for obsolete kernel versions. <a
href="https://redirect.github.com/moby/moby/pull/44684">moby/moby#44684</a>,
<a
href="https://redirect.github.com/moby/moby/pull/44802">moby/moby#44802</a></li>
<li>libnetwork: Remove unused code related to classic Swarm. <a
href="https://redirect.github.com/moby/moby/pull/44965">moby/moby#44965</a></li>
<li>libnetwork: Remove usage of the <code>xt_u32</code> kernel module
from encrypted Swarm overlay networks. <a
href="https://redirect.github.com/moby/moby/pull/45281">moby/moby#45281</a></li>
<li>Remove support for buildkit's deprecated <code>buildinfo</code> in
favor of standard provenance attestations. <a
href="https://redirect.github.com/moby/moby/pull/45097">moby/moby#45097</a></li>
<li>Remove the deprecated AUFS and legacy <code>overlay</code> storage
drivers. <a
href="https://redirect.github.com/moby/moby/pull/45342">moby/moby#45342</a>,
<a
href="https://redirect.github.com/moby/moby/pull/45359">moby/moby#</a></li>
<li>Remove the deprecated <code>overlay2.override_kernel_check</code>
storage driver option. <a
href="https://redirect.github.com/moby/moby/pull/45368">moby/moby#45368</a></li>
<li>Remove workarounds for obsolete versions of
<code>apparmor_parser</code> from the AppArmor profiles. <a
href="https://redirect.github.com/moby/moby/pull/45500">moby/moby#45500</a></li>
<li>API: <code>GET /images/json</code> no longer represents empty
RepoTags and RepoDigests
as<code>&lt;none&gt;:&lt;none&gt;</code>/<code>&lt;none&gt;@&lt;none&gt;</code>.
Empty arrays are be returned instead on API &gt;= 1.43. <a
href="https://redirect.github.com/moby/moby/pull/45068">moby/moby#45068</a></li>
</ul>
<h3>Deprecated</h3>
<ul>
<li>Deprecate the <code>--oom-score-adjust</code> daemon option. <a
href="https://redirect.github.com/moby/moby/pull/45315">moby/moby#45315</a></li>
<li>API: Deprecate the <code>VirtualSize</code> field in <code>GET
/images/json</code> and <code>GET /images/{id}/json</code>. <a
href="https://redirect.github.com/moby/moby/pull/45346">moby/moby#45346</a></li>
</ul>
<h3>Bug fixes and enhancements</h3>
<ul>
<li>The <code>docker stack</code> command no longer validates the
<code>build</code> section of Compose files. <a
href="https://redirect.github.com/docker/cli/pull/4214">docker/cli#4214</a></li>
<li>Fix lingering healthcheck processes after timeout is reached. <a
href="https://redirect.github.com/moby/moby/pull/43739">moby/moby#43739</a></li>
<li>Reduce the overhead of container startup when using the
<code>overlay2</code> storage driver. <a
href="https://redirect.github.com/moby/moby/pull/44285">moby/moby#44285</a></li>
<li>API: Handle multiple <code>before=</code> and <code>since=</code>
filters in <code>GET /images</code>. <a
href="https://redirect.github.com/moby/moby/pull/44503">moby/moby#44503</a></li>
<li>Fix numerous bugs in the embedded DNS resolver implementation used
by user-defined networks. <a
href="https://redirect.github.com/moby/moby/pull/44664">moby/moby#44664</a></li>
<li>Add <code>execDuration</code> field to the map of event attributes.
<a
href="https://redirect.github.com/moby/moby/pull/45494">moby/moby#45494</a></li>
<li>Swarm-level networks can now be created with the Windows
<code>internal</code>, <code>l2bridge</code>, and <code>nat</code>
drivers. <a
href="https://redirect.github.com/moby/swarmkit/pull/3121">moby/swarmkit#3121</a>,
<a
href="https://redirect.github.com/moby/moby/pull/45291">moby/moby#45291</a></li>
</ul>
<h3>Packaging updates</h3>
<ul>
<li>Update Go to <code>1.20.4</code>. <a
href="https://redirect.github.com/docker/cli/pull/4253">docker/cli#4253</a>,
<a
href="https://redirect.github.com/moby/moby/pull/45456">moby/moby#45456</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/moby/moby/commit/1331b8c39a601c77d678f3e03f3f39cb07aa5f76"><code>1331b8c</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/45537">#45537</a>
from thaJeztah/24.0_backport_containerd_binary_1.7.1</li>
<li><a
href="https://github.com/moby/moby/commit/907f037141b41d0a96daa379fd2cbd0b0eee7569"><code>907f037</code></a>
update containerd binary to v1.7.1</li>
<li><a
href="https://github.com/moby/moby/commit/a5b597ea51348f5f922fdd2167cba8f57c6961f3"><code>a5b597e</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/45531">#45531</a>
from rumpl/24.0_backport_fix-empty-auth-pull</li>
<li><a
href="https://github.com/moby/moby/commit/8bbfa3274109a240952c08a2263d0cd256a27311"><code>8bbfa32</code></a>
c8d: The authorizer needs to be set even if AuthConfig is empty</li>
<li><a
href="https://github.com/moby/moby/commit/807e415260380b55af87ef50d72abcef9466e43b"><code>807e415</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/45526">#45526</a>
from laurazard/backport-classic-builder</li>
<li><a
href="https://github.com/moby/moby/commit/8587a1c617dae69474e8e3847d5fd799de156da6"><code>8587a1c</code></a>
c8d/builder: implement cache</li>
<li><a
href="https://github.com/moby/moby/commit/9717369913214e9fbf1d656af24092d65a1e0102"><code>9717369</code></a>
c8d: implement classic builder</li>
<li><a
href="https://github.com/moby/moby/commit/ed0c147c8ffd969487ecc1afb74832f8aa4e798e"><code>ed0c147</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/45523">#45523</a>
from thaJeztah/24.0_backport_cleanup_reexec_inits</li>
<li><a
href="https://github.com/moby/moby/commit/90be9ab80267fbed15503c9030b864151f73503c"><code>90be9ab</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/45525">#45525</a>
from thaJeztah/24.0_backport_c8d_authconfig_default</li>
<li><a
href="https://github.com/moby/moby/commit/d73f7031e0cb866fae12e582a6846114303a10fa"><code>d73f703</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/docker/issues/45521">#45521</a>
from thaJeztah/24.0_backport_vendor_distribution_v2...</li>
<li>Additional commits viewable in <a
href="https://github.com/docker/docker/compare/v23.0.6...v24.0.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/docker/docker&package-manager=go_modules&previous-version=23.0.6+incompatible&new-version=24.0.0+incompatible)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
Co-authored-by: Rootul P <rootulp@gmail.com>
## Overview

bumps core to latest patch version

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords
* docs: update the nonces docs in QGB store

* Update x/qgb/keeper/keeper_attestation.go

Co-authored-by: Rootul P <rootulp@gmail.com>

* Update x/qgb/keeper/keeper_attestation.go

Co-authored-by: Rootul P <rootulp@gmail.com>

---------

Co-authored-by: Rootul P <rootulp@gmail.com>
)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.3 to 1.8.4.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.3...v1.8.4)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
Bumps [github.com/BurntSushi/toml](https://github.com/BurntSushi/toml) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/BurntSushi/toml/releases)
- [Commits](BurntSushi/toml@v1.2.1...v1.3.0)

---
updated-dependencies:
- dependency-name: github.com/BurntSushi/toml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
)

Bumps [github.com/cosmos/ibc-go/v6](https://github.com/cosmos/ibc-go) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/cosmos/ibc-go/releases)
- [Changelog](https://github.com/cosmos/ibc-go/blob/v6.1.1/CHANGELOG.md)
- [Commits](cosmos/ibc-go@v6.1.0...v6.1.1)

---
updated-dependencies:
- dependency-name: github.com/cosmos/ibc-go/v6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
* adds _flaky suffix to the flaky tests

* adds further comments

---------

Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
For consistency with other packages and modules
* docs: add template

Co-authored-by: Sanaz Taheri <staheri14@users.noreply.github.com>

* add initial files and their link

* fix: remove dead link

* docs: remove todo

Co-authored-by: Rootul P <rootulp@gmail.com>

* docs: remove individual directories per state machine module

* fix: support for mdbook by remove things w/o a link

* chore: add state machine modules to the readme

* chore: better mdbooks structure

* chore: add all standard cosmos-sdk modules as well

* chore: add missing link in readme

* chore: add missing link in the readme

* typo

Co-authored-by: Rootul P <rootulp@gmail.com>

---------

Co-authored-by: Sanaz Taheri <staheri14@users.noreply.github.com>
Co-authored-by: Rootul P <rootulp@gmail.com>
….0 (#1831)

Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.11.6 to 1.12.0.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.11.6...v1.12.0)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
…o 24.0.2+incompatible (#1844)

chore(deps): Bump github.com/docker/docker

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.0+incompatible to 24.0.2+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v24.0.0...v24.0.2)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Evan Forbes <42654277+evan-forbes@users.noreply.github.com>
* test: use utia as bond denom in test app

* implement failing test

* refactor test to use test cases

* green test

* fix: TestAnnualProvisions

* consolidate tests

* remove comment

* only call SetMinter once

* add another test

* fix lint
@github-actions
Copy link

github-actions bot commented Jun 5, 2023

PR Preview Action v1.4.4
🚀 Deployed preview to https://celestiaorg.github.io/celestia-app/pr-preview/pr-1876/
on branch gh-pages at 2023-06-05 13:52 UTC

@evan-forbes evan-forbes self-assigned this Jun 5, 2023
Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving given the CI passes.

Question: Why are we cherry picking instead of merging main in v1.x all the time? I guess that main is supposed to be the version we deploy to current testnets, no?

@evan-forbes
Copy link
Member Author

the changes of a few of the commits listed above have already been incorporated to the v1.x branch, but since we're merging, the hashes are different so github show them. rebasing and skipping the redundant commits should fix this but 🤷

Why are we cherry picking instead of merging main in v1.x all the time? I guess that main is supposed to be the version we deploy to current testnets, no?

for this set of release candidates, I think you are correct and we should just merge. However, if main begins to differ from the set of features that we want on the release branch, then we wouldn't want to do that. I think that was the thinking of backporting only specific changes

@rach-id
Copy link
Member

rach-id commented Jun 5, 2023

Makea sense. Thanks

@evan-forbes evan-forbes changed the title Evan/pull main v1.x chore!: pull main v1.x Jun 5, 2023
@evan-forbes evan-forbes merged commit 72be251 into v1.x Jun 5, 2023
20 checks passed
@evan-forbes evan-forbes deleted the evan/pull-main-v1.x branch June 5, 2023 14:44
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

5 participants