From 7ec57d02e8cea30301f92b08712dd9f66854154f Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Tue, 22 May 2018 15:08:28 -0700 Subject: [PATCH 1/2] fix1571 update to EscrowCreate --- content/_snippets/rippled_versions.md | 1 + .../transaction-formats/transaction-types/escrowcreate.md | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/content/_snippets/rippled_versions.md b/content/_snippets/rippled_versions.md index a5d167e869..7206068120 100644 --- a/content/_snippets/rippled_versions.md +++ b/content/_snippets/rippled_versions.md @@ -31,3 +31,4 @@ [New in: rippled 0.80.0]: https://github.com/ripple/rippled/releases/tag/0.80.0 "BADGE_BLUE" [New in: rippled 0.80.1]: https://github.com/ripple/rippled/releases/tag/0.80.1 "BADGE_BLUE" [New in: rippled 0.90.0]: https://github.com/ripple/rippled/releases/tag/0.90.0 "BADGE_BLUE" +[New in: rippled 1.0.0]: https://github.com/ripple/rippled/releases/tag/1.0.0 "BADGE_BLUE" diff --git a/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md b/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md index 31326bdd01..2cca5e75f9 100644 --- a/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md +++ b/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md @@ -35,7 +35,9 @@ Sequester XRP until the escrow process either finishes or is canceled. | `Condition` | String | VariableLength | _(Optional)_ Hex value representing a [PREIMAGE-SHA-256 crypto-condition](https://tools.ietf.org/html/draft-thomas-crypto-conditions-02#section-8.1). The funds can only be delivered to the recipient if this condition is fulfilled. | | `DestinationTag` | Number | UInt32 | _(Optional)_ Arbitrary tag to further specify the destination for this escrowed payment, such as a hosted recipient at the destination address. | -Either `CancelAfter` or `FinishAfter` must be specified. If both are included, the `FinishAfter` time must precede that of `CancelAfter`. +Either `CancelAfter` or `FinishAfter` must be specified. If both are included, the `FinishAfter` time must be before the `CancelAfter` time. + +With the [fix1571 amendment](known-amendments.html#fix1571) enabled, either `FinishAfter` or `Condition` must be specified. [New in: rippled 1.0.0][] {% include '_snippets/rippled-api-links.md' %} From 8d85577b04add1963e30e66891f6c65f46d42796 Mon Sep 17 00:00:00 2001 From: mDuo13 Date: Wed, 23 May 2018 14:00:57 -0700 Subject: [PATCH 2/2] Rephrase escrowcreate fix1571 changes per @jhaaaa review --- .../transaction-formats/transaction-types/escrowcreate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md b/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md index 2cca5e75f9..5a054f48de 100644 --- a/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md +++ b/content/references/rippled-api/transaction-formats/transaction-types/escrowcreate.md @@ -37,7 +37,7 @@ Sequester XRP until the escrow process either finishes or is canceled. Either `CancelAfter` or `FinishAfter` must be specified. If both are included, the `FinishAfter` time must be before the `CancelAfter` time. -With the [fix1571 amendment](known-amendments.html#fix1571) enabled, either `FinishAfter` or `Condition` must be specified. [New in: rippled 1.0.0][] +With the [fix1571 amendment](known-amendments.html#fix1571) enabled, you must supply `FinishAfter`, `Condition`, or both. [New in: rippled 1.0.0][] {% include '_snippets/rippled-api-links.md' %}