Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit caa857c
Merge: feb2b9e 0324764
Author: Shawn Xie <[email protected]>
Date:   Fri Jan 3 10:54:32 2025 -0500

    Merge branch 'develop' into lptoken-freeze

commit feb2b9e
Merge: fadc050 679e35f
Author: Shawn Xie <[email protected]>
Date:   Thu Jan 2 14:59:37 2025 -0500

    Merge branch 'develop' into lptoken-freeze

commit fadc050
Author: Shawn Xie <[email protected]>
Date:   Thu Jan 2 12:42:52 2025 -0500

    remove unneeded test setup

commit febd81c
Author: Shawn Xie <[email protected]>
Date:   Thu Jan 2 11:04:43 2025 -0500

    improvement

commit 9fe3f13
Author: Shawn Xie <[email protected]>
Date:   Thu Dec 19 13:40:03 2024 -0500

    comments

commit ed061b9
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 18 17:58:13 2024 -0500

    fix tests

commit 7f60ca9
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 18 16:39:33 2024 -0500

    get issue

commit 2d78d39
Merge: 358de4c 49e0d54
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 18 16:15:15 2024 -0500

    Merge remote-tracking branch 'upstream/develop' into lptoken-freeze

commit 358de4c
Author: Shawn Xie <[email protected]>
Date:   Mon Dec 16 14:08:30 2024 -0500

    comment

commit 9d8352a
Author: Shawn Xie <[email protected]>
Date:   Mon Dec 16 12:06:01 2024 -0500

    rename amednment

commit 20fb2ba
Author: Shawn Xie <[email protected]>
Date:   Thu Dec 12 13:42:53 2024 -0800

    comment

commit 0ce1f41
Author: Shawn Xie <[email protected]>
Date:   Thu Dec 12 13:39:46 2024 -0800

    comment

commit 8d1fb46
Author: Shawn Xie <[email protected]>
Date:   Thu Dec 12 10:32:30 2024 -0800

    nft test

commit 23dbf45
Author: Shawn Xie <[email protected]>
Date:   Mon Dec 9 14:34:35 2024 -0500

    offer cross test

commit 2497c4a
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 4 15:53:21 2024 -0500

    comment

commit 876d941
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 4 14:59:02 2024 -0500

    check

commit 4a4acfc
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 4 12:49:23 2024 -0500

    order book prevent tsfer

commit 996deb1
Author: Shawn Xie <[email protected]>
Date:   Wed Dec 4 10:55:40 2024 -0500

    wip

commit 861b93b
Author: Shawn Xie <[email protected]>
Date:   Tue Dec 3 13:26:57 2024 -0500

    auth tests

commit 4800cec
Author: Shawn Xie <[email protected]>
Date:   Mon Dec 2 15:35:17 2024 -0500

    wip

commit eae7fa0
Author: Shawn Xie <[email protected]>
Date:   Mon Dec 2 10:34:10 2024 -0500

    wip

commit aa49100
Author: Shawn Xie <[email protected]>
Date:   Tue Nov 19 14:39:21 2024 -0500

    wip

commit c39a417
Author: Shawn Xie <[email protected]>
Date:   Tue Nov 19 10:32:37 2024 -0500
  • Loading branch information
shawnxie999 committed Jan 3, 2025
1 parent 0324764 commit 7a0d1d7
Show file tree
Hide file tree
Showing 8 changed files with 608 additions and 13 deletions.
2 changes: 1 addition & 1 deletion include/xrpl/protocol/Feature.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace detail {
// Feature.cpp. Because it's only used to reserve storage, and determine how
// large to make the FeatureBitset, it MAY be larger. It MUST NOT be less than
// the actual number of amendments. A LogicError on startup will verify this.
static constexpr std::size_t numFeatures = 83;
static constexpr std::size_t numFeatures = 84;

/** Amendments that this server supports and the default voting behavior.
Whether they are enabled depends on the Rules defined in the validated
Expand Down
1 change: 1 addition & 0 deletions include/xrpl/protocol/detail/features.macro
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
// If you add an amendment here, then do not forget to increment `numFeatures`
// in include/xrpl/protocol/Feature.h.

XRPL_FIX (FrozenLPTokenTransfer, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FEATURE(Credentials, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FEATURE(AMMClawback, Supported::yes, VoteBehavior::DefaultNo)
XRPL_FIX (AMMv1_2, Supported::yes, VoteBehavior::DefaultNo)
Expand Down
Loading

0 comments on commit 7a0d1d7

Please sign in to comment.