From 2e2b0968e7a4b357692d0c4e27a1fdca48cb24c6 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Mon, 2 Jun 2014 10:36:10 -0400 Subject: [PATCH] Add Icons; Update Links * Add new icons for Developer Guide and Developer Examples so we don't keep reusing the book icon. * Update payment protocol links to point to developer examples when appropriate. --- _includes/guide_payment_processing.md | 5 +-- _includes/references.md | 44 +++++++++++++------------- en/developer-documentation.md | 6 ++-- img/compass-rose.svg | Bin 0 -> 5637 bytes img/hash.svg | Bin 0 -> 2179 bytes 5 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 img/compass-rose.svg create mode 100644 img/hash.svg diff --git a/_includes/guide_payment_processing.md b/_includes/guide_payment_processing.md index e4797526..f38d7614 100644 --- a/_includes/guide_payment_processing.md +++ b/_includes/guide_payment_processing.md @@ -327,7 +327,7 @@ a unique identifier. This is why, in the example URI above, the Payment Request URL contains the P2PKH address: `https://example.com/pay/mjSk1Ny9spzU2fouzYgLqGUD8U41iR35QN` -Upon receipt of the HTTP GET to the URL above, the Payment +After receiving the HTTP GET to the URL above, the Payment Request-generating CGI program on Bob's webserver takes the unique identifier from the URL and looks up the corresponding details in the database. It then creates a Payment Details message with the @@ -385,7 +385,8 @@ transaction has been suitably confirmed, it authorizes shipping Charlie's order. In the case of a dispute, Charlie can generate a cryptgraphically-proven -receipt out of the various signed or otherwise-proven information. +[receipt][]{:#term-receipt}{:.term} out of the various signed or +otherwise-proven information. * The Payment Details message signed by Bob's webserver proves Charlie received an invoice to pay a specified output script for a specified diff --git a/_includes/references.md b/_includes/references.md index a925f4cd..560b414a 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -17,7 +17,7 @@ [broadcast]: /en/developer-guide#transaction-broadcasting "Sending transactions or blocks to all other peers on the Bitcoin network (compare to privately transmitting to a single peer or partner" [broadcasts]: /en/developer-guide#transaction-broadcasting "Sending transactions or blocks to all other peers on the Bitcoin network (compare to privately transmitting to a single peer or partner" [broadcasting]: /en/developer-guide#transaction-broadcasting "Sending transactions or blocks to all other peers on the Bitcoin network (compare to privately transmitting to a single peer or partner)" -[certificate chain]: /en/developer-guide#term-certificate-chain "A chain of certificates connecting a individual's leaf certificate to the certificate authority's root certificate" +[certificate chain]: /en/developer-examples#term-certificate-chain "A chain of certificates connecting a individual's leaf certificate to the certificate authority's root certificate" [chain code]: /en/developer-guide#term-chain-code "In HD wallets, 256 bits of entropy added to the master public and private keys to help them generate secure child keys; the chain code is usually derived from a seed along with the master private key" [change address]: /en/developer-guide#term-change-output "An output used by a spender to send back to himself some of the satoshis from the inputs" [change output]: /en/developer-guide#term-change-output "An output used by a spender to send back to himself some of the satoshis from the inputs" @@ -46,11 +46,11 @@ [high-priority transactions]: /en/developer-guide#term-high-priority-transactions "Transactions which don't pay a transaction fee; only transactions spending long-idle outputs are eligible" [input]: /en/developer-guide#term-input "The input to a transaction linking to the output of a previous transaction which permits spending of satoshis" [inputs]: /en/developer-guide#term-input "The input to a transaction linking to the output of a previous transaction which permits spending of satoshis" -[intermediate certificate]: /en/developer-guide#term-intermediate-certificate "A intermediate certificate authority certificate which helps connect a leaf (receiver) certificate to a root certificate authority" +[intermediate certificate]: /en/developer-examples#term-intermediate-certificate "A intermediate certificate authority certificate which helps connect a leaf (receiver) certificate to a root certificate authority" [key index]: /en/developer-guide#term-key-index "An index number used in the HD wallet formula to generate child keys from a parent key" [key pair]: /en/developer-guide#term-key-pair "A private key and its derived public key" [label]: /en/developer-guide#term-label "The label parameter of a bitcoin: URI which provides the spender with the receiver's name (unauthenticated)" -[leaf certificate]: /en/developer-guide#term-leaf-certificate "The end-node in a certificate chain; in the payment protocol, it is the certificate belonging to the receiver of satoshis" +[leaf certificate]: /en/developer-examples#term-leaf-certificate "The end-node in a certificate chain; in the payment protocol, it is the certificate belonging to the receiver of satoshis" [locktime]: /en/developer-guide#term-locktime "Part of a transaction which indicates the earliest time or earliest block when that transaction can be added to the block chain" [long-term fork]: /en/developer-guide#term-long-term-fork "When a series of blocks have corresponding block heights, indicating a possibly serious problem" [mainnet]: /en/developer-guide#term-mainnet "The Bitcoin main network used to transfer satoshis (compare to testnet, the test network)" @@ -90,30 +90,30 @@ [parent private key]: /en/developer-guide#term-parent-private-key "A private key which has created child private keys" [parent public key]: /en/developer-guide#term-parent-public-key "A public key corresponding to a parent private key which has child private keys" [payment protocol]: /en/developer-guide#term-payment-protocol "The protocol defined in BIP70 which lets spenders get signed payment details from receivers" -[PaymentACK]: /en/developer-guide#term-paymentack "The PaymentACK of the payment protocol which allows the receiver to indicate to the spender that the payment is being processed" -[PaymentDetails]: /en/developer-guide#term-paymentdetails "The PaymentDetails of the payment protocol which allows the receiver to specify the payment details to the spender" -[PaymentRequest]: /en/developer-guide#term-paymentrequest "The PaymentRequest of the payment protocol which contains and allows signing of the PaymentDetails" -[PaymentRequests]: /en/developer-guide#term-paymentrequest "The PaymentRequest of the payment protocol which contains and allows signing of the PaymentDetails" +[PaymentACK]: /en/developer-examples#term-paymentack "The PaymentACK of the payment protocol which allows the receiver to indicate to the spender that the payment is being processed" +[PaymentDetails]: /en/developer-examples#term-paymentdetails "The PaymentDetails of the payment protocol which allows the receiver to specify the payment details to the spender" +[PaymentRequest]: /en/developer-examples#term-paymentrequest "The PaymentRequest of the payment protocol which contains and allows signing of the PaymentDetails" +[PaymentRequests]: /en/developer-examples#term-paymentrequest "The PaymentRequest of the payment protocol which contains and allows signing of the PaymentDetails" [peer]: /en/developer-guide#term-peer "Peer on the P2P network who receives and broadcasts transactions and blocks" [peers]: /en/developer-guide#term-peer "Peers on the P2P network who receive and broadcast transactions and blocks" -[PKI]: /en/developer-guide#term-pki "Public Key Infrastructure; usually meant to indicate the X.509 certificate system used for HTTP Secure (https)." +[PKI]: /en/developer-examples#term-pki "Public Key Infrastructure; usually meant to indicate the X.509 certificate system used for HTTP Secure (https)." [point function]: /en/developer-guide#term-point-function "The ECDSA function used to create a public key from a private key" [private key]: /en/developer-guide#term-private-key "The private portion of a keypair which can create signatures which other people can verify using the public key" [private keys]: /en/developer-guide#term-private-key "The private portion of a keypair which can create signatures which other people can verify using the public key" [pubkey hash]: /en/developer-guide#term-pubkey-hash "The hash of a public key which can be included in a P2PKH output" [public key]: /en/developer-guide#term-public-key "The public portion of a keypair which can be safely distributed to other people so they can verify a signature created with the corresponding private key" [public keys]: /en/developer-guide#term-public-key "The public portion of a keypair which can be safely distributed to other people so they can verify a signature created with the corresponding private key" -[pp amount]: /en/developer-guide#term-pp-amount "Part of the Output part of the PaymentDetails part of a payment protocol where receivers can specify the amount of satoshis they want paid to a particular output script" -[pp expires]: /en/developer-guide#term-pp-expires "The expires field of a PaymentDetails where the receiver tells the spender when the PaymentDetails expires" -[pp memo]: /en/developer-guide#term-pp-memo "The memo fields of PaymentDetails, Payment, and PaymentACK which allow spenders and receivers to send each other memos" -[pp merchant data]: /en/developer-guide#term-pp-merchant-data "The merchant_data part of PaymentDetails and Payment which allows the receiver to send arbitrary data to the spender in PaymentDetails and receive it back in Payments" -[pp Payment]: /en/developer-guide#term-pp-payment "The Payment message of the PaymentProtocol which allows the spender to send payment details to the receiver" -[pp PKI data]: /en/developer-guide#term-pp-pki-data "The pki_data field of a PaymentRequest which provides details such as certificates necessary to validate the request" -[pp pki type]: /en/developer-guide#term-pp-pki-type "The PKI field of a PaymentRequest which tells spenders how to validate this request as being from a specific recipient" -[pp refund to]: /en/developer-guide#term-pp-refund-to "The refund_to field of a Payment where the spender tells the receiver what outputs to send refunds to" -[pp script]: /en/developer-guide#term-pp-script "The script field of a PaymentDetails where the receiver tells the spender what output scripts to pay" -[pp transactions]: /en/developer-guide#term-pp-transactions "The transactions field of a Payment where the spender provides copies of signed transactions to the receiver" -[pp payment url]: /en/developer-guide#term-pp-payment-url "The payment_url of the PaymentDetails which allows the receiver to specify where the sender should post payment" +[pp amount]: /en/developer-examples#term-pp-amount "Part of the Output part of the PaymentDetails part of a payment protocol where receivers can specify the amount of satoshis they want paid to a particular output script" +[pp expires]: /en/developer-examples#term-pp-expires "The expires field of a PaymentDetails where the receiver tells the spender when the PaymentDetails expires" +[pp memo]: /en/developer-examples#term-pp-memo "The memo fields of PaymentDetails, Payment, and PaymentACK which allow spenders and receivers to send each other memos" +[pp merchant data]: /en/developer-examples#term-pp-merchant-data "The merchant_data part of PaymentDetails and Payment which allows the receiver to send arbitrary data to the spender in PaymentDetails and receive it back in Payments" +[pp Payment]: /en/developer-examples#term-pp-payment "The Payment message of the PaymentProtocol which allows the spender to send payment details to the receiver" +[pp PKI data]: /en/developer-examples#term-pp-pki-data "The pki_data field of a PaymentRequest which provides details such as certificates necessary to validate the request" +[pp pki type]: /en/developer-examples#term-pp-pki-type "The PKI field of a PaymentRequest which tells spenders how to validate this request as being from a specific recipient" +[pp refund to]: /en/developer-examples#term-pp-refund-to "The refund_to field of a Payment where the spender tells the receiver what outputs to send refunds to" +[pp script]: /en/developer-examples#term-pp-script "The script field of a PaymentDetails where the receiver tells the spender what output scripts to pay" +[pp transactions]: /en/developer-examples#term-pp-transactions "The transactions field of a Payment where the spender provides copies of signed transactions to the receiver" +[pp payment url]: /en/developer-examples#term-pp-payment-url "The payment_url of the PaymentDetails which allows the receiver to specify where the sender should post payment" [proof of work]: /en/developer-guide#term-proof-of-work "Proof that computationally-difficult work was performed which helps secure blocks against modification, protecting transaction history" [Pubkey]: /en/developer-guide#term-pubkey "A standard output script which specifies the full public key to match a signature; used in coinbase transactions" [r]: /en/developer-guide#term-r-parameter "The payment request parameter in a bitcoin: URI" @@ -122,7 +122,7 @@ [recurrent rebilling]: /en/developer-guide#rebilling-recurring-payments "Billing a spender on a regular schedule" [redeemScript]: /en/developer-guide#term-redeemscript "A script created by the recipient, hashed, and given to the spender for use in a P2SH output" [refund]: /en/developer-guide#issuing-refunds "A transaction which refunds some or all satoshis received in a previous transaction" -[root certificate]: /en/developer-guide#term-root-certificate "A certificate belonging to a certificate authority (CA)" +[root certificate]: /en/developer-examples#term-root-certificate "A certificate belonging to a certificate authority (CA)" [root seed]: /en/developer-guide#term-root-seed "A potentially-short value used as a seed to generate a master private key and master chain code for an HD wallet" [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" @@ -141,7 +141,7 @@ [signature]: /en/developer-guide#term-signature "The result of combining a private key and some data in an ECDSA signature operation which allows anyone with the corresponding public key to verify the signature" [signature hash]: /en/developer-guide#term-signature-hash "A byte appended onto signatures generated in Bitcoin which allows the signer to specify what data was signed, allowing modification of the unsigned data" [spv]: /en/developer-guide#simplified-payment-verification-spv "A method for verifying particular transactions were included in blocks without downloading the entire contents of the block chain" -[ssl signature]: /en/developer-guide#term-ssl-signature "Signatures created and recognized by major SSL implementations such as OpenSSL" +[ssl signature]: /en/developer-examples#term-ssl-signature "Signatures created and recognized by major SSL implementations such as OpenSSL" [stack]: /en/developer-guide#term-stack "An evaluation stack used in Bitcoin's script language" [standard script]: /en/developer-guide#standard-transactions "An output script which matches the isStandard() patterns specified in Bitcoin Core---or a transaction containing only standard outputs. Only standard transactions are mined or broadcast by peers running the default Bitcoin Core software" [target]: /en/developer-guide#term-target "The threshold below which a block header hash must be in order for the block to be added to the block chain" @@ -164,7 +164,7 @@ [wallet]: /en/developer-guide#wallets "Software which stores private keys to allow users to spend and receive satoshis" [Wallet Import Format]: /en/developer-guide#term-wallet-import-format "A private key specially formatted to allow easy import into a wallet" [wallets]: /en/developer-guide#wallets "Software which stores private keys to allow users to spend and receive satoshis" -[X509Certificates]: /en/developer-guide#term-x509certificates +[X509Certificates]: /en/developer-examples#term-x509certificates [BFGMiner]: https://github.com/luke-jr/bfgminer [BIP21]: https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki diff --git a/en/developer-documentation.md b/en/developer-documentation.md index dee2afb7..dc1ee111 100644 --- a/en/developer-documentation.md +++ b/en/developer-documentation.md @@ -10,9 +10,9 @@ title: "Developer Documentation - Bitcoin"

Find useful resources, guides and reference material for developers.

-iconDeveloper Guide(How Bitcoin works) +iconDeveloper Guide(How Bitcoin works) iconDeveloper Reference(Specifications and APIs) -iconDeveloper Examples(Examples You Can Use) +iconDeveloper Examples(Examples You Can Use)
@@ -24,6 +24,7 @@ title: "Developer Documentation - Bitcoin"

IconTransactions

Transactions Guide

Transactions Reference

+

Transaction Examples

@@ -48,6 +49,7 @@ title: "Developer Documentation - Bitcoin"

IconPayment Processing

Payment Processing Guide

+

Payment Processing Examples

Payment Protocol - BIP70

diff --git a/img/compass-rose.svg b/img/compass-rose.svg new file mode 100644 index 0000000000000000000000000000000000000000..dd5a9a43d68f5cec3263e2927077a547fd373757 GIT binary patch literal 5637 zcmds5OK;mo5Wf3Yu=FKGMRFhH@)1b^lGH#By|gKMG-z^dF`>A^a%I^r`rkXVFNtgA@2axFX4M>M37zc;V;<`wSVT+2$W*Q)F7%&tE@ zFxK_uv^bt-$E^{~^E@IfVk`iQpug=*c@x~93TJ$5DkFqMpxbZqJgcGyKsWGjGIxTo zS6f}lO8`iQoix$=kMAR=3`kg;dcRrW@SK);0CHEZWxpva*++JP9!_-K$lY6Yv+#*WJj%l)7Vzxf z?1D|b@BuGo2L~*pgLb4xF=YZ0#UDz4Mk9PsUS6mz_zhNdRX{M-rCB!X z@=9W~e*&t`qrC!c%<9UEjTq z2L$1C=E%9SoKJut8a0Li53+$JE7dB!@J}!8W6`@%x|Z50FhXL0bx+$p^IBf^j^OwX z+=k)YCM(L3XA9rR8xvK1Kb!~Fw|Zf1Jv8&e-e~Im3ID6lvN(mR2+!+bIG|sUkfehB zHJOvW`CEpce=&!u0p?gciVkj$aS<59o>ppiJUiPfm{a_m;AgMkqvE11tIw}-@=%Uo z-8-q3HADy^>!U>@LS*3WWL`D8YHh9p2)}r#2$NZyc<+Wc!9t#kJoVhm3=Ok!?zi!envS)CH(~0hEs19nb#cf2mIEAYRo@2mS z#_*v|4rNB_7C2>!*vZBmEGDD6gw)fzytO+F+m07hp^@b@Opc^L?T1p#i1^6TCeR?m zyc^IT%LwpzTI68v!IY|n!ftOI0$qn5a>76{>ai$8K`)JNZeEd)W+Klh=Q9EyxF@G^ zK*Kc76PnW*O+cKHB>vIX+Kp;&uT+O*#*>{>mc&`c#c=iQcc!@Wkoz0eKof#ah6(Hj z(GCgWUIL-b#f+zRct3Lg6v#xx_)Hn~rGfmGU?piX)YUy$>`AZyr35aW zXQMS-UQf{edq7K2G4OYf*7K-^OaqD$nxPxw7m)0wSFSid&c)}E3(EX+!Fn;&f-CdOsCAf$a2p<8 znJ>6-2}X`vh^M)QnRr;|pM>kXWLIfc*lzvDo|Yye7a5B;H?D(in@+-yOU1?3m_yko z=+6qsrFujz0@?&hjLQXK|RaobZf!l%g<6(;2jjERPu-7>|wN22Ra0GF(Q} zSG-Dfa0a7v0N>26OS9GRB@2EmgD>$o;Y-{UG0#NIzM7kvAeK{Em?a6NBJ(JN!j9eW z3?0sS;=DR=Gx#4IrFoK4{*@f1p@8n2aR{BrIAdIR5LoCM$Xsi4e8kHwTR^ps@4&TIy>W^tV7kGT4LNAc&a<;mY<8*I-2 literal 0 HcmV?d00001 diff --git a/img/hash.svg b/img/hash.svg new file mode 100644 index 0000000000000000000000000000000000000000..2784eac0820a81962adbc80047c33723e7de3d35 GIT binary patch literal 2179 zcma)8%dXot5Z(JLSX~rI&{8kIX~|jiB0zwyniO5r5-kx|A_bDR?0kKOlqlPAE>Ho6 zt$FjznW3{!m$pG?rZkr#50Wqr5EF$gxv28s-*2DsCP3OyQPM^VmIp!xpZ2rtH;mC= zic!N#)N@m#FXBxXv}5Q)ZA?d^sPFrbkHS!@D*A{p-p^*4K36k@5abn_ltmtl4&6yL z⁡Z*07cdqoX8DqTps;+{_D`ou64D+g1wgJcWL_Ggjqs3T~_E=guhEZnsgKMrn${ z0_&?V^nxEK&1UfORg+Q{whSne>iR%M6j250J>vt{SfKNz`&Tzc< zR4u*mmVakZAnco=`7JZFq=w#F?j`eWoH+UbfnZ|EKd+xHUF?$;1^G{^xA7Gu)_@-5 z3D`aQIJ>eSFk>w>d)`8$?GXO~8z_rziYZ10GIQ zH_aEDWIUP8Z>bMKxoOzm?4^HrLD^!OWgF&-DdkGNd} z^aN~}I{OJlaAjN@$a<8(Pz{|Xt92M}*Xwk#O}fi&kXsufY+IT^a;Az?VIE|?+f@%D zZ4@&_?PazmOdDPa0ymX1yM_yf2kw$2UH-mnm@!OYTP)mbB!&ul*cFcg#SJL2g^M%_ zo5OAhEQ(sHG4c_5OJ3j>fM;i4@VGKavV*GRn>~+U!)cDR<;|76D#=Uq6%gKG-x)jr z(6NFac>(vB6nA!Go8XRwRTIwB^>Ve`PC~oB;w8wFWLUhGUUt@PxiBk>$#UAK7Lf7q z;0%Za`^j3d@N#7|Dp@$OpFInW00rPE%j>l02e