Complete modifications of key formats, network, and currecy references to VTC.

Jon · Jon · commit 487227eb4aae · 2014-02-17T14:39:56.000-05:00
diff --git a/config.template.json b/config.template.json
@@ -1,16 +1,16 @@
 {
   "default": {
-    "bitcoind": "http://rpcuser:rpcpass@127.0.0.1:18332",
-    "pricesUrl": "https://bitpay.com/api/rates",
+    "bitcoind": "http://rpcuser:rpcpass@127.0.0.1:15888",
+    "pricesUrl": "http://localhost:8080/rates.json",
     "testnet": true,
     "httpPort": 8080,
     "httpsPort": 8081,
     "sslKey": "./coinpunk.key",
     "sslCert": "./coinpunk.crt"
   },
   "production": {
-    "bitcoind": "http://rpcuser:rpcpass@127.0.0.1:8332",
-    "pricesUrl": "https://bitpay.com/api/rates",
+    "bitcoind": "http://rpcuser:rpcpass@127.0.0.1:5888",
+    "pricesUrl": "http://localhost:8080/rates.json",
     "testnet": false,
     "httpPort": 8080,
     "httpsPort": 4443,
diff --git a/public/css/all.css b/public/css/all.css
diff --git a/public/css/font-awesome.css b/public/css/font-awesome.css
@@ -1164,7 +1164,7 @@
 }
 .fa-bitcoin:before,
 .fa-btc:before {
-  content: "\f15a";
+  content: "\f078";
 }
 .fa-file:before {
   content: "\f15b";
diff --git a/public/js/all.js b/public/js/all.js
diff --git a/public/js/coinpunk/controller.js b/public/js/coinpunk/controller.js
@@ -96,7 +96,7 @@ coinpunk.Controller.prototype.friendlyTimeString = function(timestamp) {
 coinpunk.Controller.prototype.updateExchangeRates = function(id) {
   coinpunk.pricing.getLatest(function(price, currency) {
     $('#balanceExchange').text(' ≈ '+ parseFloat(price * $('#balance').text()).toFixed(2) + ' ' + currency);
-    $('#exchangePrice').text('1 BTC ≈ ' + price + ' ' + currency);
+    $('#exchangePrice').text('1 VTC ≈ ' + price + ' ' + currency);
 
     $('#'+id+' .exchangePrice').remove();
 
diff --git a/public/js/coinpunk/controllers/accounts.js b/public/js/coinpunk/controllers/accounts.js
@@ -318,9 +318,9 @@ $('body').on('click', '#generateAuthQR', function() {
     var authURI = new URI({
       protocol: 'otpauth',
       hostname: 'totp',
-      path: 'Coinpunk:'+coinpunk.wallet.walletId
+      path: 'Vertpunk:'+coinpunk.wallet.walletId
     });
-    authURI.setSearch({issuer: 'Coinpunk', secret: resp.key});
+    authURI.setSearch({issuer: 'Vertpunk', secret: resp.key});
 
     new QRCode(document.getElementById('authQR'), authURI.toString());
     $('#authQR').after('
diff --git a/public/js/coinpunk/controllers/addresses.js b/public/js/coinpunk/controllers/addresses.js
@@ -68,7 +68,7 @@ coinpunk.controllers.Addresses.prototype.requestBTCUpdate = function() {
 };
 
 coinpunk.controllers.Addresses.prototype.drawRequestQR = function(address) {
-  var uri = URI({protocol: 'bitcoin', path: address});
+  var uri = URI({protocol: 'vertcoin', path: address});
   
   var amount = $('#amount').val();
   var label = $('#label').val();
diff --git a/public/js/coinpunk/controllers/dashboard.js b/public/js/coinpunk/controllers/dashboard.js
@@ -64,7 +64,7 @@ coinpunk.controllers.Dashboard.prototype.index = function() {
 coinpunk.controllers.Dashboard.prototype.updateExchangeRates = function(id) {
   coinpunk.pricing.getLatest(function(price, currency) {
     $('#balanceExchange').text(' ≈ '+ parseFloat(price * $('#balance').text()).toFixed(2) + ' ' + currency);
-    $('#exchangePrice').text('1 BTC ≈ ' + price + ' ' + currency);
+    $('#exchangePrice').text('1 VTC ≈ ' + price + ' ' + currency);
 
     $('#'+id+' .exchangePrice').remove();
 
diff --git a/public/js/coinpunk/controllers/tx.js b/public/js/coinpunk/controllers/tx.js
@@ -1,7 +1,7 @@
 coinpunk.controllers.Tx = function() {};
 coinpunk.controllers.Tx.prototype = new coinpunk.Controller();
 
-coinpunk.controllers.Tx.prototype.defaultFee = '0.0001';
+coinpunk.controllers.Tx.prototype.defaultFee = '0.001';
 coinpunk.controllers.Tx.prototype.minimumConfirmationsToSpend = 1;
 
 coinpunk.controllers.Tx.prototype.details = function(txHash) {
@@ -85,23 +85,23 @@ coinpunk.controllers.Tx.prototype.create = function() {
     try {
       new Bitcoin.Address(address, coinpunk.config.network);
     } catch (e) {
-      errors.push('The provided bitcoin address is not valid.');
+      errors.push('The provided vertcoin address is not valid.');
     }
   }
 
   var myAddresses = coinpunk.wallet.addresses();
   
   for(var i=0; i<myAddresses.length;i++) {
     if(myAddresses[i].address == address)
-      errors.push('You cannot send to your own bitcoin wallet.');
+      errors.push('You cannot send to your own vertcoin wallet.');
   }
 
   if(amount == '' || parseFloat(amount) == 0)
     errors.push('You must have a valid amount to send.');
   else if(/^[0-9]+$|^[0-9]+\.[0-9]+$|^\.[0-9]+$/.exec(amount) === null)
     errors.push('You must have a valid amount to send.');
   else if(coinpunk.wallet.safeUnspentBalance().lessThan(new BigNumber(amount).plus(calculatedFee))) {
-    errors.push('Cannot spend more bitcoins than you currently have.');
+    errors.push('Cannot spend more vertcoins than you currently have.');
   }
 
   if(errors.length > 0) {
@@ -126,7 +126,7 @@ coinpunk.controllers.Tx.prototype.create = function() {
       delete coinpunk.wallet;
     } else {
       $.post('/api/tx/send', {tx: rawtx}, function(resp) {
-        coinpunk.database.setSuccessMessage("Sent "+amount+" BTC to "+address+".");
+        coinpunk.database.setSuccessMessage("Sent "+amount+" VTC to "+address+".");
 
         self.getUnspent(function() {
           coinpunk.router.route('dashboard');
@@ -170,7 +170,7 @@ coinpunk.controllers.Tx.prototype.calculateFee = function() {
 
   var calculatedFee = coinpunk.wallet.calculateFee(amount, address, changeAddress);
   $('#calculatedFee').val(calculatedFee);
-  $('#fee').text(coinpunk.wallet.calculateFee(amount, address, changeAddress)+' BTC');
+  $('#fee').text(coinpunk.wallet.calculateFee(amount, address, changeAddress)+' VTC');
   this.updateExchangeRates('container', false);
 };
 
@@ -198,12 +198,12 @@ coinpunk.controllers.Tx.prototype.scanQR = function(event) {
       return;
     }
 
-    if(uri.protocol() != 'bitcoin')
-      return errorsDiv.removeClass('hidden').text('Not a valid Bitcoin QR code.');
+    if(uri.protocol() != 'vertcoin')
+      return errorsDiv.removeClass('hidden').text('Not a valid Vertcoin QR code.');
     
     var address = uri.path();
     if(!address || address == '')
-      return errorsDiv.removeClass('hidden').text('No Bitcoin address found in QR code.');
+      return errorsDiv.removeClass('hidden').text('No Vertcoin address found in QR code.');
 
     $('#address').val(address);
     
diff --git a/public/js/coinpunk/models/wallet.js b/public/js/coinpunk/models/wallet.js
@@ -285,7 +285,7 @@ coinpunk.Wallet = function(walletKey, walletId) {
     }
 
     if(unspentAmt.compareTo(total) < 0) {
-      throw "you do not have enough bitcoins to send this amount";
+      throw "you do not have enough vertcoins to send this amount";
     }
 
     for(i=0;i<unspent.length;i++) {
@@ -330,7 +330,7 @@ coinpunk.Wallet = function(walletKey, walletId) {
     var tx = this.createTx(amtString, 0, addressString, changeAddress);
     var txSize = tx.raw.length / 2;
     // console.log(txSize);
-    return Math.ceil(txSize/1000)*0.0001;
+    return Math.ceil(txSize/1000)*0.001;
   };
 
   this.createSend = function(amtString, feeString, addressString, changeAddress) {
diff --git a/public/js/coinpunk/router.js b/public/js/coinpunk/router.js
@@ -29,7 +29,7 @@ coinpunk.router.listener = function() {
   sock.onopen = function() {
     coinpunk.router.listenerTimeout = setInterval(function() {
       sock.send(JSON.stringify({method: 'listUnspent', addresses: coinpunk.wallet.addressHashes()}));
-    }, 30000);
+    }, 60000);
   };
 
   sock.onmessage = function(res) {
@@ -72,7 +72,7 @@ coinpunk.router.map('#/backup/download').to(function() {
 
     var payload = coinpunk.wallet.encryptPayload();
     var blob = new Blob([payload], {type: "text/plain;charset=utf-8"});
-    saveAs(blob, "coinpunk-wallet.txt");
+    saveAs(blob, "vertpunk-wallet.txt");
     coinpunk.router.route('backup');
   });
 });
diff --git a/public/js/lib/bitcoinjs.js b/public/js/lib/bitcoinjs.js
diff --git a/public/views/buy.html b/public/views/buy.html
@@ -1,17 +1,18 @@
 <div class="row">
   <div class="col-lg-12 text-center">
-    <h1>Buy Bitcoins</h1>
+    <h1>Buy Vertcoins</h1>
     <hr>
   </div>
 </div>
 
 <div class="row">
   <div class="col-lg-6 col-lg-offset-3">
-    <h2 class="text-center">Cash Into Coins</h2>
-    <p>Cash Into Coins provides a way to purchase Bitcoins using a bank account. Follow the instructions on their site, and they will send the purchased Bitcoins directly to your Coinpunk wallet!</p>
-    
+    <h2 class="text-center">Cryptsy</h2>
+    <!--- <p>Cash Into Coins provides a way to purchase Bitcoins using a bank account. Follow the instructions on their site, and they will send the purchased Bitcoins directly to your Coinpunk wallet!</p> -->
+    <p>While there is no easy way to directly purchase Vertcoin from USD yet, you can use Cryptsy to trade bitcoin or other coins for Vertcoin that you can send directly to your Vertpunk wallet. Cryptsy is an Internet startup focusing on the exchange of Crypto-Currency, where you can purchase and trade more than 90 different types of crypto-currency -- including Vertcoin.</p>
     <p class="text-center">
-      <a href="http://go.cashintocoins.com/UCPiJr?address=<%- coinpunk.wallet.addressHashes()[0] %>" target="_blank" class="btn btn-lg btn-success"><i class="fa fa-money"></i> Buy Bitcoins Now</a>
+      <!-- <a href="http://go.cashintocoins.com/UCPiJr?address=<%- coinpunk.wallet.addressHashes()[0] %>" target="_blank" class="btn btn-lg btn-success"><i class="fa fa-money"></i> Buy Bitcoins Now</a> -->
+      <a href="https://www.cryptsy.com/users/register?refid=25450" target="_blank" class="btn btn-lg btn-success"><i class="fa fa-money"></i> Buy Vertcoins Now</a>
     </p>
   </div>
-</div>
+</div>
diff --git a/public/views/header.html b/public/views/header.html
@@ -14,7 +14,7 @@
         <li><a href="#/dashboard"><i class="fa fa-bars"></i> Transactions</a></li>
         <li><a href="#/addresses/list"><i class="fa fa-arrow-down"></i> Receive</a></li>
         <li><a href="#/tx/send"><i class="fa fa-arrow-up"></i> Send</a></li>
-        <!-- <li><a href="#/buy"><i class="fa fa-money"></i> Buy Bitcoins</a></li> -->
+        <li><a href="#/buy"><i class="fa fa-money"></i> Buy Vertcoins</a></li>
         <li class="hidden-xs hidden-sm"><a href="#/backup"><i class="fa fa-download"></i> Backup</a></li>
       <% } %>
     </ul>

Original file line number	Diff line number	Diff line change
`@@ -1164,7 +1164,7 @@`
`1164`	`1164`	`}`
`1165`	`1165`	`.fa-bitcoin:before,`
`1166`	`1166`	`.fa-btc:before {`
`1167`		`- content: "\f15a";`
	`1167`	`+ content: "\f078";`
`1168`	`1168`	`}`
`1169`	`1169`	`.fa-file:before {`
`1170`	`1170`	`content: "\f15b";`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ coinpunk.Wallet = function(walletKey, walletId) {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`if(unspentAmt.compareTo(total) < 0) {`
`288`		`- throw "you do not have enough bitcoins to send this amount";`
	`288`	`+ throw "you do not have enough vertcoins to send this amount";`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`for(i=0;i<unspent.length;i++) {`
`@@ -330,7 +330,7 @@ coinpunk.Wallet = function(walletKey, walletId) {`
`330`	`330`	`var tx = this.createTx(amtString, 0, addressString, changeAddress);`
`331`	`331`	`var txSize = tx.raw.length / 2;`
`332`	`332`	`// console.log(txSize);`
`333`		`- return Math.ceil(txSize/1000)*0.0001;`
	`333`	`+ return Math.ceil(txSize/1000)*0.001;`
`334`	`334`	`};`
`335`	`335`
`336`	`336`	`this.createSend = function(amtString, feeString, addressString, changeAddress) {`