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

Master sync following v10.22.2 #16548

Merged
merged 26 commits into from
Nov 17, 2022
Merged

Master sync following v10.22.2 #16548

merged 26 commits into from
Nov 17, 2022

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Nov 17, 2022

No description provided.

Gudahtt and others added 26 commits November 15, 2022 11:30
This reverts commit 308033e, reversing
changes made to b8d71d6.
…16498)

* Prevent user from editing a contract interaction created by a dapp

* Code cleanup

* Fix e2e test selector

* Fix e2e test

* Fix e2e test

* Update snapshot
3Box was removed in v10.22.0, so this advisory will be obsolete in the
subsequent release, which is being prepared already.
The new e2e test added for the bug fix being released here has been
updated to use the old e2e test fixtures, rather than the fixture-
builder. The fixture builder is not available on this branch yet.
This reverts commit 69ccb37.
This update drops support for Node.js v12, and it includes a bug fix
for a deadlock encountered when using swaps on unsupported testnets.

Fixes #16479
Co-authored-by: Mark Stacey <[email protected]>
* Mock token import

* Add mocks, improve stability

* Update LavaMoat policies

The policies became outdated recently due to undetected conflicts
between PRs.

* Use veryLargeDelayMs, refactoring

Co-authored-by: Mark Stacey <[email protected]>
@danjm danjm requested a review from a team as a code owner November 17, 2022 01:37
@github-actions
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

Copy link
Member

@Gudahtt Gudahtt left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

@adonesky1 adonesky1 left a comment

Choose a reason for hiding this comment

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

LGTM

@Gudahtt Gudahtt merged commit 651086f into develop Nov 17, 2022
@Gudahtt Gudahtt deleted the master-sync branch November 17, 2022 03:13
@github-actions github-actions bot locked and limited conversation to collaborators Nov 17, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants