diff --git a/LICENSE b/LICENSE index cf457637..1ebdadc4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,2 @@ -The MIT License (MIT) - Copyright (c) 2014 OutCast3k - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Copyright (c) 2015 ttutdxh.nubits@gmail.com diff --git a/README.md b/README.md index dd4e44a1..1a8b794b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@ -coinbin +Cointoolkit ======= -A Open Source Browser Based Bitcoin Wallet. Version 1.2 beta by OutCast3k +A Open Source Browser Based Bitcoin Wallet. -Live version available at http://coinb.in/ or http://4zpinp6gdkjfplhk.onion +Live version available at http://ttutdxh-nubits.github.io/cointoolkit/ -Github URL: https://github.com/OutCast3k/coinbin/ - -Coinb.in supports a number of key features such as: +Github URL: https://github.com/ttutdxh-nubits/cointoolkit - Offline Compressed & uncompressed Address creation. - Offline Multisignature Address creation. @@ -28,4 +26,4 @@ Coinb.in supports a number of key features such as: - HD (bip32) support - Supports altcoins such as litecoin -Donate to 1CWHWkTWaq1K5hevimJia3cyinQsrgXUvg to see more development! +Donate to 1JbsRVvU93PXN2JovuDE2NJTVNWkGEFrvx to see more development! diff --git a/index.html b/index.html index 9f7d4d0f..3921f6f3 100644 --- a/index.html +++ b/index.html @@ -2,11 +2,11 @@ - Bitcoin Wallet by Coinb.in + Cointoolkit - + - + @@ -30,7 +30,7 @@ - + @@ -45,7 +45,7 @@ - + Cointoolkit
+
@@ -79,13 +88,13 @@
-

Coinb.in Welcome to the Blockchain

+

Cointoolkit Welcome to the Blockchain

-

Bitcoin. It's your money!

-

Be your own bank, take control of your own money and start using Bitcoin today!

+

Cointoolkit

+

Be your own bank, take control of your own money and start using NuBits today!

Learn more »

@@ -94,16 +103,16 @@

Bitcoin. It's your money!

Open Source

-

Coinbin is an open source web based wallet written in javascript and released under the MIT license which means its free to use and edit.

+

Cointoolkit is an open source web based wallet written in javascript and released under the MIT license which means its free to use and edit.

MultiSig

-

We offer a fully transparent multisig solution which works seamlessly offline and with other bitcoin clients.

+

We offer a fully transparent multisig solution which works seamlessly offline and with other wallets.

-

Raw Transactions

+

Raw Transactions

Create, verify, sign and broadcast custom raw transactions online with advanced features and minimal effort!

@@ -121,7 +130,7 @@

Addresses

Development

-

Use what we've built to write your own projects! See our documention (coming soon), or contribute at github.

+

Use what we've built to write your own projects! See our documention (coming soon), or contribute at github.

@@ -129,7 +138,7 @@

Development

-

Open Wallet browser based bitcoin wallet

+

Open Wallet browser based wallet

@@ -218,7 +227,7 @@

Open Wallet browser based bitcoin wallet

- +
@@ -238,18 +247,18 @@

Open Wallet browser based bitcoin wallet

-

New Address create a new address

-

Any keys used you will need to manually store safely as they will be needed later to redeem the bitcoins.

- - +

Create new address

+

Any keys used you will need to manually store safely as they will be needed later to redeem the coins.

+ + click generate to update
- +
- +
@@ -304,7 +313,7 @@

New Multisig Address Secure multisig address

-

Public keys can be generated in your browser or from your bitcoin client.

+

Public keys can be generated in your browser or from your wallet.

Enter the public keys of all the participants, to create a multi signature address. Maximum of 15 allowed. Compressed and uncompressed public keys are accepted.

@@ -367,7 +376,7 @@

New Multisig Address Secure multisig address

-

This script should be saved and should be shared with all the participants before a payment is made, so they may validate the authenticity of the address, it will also be used later to release the bitcoins.

+

This script should be saved and should be shared with all the participants before a payment is made, so they may validate the authenticity of the address, it will also be used later to release the coins.

@@ -454,7 +463,14 @@

Transaction Create a new transaction

+ +
+ +

Indicates the timestamp of a transaction.

+ +
+

The settings page can be used to select alternative networks of which you can retrieve your unspent outputs and broadcast a signed transaction into.

@@ -487,7 +503,7 @@

Transaction Create a new transaction

- +
@@ -567,7 +583,7 @@

Transaction Create a new transaction

Size: 0 bytes

- +
@@ -609,8 +625,10 @@

Redeem Script

Transaction Script

The above script has been decoded

Version:
+
Transaction Time:
Transaction Size:
Lock time:
+
Unit:
@@ -744,7 +762,7 @@

Keys

- +
@@ -786,19 +804,19 @@

Sign Transaction once a transaction has been verified

Size: 0 bytes

- +
-

Broadcast Transaction into the bitcoin network

+

Broadcast Transaction into the network

-

Enter your hex encoded bitcoin transaction

+

Enter your hex encoded transaction


- +
@@ -809,44 +827,55 @@

Development Javascript framework, API and more

-

About open source bitcoin wallet

+

About open source toolkit

Version 1.2

-

Compatible with bitcoin-qt

-

Github https://github.com/OutCast3k/coinbin/

-

TOR 4zpinp6gdkjfplhk.onion

+

Github https://github.com/ttutdxh-nubits/cointoolkit

What is Bitcoin?

Bitcoin is a type of digital currency in which encryption techniques are used to regulate the generation of units of currency and verify the transfer of funds, operating independently of a central bank. See weusecoins.com for more information.

-

If you are looking to buy some Bitcoin try LocalBitcoins.com.

+

If you are looking to buy some Bitcoin try LocalBitcoins.com.

+

This toolkit supports multiple cryptoassets other than bitcoin

Information

-

Coinb.in is a free and open source project released under the MIT license, originally by OutCast3k in 2013. Discussion of the project can be found at bitcointalk.org during its early testing stages when its primary focus was to develop a proof of concept multisig solution in javascript.

-

Coinb.in is run and funded by the generosity of others in terms of development and hosting.

-

Privacy

-

Coinb.in beleives strongly in privacy, not only do we support the use of TOR, the site does not collect and store IP or transaction data via our servers nor do we store your bitcoins private key. We do route traffic via cloudflare using an SSL certificate.

+

Cointoolkit is a free and open source project released under the MIT license, originally released by OutCast3k as Coinb.in in 2013, and modified to work with Peershares assets by ttutdxh.nubits@gmail.com

Donate

-

Please donate to 1CWHWkTWaq1K5hevimJia3cyinQsrgXUvg if you found this project useful or want to see more features!

+

Please donate to 1JbsRVvU93PXN2JovuDE2NJTVNWkGEFrvx if you found this project useful or want to see more features!

-

Settings making coinb.in even better!

-

These simple settings below make coinb.in one of the most decentralized wallets in the world.

+

Settings

+

Customize the wallet settings to allow using the toolkit in other cryptoassets.

Network:

Select which network you'd like to use for key pair generation.

-
-
+
HD Pub:
-
+
HD Priv:
+ +
+ Extra time field?:
+ +
+ +
+ Extra unit field value?:
+ +
+ +
+ Decimal places:
+ +

-
You will not be able to automatically broadcast or retreive your unspent outputs from coinb.in when using this setting and will need to use your desktop client instead, however everything else such as creating key pairs, addresses, transaction generation and signing will continue to function normally.
- +
- Broadcast:
-

Select the network you wish to broadcast the transaction via

- +
@@ -903,12 +945,10 @@

Settings making coinb.in even better!

- Unspent outputs:
-

Select the network you wish to retreive your unspent inputs from

- +
@@ -918,12 +958,12 @@

Settings making coinb.in even better!

- +

-

This page uses javascript to generate your addresses and sign your transactions within your browser, this means we never receive your private keys, this can be independently verified by reviewing the source code on github. You can even download this page and host it yourself or run it offline!

+

This page uses javascript to generate your addresses and sign your transactions within your browser, this means we never receive your private keys, this can be independently verified by reviewing the source code on github. You can even download this page and host it yourself or run it offline!


@@ -1024,15 +1064,8 @@

Transaction Mediation

- -
@@ -1074,7 +1107,7 @@

Warning High Fee!

- Please be aware that you have created a transaction with what seems to be a very high fee of BTC! + Please be aware that you have created a transaction with what seems to be a very high fee of !
diff --git a/js/coin.js b/js/coin.js index 25536d3c..4f40f6f4 100644 --- a/js/coin.js +++ b/js/coin.js @@ -2,7 +2,8 @@ Coinjs 0.01 beta by OutCast3k{at}gmail.com A bitcoin frameworkcoinjs. - http://github.com/OutCast3k/coinjs or http://coinb.in/coinjs + Originally by http://github.com/OutCast3k/coinjs or http://coinb.in/coinjs + Adapted to Peershares assets by ttutdxh.nubits@gmail.com */ (function () { @@ -10,6 +11,13 @@ var coinjs = window.coinjs = function () { }; /* public vars */ + coinjs.txExtraTimeField = false; + coinjs.txExtraTimeFieldValue = false; + coinjs.txExtraUnitField = false; + coinjs.txExtraUnitFieldValue = false; + + coinjs.decimalPlaces = 8; + coinjs.pub = 0x00; coinjs.priv = 0x80; coinjs.multisig = 0x05; @@ -18,7 +26,7 @@ coinjs.compressed = false; /* other vars */ - coinjs.developer = '1CWHWkTWaq1K5hevimJia3cyinQsrgXUvg'; // bitcoin + coinjs.developer = '1JbsRVvU93PXN2JovuDE2NJTVNWkGEFrvx'; // bitcoin /* bit(coinb.in) api vars */ coinjs.host = ('https:'==document.location.protocol?'https://':'http://')+'coinb.in/api/'; @@ -50,7 +58,7 @@ x += window.history.length; x += coinjs.random(64); x += navigator.userAgent; - x += 'coinb.in'; + x += 'cointoolkit'; x += (Crypto.util.randomBytes(64)).join(""); x += x.length; var dateObj = new Date(); @@ -229,7 +237,8 @@ o.prefix = front.slice(71); } else { // everything else - o.type = 'other'; // address is still valid but unknown version + //- invalid -// o.type = 'other'; // address is still valid but unknown version + return false; } return o; @@ -733,6 +742,9 @@ r.outs = []; r.timestamp = null; r.block = null; + + r.nTime = 0; + r.nUnit = 0; /* add an input to a transaction */ r.addinput = function(txid, index, script){ @@ -746,7 +758,7 @@ /* add an output to a transaction */ r.addoutput = function(address, value){ var o = {}; - o.value = new BigInteger('' + Math.round((value*1) * 1e8), 10); + o.value = new BigInteger('' + Math.round((value*1) * ("1e"+coinjs.decimalPlaces)), 10); var s = coinjs.script(); o.script = s.spendToScript(address); @@ -786,7 +798,7 @@ this.outs.push(v); var o = {}; - o.value = new BigInteger('' + Math.round((value*1) * 1e8), 10); + o.value = new BigInteger('' + Math.round((value*1) * ("1e"+coinjs.decimalPlaces)), 10); var s = coinjs.script(); o.script = s.spendToScript(sendaddress); @@ -903,7 +915,13 @@ return {'type':'scriptpubkey', 'signed':'true', 'signatures':1, 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer)}; } else if (this.ins[index].script.chunks[0]==0 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1][this.ins[index].script.chunks[this.ins[index].script.chunks.length-1].length-1]==174) { // OP_CHECKMULTISIG // multisig script, with signature(s) included - return {'type':'multisig', 'signed':'true', 'signatures':this.ins[index].script.chunks.length-2, 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[this.ins[index].script.chunks.length-1])}; + var count = -1; + for (var i = 0; i < this.ins[index].script.chunks.length; i++) { + if(this.ins[index].script.chunks[i]){ + ++count; + } + } + return {'type':'multisig', 'signed':'true', 'signatures':count, 'script': Crypto.util.bytesToHex(this.ins[index].script.chunks[this.ins[index].script.chunks.length-1])}; } else if (this.ins[index].script.chunks[0]>=80 && this.ins[index].script.chunks[this.ins[index].script.chunks.length-1]==174) { // OP_CHECKMULTISIG // multisig script, without signature! return {'type':'multisig', 'signed':'false', 'signatures':0, 'script': Crypto.util.bytesToHex(this.ins[index].script.buffer)}; @@ -1114,6 +1132,7 @@ } else if (d['type'] == 'multisig') { this.signmultisig(i, wif); } else { + console.log('could not sign input', i); // could not sign } } @@ -1124,6 +1143,11 @@ r.serialize = function(){ var buffer = []; buffer = buffer.concat(coinjs.numToBytes(parseInt(this.version),4)); + + if (coinjs.txExtraTimeField) { + buffer = buffer.concat(coinjs.numToBytes(parseInt(this.nTime),4)); + } + buffer = buffer.concat(coinjs.numToVarInt(this.ins.length)); for (var i = 0; i < this.ins.length; i++) { @@ -1146,6 +1170,11 @@ } buffer = buffer.concat(coinjs.numToBytes(parseInt(this.lock_time),4)); + + if (coinjs.txExtraUnitField) { + buffer = buffer.concat(coinjs.numToBytes(parseInt(coinjs.txExtraUnitFieldValue),1)); + } + return Crypto.util.bytesToHex(buffer); } @@ -1183,6 +1212,11 @@ var obj = new coinjs.transaction(); obj.version = readAsInt(4); + + if (coinjs.txExtraTimeField) { + obj.nTime = readAsInt(4); + } + var ins = readVarInt(); for (var i = 0; i < ins; i++) { obj.ins.push({ @@ -1204,6 +1238,11 @@ } obj.lock_time = readAsInt(4); + + if (coinjs.txExtraUnitField) { + obj.nUnit = readAsInt(1); + } + return obj; } diff --git a/js/coinbin.js b/js/cointoolkit.js similarity index 71% rename from js/coinbin.js rename to js/cointoolkit.js index 376c043d..99cdc683 100644 --- a/js/coinbin.js +++ b/js/cointoolkit.js @@ -216,6 +216,17 @@ $(document).ready(function() { $(this).parent().fadeOut().remove(); }); }); + + function updateQueryStringParameter(uri, key, value) { + var re = new RegExp("([?&])" + key + "=.*?(&|$)", "i"); + var separator = uri.indexOf('?') !== -1 ? "&" : "?"; + if (uri.match(re)) { + return uri.replace(re, '$1' + key + "=" + value + '$2'); + } + else { + return uri + separator + key + "=" + value; + } + } function walletBalance(){ var tx = coinjs.transaction(); @@ -248,7 +259,7 @@ $(document).ready(function() { } var s = ($("#newBrainwallet").is(":checked")) ? $("#brainwallet").val() : null; var coin = coinjs.newKeys(s); - $("#newBitcoinAddress").val(coin.address); + $("#newGeneratedAddress").val(coin.address); $("#newPubKey").val(coin.pubkey); $("#newPrivKey").val(coin.wif); @@ -262,7 +273,7 @@ $(document).ready(function() { $("#aes256passStatus").removeClass("hidden"); } $("#newPrivKeyEnc").val(CryptoJS.AES.encrypt(coin.wif, $("#aes256pass").val())+''); - + $("#newAddrType").text($("#coinSelector option:selected").text()); }); $("#newBrainwallet").click(function(){ @@ -432,6 +443,10 @@ $(document).ready(function() { if(($("#nLockTime").val()).match(/^[0-9]+$/g)){ tx.lock_time = $("#nLockTime").val()*1; } + + if(($("#nTime").val()).match(/^[0-9]+$/g)){ + tx.nTime = $("#nTime").val()*1; + } $("#inputs .row").removeClass('has-error'); @@ -440,7 +455,7 @@ $(document).ready(function() { $.each($("#inputs .row"), function(i,o){ if(!($(".txId",o).val()).match(/^[a-f0-9]+$/i)){ $(o).addClass("has-error"); - } else if((!($(".txIdScript",o).val()).match(/^[a-f0-9]+$/i)) && $(".txIdScript",o).val()!=""){ + } else if(!($(".txIdScript",o).val()).match(/^[a-f0-9]+$/i) || $(".txIdScript",o).val()==""){ $(o).addClass("has-error"); } else if (!($(".txIdN",o).val()).match(/^[0-9]+$/i)){ $(o).addClass("has-error"); @@ -562,9 +577,14 @@ $(document).ready(function() { $("#videoReader, #videoSource").addClass("hidden"); } } + + /* broadcast code */ + $("#rawSubmitBtn").click(function(){ + var host = $(this).attr('rel'); + providers[$("#coinSelector").val()].broadcast[host](this); + }); /* redeem from button code */ - $("#redeemFromBtn").click(function(){ var redeem = redeemingFrom($("#redeemFrom").val()); @@ -587,13 +607,7 @@ $(document).ready(function() { $("#redeemFromBtn").html("Please wait, loading...").attr('disabled',true); var host = $(this).attr('rel'); - if(host=='blockr.io_bitcoinmainnet'){ - listUnspentBlockrio_BitcoinMainnet(redeem); - } else if(host=='chain.so_litecoin'){ - listUnspentChainso_Litecoin(redeem); - } else { - listUnspentDefault(redeem); - } + providers[$("#coinSelector").val()].listUnspent[host](redeem); }); /* function to determine what we are redeeming from */ @@ -682,93 +696,6 @@ $(document).ready(function() { } } - /* default function to retreive unspent outputs*/ - function listUnspentDefault(redeem){ - var tx = coinjs.transaction(); - tx.listUnspent(redeem.addr, function(data){ - if(redeem.addr) { - $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); - - $.each($(data).find("unspent").children(), function(i,o){ - var tx = $(o).find("tx_hash").text(); - var n = $(o).find("tx_output_n").text(); - var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : $(o).find("script").text(); - var amount = (($(o).find("value").text()*1)/100000000).toFixed(8); - - addOutput(tx, n, script, amount); - }); - } - - $("#redeemFromBtn").html("Load").attr('disabled',false); - totalInputAmount(); - - mediatorPayment(redeem); - }); - } - - /* retrieve unspent data from blockrio for mainnet */ - function listUnspentBlockrio_BitcoinMainnet(redeem){ - $.ajax ({ - type: "POST", - url: "https://btc.blockr.io/api/v1/address/unspent/"+redeem.addr+"?unconfirmed=1", - dataType: "json", - error: function(data) { - $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs!'); - }, - success: function(data) { - if((data.status && data.data) && data.status=='success'){ - $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); - for(var i in data.data.unspent){ - var o = data.data.unspent[i]; - var tx = o.tx; - var n = o.n; - var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script; - var amount = o.amount; - addOutput(tx, n, script, amount); - } - } else { - $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs.'); - } - }, - complete: function(data, status) { - $("#redeemFromBtn").html("Load").attr('disabled',false); - totalInputAmount(); - } - }); - } - - /* retrieve unspent data from blockrio for litecoin */ - function listUnspentChainso_Litecoin(redeem){ - $.ajax ({ - type: "GET", - url: "https://chain.so/api/v2/get_tx_unspent/ltc/"+redeem.addr, - dataType: "json", - error: function(data) { - $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs!'); - }, - success: function(data) { - console.log(data); - if((data.status && data.data) && data.status=='success'){ - $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); - for(var i in data.data.txs){ - var o = data.data.txs[i]; - var tx = ((o.txid).match(/.{1,2}/g).reverse()).join("")+''; - var n = o.output_no; - var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script_hex; - var amount = o.value; - addOutput(tx, n, script, amount); - } - } else { - $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs.'); - } - }, - complete: function(data, status) { - $("#redeemFromBtn").html("Load").attr('disabled',false); - totalInputAmount(); - } - }); - } - /* math to calculate the inputs and outputs */ function totalInputAmount(){ @@ -828,96 +755,6 @@ $(document).ready(function() { rawSubmitDefault(this); }); - // broadcast transaction vai coinbin (default) - function rawSubmitDefault(btn){ - var thisbtn = btn; - $(thisbtn).val('Please wait, loading...').attr('disabled',true); - $.ajax ({ - type: "POST", - url: coinjs.host+'?uid='+coinjs.uid+'&key='+coinjs.key+'&setmodule=bitcoin&request=sendrawtransaction', - data: {'rawtx':$("#rawTransaction").val()}, - dataType: "xml", - error: function(data) { - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(" There was an error submitting your request, please try again").prepend(''); - }, - success: function(data) { - $("#rawTransactionStatus").html(unescape($(data).find("response").text()).replace(/\+/g,' ')).removeClass('hidden'); - if($(data).find("result").text()==1){ - $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger'); - $("#rawTransactionStatus").html('txid: '+$(data).find("txid").text()); - } else { - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').prepend(' '); - } - }, - complete: function(data, status) { - $("#rawTransactionStatus").fadeOut().fadeIn(); - $(thisbtn).val('Submit').attr('disabled',false); - } - }); - } - - // broadcast transaction via blockr.io (mainnet) - function rawSubmitBlockrio_BitcoinMainnet(thisbtn){ - $(thisbtn).val('Please wait, loading...').attr('disabled',true); - $.ajax ({ - type: "POST", - url: "https://btc.blockr.io/api/v1/tx/push", - data: {"hex":$("#rawTransaction").val()}, - dataType: "json", - error: function(data) { - var obj = $.parseJSON(data.responseText); - var r = ' '; - r += (obj.data) ? obj.data : ''; - r += (obj.message) ? ' '+obj.message : ''; - r = (r!='') ? r : ' Failed to broadcast'; // build response - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(r).prepend(''); - }, - success: function(data) { - var obj = $.parseJSON(data.responseText); - if((obj.status && obj.data) && obj.status=='success'){ - $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' Txid: '+obj.data); - } else { - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(' Unexpected error, please try again').prepend(''); - } - }, - complete: function(data, status) { - $("#rawTransactionStatus").fadeOut().fadeIn(); - $(thisbtn).val('Submit').attr('disabled',false); - } - }); - } - - // broadcast transaction via blockr.io for litecoin - function rawSubmitBlockrio_litecoin(thisbtn){ - $(thisbtn).val('Please wait, loading...').attr('disabled',true); - $.ajax ({ - type: "POST", - url: "https://ltc.blockr.io/api/v1/tx/push", - data: {"hex":$("#rawTransaction").val()}, - dataType: "json", - error: function(data) { - var obj = $.parseJSON(data.responseText); - var r = ' '; - r += (obj.data) ? obj.data : ''; - r += (obj.message) ? ' '+obj.message : ''; - r = (r!='') ? r : ' Failed to broadcast'; // build response - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(r).prepend(''); - }, - success: function(data) { - var obj = $.parseJSON(data.responseText); - if((obj.status && obj.data) && obj.status=='success'){ - $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' Txid: '+obj.data); - } else { - $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(' Unexpected error, please try again').prepend(''); - } - }, - complete: function(data, status) { - $("#rawTransactionStatus").fadeOut().fadeIn(); - $(thisbtn).val('Submit').attr('disabled',false); - } - }); - } - /* verify script code */ $("#verifyBtn").click(function(){ @@ -950,7 +787,7 @@ $(document).ready(function() { $('').appendTo("#verifyRsData table tbody"); } $("#verifyRsData").removeClass("hidden"); - $(".verifyLink").attr('href','?verify='+$("#verifyScript").val()); + $("#verify .verifyLink").attr('href','?mode='+$("#coinSelector").val()+'&verify='+$("#verifyScript").val()); return true; } else { return false; @@ -963,8 +800,10 @@ $(document).ready(function() { var decode = tx.deserialize($("#verifyScript").val()); // console.log(decode); $("#verifyTransactionData .transactionVersion").html(decode['version']); + $("#verifyTransactionData .transactionTime").html(decode['nTime']); $("#verifyTransactionData .transactionSize").html(decode.size()+' bytes'); $("#verifyTransactionData .transactionLockTime").html(decode['lock_time']); + $("#verifyTransactionData .transactionUnit").html(String.fromCharCode(decode['nUnit'])); $("#verifyTransactionData").removeClass("hidden"); $("#verifyTransactionData tbody").html(""); @@ -1008,7 +847,7 @@ $(document).ready(function() { h += ''; h += ''; - h += ''+(o.value/100000000).toFixed(8)+''; + h += ''+(o.value/("1e"+coinjs.decimalPlaces)).toFixed(coinjs.decimalPlaces)+''; h += ''; h += ''; } else { @@ -1025,14 +864,14 @@ $(document).ready(function() { h += ''; h += ''; - h += ''+(o.value/100000000).toFixed(8)+''; + h += ''+(o.value/("1e"+coinjs.decimalPlaces)).toFixed(coinjs.decimalPlaces)+''; h += ''; h += ''; } }); $(h).appendTo("#verifyTransactionData .outs tbody"); - $(".verifyLink").attr('href','?verify='+$("#verifyScript").val()); + $("#verify .verifyLink").attr('href','?mode='+$("#coinSelector").val()+'&verify='+$("#verifyScript").val()); return true; } catch(e) { return false; @@ -1075,7 +914,7 @@ $(document).ready(function() { try { $("#verifyPubKey .address").val(coinjs.pubkey2address(pubkey)); $("#verifyPubKey").removeClass("hidden"); - $(".verifyLink").attr('href','?verify='+$("#verifyScript").val()); + $("#verify .verifyLink").attr('href','?mode='+$("#coinSelector").val()+'&verify='+$("#verifyScript").val()); return true; } catch (e) { return false; @@ -1103,7 +942,7 @@ $(document).ready(function() { $("#verifyHDaddress .parent_fingerprint").val(Crypto.util.bytesToHex(hd.parent_fingerprint)); $("#verifyHDaddress .derived_data table tbody").html(""); deriveHDaddress(); - $(".verifyLink").attr('href','?verify='+$("#verifyScript").val()); + $("#verify .verifyLink").attr('href','?mode='+$("#coinSelector").val()+'&verify='+$("#verifyScript").val()); $("#verifyHDaddress").removeClass("hidden"); return true; } @@ -1161,17 +1000,191 @@ $(document).ready(function() { $("#signedData .txSize").html(t.size()); $("#signedData").removeClass('hidden').fadeIn(); } catch(e) { - // console.log(e); + console.log(e); } } else { - $("#signedDataError").removeClass('hidden'); + $("#signedDataError").removeClass('hidden').delay(2000).queue(function(){ + $(this).addClass("hidden").dequeue(); + }); $("#signedData").addClass('hidden'); } }); + /* settings page code */ + + $("#coinjs_pub").val('0x'+(coinjs.pub).toString(16)); + $("#coinjs_priv").val('0x'+(coinjs.priv).toString(16)); + $("#coinjs_multisig").val('0x'+(coinjs.multisig).toString(16)); - /* page load code */ + $("#coinjs_hdpub").val('0x'+(coinjs.hdkey.pub).toString(16)); + $("#coinjs_hdprv").val('0x'+(coinjs.hdkey.prv).toString(16)); + + $("#settingsBtn").click(function(){ + + // log out of openwallet + $("#walletLogout").click(); + + $("#statusSettings").removeClass("alert-success").removeClass("alert-danger").addClass("hidden").html(""); + $("#settings .has-error").removeClass("has-error"); + + $.each($(".coinjssetting"),function(i, o){ + if ($(o).hasClass("boolisvalid")) { + if(!$(o).val().match(/^0x[0-9a-f]+|false$/)){ + $(o).parent().addClass("has-error"); + } + } else { + if(!$(o).val().match(/^0x[0-9a-f]+$/)){ + $(o).parent().addClass("has-error"); + } + } + }); + + if($("#settings .has-error").length==0){ + + coinjs.pub = $("#coinjs_pub").val()*1; + coinjs.priv = $("#coinjs_priv").val()*1; + coinjs.multisig = $("#coinjs_multisig").val()*1; + + coinjs.hdkey.pub = $("#coinjs_hdpub").val()*1; + coinjs.hdkey.prv = $("#coinjs_hdprv").val()*1; + + coinjs.txExtraTimeField = ($("#coinjs_extratimefield").val() == "true"); + if (coinjs.txExtraTimeField) { + $("#nTime").val(Date.now() / 1000 | 0); + $("#txTimeOptional").show(); + $("#verifyTransactionData .txtime").show(); + } else { + $("#txTimeOptional").hide(); + $("#verifyTransactionData .txtime").hide(); + } + + coinjs.txExtraUnitField = ($("#coinjs_extraunitfieldvalue").val() !== "false"); + if (coinjs.txExtraUnitField) { + coinjs.txExtraUnitFieldValue = $("#coinjs_extraunitfieldvalue").val()*1; + $("#verifyTransactionData .txunit").show(); + } else { + $("#verifyTransactionData .txunit").hide(); + } + + coinjs.decimalPlaces = $("#coinjs_decimalplaces").val()*1;; + + $("#rawSubmitBtn").attr('rel',$("#coinjs_broadcast option:selected").val()); + $("#redeemFromBtn").attr('rel',$("#coinjs_utxo option:selected").val()); + + $("#coinSelector").val($("#coinjs_coin").val()); + + $("#statusSettings").addClass("alert-success").removeClass("hidden").html(" Settings updated successfully").fadeOut().fadeIn().delay(2000).fadeOut(); ; + } else { + $("#statusSettings").addClass("alert-danger").removeClass("hidden").html("There is an error with one or more of your settings"); + } + }); + + $("#coinSelector").change(function(){ + $("#coinjs_coin").val(this.value).change(); + $("#settingsBtn").click(); + }); + $("#coinjs_coin").change(function(){ + var o = ($("option:selected",this).attr("rel")).split(";"); + + var mode = this.options[this.selectedIndex].value; + + + // deal with listUnspent settings` + + $('#coinjs_utxo').empty(); + if(typeof(providers[mode]) == 'object' && typeof(providers[mode].listUnspent) == 'object' && Object.keys(providers[mode].listUnspent).length > 0){ + $.each(providers[mode].listUnspent, function(key) { + $('#coinjs_utxo').append($('').val("disabled"); + + $("#redeemFrom").val("Loading of address inputs is currently not available for " + this.options[ this.selectedIndex ].text); + } + + // deal with broadcasting settings + + $('#coinjs_broadcast').empty(); + if(typeof(providers[mode]) == 'object' && typeof(providers[mode].broadcast) == 'object' && Object.keys(providers[mode].broadcast).length > 0){ + $.each(providers[mode].broadcast, function(key) { + $('#coinjs_broadcast').append($('').val("disabled"); + + $("#rawTransaction").val("Transaction broadcasting is currently not available for " + this.options[ this.selectedIndex ].text); + } + + // deal with the reset + $("#coinjs_pub").val(o[0]); + $("#coinjs_multisig").val(o[1]); + $("#coinjs_priv").val(o[2]); + $("#coinjs_hdpub").val(o[3]); + $("#coinjs_hdprv").val(o[4]); + + $("#coinjs_extratimefield").val(o[7]); + $("#coinjs_extraunitfieldvalue").val(o[8]); + + $("#coinjs_decimalplaces").val(o[9]); + + // hide/show custom screen + if($("option:selected",this).val()=="custom"){ + $("#settingsCustom").removeClass("hidden"); + } else { + $("#settingsCustom").addClass("hidden"); + } + }); + + /* capture mouse movement to add entropy */ + var IE = document.all?true:false // Boolean, is browser IE? + if (!IE) document.captureEvents(Event.MOUSEMOVE) + document.onmousemove = getMouseXY; + function getMouseXY(e) { + var tempX = 0; + var tempY = 0; + if (IE) { // If browser is IE + tempX = event.clientX + document.body.scrollLeft; + tempY = event.clientY + document.body.scrollTop; + } else { + tempX = e.pageX; + tempY = e.pageY; + }; + + if (tempX < 0){tempX = 0}; + if (tempY < 0){tempY = 0}; + var xEnt = Crypto.util.bytesToHex([tempX]).slice(-2); + var yEnt = Crypto.util.bytesToHex([tempY]).slice(-2); + var addEnt = xEnt.concat(yEnt); + if ($("#entropybucket").html().indexOf(xEnt) == -1 && $("#entropybucket").html().indexOf(yEnt) == -1) { + $("#entropybucket").html(addEnt + $("#entropybucket").html()); + }; + + if ($("#entropybucket").html().length > 128) { + $("#entropybucket").html($("#entropybucket").html().slice(0, 128)) + }; + + return true; + }; + function _get(value) { var dataArray = (document.location.search).match(/(([a-z0-9\_\[\]]+\=[a-z0-9\_\.\%\@]+))/gi); var r = []; @@ -1186,6 +1199,243 @@ $(document).ready(function() { } return r; } + + /* external providers */ + + var providers = { + bitcoin: { + listUnspent: { + default: function(redeem){ + var tx = coinjs.transaction(); + tx.listUnspent(redeem.addr, function(data){ + if(redeem.addr) { + $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); + + $.each($(data).find("unspent").children(), function(i,o){ + var tx = $(o).find("tx_hash").text(); + var n = $(o).find("tx_output_n").text(); + var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : $(o).find("script").text(); + var amount = (($(o).find("value").text()*1)/100000000).toFixed(8); + + addOutput(tx, n, script, amount); + }); + } + + $("#redeemFromBtn").html("Load").attr('disabled',false); + totalInputAmount(); + + mediatorPayment(redeem); + }); + }, + blockr_io: function(redeem){ + $.ajax ({ + type: "POST", + url: "https://btc.blockr.io/api/v1/address/unspent/"+redeem.addr+"?unconfirmed=1", + dataType: "json", + error: function(data) { + $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs!'); + }, + success: function(data) { + console.log(data); + if((data.status && data.data) && data.status=='success'){ + $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); + for(var i in data.data.unspent){ + var o = data.data.unspent[i]; + var tx = o.tx; + var n = o.n; + var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script; + var amount = o.amount; + addOutput(tx, n, script, amount); + } + } else { + $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs.'); + } + }, + complete: function(data, status) { + $("#redeemFromBtn").html("Load").attr('disabled',false); + totalInputAmount(); + } + }); + } + }, + broadcast: { + default: function(btn){ + var thisbtn = btn; + $(thisbtn).val('Please wait, loading...').attr('disabled',true); + $.ajax ({ + type: "POST", + url: coinjs.host+'?uid='+coinjs.uid+'&key='+coinjs.key+'&setmodule=bitcoin&request=sendrawtransaction', + data: {'rawtx':$("#rawTransaction").val()}, + dataType: "xml", + error: function(data) { + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(" There was an error submitting your request, please try again").prepend(''); + }, + success: function(data) { + $("#rawTransactionStatus").html(unescape($(data).find("response").text()).replace(/\+/g,' ')).removeClass('hidden'); + if($(data).find("result").text()==1){ + $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger'); + $("#rawTransactionStatus").html('txid: '+$(data).find("txid").text()); + } else { + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').prepend(' '); + } + }, + complete: function(data, status) { + $("#rawTransactionStatus").fadeOut().fadeIn(); + $(thisbtn).val('Submit').attr('disabled',false); + } + }); + }, + blockr_io: function(thisbtn){ + $(thisbtn).val('Please wait, loading...').attr('disabled',true); + $.ajax ({ + type: "POST", + url: "https://btc.blockr.io/api/v1/tx/push", + data: {"hex":$("#rawTransaction").val()}, + dataType: "json", + error: function(data) { + var obj = $.parseJSON(data.responseText); + var r = ' '; + r += (obj.data) ? obj.data : ''; + r += (obj.message) ? ' '+obj.message : ''; + r = (r!='') ? r : ' Failed to broadcast'; // build response + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(r).prepend(''); + }, + success: function(data) { + var obj = $.parseJSON(data.responseText); + if((obj.status && obj.data) && obj.status=='success'){ + $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' Txid: '+obj.data); + } else { + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(' Unexpected error, please try again').prepend(''); + } + }, + complete: function(data, status) { + $("#rawTransactionStatus").fadeOut().fadeIn(); + $(thisbtn).val('Submit').attr('disabled',false); + } + }); + }, + } + }, + litecoin: { + listUnspent: { + chain_so: function(redeem){ + $.ajax ({ + type: "GET", + url: "https://chain.so/api/v2/get_tx_unspent/ltc/"+redeem.addr, + dataType: "json", + error: function(data) { + $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs!'); + }, + success: function(data) { + console.log(data); + if((data.status && data.data) && data.status=='success'){ + $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); + for(var i in data.data.txs){ + var o = data.data.txs[i]; + var tx = ((o.txid).match(/.{1,2}/g).reverse()).join("")+''; + var n = o.output_no; + var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script_hex; + var amount = o.value; + addOutput(tx, n, script, amount); + } + } else { + $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs.'); + } + }, + complete: function(data, status) { + $("#redeemFromBtn").html("Load").attr('disabled',false); + totalInputAmount(); + } + }); + } + }, + broadcast: { + blockr_io: function(thisbtn){ + $(thisbtn).val('Please wait, loading...').attr('disabled',true); + $.ajax ({ + type: "POST", + url: "https://ltc.blockr.io/api/v1/tx/push", + data: {"hex":$("#rawTransaction").val()}, + dataType: "json", + error: function(data) { + var obj = $.parseJSON(data.responseText); + var r = ' '; + r += (obj.data) ? obj.data : ''; + r += (obj.message) ? ' '+obj.message : ''; + r = (r!='') ? r : ' Failed to broadcast'; // build response + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(r).prepend(''); + }, + success: function(data) { + var obj = $.parseJSON(data.responseText); + if((obj.status && obj.data) && obj.status=='success'){ + $("#rawTransactionStatus").addClass('alert-success').removeClass('alert-danger').removeClass("hidden").html(' Txid: '+obj.data); + } else { + $("#rawTransactionStatus").addClass('alert-danger').removeClass('alert-success').removeClass("hidden").html(' Unexpected error, please try again').prepend(''); + } + }, + complete: function(data, status) { + $("#rawTransactionStatus").fadeOut().fadeIn(); + $(thisbtn).val('Submit').attr('disabled',false); + } + }); + } + } + }, + nubits: { + listUnspent: { + blockexplorer_nu: function(redeem){ + $.ajax ({ + type: "GET", + url: "https://blockexplorer.nu/api/addressDetails/"+redeem.addr+"/1/oldest", + // url: "file", // testing offline + dataType: "json", + error: function(data) { + $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs!'); + }, + success: function(data) { + console.log(data); + if((data.exists && data.tx) && data.address == redeem.addr){ + console.log(1); + $("#redeemFromAddress").removeClass('hidden').html(' Retrieved unspent inputs from address '+redeem.addr+''); + for(var i in data.tx){ + console.log(1); + for(var v in data.tx[i].outputs){ + console.log(data.tx[i].outputs[v].status, data.tx[i].outputs[v].outAddress, redeem.addr); + if (data.tx[i].outputs[v].status == "unspent" && data.tx[i].outputs[v].outAddress == redeem.addr) { + var o = data.tx[i].outputs[v]; + var tx = data.tx[i].txHash; + var n = o.out_num; + var script = (redeem.isMultisig==true) ? $("#redeemFrom").val() : o.script_hex; + var amount = o.outValInt; + addOutput(tx, n, script, amount); + } + } + } + } else { + $("#redeemFromStatus").removeClass('hidden').html(' Unexpected error, unable to retrieve unspent outputs.'); + } + }, + complete: function(data, status) { + $("#redeemFromBtn").html("Load").attr('disabled',false); + totalInputAmount(); + } + }); + } + }, + broadcast: { + } + }, + } + + /* page load code */ + + $("#coinjs_coin option").clone().appendTo("#coinSelector"); + + var _getMode = _get("mode"); + if(_getMode[0]){ + $("#coinSelector").val(_getMode[0]); + } + $("#coinSelector").change(); $("#newKeysBtn, #newHDKeysBtn").click(); @@ -1233,7 +1483,15 @@ $(document).ready(function() { } $(".showKey").click(function(){ - $("input[type='password']",$(this).parent().parent()).attr('type','text'); + if ($(this).data('hidden') === false) { + $("input[type='text']",$(this).parent().parent()).attr('type','password'); + $(this).data('hidden', true); + $(".showKey").text("Show"); + } else { + $("input[type='password']",$(this).parent().parent()).attr('type','text'); + $(this).data('hidden', false); + $(".showKey").text("Hide"); + } }); $("#homeBtn").click(function(e){ @@ -1264,136 +1522,4 @@ $(document).ready(function() { } validateOutputAmount(); - - /* settings page code */ - - $("#coinjs_pub").val('0x'+(coinjs.pub).toString(16)); - $("#coinjs_priv").val('0x'+(coinjs.priv).toString(16)); - $("#coinjs_multisig").val('0x'+(coinjs.multisig).toString(16)); - - $("#coinjs_hdpub").val('0x'+(coinjs.hdkey.pub).toString(16)); - $("#coinjs_hdprv").val('0x'+(coinjs.hdkey.prv).toString(16)); - - $("#settingsBtn").click(function(){ - - // log out of openwallet - $("#walletLogout").click(); - - $("#statusSettings").removeClass("alert-success").removeClass("alert-danger").addClass("hidden").html(""); - $("#settings .has-error").removeClass("has-error"); - - $.each($(".coinjssetting"),function(i, o){ - if(!$(o).val().match(/^0x[0-9a-f]+$/)){ - $(o).parent().addClass("has-error"); - } - }); - - if($("#settings .has-error").length==0){ - - coinjs.pub = $("#coinjs_pub").val()*1; - coinjs.priv = $("#coinjs_priv").val()*1; - coinjs.multisig = $("#coinjs_multisig").val()*1; - - coinjs.hdkey.pub = $("#coinjs_hdpub").val()*1; - coinjs.hdkey.prv = $("#coinjs_hdprv").val()*1; - - configureBroadcast(); - configureGetUnspentTx(); - - $("#statusSettings").addClass("alert-success").removeClass("hidden").html(" Settings updates successfully").fadeOut().fadeIn(); - } else { - $("#statusSettings").addClass("alert-danger").removeClass("hidden").html("There is an error with one or more of your settings"); - } - }); - - $("#coinjs_coin").change(function(){ - - var o = ($("option:selected",this).attr("rel")).split(";"); - - // deal with broadcasting settings - if(o[5]=="false"){ - $("#coinjs_broadcast, #rawTransaction, #rawSubmitBtn, #openBtn").attr('disabled',true); - $("#coinjs_broadcast").val("coinb.in"); - } else { - $("#coinjs_broadcast").val(o[5]); - $("#coinjs_broadcast, #rawTransaction, #rawSubmitBtn, #openBtn").attr('disabled',false); - } - - // deal with unspent output settings - if(o[6]=="false"){ - $("#coinjs_utxo, #redeemFrom, #redeemFromBtn, #openBtn, .qrcodeScanner").attr('disabled',true); - $("#coinjs_utxo").val("coinb.in"); - } else { - $("#coinjs_utxo").val(o[6]); - $("#coinjs_utxo, #redeemFrom, #redeemFromBtn, #openBtn, .qrcodeScanner").attr('disabled',false); - } - - // deal with the reset - $("#coinjs_pub").val(o[0]); - $("#coinjs_priv").val(o[1]); - $("#coinjs_multisig").val(o[2]); - $("#coinjs_hdpub").val(o[3]); - $("#coinjs_hdprv").val(o[4]); - - // hide/show custom screen - if($("option:selected",this).val()=="custom"){ - $("#settingsCustom").removeClass("hidden"); - } else { - $("#settingsCustom").addClass("hidden"); - } - }); - - function configureBroadcast(){ - var host = $("#coinjs_broadcast option:selected").val(); - $("#rawSubmitBtn").unbind(""); - if(host=="blockr.io_litecoin"){ - $("#rawSubmitBtn").click(function(){ - rawSubmitBlockrio_litecoin(this) - }); - } else if(host=="blockr.io_bitcoinmainnet"){ - $("#rawSubmitBtn").click(function(){ - rawSubmitBlockrio_BitcoinMainnet(this); - }); - } else { - $("#rawSubmitBtn").click(function(){ - rawSubmitDefault(this); // revert to default - }); - } - } - - function configureGetUnspentTx(){ - $("#redeemFromBtn").attr('rel',$("#coinjs_utxo option:selected").val()); - } - - /* capture mouse movement to add entropy */ - var IE = document.all?true:false // Boolean, is browser IE? - if (!IE) document.captureEvents(Event.MOUSEMOVE) - document.onmousemove = getMouseXY; - function getMouseXY(e) { - var tempX = 0; - var tempY = 0; - if (IE) { // If browser is IE - tempX = event.clientX + document.body.scrollLeft; - tempY = event.clientY + document.body.scrollTop; - } else { - tempX = e.pageX; - tempY = e.pageY; - }; - - if (tempX < 0){tempX = 0}; - if (tempY < 0){tempY = 0}; - var xEnt = Crypto.util.bytesToHex([tempX]).slice(-2); - var yEnt = Crypto.util.bytesToHex([tempY]).slice(-2); - var addEnt = xEnt.concat(yEnt); - - if ($("#entropybucket").html().indexOf(xEnt) == -1 && $("#entropybucket").html().indexOf(yEnt) == -1) { - $("#entropybucket").html(addEnt + $("#entropybucket").html()); - }; - - if ($("#entropybucket").html().length > 128) { - $("#entropybucket").html($("#entropybucket").html().slice(0, 128)) - }; - - return true; - }; });