Use rai::pub_key instead of ed25519_publickey

rai/core_test/block.cpp

@@ -13,8 +13,7 @@
 TEST (ed25519, signing)
 {
 	rai::uint256_union prv (0);
-	rai::uint256_union pub;
-	ed25519_publickey (prv.bytes.data (), pub.bytes.data ());
+	rai::uint256_union pub (rai::pub_key (prv));
 	rai::uint256_union message (0);
 	rai::uint512_union signature;
 	ed25519_sign (message.bytes.data (), sizeof (message.bytes), prv.bytes.data (), pub.bytes.data (), signature.bytes.data ());

rai/core_test/uint256_union.cpp

@@ -3,8 +3,6 @@
 #include <rai/lib/interface.h>
 #include <rai/secure/common.hpp>
 
-#include <ed25519-donna/ed25519.h>
-
 TEST (uint128_union, decode_dec)
 {
 	rai::uint128_union value;
@@ -115,8 +113,7 @@ TEST (uint256_union, key_encryption)
 	rai::raw_key key4;
 	key4.decrypt (encrypted, secret_key, key1.pub.owords[0]);
 	ASSERT_EQ (key1.prv, key4);
-	rai::public_key pub;
-	ed25519_publickey (key4.data.bytes.data (), pub.bytes.data ());
+	rai::public_key pub (rai::pub_key (key4.data));
 	ASSERT_EQ (key1.pub, pub);
 }
 

rai/node/cli.cpp

@@ -1,4 +1,3 @@
-#include <ed25519-donna/ed25519.h>
 #include <rai/lib/interface.h>
 #include <rai/node/cli.hpp>
 #include <rai/node/common.hpp>
@@ -280,8 +279,7 @@ std::error_code rai::handle_node_options (boost::program_options::variables_map
 		{
 			rai::uint256_union prv;
 			prv.decode_hex (vm["key"].as<std::string> ());
-			rai::uint256_union pub;
-			ed25519_publickey (prv.bytes.data (), pub.bytes.data ());
+			rai::uint256_union pub (rai::pub_key (prv));
 			std::cout << "Private: " << prv.to_string () << std::endl
 			          << "Public: " << pub.to_string () << std::endl
 			          << "Account: " << pub.to_account () << std::endl;

rai/node/node.cpp

@@ -21,8 +21,6 @@
 
 #include <upnpcommands.h>
 
-#include <ed25519-donna/ed25519.h>
-
 double constexpr rai::node::price_max;
 double constexpr rai::node::free_cutoff;
 std::chrono::seconds constexpr rai::node::period;

rai/node/wallet.cpp

@@ -12,8 +12,6 @@
 
 #include <future>
 
-#include <ed25519-donna/ed25519.h>
-
 rai::uint256_union rai::wallet_store::check (MDB_txn * transaction_a)
 {
 	rai::wallet_value value (entry_get_raw (transaction_a, rai::wallet_store::check_special));
@@ -59,13 +57,12 @@ rai::public_key rai::wallet_store::deterministic_insert (MDB_txn * transaction_a
 	auto index (deterministic_index_get (transaction_a));
 	rai::raw_key prv;
 	deterministic_key (prv, transaction_a, index);
-	rai::public_key result;
-	ed25519_publickey (prv.data.bytes.data (), result.bytes.data ());
+	rai::public_key result (rai::pub_key (prv.data));
 	while (exists (transaction_a, result))
 	{
 		++index;
 		deterministic_key (prv, transaction_a, index);
-		ed25519_publickey (prv.data.bytes.data (), result.bytes.data ());
+		result = rai::pub_key (prv.data);
 	}
 	uint64_t marker (1);
 	marker <<= 32;
@@ -411,8 +408,7 @@ rai::account rai::wallet_store::representative (MDB_txn * transaction_a)
 rai::public_key rai::wallet_store::insert_adhoc (MDB_txn * transaction_a, rai::raw_key const & prv)
 {
 	assert (valid_password (transaction_a));
-	rai::public_key pub;
-	ed25519_publickey (prv.data.bytes.data (), pub.bytes.data ());
+	rai::public_key pub (rai::pub_key (prv.data));
 	rai::raw_key password_l;
 	wallet_key (password_l, transaction_a);
 	rai::uint256_union ciphertext;
@@ -522,8 +518,7 @@ bool rai::wallet_store::fetch (MDB_txn * transaction_a, rai::public_key const &
 	}
 	if (!result)
 	{
-		rai::public_key compare;
-		ed25519_publickey (prv.data.bytes.data (), compare.bytes.data ());
+		rai::public_key compare (rai::pub_key (prv.data));
 		if (!(pub == compare))
 		{
 			result = true;
@@ -661,8 +656,7 @@ void rai::wallet_store::upgrade_v1_v2 ()
 			// Key failed to decrypt despite valid password
 			rai::wallet_value data (entry_get_raw (transaction, key));
 			prv.decrypt (data.key, zero_password, salt (transaction).owords[0]);
-			rai::public_key compare;
-			ed25519_publickey (prv.data.bytes.data (), compare.bytes.data ());
+			rai::public_key compare (rai::pub_key (prv.data));
 			if (compare == key)
 			{
 				// If we successfully decrypted it, rewrite the key back with the correct wallet key
@@ -673,8 +667,7 @@ void rai::wallet_store::upgrade_v1_v2 ()
 				// Also try the empty password
 				rai::wallet_value data (entry_get_raw (transaction, key));
 				prv.decrypt (data.key, empty_password, salt (transaction).owords[0]);
-				rai::public_key compare;
-				ed25519_publickey (prv.data.bytes.data (), compare.bytes.data ());
+				rai::public_key compare (rai::pub_key (prv.data));
 				if (compare == key)
 				{
 					// If we successfully decrypted it, rewrite the key back with the correct wallet key

rai/secure/utility.cpp

@@ -3,8 +3,6 @@
 #include <rai/lib/interface.h>
 #include <rai/node/working.hpp>
 
-#include <ed25519-donna/ed25519.h>
-
 static std::vector<boost::filesystem::path> all_unique_paths;
 
 boost::filesystem::path rai::working_path ()