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.

Sign up for GitHub

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

Jump to bottom

chore: merge main into 3.0 #2405

Merged
merged 12 commits into from
Jul 25, 2023
Merged

chore: merge main into 3.0 #2405

merged 12 commits into from
Jul 25, 2023

Conversation

ckniffen
Copy link
Collaborator

High Level Overview of Change

Merge in a bunch of changes from main

justinr1234 and others added 12 commits July 17, 2023 16:56
@justinr1234
fix: escrow finish and cancel integration (#2382)
e760a48 
* fix: escrow finish and cancel integration

* add docs
@shawnxie999
Update docker to xrpllabsofficial/xrpld:1.12.0-b1 (#2381)
d158770
@pdp2121
release 2.9.1 (#2391)
5ec6729
@dependabot
build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4 (#2392)
c564161 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@shawnxie999
feat: add Clawback amendment support (#2353)
63ea6e8 
* Add Clawback transaction
* Account flag lsfAllowTrustLineClawback
* Support bitwise flag checking of 64 bit flags
@dependabot
build(deps-dev): bump ts-jest from 29.1.0 to 29.1.1 (#2396)
0972fc2
@dependabot
build(deps-dev): bump ts-loader from 9.4.2 to 9.4.4 (#2395)
c6f6c78 
Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 9.4.2 to 9.4.4.
- [Release notes](https://github.com/TypeStrong/ts-loader/releases)
- [Changelog](https://github.com/TypeStrong/ts-loader/blob/main/CHANGELOG.md)
- [Commits](TypeStrong/ts-loader@v9.4.2...v9.4.4)

---
updated-dependencies:
- dependency-name: ts-loader
  dependency-type: direct:development
  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>
@dependabot
build(deps-dev): bump source-map-loader from 3.0.2 to 4.0.1 (#2399)
104afa4
@dependabot
build(deps-dev): bump url from 0.11.0 to 0.11.1 (#2400)
8972e5e 
Bumps [url](https://github.com/defunctzombie/node-url) from 0.11.0 to 0.11.1.
- [Commits](defunctzombie/node-url@v0.11.0...v0.11.1)

---
updated-dependencies:
- dependency-name: url
  dependency-type: direct:development
  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>
@dependabot @ckniffen
build(deps-dev): bump jest and @types/jest (#2397)
03ba07d 
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) and [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest). These dependencies needed to be updated together.

Updates `jest` from 29.5.0 to 29.6.1
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.6.1/packages/jest)

Updates `@types/jest` from 29.5.1 to 29.5.3
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@types/jest"
  dependency-type: direct:development
  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: Caleb Kniffen <ckniffen@ripple.com>
@ckniffen
chore: remove extra lock files and nyc (#2403)
f760b2e 
nyc is not a direct dependency any more and nested lock files are unused
@ckniffen
Merge branch 'main' into merge-main-into-3.0
253e545
@ckniffen
Copy link
Collaborator Author

This will fix failing check tests and update a bunch of dependencies

@ckniffen
Copy link
Collaborator Author

@JST5000 Is this a similar technique you used for xrpl-py@2.0? I have never setup auto merges on github before only bitbucket.

@JST5000
Copy link
Contributor

JST5000 commented Jul 20, 2023

@JST5000 Is this a similar technique you used for xrpl-py@2.0? I have never setup auto merges on github before only bitbucket.

I'm not sure about auto-merges. For the final merge back into main, we'll need to rebase from 3.0 and drop all the merge commits, but for now I think it's fine to merge in. @mvadari would know better than I do I think :)

@mvadari
Copy link
Collaborator

mvadari commented Jul 20, 2023 •
edited
Loading

@JST5000 Is this a similar technique you used for xrpl-py@2.0? I have never setup auto merges on github before only bitbucket.

I'm not sure about auto-merges. For the final merge back into main, we'll need to rebase from 3.0 and drop all the merge commits, but for now I think it's fine to merge in. @mvadari would know better than I do I think :)

What we did for xrpl-py@2.0 was:

  1. Rebase the branch on top of main
  2. Merge the branch into main with --ff-only locally
  3. Push the changes (with main branch protections temporarily turned off)

The --ff-only part is the important one, so that you preserve all the commits and hashes and avoid the merge commits.

@socket-security
Copy link

Updated and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
url 0.11.0...0.11.1 None +1/-2 101 kB ljharb
ripple-keypairs 1.1.5...1.3.0 None +0/-1 29.6 kB jst5000
ws 8.12.1...8.13.0 None +0/-0 137 kB lpinca
karma-chrome-launcher 3.1.1...3.2.0 environment +0/-0 29.6 kB karmarunnerbot
source-map-loader 3.0.2...4.0.1 None +1/-1 196 kB evilebottnawi

🚮 Removed packages: @types/jest@29.5.1, buffer@5.6.0, expect@29.5.0, jest@29.5.0, jest-mock@29.5.0, karma@6.4.1, nyc@15.1.0, ripple-address-codec@4.2.5, ripple-binary-codec@1.4.3, ts-jest@29.1.0, ts-loader@9.4.2, typedoc@0.24.6

@ckniffen
Copy link
Collaborator Author

@JST5000 Is this a similar technique you used for xrpl-py@2.0? I have never setup auto merges on github before only bitbucket.

I'm not sure about auto-merges. For the final merge back into main, we'll need to rebase from 3.0 and drop all the merge commits, but for now I think it's fine to merge in. @mvadari would know better than I do I think :)

What we did for xrpl-py@2.0 was:

  1. Rebase the branch on top of main
  2. Merge the branch into main with --ff-only locally
  3. Push the changes (with main branch protections temporarily turned off)

The --ff-only part is the important one, so that you preserve all the commits and hashes and avoid the merge commits.

Gotcha.

@ckniffen ckniffen merged commit 3eb93d4 into 3.0 Jul 25, 2023
@ckniffen ckniffen deleted the merge-main-into-3.0 branch July 25, 2023 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JST5000 JST5000 JST5000 approved these changes

@justinr1234 justinr1234 justinr1234 approved these changes

@khancode khancode Awaiting requested review from khancode

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ckniffen @JST5000 @mvadari @justinr1234 @shawnxie999 @pdp2121