diff --git a/generate-wallet.html b/generate-wallet.html index 9ea3fc6..c80f350 100644 --- a/generate-wallet.html +++ b/generate-wallet.html @@ -1,29 +1,31 @@ - + Bitcoin Paper Wallet Generator - Bitcoin Paper Wallet Generator - + @@ -5542,6 +5593,8 @@ Bitcoin.Util = { // using this function to enclose everything needed to create a worker (but also invokable directly for synchronous use) function scryptCore() { var XY = [], V = []; + + salsa20_8(new Array(32)); // dummy call added to work around problem with BIP38 encoding on Safari 6.05 if (typeof B === 'undefined') { onmessage = function (event) { @@ -5747,11 +5800,12 @@ Bitcoin.Util = { + + + + + Español | + Français -->   -
Open Source JavaScript Bitcoin Wallet Generator Updated January 18, 2014
+
Open Source JavaScript Bitcoin Wallet Generator Updated February 10, 2014
For help, security tips, or wallet making supplies visit bitcoinpaperwallet.com
+
-
Please move your mouse around...
-

(This helps to generate more random & secure bitcoin addresses.)

+
+ + +
+ +
+
 
+
+ +
+ Skip »
+

You may skip this step if you do not plan to use the random key generator.

+
+
+ + Secure wallet generation requires that you provide some "entropy", or random data.
+ Please move your mouse around and/or type random keystrokes into this box: + + +

+

+

+
@@ -6689,7 +10423,7 @@ Bitcoin.Util = { 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.

Step 2: Print Front
- Next we'll 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 if you are using 'vanitygen' or some other random key generator. + 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.

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. @@ -6710,7 +10444,9 @@ Bitcoin.Util = {
-

To calibrate your output, print out this page in LANDSCAPE (wide) format. Based on the results, adjust the "zoom" and "horizontal shift" until your printed ruler approximates a real ruler, and leaves equal margins on the left and right sides of the page. Consider letting us know what settings worked best.

+

The calibration step helps line up the front and back sides of your printout. Print out this page in LANDSCAPE (wide) format. Based on the results, adjust the "zoom" and "horizontal shift" until your printed ruler (1) approximates a real ruler, and (2) is horizontally centered, leaving approximately equal margins on the left and right sides of the page.
+
+ What settings worked best for you? Feedback form »

Print Calibration Test @@ -6737,17 +10473,79 @@ Bitcoin.Util = {
- + - +
+ + -
-

How to cut & fold your 2-sided wallet:

+
- Cut out your wallet (use the dotted lines on the front as a guide, not the back!) +
+ Folding Diagram

+ Sample Wallet

+ Sealed Wallet +
+ + Cut out your wallet using the dotted lines on the front as a guide, not the back! + + Note that the design on the back side is intentionally larger than the front side so that back design will "bleed" to the edges even if your front and back sides are misaligned up to 1cm. +

+ Now fold the more narrow private key area in half, and then over again as indicated by the dotted lines in this diagram. The unusual "butterfly" shape can be a bit of a pain to cut out, but it's essential to keep your private key safe.
-
- Now fold the more narrow private key area in half, and then over again as indicated by the dotted lines in this diagram:
- Folding Diagram -
-
- The final wallet will be a rectangle shape with the more narrow private key area folded over it, like this:
- - Sample Wallet - -
+ The final wallet will be a rectangle shape with the more narrow private key area folded over it. +
+
- Finally 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.) + 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 » -

- Sealed Wallet

@@ -6815,12 +10614,131 @@ Bitcoin.Util = {

How to withdraw funds from your wallet:

- You should expect to withdraw the entire balance of the wallet by importing it (or "sweeping" it) to a live wallet, e.g. a Bitcoin wallet application or online service like blockchain.info or coinbase.com. Click here for important tips on withdrawing funds from your wallet » + You should expect to withdraw the entire balance of the wallet by importing it (or "sweeping" it) to a live wallet, e.g. a Bitcoin wallet application or online service like blockchain.info or coinbase.com. +
+
+ If you elected to BIP38-encrypt your wallet, you may need to recover your unencrypted WIF "Wallet Import Format" private key by using the "validate" tab on this web page. +
+
Visit BitcoinPaperWallet.com for detailed information on adding to and spending from a paper wallet »
+
+ +
+   +
+
+

Validate or decrypt private key

+
+

Enter or scan any private key into this form to display all available details in various formats. If your private key decodes properly, then you have verified that you should be able to retrieve any funds sent to that wallet. This should work for private keys generated by BitcoinPaperWallet.com as well as any other Bitcoin service.

+

For example, if you have a wallet encrypted with a BIP38 passphrase, you can use this form to decrypt your private key and retrieve the standard Wallet Import Format (WIF) key suitable for wallet software and services that don't directly support BIP38 importing.

+

You may also enter a passphrase (or "brain wallet") to see the corresponding SHA256 hashed keys.

+
+
+ + + + +
+
+
+

Help / Instructions »

+

Scan QR code using your camera

+
Sorry, but your web browser does not support the HTML5 camera controls. Try using a recent version of Firefox (recommended), Chrome or Opera.
+
+

Permission denied. Your browser should display a message requesting access to your camera. Please click the "Allow" button to enable the camera.

+

If you are using Chrome and you launched this generator by opening the HTML file from your own computer "locally", you may need to launch Chrome from the command line and specify the --allow-file-access-from-files flag. Or you can set up a local web server (Apache) and run this generator via http://127.0.0.1... or, give up and just use Firefox.

+ +
+
+
+ +
+
+
+ +
+ +
+
+ This "6P..." private key is BIP38-encrypted.
+
+ + +
+
+
+ +
+
+

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. +
+
+
+ Bitcoin Address +
+ +
+
+ Bitcoin Address Compressed +
+ +
+
+

+
+ Public Key (130 characters [0-9A-F]): + +
+
+ Public Key (compressed, 66 characters [0-9A-F]): + +
+
+
+
+ Private Key WIF
51 characters base58, starts with a '5' +
+ +
+
+ Private Key WIF Compressed
52 characters base58, starts with a 'K' or 'L' +
+ +
+
+

+
+ Private Key Hexadecimal Format (64 characters [0-9A-F]): + +
+
+ Private Key Base64 (44 characters): + +
+ + + +
+ +
+
@@ -6838,7 +10756,6 @@ Bitcoin.Util = {
Security Details - For extra security, do not run this generator directly from the bitcoinpaperwallet.com website.
+ For extra security, do not run this generator directly from the bitcoinpaperwallet.com website.
Download the generator and run the HTML as a local file in your browser instead. Download (GitHub ZIP file) - Run local encode/decode unit tests + Validate PGP/GPG signature - Validate PGP/GPG signature + Run unit tests: basic | async
- © Copyright 2013 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 bitcoinpaperwallet.com logo and folding paper wallet design are pending US trademark and may not be modified or redistributed without permission excepting for personal use. + © 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.
- - + + + }, - + ninja.seeder.seedPoints.push(div); + + }, + + removePoints: function () { + for (var i = 0; i < ninja.seeder.seedPoints.length; i++) { + document.body.removeChild(ninja.seeder.seedPoints[i]); + } + ninja.seeder.seedPoints = []; + } + }; + + ninja.qrCode = { + // determine which type number is big enough for the input text length + getTypeNumber: function (text) { + var lengthCalculation = text.length * 8 + 12; // length as calculated by the QRCode + if (lengthCalculation < 72) { return 1; } + else if (lengthCalculation < 128) { return 2; } + else if (lengthCalculation < 208) { return 3; } + else if (lengthCalculation < 288) { return 4; } + else if (lengthCalculation < 368) { return 5; } + else if (lengthCalculation < 480) { return 6; } + else if (lengthCalculation < 528) { return 7; } + else if (lengthCalculation < 688) { return 8; } + else if (lengthCalculation < 800) { return 9; } + else if (lengthCalculation < 976) { return 10; } + return null; + }, + + createCanvas: function (text, sizeMultiplier) { + sizeMultiplier = (sizeMultiplier == undefined) ? 2 : sizeMultiplier; // default 2 + // create the qrcode itself + var typeNumber = ninja.qrCode.getTypeNumber(text); + var qrcode = new QRCode(typeNumber, QRCode.ErrorCorrectLevel.H); + qrcode.addData(text); + qrcode.make(); + var width = qrcode.getModuleCount() * sizeMultiplier; + var height = qrcode.getModuleCount() * sizeMultiplier; + // create canvas element + var canvas = document.createElement('canvas'); + var scale = 10.0; + canvas.width = width * scale; + canvas.height = height * scale; + canvas.style.width = width + 'px'; + canvas.style.height = height + 'px'; + var ctx = canvas.getContext('2d'); + ctx.scale(scale, scale); + // compute tileW/tileH based on width/height + var tileW = width / qrcode.getModuleCount(); + var tileH = height / qrcode.getModuleCount(); + // draw in the canvas + for (var row = 0; row < qrcode.getModuleCount(); row++) { + for (var col = 0; col < qrcode.getModuleCount(); col++) { + ctx.fillStyle = qrcode.isDark(row, col) ? "#000000" : "#ffffff"; + ctx.fillRect(col * tileW, row * tileH, tileW, tileH); + } + } + // return just built canvas + return canvas; + }, + + // generate a QRCode and return it's representation as an Html table + createTableHtml: function (text) { + var typeNumber = ninja.qrCode.getTypeNumber(text); + var qr = new QRCode(typeNumber, QRCode.ErrorCorrectLevel.H); + qr.addData(text); + qr.make(); + var tableHtml = ""; + for (var r = 0; r < qr.getModuleCount(); r++) { + tableHtml += ""; + for (var c = 0; c < qr.getModuleCount(); c++) { + if (qr.isDark(r, c)) { + tableHtml += ""; + } + tableHtml += "
"; + } else { + tableHtml += ""; + } + } + tableHtml += "
"; + return tableHtml; + }, + + // show QRCodes with canvas OR table (IE8) + // parameter: keyValuePair + // example: { "id1": "string1", "id2": "string2"} + // "id1" is the id of a div element where you want a QRCode inserted. + // "string1" is the string you want encoded into the QRCode. + showQrCode: function (keyValuePair, sizeMultiplier) { + for (var key in keyValuePair) { + var value = keyValuePair[key]; + try { + if (document.getElementById(key)) { + document.getElementById(key).innerHTML = ""; + document.getElementById(key).appendChild(ninja.qrCode.createCanvas(value, sizeMultiplier)); + } + } + catch (e) { + // for browsers that do not support canvas (IE8) + document.getElementById(key).innerHTML = ninja.qrCode.createTableHtml(value); + } + } + } + }; + + ninja.tabSwitch = function (walletTab) { + if (walletTab.className.indexOf("selected") == -1) { + // unselect all tabs + for (var wType in ninja.wallets) { + document.getElementById(wType).className = "tab"; + ninja.wallets[wType].close(); + } + walletTab.className += " selected"; + ninja.wallets[walletTab.getAttribute("id")].open(); + } + }; + + ninja.getQueryString = function () { + var result = {}, queryString = location.search.substring(1), re = /([^&=]+)=([^&]*)/g, m; + while (m = re.exec(queryString)) { + result[decodeURIComponent(m[1])] = decodeURIComponent(m[2]); + } + return result; + }; + + // use when passing an Array of Functions + ninja.runSerialized = function (functions, onComplete) { + onComplete = onComplete || function () { }; + + if (functions.length === 0) onComplete(); + else { + // run the first function, and make it call this + // function when finished with the rest of the list + var f = functions.shift(); + f(function () { ninja.runSerialized(functions, onComplete); }); + } + }; + + ninja.forSerialized = function (initial, max, whatToDo, onComplete) { + onComplete = onComplete || function () { }; + + if (initial === max) { onComplete(); } + else { + // same idea as runSerialized + whatToDo(initial, function () { ninja.forSerialized(++initial, max, whatToDo, onComplete); }); + } + }; + + // use when passing an Object (dictionary) of Functions + ninja.foreachSerialized = function (collection, whatToDo, onComplete) { + var keys = []; + for (var name in collection) { + keys.push(name); + } + ninja.forSerialized(0, keys.length, function (i, callback) { + whatToDo(keys[i], callback); + }, onComplete); + }; + + + - + + + + + + + + + + + - - - - + }, + close: function () { + document.getElementById("paperarea").style.display = "none"; + document.getElementById("main").setAttribute("class", ""); // remove 'paper' class from main div + }, + toggleVanityField: function(show) { + document.getElementById('keyButtons').style.display= show ? 'none' : 'block'; + document.getElementById('supplyKeys').style.display = show ? 'block' : 'none'; + }, - - - - + + + }, + open: function () { + document.getElementById("detailarea").style.display = "block"; + document.getElementById("detailprivkey").focus(); + if (!ninja.wallets.detailwallet.qrscanner.scanner) { + ninja.wallets.detailwallet.qrscanner.scanner = new QRCodeScanner(320, 240, 'paperqroutput', + function(data) { + document.getElementById('detailprivkey').value = data; + document.getElementById('paperqrscanner').className = ''; + }, + function(error) { + ninja.wallets.detailwallet.qrscanner.showError(error); + }); + } + }, - + + + - - - - - function guessPrinterSettings() { - // detect browser / OS human-readable - txt = "

User-agent: " + navigator.userAgent + "
 
"; - var parser = new UAParser(); - parser.setUA(navigator.userAgent); - var result = parser.getResult(); - txt+=result.browser.name + " version " + result.browser.version + " (" + result.engine.name + ")
"; - txt+=result.os.name + " version " + result.os.version + " (" + result.cpu.architecture + ")
"; - txt += "

"; - document.getElementById("browserinfo").innerHTML=txt; - - // some common printer calibration settings here - if (result.browser.name == 'Safari') { // OS X Safari - document.getElementById("printerzoom").value = 5; - document.getElementById("printershift").value = 6; - } else if (result.browser.name == 'Chrome' && result.os.name == 'Mac OS X') { - document.getElementById("printerzoom").value = 3; - document.getElementById("printershift").value = 3; - } else if (result.browser.name == 'Firefox' && result.os.name == 'Ubuntu') { // live CD? - document.getElementById("printerzoom").value = 2; - document.getElementById("printershift").value = 3; - } else if (result.browser.name == 'Iceweasel' && result.os.name == 'Debian') { - document.getElementById("printerzoom").value = 1.8; - document.getElementById("printershift").value = 2.9; - } else if (result.browser.name == 'IE' && result.os.name == 'Windows') { - document.getElementById("printerzoom").value = 5; - document.getElementById("printershift").value = 6; - } - - updateCalibrationInfo(); - } - - function setDesign (whichDesign) { - if (!whichDesign) whichDesign = 'default'; - if (whichDesign == 'default') { - var myFront = './images/front-300dpi.jpg'; - var myBack = './images/back-300dpi.jpg'; - var myPreview = './images/finished-sample-sealed.jpg'; - } else { - var myFront = './images/front-300dpi-' + whichDesign + '.jpg'; - var myBack = './images/back-300dpi-' + whichDesign + '.jpg'; - var myPreview = './images/finished-sample-' + whichDesign + '.jpg'; - } - window.frontJPG=myFront; - if (document.getElementById('papersvg1') != null) document.getElementById('papersvg1').src=myFront; - document.getElementById('backsvg1').src=myBack; - document.getElementById('designPreview').src=myPreview; - document.getElementById('designPicker').value = whichDesign; // force menu option in case it was picked during onload. + + if (ninja.getQueryString()["showseedpool"] == "true" || ninja.getQueryString()["showseedpool"] == "1") { + document.getElementById("seedpoolarea").style.display = "block"; + } + + + - + \ No newline at end of file diff --git a/generate-wallet.html.sig b/generate-wallet.html.sig index b100f15..78f6fbd 100644 Binary files a/generate-wallet.html.sig and b/generate-wallet.html.sig differ diff --git a/images/front-300dpi-holiday.jpg b/images/front-300dpi-holiday.jpg index f982b5b..a61434a 100644 Binary files a/images/front-300dpi-holiday.jpg and b/images/front-300dpi-holiday.jpg differ diff --git a/images/front-300dpi.jpg b/images/front-300dpi.jpg index 11c9d8b..d47d08d 100644 Binary files a/images/front-300dpi.jpg and b/images/front-300dpi.jpg differ