Merge remote-tracking branch 'origin/master'

README.md

@@ -15,16 +15,14 @@ to MyMonero. They include:
 
  - google analytics, cloudflare, images and flash were removed.
  - frontend's html and javascript upgrads and cleanups.
- - transaction fees were set to zero.
+ - transaction service fee was set to zero (same as in MyMonero).
  - the wallets generated use 25 word mnemonics, fully compatible with official monero wallets
 (13 word mnemonics generated by MyMonero work as usual though).
  - import wallet fee was reduced.
  - added support of testnet and stagenet networks, and mainnet without relying transactions
  - improved handling of mempool, coinbase, locked and unlocked transactions.
  - added dynamic miner fees.
- - minimum mixin set to 4 for the next hard fork.
  - view only mode added.
- - ability to offline show your address and private view and spend keys, based on the mnemonic seed, in case of server or connections problem resulting in not being able to login to your account.
  - private tx key given to a user which can be used to prove sending xmr to a recipient.
  - Cross-Origin Resource Sharing (CORS) was disabled.
  - transaction confirmation window added to double check tx details before its commited.
@@ -36,15 +34,14 @@ to MyMonero. They include:
 
 ## Stagenet version (Currently offline)
 
-- [http://139.162.32.245:81](http://139.162.32.245:81) - DOWN due to VPN problems at the moment :-(
+- [http://139.162.32.245:81](http://139.162.32.245:81) - DOWN due to problems with
+my VPS hosting.
 
-This is Open Monero running on testnet network. You can use it to play around with it. 
-Since this is testnet version, frequent changes and database resets are expected. Also,
+This is Open Monero running on stagnet network. You can use it to play around with it.
+Since this is stagnet version, frequent changes and database resets are expected. Also,
 
- it is running on cheap vps, which may result in some lag.
+ it is running on cheap VPS, which may result in some lag.
 
-If you want some testnet or stagenet monero, please make issue with your stagenet address that you can
-obtained from Open Monero.  
 
 ## Screenshot
 
@@ -76,7 +73,7 @@ Open Monero is not as fast as MyMonero.
  straight forward implementation of the backend. Thus,
  it does not use any special memory buffers/caches for transactions,
  blocks, complex database structures and SQL queries. Also, no ongoing monitoring of user's
-  transactions is happening, since viewkey is not stored. Transaction search threads start when 
+  transactions is happening, since user's viewkey is not stored (only its hash). Transaction search threads start when
   user logs in (viewkey and address are submitted to the search thread), and finish shorty
   after logout. Once the search threads stop, they can't be restarted without user logging
    in back, because viewkey is unknown.

html/js/config.js

@@ -3,7 +3,7 @@ var config = {
     mainnetExplorerUrl: "https://xmrchain.com/",
     testnetExplorerUrl: "https://testnet.xmrchain.com/",
     stagenetExplorerUrl: "http://162.210.173.150:8083/",
-    nettype: 1, /* 0 - MAINNET, 1 - TESTNET, 2 - STAGENET */
+    nettype: 2, /* 0 - MAINNET, 1 - TESTNET, 2 - STAGENET */
     coinUnitPlaces: 12,
     txMinConfirms: 10,         // corresponds to CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE in Monero
     txCoinbaseMinConfirms: 60, // corresponds to CRYPTONOTE_MINED_MONEY_UNLOCK_WINDOW in Monero
@@ -31,4 +31,3 @@ var config = {
     avgBlockTime: 120,
     debugMode: false
 };
-