diff --git a/README b/README index d52e9a6..1d9bfd7 100644 --- a/README +++ b/README @@ -11,12 +11,15 @@ JavaScript powered offline bitcoin address generator. This attractive paper wallet design is two-sided and folds up to hide the private key. Optional tamper-evident hologram tape and/or a live-boot Ubuntu CD with this software pre-installed can be purchased from bitcoinpaperwallet.com -to provide extra security against snooping. +to provide additional security against snooping. This generator includes the same pseudorandom key generation as bitaddress.org, as well as support for creating wallets using "vanity keys", passphrases ("brain wallets") or even rolling dice or shuffling cards. +As of March 1, 2014, this generator also includes support and designs for making +Litecoin and Dogecoin wallets. + Use the "verify" tab to decrypt a BIP38 password-encrypted wallet, check the integrity of any private key, or even duplicate an exising wallet by scanning its QR code. @@ -80,6 +83,9 @@ purchasing wallet-making supplies or the Ubuntu LiveCD with this software here: https://bitcoinpaperwallet.com/#purchase https://bitcoinpaperwallet.com/#donate +Special thanks to pointbiz/bitaddress.org and Artiom Chilaru/flexlabs.org for +their significant contributions to this software. + *** LICENSE *** © Copyright 2014 Canton Becker. This software may be modified and redistributed as diff --git a/generate-wallet.html b/generate-wallet.html index c80f350..10e7f1d 100644 --- a/generate-wallet.html +++ b/generate-wallet.html @@ -16,11 +16,15 @@ The bitcoinpaperwallet.com folding wallet design may not be used for commercial use without permission. The design of the bitcoin hologram sticker used to seal these wallets - is copyrighted. - + is copyrighted. As a courtesy, please do not modify this software in such a way that the + links to purchase hologram stickers and wallet making supplies are removed or pointed elsewhere. + This software (HTML and JavaScript) is ©Copyright 2014 Canton Becker and bitaddress.org and licensed under the MIT license. + Special thanks to pointbiz/bitaddress.org and Artiom Chilaru/flexlabs.org for significant + contributions to this software. + Portions of this code are copyrighted by their respective authors - see below. **************************************************************************************** @@ -81,6 +85,73 @@ + + Wallet Generator Updated March 1, 2014
For help, security tips, or wallet making supplies visit bitcoinpaperwallet.com
@@ -10355,34 +10425,14 @@ Bitcoin.Util = {
-

Welcome! Let's print out a beautiful and secure wallet for your bitcoins.

+

Welcome! Let's print out a beautiful and secure wallet for your s.

Here's an overview of what will happen, step by step.

-
-

Select your wallet design or language here: - -

-
- Flags + Sealed Wallet @@ -10412,28 +10462,58 @@ Bitcoin.Util = { } -
  • ? Are you using a secure operating system guaranteed to be free of spyware and viruses, for example, an Ubuntu LiveCD?
    • +
  • ? Are you using a secure operating system guaranteed to be free of spyware and viruses, for example, an Ubuntu LiveCD?
    • -

    More security tips

    +

    More security tips and answers to frequently asked questions »

    + Order hologram stickers / zip bags / Ubuntu CD » +
    - Step 1: Calibrate Printer
    - Before printing out a wallet you'll need to "calibrate" your output using the zoom and horizontal shift adjustments to accommodate your particular browser / printer combination. Without proper callibration, your wallet may print out too small or with a misaligned reverse side.     + + + +
    + Flags + +
    +

    Change your wallet design, language, or cryptocurrency? + +

    + Step 1: Calibrate Printer
    + Before printing out a wallet you'll need to "calibrate" your output using the zoom and horizontal shift adjustments to accommodate your particular browser / printer combination. Without adjustment, your wallet may print out too small or with a misaligned reverse side.

    Step 2: Print Front
    - Next you will print out the front side of your wallet. A public address and private key will automatically be generated, or you can supply your own key by rolling dice, shuffling cards, etc. It is also possible to duplicate an existing paper wallet or provide a "vanity" address if you have one.     + Next you will print out the front side of your wallet. A public address and private key will automatically be generated, or you can supply your own key by rolling dice, shuffling cards, etc. You may also duplicate an existing paper wallet or provide a "vanity" address if you have one. If you are printing several wallets, it's possible to print two per page.

    Step 3: Print Back
    - Then you will put the same page back in your printer (but flipped over) to print out the back side of your wallet. This isn't just for good looks: the back side design includes additional tamper-resistant safeguards.     + You will put the same page back in your printer (but flipped over) to print out the back side of your wallet. This isn't just for good looks: the back side design includes additional tamper-resistant safeguards.

    Step 4: Cut, Fold, Seal & Fund
    - Find your scissors! The final step is to cut out your wallet, fold it, and seal it with opaque (light-blocking) tape. Now you're ready to transfer bitcoins from your online holdings to your new wallet.     + Find your scissors! The final step is to cut out your wallet, fold it, and seal it with tamper-evident hologram stickers or at least opaque (light-blocking) tape. Now you're ready to transfer funds from your online holdings to your new wallet.

    90 second tutorial video on YouTube » -

    - Purchase hologram stickers and/or zip-sealing bags »
    @@ -10499,7 +10579,7 @@ Bitcoin.Util = { If you want to make a paper wallet which can also be accessed using a passphrase (AKA a "brain wallet"):

    - You can make a so-called "brain wallet" by supplying a very, very, VERY secure passphrase, like '1852 Cloud SMASH fuzzy steamzonk'. Be careful doing this because a wallet generated using an insecure passphrase will have its balance stolen within hours of receiving funds. + You can make a so-called "brain wallet" by supplying a VERY secure passphrase like '1852 Adobe Cloud SMASH fuzzy steamzonk'. Be extremely careful doing this because a wallet generated using an insecure passphrase is virtually guaranteed to have its balance stolen within minutes of receiving funds!.

    The resulting paper wallet will still have an ordinary crypto-looking private key and public address, but you will also be able to retrieve your wallet contents by entering your passphrase into the 'verify' tab of this service or a similar service such as brainwallet.org.

    Note: supplying a brain wallet passphrase is different from BIP38-encrypting your wallet with a passphrase. @@ -10533,7 +10613,7 @@ Bitcoin.Util = {

    About "BIP38" Encryption

    The advantage to encrypting your paper wallet is that if your paper wallet is stolen or otherwise exposed, the balance on the wallet is safe unless the passphrase used to encrypt the wallet is guessed. However, if you encrypt your private key with BIP38 and you lose your passphrase, it will be impossible for you to recover the funds you have sent to this wallet.

    -

    Also, note that not many bitcoin wallet applications or web services are able to import BIP38 private keys. In this case, you will have to use the "Validate" feature on this webpage to extract the unencrypted Wallet Import Format (WIF) key as an intermediate step before sweeping the balance.

    +

    Also, note that not many wallet applications or web services are able to import BIP38 private keys. In this case, you will have to use the "Validate" feature on this webpage to extract the unencrypted Wallet Import Format (WIF) key as an intermediate step before sweeping the balance.

    WARNING: Before sending any funds to a BIP38-encrypted wallet, first do a test make sure you are able to decrypt the printed private key back to ordinary WIF format.

    In short, if you do not have a strong understanding of the BIP38 encryption and decryption workflow, click cancel, print your paper wallet out without encryption, and keep it safe the same way you would jewels or cash. @@ -10603,13 +10683,13 @@ Bitcoin.Util = {
    Seal your wallet by placing two strips of sturdy light-blocking tape over the top and bottom edges of the private (folded) area. A zip-seal bag will keep it safe from moisture (especially important for inkjet prints.)

    - Purchase hologram stickers and/or zip-sealing bags » + Purchase hologram stickers and/or zip-sealing bags »

    How to add funds to your wallet:

    - Send bitcoins to the address (or QR code) where your wallet says "PUBLIC ADDRESS". + Send s to the address (or QR code) where your wallet says "PUBLIC ADDRESS".

    How to withdraw funds from your wallet:

    @@ -10676,18 +10756,17 @@ Bitcoin.Util = {

    Public and private details for:

    - This private key is a unique number that you should keep secret since it can be used to spend any bitcoins that have been sent to the corresponding public key. Keys can be encoded in a number of different formats. Look below for the most popular encoding formats (WIF, WIFC, HEX, B64, MINI). -

    - Bitcoin v0.6+ stores public keys in compressed format. The client now also supports import and export of private keys with importprivkey/dumpprivkey. The format of the exported private key is determined by whether the address was generated in an old or new wallet. + Use the Public Address to receive funds or check your balance online. The Private Key WIF is a code that needs to be keep secret since it can be used to spend any funds that have been sent to the corresponding public key. Keys can be encoded in a number of different formats. The most popular encoding formats (WIF, WIFC, HEX, B64) are shown below. +
    - Bitcoin Address + Public Address
    - Bitcoin Address Compressed + Address Compressed Format
    @@ -10704,12 +10783,12 @@ Bitcoin.Util = {
    - Private Key WIF
    51 characters base58, starts with a     '5'     + Private Key WIF
    51 characters base58, starts with a     ''
    - Private Key WIF Compressed
    52 characters base58, starts with a     'K' or 'L'     + Private Key WIF Compressed
    52 characters base58, starts with a     ''
    @@ -10746,11 +10825,16 @@ Bitcoin.Util = {
    © The folding wallet design and tamper-evident seals are Copyright 2014 by Canton Becker. - This software may be modified and redistributed as per the MIT/GPL/BSD licenses included in the HTML and JavaScript source. However, the folding paper wallet design itself may not be modified or redistributed for commercial purposes without permission. - This software and service is provided with no warranty. Use at your own risk.
    + This software may be modified and redistributed as per the MIT/GPL/BSD/Apache licenses described in the HTML source code. However, the folding paper wallet design itself may not be modified or redistributed for commercial purposes without permission.
    + This software and service is provided with no warranty. Use at your own risk.
    @@ -11448,7 +11531,7 @@ ninja.publicKey = { "paperlabelencryptedkey": "Encrypted Private Key (Password required)", "bip38alertpassphraserequired": "Passphrase required for BIP38 key", "detailalertnotvalidprivatekey": "The text you entered is not a valid private key or passphrase.", - "detailconfirmsha256": "The text you entered does not appear to be a private key.\n\nWould you like to use this text as a passphrase and create a private key using its SHA256 hash?\n\nWarning: Choosing an extremely strong passphrase (also known as a \"brain wallet\") is important as all common phrases, words, lyrics etc. are regularly scanned by hackers for bitcoin balances worth stealing.", + "detailconfirmsha256": "The text you entered does not appear to be a private " + window.currencyName + " key.\n\nWould you like to use this text as a passphrase and create a private key using its SHA256 hash?\n\nWarning: Choosing an extremely strong passphrase (also known as a \"brain wallet\") is important as all common phrases, words, lyrics etc. are regularly scanned by hackers for bitcoin balances worth stealing.", "bip38alertincorrectpassphrase": "Incorrect passphrase for this encrypted private key.", }, @@ -12743,7 +12826,7 @@ ninja.publicKey = { suppliedKey = suppliedKey.trim(); // in case any spaces or whitespace got pasted in document.getElementById('suppliedPrivateKey').value = suppliedKey; if (!ninja.privateKey.isPrivateKey(suppliedKey)) { - var message = 'What you entered does not appear to be a Wallet Import Format (WIF) private key.'; + var message = 'What you entered does not appear to be a ' + window.currencyName + ' Wallet Import Format (WIF) private key.'; if (suppliedKey == null || suppliedKey.length == 0) { alert(message); return; @@ -12798,8 +12881,18 @@ ninja.publicKey = { updateCalibrationInfo(); } -function setDesign (whichDesign) { - if (!whichDesign) whichDesign = 'default'; +function setDesign (whichDesign, isOnLoad) { + if (!whichDesign) whichDesign = 'default'; + // if we used the dropdown menu to select an alt-coin, we need to reload the page altogether. + if (!isOnLoad && whichDesign.substring(0,4) == 'alt-') window.location='?design=' + whichDesign; + // if we're already using an altcoin, reload the page no matter which design we choose. + if (!isOnLoad && window.networkVersion != 0x00 ) window.location='?design=' + whichDesign; + + // reload background and add altcoin donation addresses if necessary + if (isOnLoad && whichDesign.substring(0,4) == 'alt-') { + document.getElementById('logoback').style.backgroundImage = 'url(images/logo-' + whichDesign + '.png)'; + } + if (whichDesign == 'default') { var myFront = './images/front-300dpi.jpg'; var myBack = './images/back-300dpi.jpg'; diff --git a/generate-wallet.html.sig b/generate-wallet.html.sig index 78f6fbd..2abfd66 100644 Binary files a/generate-wallet.html.sig and b/generate-wallet.html.sig differ diff --git a/images/back-300dpi-alt-dogecoin.jpg b/images/back-300dpi-alt-dogecoin.jpg new file mode 100644 index 0000000..3803a8b Binary files /dev/null and b/images/back-300dpi-alt-dogecoin.jpg differ diff --git a/images/back-300dpi-alt-litecoin.jpg b/images/back-300dpi-alt-litecoin.jpg new file mode 100644 index 0000000..e88d934 Binary files /dev/null and b/images/back-300dpi-alt-litecoin.jpg differ diff --git a/images/back-300dpi-alt-testnet.jpg b/images/back-300dpi-alt-testnet.jpg new file mode 100644 index 0000000..baed1c3 Binary files /dev/null and b/images/back-300dpi-alt-testnet.jpg differ diff --git a/images/finished-sample-alt-dogecoin.jpg b/images/finished-sample-alt-dogecoin.jpg new file mode 100644 index 0000000..5881874 Binary files /dev/null and b/images/finished-sample-alt-dogecoin.jpg differ diff --git a/images/finished-sample-alt-litecoin.jpg b/images/finished-sample-alt-litecoin.jpg new file mode 100644 index 0000000..dface8f Binary files /dev/null and b/images/finished-sample-alt-litecoin.jpg differ diff --git a/images/finished-sample-alt-testnet.jpg b/images/finished-sample-alt-testnet.jpg new file mode 100644 index 0000000..51c1896 Binary files /dev/null and b/images/finished-sample-alt-testnet.jpg differ diff --git a/images/front-300dpi-alt-dogecoin.jpg b/images/front-300dpi-alt-dogecoin.jpg new file mode 100644 index 0000000..b452c47 Binary files /dev/null and b/images/front-300dpi-alt-dogecoin.jpg differ diff --git a/images/front-300dpi-alt-litecoin.jpg b/images/front-300dpi-alt-litecoin.jpg new file mode 100644 index 0000000..20371cd Binary files /dev/null and b/images/front-300dpi-alt-litecoin.jpg differ diff --git a/images/front-300dpi-alt-testnet.jpg b/images/front-300dpi-alt-testnet.jpg new file mode 100644 index 0000000..ec255b4 Binary files /dev/null and b/images/front-300dpi-alt-testnet.jpg differ diff --git a/images/logo-alt-dogecoin.png b/images/logo-alt-dogecoin.png new file mode 100644 index 0000000..a68c523 Binary files /dev/null and b/images/logo-alt-dogecoin.png differ diff --git a/images/logo-alt-litecoin.png b/images/logo-alt-litecoin.png new file mode 100644 index 0000000..8cabc53 Binary files /dev/null and b/images/logo-alt-litecoin.png differ diff --git a/images/logo-alt-testnet.png b/images/logo-alt-testnet.png new file mode 100644 index 0000000..3987f23 Binary files /dev/null and b/images/logo-alt-testnet.png differ