Small fixes to scriptPubKey/scriptSig pull

* Small grammar fixes.

* Lower case #term-scriptPubKey as all our other anchor links are
  lower case

* Replace script/scripts with scriptPubKey/scriptPubKeys in
  _autocrossref.yaml. (Fixes `make test` errors from broken
  auto-crossref links.)
This commit is contained in:
David A. Harding 2014-09-19 11:31:31 -04:00 committed by David Harding
parent c77556c786
commit 89cb2fff08
5 changed files with 13 additions and 13 deletions

View file

@ -165,10 +165,10 @@ RPCs: rpc
RPC:
satoshi:
satoshis: satoshi
script:
scriptPubKey:
'`script`': pp script
script hash:
scripts: script
scriptPubKeys: scriptPubKey
scriptSig:
scriptSigs: scriptSig
secp256k1:

View file

@ -64,7 +64,7 @@ keys provided).
Bob gives the redeemScript to Charlie, who checks to make sure his
public key and Alice's public key are included. Then he hashes the
redeemScript, to create a P2SH scriptPubKey, and pays the satoshis to it. Bob
redeemScript to create a P2SH scriptPubKey and pays the satoshis to it. Bob
sees the payment get added to the block chain and ships the merchandise.
Unfortunately, the merchandise gets slightly damaged in transit. Charlie

View file

@ -79,7 +79,7 @@ Once Alice has the address and decodes it back into a standard hash, she
can create the first transaction. She creates a standard P2PKH
transaction output containing instructions which allow anyone to spend that
output if they can prove they control the private key corresponding to
Bob's hashed public key. These instructions are called the [scriptPubKey][]{:#term-scriptPubKey}{:.term}.
Bob's hashed public key. These instructions are called the [scriptPubKey][]{:#term-scriptpubkey}{:.term}.
Alice broadcasts the transaction and it is added to the block chain.
The network categorizes it as an Unspent Transaction Output (UTXO), and Bob's
@ -225,7 +225,7 @@ problems with it).
{% autocrossref %}
Transaction output scriptPubKey's are created by spenders who have little interest in the
Transaction scriptPubKeys are created by spenders who have little interest in the
long-term security or usefulness of the particular satoshis they're
currently spending. Receivers do care about the conditions imposed on
the satoshis by the scriptPubKey and, if they want, they can ask
@ -271,8 +271,8 @@ redeemScript, so P2SH scripts are as secure as P2PKH pubkey hashes.
After the discovery of several dangerous bugs in early versions of
Bitcoin, a test was added which only accepted transactions from the
network if they had only scriptPubKeys and scriptSigs which matched a small set of
believed-to-be-safe templates and if the rest of the transaction didn't
network if their scriptPubKeys and scriptSigs matched a small set of
believed-to-be-safe templates, and if the rest of the transaction didn't
violate another small set of rules enforcing good network behavior. This
is the `IsStandard()` test, and transactions which pass it are called
standard transactions.
@ -308,7 +308,7 @@ scriptSig: <sig> <pubkey>
{% autocrossref %}
**Pay 2 Script Hash (P2SH)**
**Pay To Script Hash (P2SH)**
P2SH is used to send a transaction to a script hash. Each of the standard
scriptPubKeys can be used as a P2SH redeemScript, but in practice only the

View file

@ -13,15 +13,15 @@ The op codes used in the scriptPubKeys of standard transactions are:
signatures and public keys onto the stack. See the link below this list
for a description.
* `OP_TRUE`/`OP_1` (0x51), and `OP_2` through `OP_16` (0x52--0x60), which
(respectively) push the values 1, and 2--16 to the stack.
* `OP_TRUE`/`OP_1` (0x51) and `OP_2` through `OP_16` (0x52--0x60), which
push the values 1 through 16 to the stack.
* [`OP_CHECKSIG`][op_checksig]{:#term-op-checksig}{:.term} consumes a signature and a full public key, and pushes
true onto the stack if the the transaction data specified by the SIGHASH flag was
converted into the signature using the same ECDSA private key that
generated the public key. Otherwise, it pushes false onto the stack.
* [`OP_DUP`][op_dup]{:#term-op-dup}{:.term} pushes a copy of the topmost stack item to the stack.
* [`OP_DUP`][op_dup]{:#term-op-dup}{:.term} pushes a copy of the topmost stack item on to the stack.
* [`OP_HASH160`][op_hash160]{:#term-op-hash160}{:.term} consumes the topmost item on the stack,
computes the RIPEMD160(SHA256()) hash of that item, and pushes that hash onto the stack.

View file

@ -122,8 +122,8 @@
[satoshi]: /en/developer-guide#term-satoshi "The smallest unit of Bitcoin value; 0.00000001 bitcoins. Also used generically for any value of bitcoins"
[satoshis]: /en/developer-guide#term-satoshi "The smallest unit of Bitcoin value; 0.00000001 bitcoins. Also used generically for any value of bitcoins"
[sequence number]: /en/developer-guide#term-sequence-number "A number intended to allow time locked transactions to be updated before being finalized; not currently used except to disable locktime in a transaction"
[scriptPubKey]: /en/developer-guide#term-scriptPubKey "The part of an output which sets the conditions for spending of the satoshis in that output"
[scriptPubKeys]: /en/developer-guide#term-scriptPubKey "The part of an output which sets the conditions for spending of the satoshis in that output"
[scriptPubKey]: /en/developer-guide#term-scriptpubkey "The part of an output which sets the conditions for spending of the satoshis in that output"
[scriptPubKeys]: /en/developer-guide#term-scriptpubkey "The part of an output which sets the conditions for spending of the satoshis in that output"
[scriptSig]: /en/developer-guide#term-scriptsig "Data generated by a spender which is almost always used as variables to satisfy an output script"
[script hash]: /en/developer-guide#term-script-hash "The hash of a redeemScript used to create a P2SH output"
[sha_shacp]: /en/developer-guide#term-sighash-all-sighash-anyonecanpay "Signature hash type which allows other people to contribute satoshis without changing the number of satoshis sent nor where they go"