Start wallet nonce from 0

Author: catena2w

scorex-basics/src/main/scala/scorex/wallet/Wallet.scala

@@ -83,7 +83,7 @@ class Wallet(walletFileOpt: Option[File], password: String, seedOpt: Option[Arra
     } else false
 
     if (created) {
-      log.info("Added account #" + (nonce + 2))
+      log.info("Added account #" + privateKeyAccounts().size)
       Some(account)
     } else None
   }
@@ -119,7 +119,7 @@ class Wallet(walletFileOpt: Option[File], password: String, seedOpt: Option[Arra
   def nonce(): Int = Option(noncePersistence.get(NonceFieldName)).getOrElse(0)
 
   def getAndIncrementNonce(): Int = synchronized {
-    noncePersistence.put(NonceFieldName, nonce() + 1) - 1
+    noncePersistence.put(NonceFieldName, nonce() + 1)
   }
 
 }

src/test/scala/scorex/lagonaki/unit/WalletSpecification.scala

@@ -15,7 +15,7 @@ class WalletSpecification extends FunSuite with Matchers {
     w.generateNewAccounts(walletSize)
 
     w.privateKeyAccounts().size shouldBe walletSize
-    w.privateKeyAccounts().map(_.address) shouldBe Seq("3Mb4mR4taeYS3wci78SntztFwLoaS6Wbg81", "3MkcXZiczXxqEQYVVhRqkUnVaTfzaeMs15e", "3MoFqpXVnxVpMwN1egMj2yH6EEWWYVruvfn", "3MjLQqH3cU6DZ4yFC6SAPmXkHf3ajWmV3LK", "3MbWTyn6Tg7zL6XbdN8TLcFMfhWX77hKcmc", "3MUc8z9WMuMbRR93NU8Jxh1DgwCkfHr78Fu", "3Mo4k51wnV4EYmCmneh4fqDdfKYxcgZgCUT", "3MiSmwnRGJtLmZeNLYg75bje6StYhCEKCrX", "3MjQ5FJEBGggnwBWBNjZtgcwyrYTn4r4shg", "3MkjMybqczyo6SyouuaSniTuSiZqTsMhQQx")
+    w.privateKeyAccounts().map(_.address) shouldBe Seq("3Mb4mR4taeYS3wci78SntztFwLoaS6Wbg81", "3MkcXZiczXxqEQYVVhRqkUnVaTfzaeMs15e", "3MoFqpXVnxVpMwN1egMj2yH6EEWWYVruvfn", "3MjLQqH3cU6DZ4yFC6SAPmXkHf3ajWmV3LK", "3MXTTi9tjPSjossb4Tx5nokg895tCfroWLB", "3MUc8z9WMuMbRR93NU8Jxh1DgwCkfHr78Fu", "3Mo4k51wnV4EYmCmneh4fqDdfKYxcgZgCUT", "3MiSmwnRGJtLmZeNLYg75bje6StYhCEKCrX", "3MjQ5FJEBGggnwBWBNjZtgcwyrYTn4r4shg", "3MkjMybqczyo6SyouuaSniTuSiZqTsMhQQx")
 
   }