summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-12-09 08:19:30 +0000
committerWladimir J. van der Laan <laanwj@gmail.com>2014-12-09 08:19:30 +0000
commitfa0e892e7336232b06b7bcc269f784d8a7e954e3 (patch)
treeda3632958bb8d7676c91d8b7b50cd8c7d8d746d1
parentab32af9abc7b243f770fb5549eacab9704d36bd8 (diff)
parenta66a75c6833a1d833c673884d4b0b1e6d4328123 (diff)
downloadbips-fa0e892e7336232b06b7bcc269f784d8a7e954e3.tar.xz
Merge pull request #125 from kaykurokawa/master
Updating status of BIP 0010
-rw-r--r--README.mediawiki2
-rw-r--r--bip-0010.mediawiki5
2 files changed, 3 insertions, 4 deletions
diff --git a/README.mediawiki b/README.mediawiki
index 8ad9e17..54a7229 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -23,7 +23,7 @@ Those proposing changes should consider that ultimately consent may rest with th
| Multi-Sig Transaction Distribution
| Alan Reiner
| Informational
-| Draft
+| Withdrawn
|- style="background-color: #cfffcf"
| [[bip-0011.mediawiki|11]]
| M-of-N Standard Transactions
diff --git a/bip-0010.mediawiki b/bip-0010.mediawiki
index b3d750b..4307f3e 100644
--- a/bip-0010.mediawiki
+++ b/bip-0010.mediawiki
@@ -2,7 +2,7 @@
BIP: 10
Title: Multi-Sig Transaction Distribution
Author: Alan Reiner
- Status: Draft
+ Status: Withdrawn
Type: Informational
Created: 2011-10-28
</pre>
@@ -96,5 +96,4 @@ A party receiving this TxDP can simply add their signature to the appropriate _T
== Reference Implementation ==
-This proposal has been implemented and tested in the ''Armory'' Bitcoin software for use in offline-wallet transaction signing (as a 1-of-1 transaction), and will eventually use it for multi-signature transcations. The source code for this implementation be found in the [https://github.com/etotheipi/BitcoinArmory/blob/qtdev/armoryengine.py Armory Github project]. Specifically, the [https://github.com/etotheipi/BitcoinArmory/blob/qtdev/armoryengine.py#L4704 PyTxDistProposal class] implements all features of BIP 0010. It contains reference code for both
-[https://github.com/etotheipi/BitcoinArmory/blob/qtdev/armoryengine.py#L5095 serializing a TxDP] and [https://github.com/etotheipi/BitcoinArmory/blob/qtdev/armoryengine.py#L5143 unserializing a TxDP].
+This proposal was implemented and tested in the older versions of ''Armory'' Bitcoin software for use in offline-wallet transaction signing (as a 1-of-1 transaction). Implementation can be found in https://github.com/etotheipi/BitcoinArmory/blob/v0.91-beta/armoryengine/Transaction.py under the class PyTxDistProposal. However, as of verion 0.92 released in July 2014, Armory no longer uses this proposal for offline wallet transaction signing and has moved on to a new format.