summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Taaki <genjix@riseup.net>2014-01-05 08:49:16 (GMT)
committer Amir Taaki <genjix@riseup.net>2014-01-05 08:49:16 (GMT)
commitd532a2caab560f9a789959e201c1492aa0a5cacc (patch)
treef9f288b6f2ad2b1224e0c0371ebc2d868bf43528
parent8ccf529c0e81016ae8bf83f8cc4126922364e166 (diff)
parent2185377c323a2cb6cd5d534b4590033241a3d589 (diff)
Merge branch 'master' of munir.dyne.org:repo-sxv1.0
-rw-r--r--doc/sphinx/index.rst6
-rw-r--r--doc/sphinx/introduction.rst2
-rw-r--r--doc/sphinx/multisig.rst8
3 files changed, 10 insertions, 6 deletions
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index e1b4073..e45a5c5 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -7,6 +7,8 @@
Welcome to the online version of The sx Tutorial, a free tutorial about
the sx tools for the Bitcoin cryptocurrency.
+sx is built using `libbitcoin <http://libbitcoin.dyne.org>`_ and `obelisk <http://libbitcoin.dyne.org/obelisk/>`_.
+
.. toctree::
:numbered:
@@ -23,7 +25,9 @@ Authors
Amir Taaki (genjix) - Development - 1Fufjpf9RM2aQsGedhSpbSCGRHrmLMJ7yY
-Santiago Mendez (d3) - Feedback, heavy testing and improvements.
+Santiago Mendez (d3) - Feedback, testing and improvements. - 1BcszqWoLLFeJGMipyqCEMwp8DnjTwM9UK
Vitalik Buterin - Development - 1GNRekXGy7s2UYnE7ZhMcWdv3GpJSGtLkc
+Grazcoin - Development - 1HAcKsR5LcV2WaPiYP8LqotQys4r8mw4m
+
diff --git a/doc/sphinx/introduction.rst b/doc/sphinx/introduction.rst
index 55ccc19..de5b6d6 100644
--- a/doc/sphinx/introduction.rst
+++ b/doc/sphinx/introduction.rst
@@ -51,5 +51,5 @@ My Bitcoin address (from http://libbitcoin.dyne.org/):
1Fufjpf9RM2aQsGedhSpbSCGRHrmLMJ7yY
-Email: amir@unsystem.net
+Email: genjix@riseup.net
diff --git a/doc/sphinx/multisig.rst b/doc/sphinx/multisig.rst
index 8b5ebb6..14dc372 100644
--- a/doc/sphinx/multisig.rst
+++ b/doc/sphinx/multisig.rst
@@ -70,19 +70,19 @@ We use the opcode ``zero`` to represent the emitted signature of key1.
Sign an input using::
- $ cat key2 | sx sign-input txfile.tx 0
+ $ cat key2 | sx sign-input txfile.tx 0 $(cat msig.script)
3046022100a147c529f7dfa291ceb2c2f21094ca101a1cfe7036cda18935d6899111cad76b022100c0d6392bdd9b31e0e3fe13dce3d928cf6857b411b6e05f35f12403b877c26bad01
- $ cat key3 | sx sign-input txfile.tx 0
+ $ cat key3 | sx sign-input txfile.tx 0 $(cat msig.script)
3046022100957f0bfdd476f2d8985268d7964168f6b7e43f54089f8fbff35a4f62e7a221f9022100be8f565e30781d353d71f54202009fe14b8203151d235ba6bf3db2b531680bca01
Our example will use bash substitution again.
::
- $ sx rawscript zero [ $(cat key2 | sx sign-input txfile.tx 0 $(cat msig.script)) ] [ $(cat key3 | sx sign-input txfile.tx 0 $(cat msig.script)) ] [ $(cat msig.script) ] | sx set-input txfile.tx 0 > txfile.tx
+ $ sx rawscript zero [ $(cat key2 | sx sign-input txfile.tx 0 $(cat msig.script)) ] [ $(cat key3 | sx sign-input txfile.tx 0 $(cat msig.script)) ] [ $(cat msig.script) ] | sx set-input txfile.tx 0 > signed.tx
The transaction is finalised! Broadcast it::
- $ sx broadcast-tx txfile.tx
+ $ sx broadcast-tx signed.tx
https://blockchain.info/tx/d646f82bd5fbdb94a36872ce460f97662b80c3050ad3209bef9d1e398ea277ab