From 53081fa961601eda0919869a7f01c476845b4bca Mon Sep 17 00:00:00 2001 From: Amarantha Kulkarni Date: Thu, 8 Feb 2024 14:13:47 -0800 Subject: [PATCH 1/4] Update clawback status to enabled --- @i18n/ja/docs/_snippets/clawback-disclaimer.md | 2 +- @i18n/ja/resources/known-amendments.md | 8 ++++---- docs/_snippets/clawback-disclaimer.md | 2 +- resources/known-amendments.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/@i18n/ja/docs/_snippets/clawback-disclaimer.md b/@i18n/ja/docs/_snippets/clawback-disclaimer.md index 78685f6763..bc3139d57b 100644 --- a/@i18n/ja/docs/_snippets/clawback-disclaimer.md +++ b/@i18n/ja/docs/_snippets/clawback-disclaimer.md @@ -1 +1 @@ -_[Clawback amendment](https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-39d-clawback)が必要です。_ +_[Clawback amendment](https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-0039d-clawback)が必要です。_ diff --git a/@i18n/ja/resources/known-amendments.md b/@i18n/ja/resources/known-amendments.md index b5c24ae317..503ac04984 100644 --- a/@i18n/ja/resources/known-amendments.md +++ b/@i18n/ja/resources/known-amendments.md @@ -20,8 +20,8 @@ labels: | [DID][] | v2.0.0 | {% badge href="https://xrpl.org/blog/2024/rippled-2.0.0.html" %}投票中: 2024-01-09{% /badge %} | | [XChainBridge][] | v2.0.0 | {% badge href="https://xrpl.org/blog/2024/rippled-2.0.0.html" %}投票中: 2024-01-09{% /badge %} | | [AMM][] | v1.12.0 | {% badge href="https://xrpl.org/blog/2023/rippled-1.12.0.html" %}投票中: 2023-09-06{% /badge %} | -| [Clawback][] | v1.12.0 | {% badge href="https://xrpl.org/blog/2023/rippled-1.12.0.html" %}投票中: 2023-09-06{% /badge %} | | [XRPFees][] | v1.10.0 | {% badge href="https://xrpl.org/blog/2023/rippled-1.10.0.html" %}投票中: 2023-03-14{% /badge %} | +| [Clawback][] | v1.12.0 | {% badge href="https://livenet.xrpl.org/transactions/C6BCCE60DFA4430A1F9097D774EA49E6FEFB1B535BA0EF9170DA0F2D08CDDB11" %}有効: 2024-02-08{% /badge %} | | [fixReducedOffersV1][] | v1.12.0 | {% badge href="https://livenet.xrpl.org/transactions/87723D9D01AFAD8E55C944D7D1598969A8FBD852FCACAE361A40CBF5D4CB3BB1" %}有効: 2023-11-24{% /badge %} | | [fixNFTokenRemint][] | v1.11.0 | {% badge href="https://livenet.xrpl.org/transactions/CA4562711E4679FE9317DD767871E90A404C7A8B84FAFD35EC2CF0231F1F6DAF" %}有効: 2023-11-27{% /badge %} | | [DisallowIncoming][] | v1.10.0 | {% badge href="https://livenet.xrpl.org/transactions/8747EF67D8CC1CA72A88817FBDF454507C3D9E8F0702D8E2B614958AE27A1D4E" %}有効: 2023-08-21{% /badge %} | @@ -200,15 +200,15 @@ labels: | Amendment | Clawback | |:-------------|:---------| | Amendment ID | 56B241D7A43D40354D02A9DC4C8DF5C7A1F930D92A9035C4E12291B3CA3E1C2B | -| Status | 投票中 | -| デフォルトの投票(最新の安定版) | いいえ | +| Status | 有効 | +| デフォルトの投票(最新の安定版) | はい | | Amendment前の機能は廃止? | いいえ | 規制上の目的から、発行者の中には、発行されたトークンがアカウントに配布された後に回収する能力を持たなければならない場合があります。例えば、トークンが違法行為で制裁を受けたアカウントに送られたことが発覚した場合、発行者はその資金を _回収(claw back)_ することができます。 Clawbackはデフォルトでは無効になっています。Clawbackを使用するには、`AccountSet`トランザクションを使用して`lsfAllowTrustLineClawback`フラグを設定する必要があります。 -この修正の詳細については、[Clawback](https://opensource.ripple.com/docs/clawback/clawback-of-issued-currency/)をご覧ください。 +この修正の詳細については、[Clawback](../docs/concepts/tokens/fungible-tokens/clawing-back-tokens.md)をご覧ください。 ### XChainBridge diff --git a/docs/_snippets/clawback-disclaimer.md b/docs/_snippets/clawback-disclaimer.md index 2da646741b..0037aac429 100644 --- a/docs/_snippets/clawback-disclaimer.md +++ b/docs/_snippets/clawback-disclaimer.md @@ -1 +1 @@ -_Requires the [Clawback amendment](https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-39d-clawback)._ +_Requires the [Clawback amendment](https://github.com/XRPLF/XRPL-Standards/tree/master/XLS-0039d-clawback)._ diff --git a/resources/known-amendments.md b/resources/known-amendments.md index 0c120bdbbf..a3a27a1356 100644 --- a/resources/known-amendments.md +++ b/resources/known-amendments.md @@ -22,8 +22,8 @@ The following is a comprehensive list of all known [amendments](../docs/concepts | [fixFillOrKill][] | v2.0.0 | {% badge href="https://xrpl.org/blog/2024/rippled-2.0.0.html" %}Open for Voting: 2024-01-09{% /badge %} | | [XChainBridge][] | v2.0.0 | {% badge href="https://xrpl.org/blog/2024/rippled-2.0.0.html" %}Open for Voting: 2024-01-09{% /badge %} | | [AMM][] | v1.12.0 | {% badge href="https://xrpl.org/blog/2023/rippled-1.12.0.html" %}Open for Voting: 2023-09-06{% /badge %} | -| [Clawback][] | v1.12.0 | {% badge href="https://xrpl.org/blog/2023/rippled-1.12.0.html" %}Open for Voting: 2023-09-06{% /badge %} | | [XRPFees][] | v1.10.0 | {% badge href="https://xrpl.org/blog/2023/rippled-1.10.0.html" %}Open for Voting: 2023-03-14{% /badge %} | +| [Clawback][] | v1.12.0 | {% badge href="https://livenet.xrpl.org/transactions/C6BCCE60DFA4430A1F9097D774EA49E6FEFB1B535BA0EF9170DA0F2D08CDDB11" %}Enabled: 2024-02-08{% /badge %} | | [fixReducedOffersV1][] | v1.12.0 | {% badge href="https://livenet.xrpl.org/transactions/87723D9D01AFAD8E55C944D7D1598969A8FBD852FCACAE361A40CBF5D4CB3BB1" %}Enabled: 2023-11-24{% /badge %} | | [fixNFTokenRemint][] | v1.11.0 | {% badge href="https://livenet.xrpl.org/transactions/CA4562711E4679FE9317DD767871E90A404C7A8B84FAFD35EC2CF0231F1F6DAF" %}Enabled: 2023-11-27{% /badge %} | | [DisallowIncoming][] | v1.10.0 | {% badge href="https://livenet.xrpl.org/transactions/8747EF67D8CC1CA72A88817FBDF454507C3D9E8F0702D8E2B614958AE27A1D4E" %}Enabled: 2023-08-21{% /badge %} | @@ -243,15 +243,15 @@ Introduces three new transaction types: CheckCreate, CheckCancel, and CheckCash, | Amendment | Clawback | |:-------------|:---------| | Amendment ID | 56B241D7A43D40354D02A9DC4C8DF5C7A1F930D92A9035C4E12291B3CA3E1C2B | -| Status | Open for Voting | -| Default Vote (Latest stable release) | No | +| Status | Enabled | +| Default Vote (Latest stable release) | Yes | | Pre-amendment functionality retired? | No | For regulatory purposes, some issuers must have the ability to recover issued tokens after they are distributed to accounts. For example, if an issuer were to discover that tokens were sent to an account sanctioned for illegal activity, the issuer could recover, or _claw back_ the funds. Clawback is disabled by default. To use clawback, you must set the `lsfAllowTrustLineClawback` flag using an `AccountSet` transaction. -See [Clawback](https://opensource.ripple.com/docs/clawback/clawback-of-issued-currency/) for details on this amendment. +See [Clawback](../docs/concepts/tokens/fungible-tokens/clawing-back-tokens.md) for details on this amendment. ### XChainBridge From a8a90ac8ca396e5733c4aa43a3e0e398fadb031e Mon Sep 17 00:00:00 2001 From: Amarantha Kulkarni Date: Thu, 8 Feb 2024 14:22:46 -0800 Subject: [PATCH 2/4] Fix links to getting started with SDK tutorials --- docs/tutorials/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/tutorials/index.md b/docs/tutorials/index.md index ce7fe3fe18..fb242c0ed5 100644 --- a/docs/tutorials/index.md +++ b/docs/tutorials/index.md @@ -12,15 +12,15 @@ These tutorials walk you through the basics of building a very simple XRP Ledger {% card-grid %} -{% xrpl-card title="Python" body="Using xrpl.py, a pure Python library." href="/docs/tutorials/get-started/get-started-using-python/" image="/img/logos/python.svg" imageAlt="Python logo" /%} +{% xrpl-card title="Python" body="Using xrpl.py, a pure Python library." href="/docs/tutorials/python/get-started/" image="/img/logos/python.svg" imageAlt="Python logo" /%} -{% xrpl-card title="Java" body="Using xrpl4j, a pure Java library." href="/docs/tutorials/get-started/get-started-using-java/" image="/img/logos/java.svg" imageAlt="Java logo" /%} +{% xrpl-card title="Java" body="Using xrpl4j, a pure Java library." href="/docs/tutorials/java/get-started/" image="/img/logos/java.svg" imageAlt="Java logo" /%} -{% xrpl-card title="Javascript" body="Using the xrpl.js client library." href="/docs/tutorials/get-started/get-started-using-javascript/" image="/img/logos/javascript.svg" imageAlt="Javascript logo" /%} +{% xrpl-card title="Javascript" body="Using the xrpl.js client library." href="/docs/tutorials/javascript/get-started/" image="/img/logos/javascript.svg" imageAlt="Javascript logo" /%} -{% xrpl-card title="PHP" body="Using the XRPL_PHP client library." href="/docs/tutorials/get-started/get-started-using-php/" image="/img/logos/php.svg" imageAlt="PHP logo" /%} +{% xrpl-card title="PHP" body="Using the XRPL_PHP client library." href="/docs/tutorials/php/get-started/" image="/img/logos/php.svg" imageAlt="PHP logo" /%} -{% xrpl-card title="HTTP & WebSocket APIs" body="Access the XRP Ledger directly through the APIs of its core server." href="/docs/tutorials/get-started/get-started-using-http-websocket-apis/" image="/img/logos/globe.svg" imageAlt="globe icon" /%} +{% xrpl-card title="HTTP & WebSocket APIs" body="Access the XRP Ledger directly through the APIs of its core server." href="/docs/tutorials/http-websocket-apis/get-started/" image="/img/logos/globe.svg" imageAlt="globe icon" /%} {% /card-grid %} From 5169aa1aa990eaa190973f3592b2eb5ca549cc21 Mon Sep 17 00:00:00 2001 From: Dennis Dawson Date: Thu, 8 Feb 2024 15:00:29 -0800 Subject: [PATCH 3/4] Update index.page.tsx Fix links to Javascript, Python, and Java pages under Explore SDKs --- docs/index.page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.page.tsx b/docs/index.page.tsx index dd3ab331cf..7828b39b8c 100644 --- a/docs/index.page.tsx +++ b/docs/index.page.tsx @@ -325,7 +325,7 @@ export default function Docs() {
- + Java Logo
{translate('Java')}
 From b034d0bd73bf093775b4dbaac65d11cf7eac13ae Mon Sep 17 00:00:00 2001 From: Amarantha Kulkarni Date: Fri, 9 Feb 2024 09:56:24 -0800 Subject: [PATCH 4/4] Fix typo - missing double quotation mark --- docs/index.page.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/index.page.tsx b/docs/index.page.tsx index 7828b39b8c..92f46e7f86 100644 --- a/docs/index.page.tsx +++ b/docs/index.page.tsx @@ -325,12 +325,8 @@ export default function Docs() {