summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke-Jr <luke_github1@dashjr.org>2016-09-02 22:11:13 +0000
committerGitHub <noreply@github.com>2016-09-02 22:11:13 +0000
commitf45cc085f1cbafdb7b940c3897fa4ed6cc71ddbd (patch)
tree99d78f3fc705dd80b4f8b7b5fc42dc086b8795ee
parent420b959a6900ec0e573fbec1dbc2ec2bb7cef743 (diff)
parentf64f3c3d9c9b6d36a90b270d7b971cec071ec10a (diff)
downloadbips-f45cc085f1cbafdb7b940c3897fa4ed6cc71ddbd.tar.xz
Merge pull request #429 from OpenBitcoinPrivacyProject/master
BIP126: Clarify interaction with BIP69
-rw-r--r--bip-0126.mediawiki8
1 files changed, 8 insertions, 0 deletions
diff --git a/bip-0126.mediawiki b/bip-0126.mediawiki
index eed0c3e..43722d0 100644
--- a/bip-0126.mediawiki
+++ b/bip-0126.mediawiki
@@ -37,6 +37,10 @@ In order to achieve these goals, this specification proposes a set of best pract
In order to achieve this, two forms of HIT are proposed: Standard form and alternate form.
+==Interaction with Other Procedures==
+
+Applications which wish to comply both with this procedure and BIP69 should apply this procedure prior to applying BIP69.
+
==Standard form heterogenous input script transaction==
===Rules===
@@ -96,3 +100,7 @@ An HIT formed via the preceding procedure will adhere to the following condition
==Non-compliant heterogenous input script transactions==
If a user wishes to create an output that is larger than half the total size of their spendable outputs, or if their inputs are not distributed in a manner in which the alternate form procedure can be completed, then the user can not create a transaction which is compliant with this procedure.
+
+==Reference==
+
+* [[bip-0069.mediawiki|BIP69 - Lexicographical Indexing of Transaction Inputs and Outputs]]