From 12740686e94cc39a250c91285fe684ec7e8d51a7 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Mon, 23 Jul 2018 18:03:21 +0200 Subject: [PATCH] Problem: Docs say Crypto Conditions are part of ILP (#2399) * Fixed 2 PEP257 compliance errors * Upgrade Tendermint to 0.19.7 except for Docker image, which is still at 0.19.2 * Problem: Docs say Crypto Conditions are part of ILP Solution: Edit the docs so they no longer say that --- docs/root/source/smart-contracts.rst | 2 +- docs/root/source/transaction-concepts.md | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/root/source/smart-contracts.rst b/docs/root/source/smart-contracts.rst index 91b01b3b..b031f2f2 100644 --- a/docs/root/source/smart-contracts.rst +++ b/docs/root/source/smart-contracts.rst @@ -3,7 +3,7 @@ BigchainDB and Smart Contracts One can store the source code of any smart contract (i.e. a computer program) in BigchainDB, but BigchainDB won't run arbitrary smart contracts. -BigchainDB will run the subset of smart contracts expressible using `Crypto-Conditions `_. Crypto-conditions are part of the `Interledger Protocol `_. +BigchainDB will run the subset of smart contracts expressible using `Crypto-Conditions `_. The owners of an asset can impose conditions on it that must be met for the asset to be transferred to new owners. Examples of possible conditions (crypto-conditions) include: diff --git a/docs/root/source/transaction-concepts.md b/docs/root/source/transaction-concepts.md index 18c2d3b7..6a3b183d 100644 --- a/docs/root/source/transaction-concepts.md +++ b/docs/root/source/transaction-concepts.md @@ -27,9 +27,8 @@ and the other output might have 15 oak trees for another set of owners. Each output also has an associated condition: the condition that must be met (by a TRANSFER transaction) to transfer/spend the output. -BigchainDB supports a variety of conditions, -a subset of the [Interledger Protocol (ILP)](https://interledger.org/) -crypto-conditions. For details, see +BigchainDB supports a variety of conditions. +For details, see the section titled **Transaction Components: Conditions** in the relevant [BigchainDB Transactions Spec](https://github.com/bigchaindb/BEPs/tree/master/tx-specs/).