summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kerin <afk11@users.noreply.github.com>2015-03-11 21:02:51 +0100
committerThomas Kerin <afk11@users.noreply.github.com>2015-03-11 21:02:51 +0100
commitb924a75f66580ffa12b6f72b625ec1575d002691 (patch)
tree4f29100abc39791e5d83fafb6d40642ec001b92a
parent9f15ac4eb457c50d989d5da5305107e04a938937 (diff)
parent376d3cd6f8752db3b434a64b63f903f3f429518c (diff)
downloadbips-b924a75f66580ffa12b6f72b625ec1575d002691.tar.xz
Merge pull request #1 from blocktrail/bip0090
add bitcoinJ
-rw-r--r--bip-0090.mediawiki1
1 files changed, 1 insertions, 0 deletions
diff --git a/bip-0090.mediawiki b/bip-0090.mediawiki
index f7904eb..dee9c5d 100644
--- a/bip-0090.mediawiki
+++ b/bip-0090.mediawiki
@@ -119,5 +119,6 @@ Vector 4: (from bitcore)
* Haskoin - https://github.com/haskoin/haskoin/blob/master/Network/Haskoin/Script/Parser.hs#L112-122
* Armory - https://github.com/etotheipi/BitcoinArmory/blob/268db0f3fa20c989057bd43343a43b2edbe89aeb/armoryengine/ArmoryUtils.py#L1441
* Multisignature Brainwallet - http://ms-brainwallet.org/
+* BitcoinJ - https://github.com/bitcoinj/bitcoinj/blob/master/core/src/main/java/org/bitcoinj/script/ScriptBuilder.java#L331