917: Make oracle and monitor actor load CFDs from DB r=thomaseizinger a=thomaseizinger
With event sourcing, these actors will use a different model. Passing
them the DB connection directly now makes this change easier.
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
916: Move init of syncing task to respective actor r=thomaseizinger a=thomaseizinger
This reduces code duplication across maker and taker.
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
904: Cleanup dependencies in `taker-frontend` r=thomaseizinger a=thomaseizinger
Read the commit messages for details.
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
900: Use single generic enum for protocol completion status r=klochowicz a=klochowicz
See commit messages.
TODO: CollaborativeSettlement will come in a separate PR.
Co-authored-by: Mariusz Klochowicz <mariusz@klochowicz.com>
Use the same enum across:
- setup taker,
- setup maker,
- rollover taker
Generic enum contains a reason in the Rejection case - if it's not specified, it
defaults to "unknown".
Note: Completed::Succeeded uses a marker type to allow distinguishing the
protocol in the cfd actor message handlers.
In general, we would like to let the sender of an `xtra::Message` to
be able to handle all the possible errors. The `log_error` macro
catered to the complete opposite use case, so we remove it.
In order to make error handling at the sending site more ergonomic, we
introduce a `LogFailure` trait designed for fallible `xtra::Messages`.
With this patch we've tried to change _where_ we handle errors, but
not _what_ we do with them.
When using a bundler, there is no need for npm's differentation
between dependencies and devDependencies and it only leads to
confusion which ones are already installed.
We are using vite as our build tool. No need for react-scripts.
The removal of react-scripts highlights that we are depending
on things like eslint without declaring these dependencies. Fix
that.
880: Auto-rollover r=thomaseizinger a=da-kami
resolves#456
Note: I'm looking forward to the event sourcing model. Getting this working in the current state model is quite cumbersome.
Fixes https://github.com/itchysats/itchysats/issues/892. (settlement interval is reduced)
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
903: Bump framer-motion from 5.4.5 to 5.5.1 in /taker-frontend r=thomaseizinger a=dependabot[bot]
Bumps [framer-motion](https://github.com/framer/motion) from 5.4.5 to 5.5.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/framer/motion/blob/main/CHANGELOG.md">framer-motion's changelog</a>.</em></p>
<blockquote>
<h2>[5.5.1] 2021-12-14</h2>
<h3>Fixed</h3>
<ul>
<li>Removed dynamic resolution scaling from <code>LayoutCamera</code> to fix crash in iOS.</li>
</ul>
<h2>[5.5.0] 2021-12-14</h2>
<h3>Added</h3>
<ul>
<li><code>LayoutCamera</code> and <code>LayoutOrthographicCamera</code>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="a2184f5150"><code>a2184f5</code></a> 5.5.1</li>
<li><a href="ef150aaadd"><code>ef150aa</code></a> Removing dynamic resolution scaling</li>
<li><a href="715362723f"><code>7153627</code></a> Updating changelog</li>
<li><a href="5f0c3a772d"><code>5f0c3a7</code></a> Updating internal rendering resolution:</li>
<li><a href="8cfdd8b115"><code>8cfdd8b</code></a> 5.5.0</li>
<li><a href="28b1ce3c7e"><code>28b1ce3</code></a> Feature/layout camera (<a href="https://github-redirect.dependabot.com/framer/motion/issues/1393">#1393</a>)</li>
<li><a href="fe8c226dbd"><code>fe8c226</code></a> Feature/three final (<a href="https://github-redirect.dependabot.com/framer/motion/issues/1391">#1391</a>)</li>
<li>See full diff in <a href="https://github.com/framer/motion/compare/v5.4.5...v5.5.1">compare view</a></li>
</ul>
</details>
<br />
[](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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
899: Rename database function for loading CFDs r=thomaseizinger a=thomaseizinger
With the removal of the order from the DB, we are loading a CFD by
its ID which just happens to be the order id but that is no longer
relevant at this stage.
Co-authored-by: Thomas Eizinger <thomas@eizinger.io>
With the removal of the order from the DB, we are loading a CFD by
its ID which just happens to be the order id but that is no longer
relevant at this stage.
893: Bump serde_json from 1.0.72 to 1.0.73 r=thomaseizinger a=dependabot[bot]
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.72 to 1.0.73.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/serde-rs/json/releases">serde_json's releases</a>.</em></p>
<blockquote>
<h2>v1.0.73</h2>
<ul>
<li>Update <code>itoa</code> dependency to 1.0</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="296f718e18"><code>296f718</code></a> Release 1.0.73</li>
<li><a href="48455de674"><code>48455de</code></a> Update to itoa 1.0</li>
<li><a href="b66b0eb322"><code>b66b0eb</code></a> Track raw pointers in miri CI run</li>
<li><a href="52eec5e2ee"><code>52eec5e</code></a> Add a miri test job in CI</li>
<li><a href="aaaf125f0b"><code>aaaf125</code></a> Disable TcpStream test on miri</li>
<li><a href="f0774c482a"><code>f0774c4</code></a> Raise required rustc from 1.31 to 1.36</li>
<li><a href="c3eddcdf40"><code>c3eddcd</code></a> Collect imports to top of test suite</li>
<li><a href="a28529ddc9"><code>a28529d</code></a> Skip ui test when running in miri</li>
<li><a href="7db1ea907d"><code>7db1ea9</code></a> Ignore needless_late_init Clippy lint</li>
<li><a href="fc0ca07b10"><code>fc0ca07</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/serde-rs/json/issues/831">#831</a> from serde-rs/from_u32</li>
<li>Additional commits viewable in <a href="https://github.com/serde-rs/json/compare/v1.0.72...v1.0.73">compare view</a></li>
</ul>
</details>
<br />
[](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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Making all fields private revealed some weirdness in how we compute
the position of the CFD. For an order, it made sense that we store
the `origin` of it. For a CFD however, it makes more sense to store
the position and role of the actor explicitly and derive other
information from there.
Electrum sometimes returns error code -27
bad-txns-inputs-missingorspent. This can occur because the transaction
has been published. Electrum should return error code -25 transaction
already on chain. In the case of error code -27 we now check if the
transaction is on chain and return ok if it is.
877: Remove oracle event id from cfd r=da-kami a=da-kami
Loading the CFD by oracle event id, based on the "initial oracle event id" that we store in the CFD is wrong.
We should actually not store this even id at all, as it only becomes relevant once the setup is completed and we have a DLC.
If we load based on the event id that was stored in the CFD we might still load based on an outdated id once we roll over!
Thus, the event id of the cfd was removed. We always use the one stored in the DLC.
Since it is very hard to load a CFD based on the event id in the DLC (because that only exists in some states) this was removed.
Instead, upon attestation, we load all CFDs and then decide if we care about the attestation.
This should be optimized to loading all **open** CFDs at some point.
Co-authored-by: Daniel Karzel <daniel@comit.network>
883: Bump mockall_derive from 0.10.2 to 0.11.0 r=thomaseizinger a=dependabot[bot]
Bumps [mockall_derive](https://github.com/asomers/mockall) from 0.10.2 to 0.11.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/asomers/mockall/blob/master/CHANGELOG.md">mockall_derive's changelog</a>.</em></p>
<blockquote>
<h2>[ 0.11.0 ] - 2021-12-11</h2>
<h3>Added</h3>
<ul>
<li><code>mock!</code> and <code>#[automock]</code> now support <code>unsafe</code> traits.
(<a href="https://github-redirect.dependabot.com/asomers/mockall/pull/313">#313</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Bump <code>predicates</code> to v2.0.1, see all v2 changes in
<a href="https://github.com/assert-rs/predicates-rs/blob/master/CHANGELOG.md">predicates' changelog</a>.
(<a href="https://github-redirect.dependabot.com/asomers/mockall/pull/325">#325</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Fixed nondeterministic code generation in methods with multiple lifetime
parameters.
(<a href="https://github-redirect.dependabot.com/asomers/mockall/pull/333">#333</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="1c6a7ab38c"><code>1c6a7ab</code></a> (cargo-release) version 0.11.0</li>
<li><a href="62e22e76e3"><code>62e22e7</code></a> (cargo-release) version 0.11.0</li>
<li><a href="e49261335d"><code>e492613</code></a> Update Mockall's dev-dependency on mockall-double</li>
<li><a href="d7e351199f"><code>d7e3511</code></a> (cargo-release) version 0.2.1</li>
<li><a href="539d8dac88"><code>539d8da</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/asomers/mockall/issues/353">#353</a> from asomers/downcast_0.11</li>
<li><a href="7abfc2464a"><code>7abfc24</code></a> Update downcast to 0.11.0</li>
<li><a href="d4dceabcdb"><code>d4dceab</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/asomers/mockall/issues/346">#346</a> from asomers/unused-warnings</li>
<li><a href="383fb14f33"><code>383fb14</code></a> Fix a Clippy lint on the latest nightly</li>
<li><a href="fbf86241e3"><code>fbf8624</code></a> Suppress unused_imports warnings when mocking modules</li>
<li><a href="bda0ed79e6"><code>bda0ed7</code></a> Be picker about using #[allow(unused)] in the tests</li>
<li>Additional commits viewable in <a href="https://github.com/asomers/mockall/compare/v0.10.2...v0.11.0">compare view</a></li>
</ul>
</details>
<br />
[](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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
881: Bump mockall from 0.10.2 to 0.11.0 r=thomaseizinger a=dependabot[bot]
Bumps [mockall](https://github.com/asomers/mockall) from 0.10.2 to 0.11.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/asomers/mockall/blob/master/CHANGELOG.md">mockall's changelog</a>.</em></p>
<blockquote>
<h2>[ 0.11.0 ] - 2021-12-11</h2>
<h3>Added</h3>
<ul>
<li><code>mock!</code> and <code>#[automock]</code> now support <code>unsafe</code> traits.
(<a href="https://github-redirect.dependabot.com/asomers/mockall/pull/313">#313</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Bump <code>predicates</code> to v2.0.1, see all v2 changes in
<a href="https://github.com/assert-rs/predicates-rs/blob/master/CHANGELOG.md">predicates' changelog</a>.
(<a href="https://github-redirect.dependabot.com/asomers/mockall/pull/325">#325</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>Fixed nondeterministic code generation in methods with multiple lifetime
parameters.
(<a href="https://github-redirect.dependabot.com/asomers/mockall/pull/333">#333</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="1c6a7ab38c"><code>1c6a7ab</code></a> (cargo-release) version 0.11.0</li>
<li><a href="62e22e76e3"><code>62e22e7</code></a> (cargo-release) version 0.11.0</li>
<li><a href="e49261335d"><code>e492613</code></a> Update Mockall's dev-dependency on mockall-double</li>
<li><a href="d7e351199f"><code>d7e3511</code></a> (cargo-release) version 0.2.1</li>
<li><a href="539d8dac88"><code>539d8da</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/asomers/mockall/issues/353">#353</a> from asomers/downcast_0.11</li>
<li><a href="7abfc2464a"><code>7abfc24</code></a> Update downcast to 0.11.0</li>
<li><a href="d4dceabcdb"><code>d4dceab</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/asomers/mockall/issues/346">#346</a> from asomers/unused-warnings</li>
<li><a href="383fb14f33"><code>383fb14</code></a> Fix a Clippy lint on the latest nightly</li>
<li><a href="fbf86241e3"><code>fbf8624</code></a> Suppress unused_imports warnings when mocking modules</li>
<li><a href="bda0ed79e6"><code>bda0ed7</code></a> Be picker about using #[allow(unused)] in the tests</li>
<li>Additional commits viewable in <a href="https://github.com/asomers/mockall/compare/v0.10.2...v0.11.0">compare view</a></li>
</ul>
</details>
<br />
[](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>
882: Bump clap from 3.0.0-rc.3 to 3.0.0-rc.4 r=thomaseizinger a=dependabot[bot]
Bumps [clap](https://github.com/clap-rs/clap) from 3.0.0-rc.3 to 3.0.0-rc.4.
<details>
<summary>Commits</summary>
<ul>
<li><a href="c3f8c8938f"><code>c3f8c89</code></a> chore: Release</li>
<li><a href="74349cfcaa"><code>74349cf</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/clap-rs/clap/issues/3144">#3144</a> from epage/test</li>
<li><a href="703238f155"><code>703238f</code></a> test(derive): Check all derives</li>
<li><a href="43d3ac37a6"><code>43d3ac3</code></a> fix(derive): Allow aliased Option with ArgEnum</li>
<li><a href="71a564de88"><code>71a564d</code></a> test(derive): Don't parse the actual command line</li>
<li><a href="0eda43d0f6"><code>0eda43d</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/clap-rs/clap/issues/3142">#3142</a> from spire-ffoston/fix-result-type-alias-derive-impl</li>
<li><a href="cfbea9b12f"><code>cfbea9b</code></a> docs: Note argfile's existence</li>
<li><a href="1285c0f885"><code>1285c0f</code></a> fix: unqualified result types causing compilation failures with derive implem...</li>
<li>See full diff in <a href="https://github.com/clap-rs/clap/compare/clap_generate-v3.0.0-rc.3...clap_generate-v3.0.0-rc.4">compare view</a></li>
</ul>
</details>
<br />
[](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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
885: Bump @emotion/react from 11.7.0 to 11.7.1 in /taker-frontend r=thomaseizinger a=dependabot[bot]
Bumps [`@emotion/react](https://github.com/emotion-js/emotion)` from 11.7.0 to 11.7.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/emotion-js/emotion/releases"><code>`@emotion/react</code>'s` releases</a>.</em></p>
<blockquote>
<h2><code>`@emotion/react</code><a` href="https://github.com/11"><code>`@11</code></a>.7.1</h2>`
<h3>Patch Changes</h3>
<ul>
<li>
<p><a href="https://github-redirect.dependabot.com/emotion-js/emotion/pull/2577">#2577</a> <a href="04681a5f52"><code>04681a5f</code></a> Thanks <a href="https://github.com/Methuselah96"><code>`@Methuselah96</code></a>!` - Export <code>Keyframes</code> type to avoid TypeScript inserting <code>import("`@emotion/serialize").Keyframes</code>` references into declaration files emitted based on a source files exporting <code>keyframes</code> result. This avoids issues with strict package managers that don't allow accessing undeclared dependencies.</p>
</li>
<li>
<p><a href="https://github-redirect.dependabot.com/emotion-js/emotion/pull/2590">#2590</a> <a href="1554a7e264"><code>1554a7e2</code></a> Thanks <a href="https://github.com/Andarist"><code>`@Andarist</code></a>!` - Upgraded and pinned the version of Stylis - the CSS parser that Emotion uses under the hood.</p>
</li>
<li>
<p>Updated dependencies [<a href="1554a7e264"><code>1554a7e2</code></a>]:</p>
<ul>
<li><code>`@emotion/cache</code><a` href="https://github.com/11"><code>`@11</code></a>.7.1</li>`
</ul>
</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="01cca604ca"><code>01cca60</code></a> Version Packages (<a href="https://github-redirect.dependabot.com/emotion-js/emotion/issues/2581">#2581</a>)</li>
<li><a href="1554a7e264"><code>1554a7e</code></a> Stylis upgrade (<a href="https://github-redirect.dependabot.com/emotion-js/emotion/issues/2590">#2590</a>)</li>
<li><a href="04681a5f52"><code>04681a5</code></a> Export Keyframes type from <code>`@emotion/react</code>` (<a href="https://github-redirect.dependabot.com/emotion-js/emotion/issues/2577">#2577</a>)</li>
<li><a href="26ded6109f"><code>26ded61</code></a> Tweak grammar in the CHANGELOGs</li>
<li>See full diff in <a href="https://github.com/emotion-js/emotion/compare/`@emotion/react@11.7.0...@emotion/react@11.7.1">compare` view</a></li>
</ul>
</details>
<br />
[](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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
bors[bot]
Thomas Eizinger
Mariusz Klochowicz
Lucas Soriano del Pino
dependabot[bot]
rishflab
Philipp Hoenisch