Skip to content

Commit 0160d5d

Browse files
authored
Merge branch 'rippled-2.4.0' into add_dynamic_nfts
2 parents 57579d4 + 8d7aea2 commit 0160d5d

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

blog/2025/rippled-2.4.0.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ There are two key goals driving this transition:
2929
- Ensure continued network participation and avoid potential downtime.
3030
- Allow for a staged migration with minimal impact on validators and node operators.
3131

32-
Keeping these goals in mind, a new subdomain, **unl.xrplf.org**, has been introduced alongside the existing https://vl.xrplf.org/. This approach allows for a staged migration without modifying the key for the current UNL list. Eventually, vl.xrplf.org will be fully deprecated and replaced by unl.xrplf.org.
32+
Keeping these goals in mind, a new subdomain, **unl.xrplf.org**, has been introduced alongside the existing list at **vl.xrplf.org**. This approach allows for a staged migration without modifying the key for the current UNL list. Eventually, vl.xrplf.org will be fully deprecated and replaced by unl.xrplf.org.
3333

34-
In `rippled` release 2.4.0, the validators-example.txt has been updated to include the new public key published by the new XRPL Foundation.
34+
In `rippled` release 2.4.0, the `validators-example.txt` file has been updated to include the new public key published by the new XRPL Foundation.
3535

3636
Further information on the transition will be shared by the XRPL Foundation in the near future.
3737

@@ -72,9 +72,9 @@ Date: Mon Nov 25 12:27:17 2024 -0800
7272
The following amendments are open for voting with this release:
7373

7474

75-
- **XLS-46 DynamicNFT** - Adds the ability to update the URI of `NFToken` objects. ([#5048](https://github.com/XRPLF/rippled/pull/5048))
76-
- **XLS-80 Permissioned Domains** - Adds Permissioned Domains, which act as part of broader systems on the XRP Ledger to restrict access to satisfy compliance rules. ([#5161](https://github.com/XRPLF/rippled/pull/5161))
77-
- **XLS-77 Deep Freeze** - Adds the ability to deep freeze trust lines, enabling token issuers to block the transfer of assets for holders who have been deep frozen. ([#5187](https://github.com/XRPLF/rippled/pull/5187))
75+
- **DynamicNFT (XLS-46)** - Adds the ability to mint mutable `NFToken` objects whose URI can be changed. ([#5048](https://github.com/XRPLF/rippled/pull/5048))
76+
- **PermissionedDomains (XLS-80)** - Adds Permissioned Domains, which act as part of broader systems on the XRP Ledger to restrict access to satisfy compliance rules. ([#5161](https://github.com/XRPLF/rippled/pull/5161))
77+
- **DeepFreeze (XLS-77)** - Adds the ability to deep freeze trust lines, enabling token issuers to block the transfer of assets for holders who have been deep frozen. ([#5187](https://github.com/XRPLF/rippled/pull/5187))
7878
- **fixFrozenLPTokenTransfer** - Prohibits the transfer of LP tokens when the associated liquidity pool contains at least one frozen asset. ([#5227](https://github.com/XRPLF/rippled/pull/5227))
7979
- **fixInvalidTxFlags** - Adds transaction flag checking for `CredentialCreate`, `CredentialAccept`, and `CredentialDelete` transactions. ([#5250](https://github.com/XRPLF/rippled/pull/5250))
8080

@@ -83,7 +83,7 @@ The following amendments are open for voting with this release:
8383

8484
- Added a new `simulate` API method to execute dry runs of transactions and see the simulated metadata. ([#5069](https://github.com/XRPLF/rippled/pull/5069), [#5265](https://github.com/XRPLF/rippled/pull/5265))
8585
- Added the ability to specify MPTs when defining assets in transactions. ([#5200](https://github.com/XRPLF/rippled/pull/5200))
86-
- Refactored `LedgerEntry.cpp` to make it easier to read. Also added a `state` alias for `ripple_state` in the `ledger_entry` API method. ([#5199](https://github.com/XRPLF/rippled/pull/5199))
86+
- Added a `state` alias for `ripple_state` in the `ledger_entry` API method. Also refactored `LedgerEntry.cpp` to make it easier to read. ([#5199](https://github.com/XRPLF/rippled/pull/5199))
8787
- Improved UNL security by enabling validators to set a minimum number of UNL publishers to agree on validators. ([#5112](https://github.com/XRPLF/rippled/pull/5112))
8888
- Updated the XRPL Foundation UNL keys. ([#5289](https://github.com/XRPLF/rippled/pull/5289))
8989
- Added a new XRPL Foundation subdomain to enable a staged migration without modifying the key for the current UNL list. ([#5326](https://github.com/XRPLF/rippled/pull/5326))

docs/_snippets/common-links.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
[DID entry]: /docs/references/protocol/ledger-data/ledger-entry-types/did.md
9797
[DIDエントリ]: /docs/references/protocol/ledger-data/ledger-entry-types/did.md
9898
[DeletableAccounts amendment]: /resources/known-amendments.md#deletableaccounts
99+
[DeepFreeze amendment]: /resources/known-amendments.md#deepfreeze
99100
[DepositAuth amendment]: /resources/known-amendments.md#depositauth
100101
[DepositPreauth amendment]: /resources/known-amendments.md#depositpreauth
101102
[DepositPreauth entry]: /docs/references/protocol/transactions/types/depositpreauth.md

docs/concepts/tokens/fungible-tokens/deep-freeze.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Deep Freeze lets token issuers on the XRP Ledger prevent token misuse by frozen
1111

1212
Deep Freeze impacts trust lines that interact with payments, offers, DEX, and AMM. Issuers can block sending and receiving of funds for holders in deep freeze.
1313

14+
_(Requires the [DeepFreeze amendment][] {% not-enabled /%})_
15+
1416
## Deep Freeze Mechanism
1517

1618
Deep Freeze is a setting on a trust line. It requires that the issuer implement a standard freeze on the trust line before enacting a deep freeze. The issuer cannot enact a deep freeze if they have enabled `No Freeze` on their account.

resources/known-amendments.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ This list is updated manually. For a live view of amendment voting, see the Amen
1818
| Name | Introduced | Status |
1919
|:----------------------------------|:-----------|:------------------------------|
2020
| [DynamicNFT][] | v2.4.0 | {% badge href="https://xrpl.org/blog/2025/rippled-2.4.0" %}Open for Voting: 2025-03-05{% /badge %} |
21+
| [DeepFreeze][] | v2.4.0 | {% badge href="https://xrpl.org/blog/2025/rippled-2.4.0" %}Open for Voting: 2025-03-05{% /badge %} |
2122
| [PermissionedDomains][] | v2.4.0 | {% badge href="https://xrpl.org/blog/2025/rippled-2.4.0" %}Open for Voting: 2025-03-05{% /badge %} |
2223
| [fixFrozenLPTokenTransfer][] | v2.4.0 | {% badge href="https://xrpl.org/blog/2025/rippled-2.4.0" %}Open for Voting: 2025-03-05{% /badge %} |
2324
| [fixInvalidTxFlags][] | v2.4.0 | {% badge href="https://xrpl.org/blog/2025/rippled-2.4.0" %}Open for Voting: 2025-03-05{% /badge %} |
@@ -302,6 +303,26 @@ This amendment was intended to add support for several types of crypto-condition
302303
However, the amendment was added to `rippled` v0.60.0 before implementation was complete. As a result, this amendment ID refers to incomplete code which does almost nothing. Modifying the existing amendment to add support for other crypto-conditions would cause a conflict with old versions of the amendment already in released software. If a future release adds support for additional crypto-conditions, it must use a new and different amendment ID.
303304

304305

306+
### DeepFreeze
307+
[DeepFreeze]: #deepfreeze
308+
309+
| Amendment | DeletableAccounts |
310+
|:-------------|:------------------|
311+
| Amendment ID | DAF3A6EB04FA5DC51E8E4F23E9B7022B693EFA636F23F22664746C77B5786B23 |
312+
| Status | Enabled |
313+
| Default Vote (Latest stable release) | No |
314+
| Pre-amendment functionality retired? | No |
315+
316+
This amendment enables issuers to deep freeze trustlines from interacting with payments, offers, AMMs, and the DEX. This prevents deep frozen accounts from sending and receiving frozen assets. With this amendment, four new flags are introduced:
317+
318+
- `RippleState` flags:
319+
- `lsfLowDeepFreeze`
320+
- `lsfHighDeepFreeze`
321+
- `TrustSet` flags:
322+
- `tfSetDeepFreeze`
323+
- `tfClearDeepFreeze`
324+
325+
305326
### DeletableAccounts
306327
[DeletableAccounts]: #deletableaccounts
307328

sidebars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@
115115
- page: docs/concepts/tokens/fungible-tokens/multi-purpose-tokens.md
116116
- page: docs/concepts/tokens/fungible-tokens/clawing-back-tokens.md
117117
- page: docs/concepts/tokens/fungible-tokens/freezes.md
118-
- page: docs/concepts/tokens/fungible-tokens/deep-freeze.md
119118
expanded: false
120119
items:
120+
- page: docs/concepts/tokens/fungible-tokens/deep-freeze.md
121121
- page: docs/concepts/tokens/fungible-tokens/common-misconceptions-about-freezes.md
122122
- page: docs/concepts/tokens/fungible-tokens/paths.md
123123
- page: docs/concepts/tokens/fungible-tokens/rippling.md

0 commit comments

Comments
 (0)