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

Clawback #2353

Merged
merged 20 commits into from
Jul 19, 2023
Merged

Clawback #2353

merged 20 commits into from
Jul 19, 2023

Conversation

shawnxie999
Copy link
Collaborator

@shawnxie999 shawnxie999 commented Jun 27, 2023 •
edited by ckniffen

High Level Overview of Change

  • Clawback transaction
  • Account flag asfAllowTrustLineClawback

Context of Change

Spec https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-39d-clawback

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Refactor (non-breaking change that only restructures code)
  • Tests (You added tests for code that already exists, or your new feature included in this PR)
  • Documentation Updates
  • Release

Test Plan

@shawnxie999 shawnxie999 changed the title Clawback [Don't merge] Clawback Jun 28, 2023
@shawnxie999 shawnxie999 changed the title [Don't merge] Clawback Clawback Jul 10, 2023
@shawnxie999 shawnxie999 marked this pull request as ready for review July 10, 2023 14:23
@ckniffen
Copy link
Collaborator

AccountRoot object needs to be updated as well.

@ckniffen ckniffen merged commit 63ea6e8 into XRPLF:main Jul 19, 2023
17 checks passed
ckniffen added a commit that referenced this pull request Jul 25, 2023
@ckniffen @justinr1234
@shawnxie999 @pdp2121 @dependabot
chore: merge main into 3.0 (#2405)
3eb93d4 
* fix: escrow finish and cancel integration (#2382)

* fix: escrow finish and cancel integration

* add docs

* Update docker to xrpllabsofficial/xrpld:1.12.0-b1 (#2381)

* release 2.9.1 (#2391)

* build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4 (#2392)

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>

* feat: add Clawback amendment support (#2353)

* Add Clawback transaction
* Account flag lsfAllowTrustLineClawback
* Support bitwise flag checking of 64 bit flags

* build(deps-dev): bump ts-jest from 29.1.0 to 29.1.1 (#2396)

* build(deps-dev): bump ts-loader from 9.4.2 to 9.4.4 (#2395)

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>

* build(deps-dev): bump source-map-loader from 3.0.2 to 4.0.1 (#2399)

* build(deps-dev): bump url from 0.11.0 to 0.11.1 (#2400)

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>

* build(deps-dev): bump jest and @types/jest (#2397)

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>

* chore: remove extra lock files and `nyc` (#2403)

nyc is not a direct dependency any more and nested lock files are unused

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: justinr1234 <justinr1234@gmail.com>
Co-authored-by: Shawn Xie <35279399+shawnxie999@users.noreply.github.com>
Co-authored-by: pdp2121 <71317875+pdp2121@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ckniffen ckniffen ckniffen approved these changes

@mvadari mvadari mvadari approved these changes

@jonathanlei jonathanlei jonathanlei approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@shawnxie999 @ckniffen @mvadari @jonathanlei