From 662aed72b9f7213d287e19e667c3ceab7b5a8c5e Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Mon, 21 Sep 2020 18:54:11 +0200
Subject: [PATCH] update proto files matching with pauls proto version, update
 code which use them

---
 .../HTTPInterface/DecodeTransactionPage.cpp   | 117 +++---
 src/cpp/model/TransactionCreation.cpp         | 145 +++----
 src/cpp/model/TransactionCreation.h           |   8 +-
 src/cpp/model/TransactionTransfer.cpp         | 375 ++++++++++--------
 src/cpp/model/TransactionTransfer.h           |   6 +-
 src/cpp/tasks/ProcessingTransaction.h         |   2 +-
 src/cpp/tasks/SigningTransaction.cpp          |  10 +-
 src/cpp/tasks/SigningTransaction.h            |   2 +-
 src/cpsp/decodeTransaction.cpsp               |  41 +-
 9 files changed, 365 insertions(+), 341 deletions(-)

diff --git a/src/cpp/HTTPInterface/DecodeTransactionPage.cpp b/src/cpp/HTTPInterface/DecodeTransactionPage.cpp
index 405ed85a6..4597672ca 100644
--- a/src/cpp/HTTPInterface/DecodeTransactionPage.cpp
+++ b/src/cpp/HTTPInterface/DecodeTransactionPage.cpp
@@ -5,14 +5,14 @@
 #include "Poco/DeflatingStream.h"
 
 
-#line 7 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 7 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 
 #include "sodium.h"
 #include "../proto/gradido/TransactionBody.pb.h"
 #include "../controller/User.h"
 #include "../model/TransactionBase.h"
 #include "../model/TransactionCreation.h"
-#line 1 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 1 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header_old.cpsp"
  
 #include "../ServerConfig.h"	
 
@@ -31,10 +31,10 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
 	if (_compressResponse) response.set("Content-Encoding", "gzip");
 
 	Poco::Net::HTMLForm form(request, request.stream());
-#line 14 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 14 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 
 	const char* pageName = "Decode Transaction";
-	model::messages::gradido::TransactionBody transactionBody;
+	proto::gradido::TransactionBody transactionBody;
 	bool decoded = false;
 	bool adminUser = false;
 	if(mSession && mSession->getNewUser())  {
@@ -99,12 +99,12 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
 	responseStream << "<meta charset=\"UTF-8\">\n";
 	responseStream << "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n";
 	responseStream << "<title>Gradido Login Server: ";
-#line 9 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 9 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header_old.cpsp"
 	responseStream << ( pageName );
 	responseStream << "</title>\n";
 	responseStream << "<!--<link rel=\"stylesheet\" type=\"text/css\" href=\"css/styles.min.css\">-->\n";
 	responseStream << "<link rel=\"stylesheet\" type=\"text/css\" href=\"";
-#line 11 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 11 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header_old.cpsp"
 	responseStream << ( ServerConfig::g_php_serverPath );
 	responseStream << "/css/styles.css\">\n";
 	responseStream << "<style type=\"text/css\" >\n";
@@ -149,7 +149,7 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
 	responseStream << "<div class=\"versionstring dev-info\">\n";
 	responseStream << "\t<p class=\"grd_small\">Login Server in Entwicklung</p>\n";
 	responseStream << "\t<p class=\"grd_small\">Alpha ";
-#line 53 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\header_old.cpsp"
+#line 53 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\header_old.cpsp"
 	responseStream << ( ServerConfig::g_versionString );
 	responseStream << "</p>\n";
 	responseStream << "</div>\n";
@@ -158,84 +158,79 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
 	responseStream << "<div class=\"grd_container\">\n";
 	responseStream << "\t<h1>Transaktion dekodieren</h1>\n";
 	responseStream << "\t";
-#line 72 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 72 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( getErrorsHtml() );
 	responseStream << "\n";
 	responseStream << "\t<form method=\"POST\">\n";
 	responseStream << "\t\t<fieldset class=\"grd_container_small\">\n";
 	responseStream << "\t\t\t<legend>Transaktion dekodieren</legend>\n";
 	responseStream << "\t\t\t<textarea style=\"width:100%;height:100px\" name=\"transaction\">";
-#line 76 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 76 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( !form.empty() ? form.get("transaction", "") : "" );
 	responseStream << "</textarea>\n";
 	responseStream << "\t\t</fieldset>\n";
 	responseStream << "\t\t<input class=\"grd-form-bn grd-form-bn-succeed\" type=\"submit\" name=\"submit\" value=\"Dekodieren\">\n";
 	responseStream << "\t</form>\n";
 	responseStream << "\t";
-#line 80 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 80 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  if(decoded) { 	responseStream << "\n";
 	responseStream << "\t\t<p><b>Verwendungszweck:</b></p>\n";
 	responseStream << "\t\t<p>";
-#line 82 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 82 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( transactionBody.memo() );
 	responseStream << "</p>\n";
 	responseStream << "\t\t";
-#line 83 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 83 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  if(transactionBody.has_transfer()) { 
 			auto transfer = transactionBody.transfer();
+			char hex[65]; memset(hex, 0, 65);
 			responseStream << "\n";
-	responseStream << "\t\t<h3>Transfer</h3>\n";
-	responseStream << "\t\t<b>Sender</b>\n";
-	responseStream << "\t\t";
-#line 88 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
- for(int i = 0; i < transfer.senderamounts_size(); i++) {
-			auto sender = transfer.senderamounts(i); 
-			char hex[65]; memset(hex, 0, 65);
-			sodium_bin2hex(hex, 65, (const unsigned char*)sender.ed25519_sender_pubkey().data(), sender.ed25519_sender_pubkey().size());
+	responseStream << "\t\t\t";
+#line 87 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
+ if(transfer.has_local()) { 
+				auto local_transfer = transfer.local();
+				auto sender_pubkey = local_transfer.sender().pubkey();
+				auto receiver_pubkey = local_transfer.receiver();
+				sodium_bin2hex(hex, 65, (const unsigned char*)sender_pubkey.data(), sender_pubkey.size());
 				responseStream << "\n";
-	responseStream << "\t\t\t<p>pubkey: ";
-#line 93 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+	responseStream << "\t\t\t\t<h3>Local Transfer</h3>\n";
+	responseStream << "\t\t\t\t<b>From: </b>";
+#line 94 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( hex );
-	responseStream << "</p>\n";
-	responseStream << "\t\t\t<p>amount: ";
-#line 94 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
-	responseStream << (  TransactionBase::amountToString(sender.amount()) );
-	responseStream << " GDD</p>\n";
-	responseStream << "\t\t";
-#line 95 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
- } 	responseStream << "\n";
-	responseStream << "\t\t<b>Receiver</b>\n";
-	responseStream << "\t\t";
-#line 97 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
- for(int i = 0; i < transfer.receiveramounts_size(); i++) {
-			auto receiver = transfer.receiveramounts(i); 
-			char hex[65]; memset(hex, 0, 65);
-			sodium_bin2hex(hex, 65, (const unsigned char*)receiver.ed25519_receiver_pubkey().data(), receiver.ed25519_receiver_pubkey().size());
-				responseStream << "\n";
-	responseStream << "\t\t\t<p>pubkey: ";
-#line 102 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+	responseStream << "\n";
+	responseStream << "\t\t\t\t";
+#line 95 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
+ sodium_bin2hex(hex, 65, (const unsigned char*)receiver_pubkey.data(), receiver_pubkey.size()); 	responseStream << "\n";
+	responseStream << "\t\t\t\t<b>To: </b>";
+#line 96 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( hex );
-	responseStream << "</p>\n";
-	responseStream << "\t\t\t<p>amount: ";
-#line 103 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
-	responseStream << (  TransactionBase::amountToString(receiver.amount()) );
-	responseStream << " GDD</p>\n";
-	responseStream << "\t\t";
-#line 104 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+	responseStream << "\n";
+	responseStream << "\t\t\t\t<b>Amount: </b>";
+#line 97 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
+	responseStream << ( TransactionBase::amountToString(local_transfer.sender().amount()) );
+	responseStream << "\n";
+	responseStream << "\t\t\t";
+#line 98 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
+ } else { 	responseStream << "\n";
+	responseStream << "\t\t\t\t<h3>- Not implemented yet (Group Transfer) -</h3>\n";
+	responseStream << "\t\t\t";
+#line 100 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t\t";
-#line 105 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 102 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  } else if(transactionBody.has_creation()) { 
 			auto creation = transactionBody.creation();
+
 			TransactionCreation creationObject("", creation);
 			auto receiver = creation.receiveramount();
+
 			char hex[65]; memset(hex, 0, 65);
-			sodium_bin2hex(hex, 65, (const unsigned char*)receiver.ed25519_receiver_pubkey().data(), receiver.ed25519_receiver_pubkey().size());
+			sodium_bin2hex(hex, 65, (const unsigned char*)receiver.pubkey().data(), receiver.pubkey().size());
 			
 			Poco::AutoPtr<controller::User> user = nullptr;
 			if(adminUser) {
 				user = controller::User::create();
-				if(!user->load((const unsigned char*)receiver.ed25519_receiver_pubkey().data())) {
+				if(!user->load((const unsigned char*)receiver.pubkey().data())) {
 					user.assign(nullptr);
 				}
 			}
@@ -243,36 +238,36 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
 			responseStream << "\n";
 	responseStream << "\t\t<h3>Creation</h3>\n";
 	responseStream << "\t\t";
-#line 122 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 121 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  if(!adminUser || user.isNull() || !user->getModel()) { 	responseStream << "\n";
 	responseStream << "\t\t<p>pubkey: ";
-#line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 122 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( hex );
 	responseStream << "</p>\n";
 	responseStream << "\t\t";
-#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 123 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  } else { 	responseStream << "\n";
 	responseStream << "\t\t<p>user: </p>\n";
 	responseStream << "\t\t<p>";
-#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 125 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( user->getModel()->toHTMLString() );
 	responseStream << "</p>\n";
 	responseStream << "\t\t";
-#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 126 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t\t<p>amount: ";
-#line 128 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 127 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( TransactionBase::amountToString(receiver.amount()) );
 	responseStream << " GDD</p>\n";
 	responseStream << "\t\t<p>target date: ";
-#line 129 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 128 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
 	responseStream << ( creationObject.getTargetDateString() );
 	responseStream << "</p>\n";
 	responseStream << "\t\t";
-#line 130 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 129 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  } 	responseStream << "\n";
 	responseStream << "\t";
-#line 131 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\decodeTransaction.cpsp"
+#line 130 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\decodeTransaction.cpsp"
  } 	responseStream << "\n";
 	responseStream << "</div>\n";
 	// begin include footer.cpsp
@@ -282,14 +277,14 @@ void DecodeTransactionPage::handleRequest(Poco::Net::HTTPServerRequest& request,
 	responseStream << "        </div>\n";
 	responseStream << "        <div class=\"bottomleft\">\n";
 	responseStream << "            ";
-#line 6 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+#line 6 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\footer.cpsp"
 	responseStream << ( mTimeProfiler.string() );
 	responseStream << "\n";
 	responseStream << "        </div>\n";
 	responseStream << "        <div class=\"bottomright\">\n";
 	responseStream << "            <p>Login Server in Entwicklung</p>\n";
 	responseStream << "            <p>Alpha ";
-#line 10 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\footer.cpsp"
+#line 10 "D:\\code\\gradido\\gradido_login_server_grpc\\src\\cpsp\\footer.cpsp"
 	responseStream << ( ServerConfig::g_versionString );
 	responseStream << "</p>\n";
 	responseStream << "        </div>\n";
diff --git a/src/cpp/model/TransactionCreation.cpp b/src/cpp/model/TransactionCreation.cpp
index a04c424c7..65b1bf837 100644
--- a/src/cpp/model/TransactionCreation.cpp
+++ b/src/cpp/model/TransactionCreation.cpp
@@ -1,72 +1,73 @@
-#include "TransactionCreation.h"
-#include "Poco/DateTimeFormatter.h"
-#include <sodium.h>
-
-TransactionCreation::TransactionCreation(const std::string& memo, const model::messages::gradido::TransactionCreation& protoCreation)
-	: TransactionBase(memo), mProtoCreation(protoCreation), mReceiverUser(nullptr)
-{
-	memset(mReceiverPublicHex, 0, 65);
-}
-
-TransactionCreation::~TransactionCreation()
-{
-	if (mReceiverUser) {
-		delete mReceiverUser;
-		mReceiverUser = nullptr;
-	}
-}
-
-int TransactionCreation::prepare()
-{
-	const static char functionName[] = { "TransactionCreation::prepare" };
-	if (!mProtoCreation.has_receiveramount()) {
-		addError(new Error(functionName, "hasn't receiver amount"));
-		return -1;
-	}
-	auto receiverAmount = mProtoCreation.receiveramount();
-
-	if (receiverAmount.amount() <= 0) {
-		addError(new Error(functionName, "amount must be > 0"));
-		return -4;
-	}
-	if (receiverAmount.amount() > 10000000) {
-		addError(new Error(functionName, "amount must be <= 1000 GDD"));
-		return -5;
-	}
-
-	auto receiverPublic = receiverAmount.ed25519_receiver_pubkey();
-	if (receiverPublic.size() != 32) {
-		addError(new Error(functionName, "receiver public invalid (size not 32)"));
-		return -2;
-	}
-	mReceiverUser = new User((const unsigned char*)receiverPublic.data());
-	getErrors(mReceiverUser);
-	if (mReceiverUser->getUserState() == USER_EMPTY) {
-		sodium_bin2hex(mReceiverPublicHex, 65, (const unsigned char*)receiverPublic.data(), receiverPublic.size());
-		delete mReceiverUser;
-		mReceiverUser = nullptr;
-	}
-	else {
-		memcpy(mReceiverPublicHex, mReceiverUser->getPublicKeyHex().data(), 64);
-		// uncomment because not correctly working
-		/*if (!mReceiverUser->validateIdentHash(mProtoCreation.ident_hash())) {
-			addError(new Error(functionName, "ident hash isn't the same"));
-			addError(new ParamError(functionName, "hash calculated from email: ", mReceiverUser->getEmail()));
-			addError(new ParamError(functionName, "hash: ", std::to_string(mProtoCreation.ident_hash())));
-			return -3;
-		}*/
-	}
-	//
-
-	
-	return 0;
-}
-
-std::string TransactionCreation::getTargetDateString()
-{
-	// proto format is seconds, poco timestamp format is microseconds
-	Poco::Timestamp pocoStamp(mProtoCreation.target_date().seconds() * 1000*1000);
-	//Poco::DateTime(pocoStamp);
-	return Poco::DateTimeFormatter::format(pocoStamp, "%d. %b %y");
-}
-
+#include "TransactionCreation.h"
+#include "Poco/DateTimeFormatter.h"
+#include <sodium.h>
+
+//TransactionCreation::TransactionCreation(const std::string& memo, const model::messages::gradido::TransactionCreation& protoCreation)
+TransactionCreation::TransactionCreation(const std::string& memo, const proto::gradido::GradidoCreation& protoCreation)
+	: TransactionBase(memo), mProtoCreation(protoCreation), mReceiverUser(nullptr)
+{
+	memset(mReceiverPublicHex, 0, 65);
+}
+
+TransactionCreation::~TransactionCreation()
+{
+	if (mReceiverUser) {
+		delete mReceiverUser;
+		mReceiverUser = nullptr;
+	}
+}
+
+int TransactionCreation::prepare()
+{
+	const static char functionName[] = { "TransactionCreation::prepare" };
+	if (!mProtoCreation.has_receiveramount()) {
+		addError(new Error(functionName, "hasn't receiver amount"));
+		return -1;
+	}
+	auto receiverAmount = mProtoCreation.receiveramount();
+
+	if (receiverAmount.amount() <= 0) {
+		addError(new Error(functionName, "amount must be > 0"));
+		return -4;
+	}
+	if (receiverAmount.amount() > 10000000) {
+		addError(new Error(functionName, "amount must be <= 1000 GDD"));
+		return -5;
+	}
+
+	auto receiverPublic = receiverAmount.ed25519_receiver_pubkey();
+	if (receiverPublic.size() != 32) {
+		addError(new Error(functionName, "receiver public invalid (size not 32)"));
+		return -2;
+	}
+	mReceiverUser = new User((const unsigned char*)receiverPublic.data());
+	getErrors(mReceiverUser);
+	if (mReceiverUser->getUserState() == USER_EMPTY) {
+		sodium_bin2hex(mReceiverPublicHex, 65, (const unsigned char*)receiverPublic.data(), receiverPublic.size());
+		delete mReceiverUser;
+		mReceiverUser = nullptr;
+	}
+	else {
+		memcpy(mReceiverPublicHex, mReceiverUser->getPublicKeyHex().data(), 64);
+		// uncomment because not correctly working
+		/*if (!mReceiverUser->validateIdentHash(mProtoCreation.ident_hash())) {
+			addError(new Error(functionName, "ident hash isn't the same"));
+			addError(new ParamError(functionName, "hash calculated from email: ", mReceiverUser->getEmail()));
+			addError(new ParamError(functionName, "hash: ", std::to_string(mProtoCreation.ident_hash())));
+			return -3;
+		}*/
+	}
+	//
+
+	
+	return 0;
+}
+
+std::string TransactionCreation::getTargetDateString()
+{
+	// proto format is seconds, poco timestamp format is microseconds
+	Poco::Timestamp pocoStamp(mProtoCreation.target_date().seconds() * 1000*1000);
+	//Poco::DateTime(pocoStamp);
+	return Poco::DateTimeFormatter::format(pocoStamp, "%d. %b %y");
+}
+
diff --git a/src/cpp/model/TransactionCreation.h b/src/cpp/model/TransactionCreation.h
index a696ff962..ff1fd62a8 100644
--- a/src/cpp/model/TransactionCreation.h
+++ b/src/cpp/model/TransactionCreation.h
@@ -12,26 +12,26 @@
 #pragma warning(disable:4800)
 
 #include "TransactionBase.h"
-#include "../proto/gradido/TransactionCreation.pb.h"
+#include "../proto/gradido/GradidoCreation.pb.h"
 #include "User.h"
 
 class TransactionCreation : public TransactionBase
 {
 public:
-	TransactionCreation(const std::string& memo, const model::messages::gradido::TransactionCreation& protoCreation);
+	TransactionCreation(const std::string& memo, const proto::gradido::GradidoCreation& protoCreation);
 	~TransactionCreation();
 
 	int prepare();
 
 	inline User* getUser() { return mReceiverUser; }
-	inline google::protobuf::int64 getAmount() { return mProtoCreation.receiveramount().amount(); }
+	inline google::protobuf::int64 getAmount() { return mProtoCreation.receiver().amount(); }
 	inline char* getPublicHex() { return mReceiverPublicHex; }
 
 	inline std::string getAmountString() { return amountToString(getAmount()); }
 	std::string getTargetDateString();
 
 protected:
-	const model::messages::gradido::TransactionCreation& mProtoCreation;
+	const proto::gradido::GradidoCreation& mProtoCreation;
 	char mReceiverPublicHex[65];
 	User* mReceiverUser;
 };
diff --git a/src/cpp/model/TransactionTransfer.cpp b/src/cpp/model/TransactionTransfer.cpp
index 136258816..d46d1a03a 100644
--- a/src/cpp/model/TransactionTransfer.cpp
+++ b/src/cpp/model/TransactionTransfer.cpp
@@ -1,172 +1,203 @@
-#include "TransactionTransfer.h"
-
-const std::string TransactionTransfer::mInvalidIndexMessage("invalid index");
-
-TransactionTransfer::KontoTableEntry::KontoTableEntry(model::table::User* user, google::protobuf::int64 amount, bool negativeAmount/* = false*/)
-{
-	//<span class="content-cell">Normaler&nbsp;User&nbsp;&lt;info@software-labor.de&gt;</span>
-	if (!user) return;
-
-	composeAmountCellString(amount, negativeAmount);
-
-	/*kontoNameCell = "<td>";
-	kontoNameCell += user->getFirstName();
-	kontoNameCell += "&nbsp;";
-	kontoNameCell += user->getLastName();
-	kontoNameCell += "&nbsp;&lt;";
-	kontoNameCell += user->getEmail();
-	kontoNameCell += "&gt;</td>";*/
-	kontoNameCell = "<span class=\"content-cell\">";
-	kontoNameCell += user->getNameWithEmailHtml();
-	kontoNameCell += "</span>";
-}
-
-TransactionTransfer::KontoTableEntry::KontoTableEntry(const std::string& pubkeyHex, google::protobuf::int64 amount, bool negativeAmount/* = false*/)
-{
-	composeAmountCellString(amount, negativeAmount);
-	//kontoNameCell = "<td class=\"small\">0x" + pubkeyHex + "</td>";
-	kontoNameCell = "<span class = \"content-cell\">" + pubkeyHex + "</span>";
-}
-
-void TransactionTransfer::KontoTableEntry::composeAmountCellString(google::protobuf::int64 amount, bool negativeAmount)
-{
-	//<span class="content-cell alert-color">-10 GDD</span>
-	//<span class="content-cell success-color">10 GDD</span>
-	amountCell = "<span class=\"content-cell ";
-	if (negativeAmount) {
-		amountCell += "alert-color\">-";
-	}
-	else {
-		amountCell += "success-color\">";
-	}
-	amountCell += amountToString(amount);
-	//amountCell += " GDD</td>";
-	amountCell += " GDD</span>";
-}
-
-// ********************************************************************************************************************************
-
-TransactionTransfer::TransactionTransfer(const std::string& memo, const model::messages::gradido::Transfer& protoTransfer)
-	: TransactionBase(memo), mProtoTransfer(protoTransfer)
-{
-
-}
-
-TransactionTransfer::~TransactionTransfer()
-{
-	mKontoTable.clear();
-}
-
-int TransactionTransfer::prepare()
-{
-	lock();
-	const static char functionName[] = { "TransactionTransfer::prepare" };
-	if (mProtoTransfer.senderamounts_size() == 0) {
-		addError(new Error(functionName, "hasn't sender amount(s)"));
-		unlock();
-		return -1;
-	}
-	if (mProtoTransfer.receiveramounts_size() == 0) {
-		addError(new Error(functionName, "hasn't receiver amount(s)"));
-		unlock();
-		return -2;
-	}
-	mKontoTable.reserve(mProtoTransfer.senderamounts_size() + mProtoTransfer.receiveramounts_size());
-
-	//auto receiverAmount = mProtoTransfer.receiveramount();
-	//auto senderAmount
-	int senderSum = 0;
-	int receiverSum = 0;
-
-	char pubkeyHexTemp[65];
-
-	for (int i = 0; i < mProtoTransfer.senderamounts_size(); i++) {
-		auto senderAmount = mProtoTransfer.senderamounts(i);
-		auto pubkey = senderAmount.ed25519_sender_pubkey();
-		senderSum += senderAmount.amount();
-		if (pubkey.size() != 32) {
-			addError(new ParamError(functionName, "invalid public key for sender ", i));
-			unlock();
-			return -3;
-		}
-		//User user((const unsigned char*)pubkey.data());
-		auto user = controller::User::create();
-		if (!user->load((const unsigned char*)pubkey.data())) {
-			sodium_bin2hex(pubkeyHexTemp, 65, (const unsigned char*)pubkey.data(), pubkey.size());
-			mKontoTable.push_back(KontoTableEntry(pubkeyHexTemp, senderAmount.amount(), true));
-		}
-		else {
-			mKontoTable.push_back(KontoTableEntry(user->getModel(), senderAmount.amount(), true));
-		}
-	}
-	for (int i = 0; i < mProtoTransfer.receiveramounts_size(); i++) {
-		auto receiverAmount = mProtoTransfer.receiveramounts(i);
-		auto pubkey = receiverAmount.ed25519_receiver_pubkey();
-		receiverSum += receiverAmount.amount();
-		if (receiverAmount.ed25519_receiver_pubkey().size() != 32) {
-			addError(new ParamError(functionName, "invalid public key for receiver ", i));
-			unlock();
-			return -4;
-		}
-		auto user = controller::User::create();
-		if (!user->load((const unsigned char*)pubkey.data())) {
-			sodium_bin2hex(pubkeyHexTemp, 65, (const unsigned char*)pubkey.data(), pubkey.size());
-			mKontoTable.push_back(KontoTableEntry(pubkeyHexTemp, receiverAmount.amount(), false));
-		}
-		else {
-			mKontoTable.push_back(KontoTableEntry(user->getModel(), receiverAmount.amount(), false));
-		}
-	}
-	if (senderSum != receiverSum) {
-		addError(new Error(functionName, "sender amounts sum != receiver amounts sum"));
-		unlock();
-		return -5;
-	}
-	if (senderSum < 0) {
-		addError(new Error(functionName, "negative amount not supported"));
-		unlock();
-		return -6;
-	}
-
-	/*
-	mReceiverUser = new User(receiverPublic.data());
-	getErrors(mReceiverUser);
-	if (mReceiverUser->getUserState() == USER_EMPTY) {
-		sodium_bin2hex(mReceiverPublicHex, 65, (const unsigned char*)receiverPublic.data(), receiverPublic.size());
-		delete mReceiverUser;
-		mReceiverUser = nullptr;
-	}
-	else {
-		memcpy(mReceiverPublicHex, mReceiverUser->getPublicKeyHex().data(), 64);
-	}
-	//*/
-
-	unlock();
-	return 0;
-}
-
-const std::string& TransactionTransfer::getKontoNameCell(int index)
-{
-	
-	lock();
-	if (index >= mKontoTable.size()) {
-		unlock();
-		return mInvalidIndexMessage;
-	}
-	unlock();
-
-	return mKontoTable[index].kontoNameCell;
-}
-
-const std::string& TransactionTransfer::getAmountCell(int index)
-{
-	lock();
-	if (index >= mKontoTable.size()) {
-		unlock();
-		return mInvalidIndexMessage;
-	}
-	unlock();
-
-	return mKontoTable[index].amountCell;
-}
-
+#include "TransactionTransfer.h"
+
+const std::string TransactionTransfer::mInvalidIndexMessage("invalid index");
+
+TransactionTransfer::KontoTableEntry::KontoTableEntry(model::table::User* user, google::protobuf::int64 amount, bool negativeAmount/* = false*/)
+{
+	//<span class="content-cell">Normaler&nbsp;User&nbsp;&lt;info@software-labor.de&gt;</span>
+	if (!user) return;
+
+	composeAmountCellString(amount, negativeAmount);
+
+	/*kontoNameCell = "<td>";
+	kontoNameCell += user->getFirstName();
+	kontoNameCell += "&nbsp;";
+	kontoNameCell += user->getLastName();
+	kontoNameCell += "&nbsp;&lt;";
+	kontoNameCell += user->getEmail();
+	kontoNameCell += "&gt;</td>";*/
+	kontoNameCell = "<span class=\"content-cell\">";
+	kontoNameCell += user->getNameWithEmailHtml();
+	kontoNameCell += "</span>";
+}
+
+TransactionTransfer::KontoTableEntry::KontoTableEntry(const std::string& pubkeyHex, google::protobuf::int64 amount, bool negativeAmount/* = false*/)
+{
+	composeAmountCellString(amount, negativeAmount);
+	//kontoNameCell = "<td class=\"small\">0x" + pubkeyHex + "</td>";
+	kontoNameCell = "<span class = \"content-cell\">" + pubkeyHex + "</span>";
+}
+
+void TransactionTransfer::KontoTableEntry::composeAmountCellString(google::protobuf::int64 amount, bool negativeAmount)
+{
+	//<span class="content-cell alert-color">-10 GDD</span>
+	//<span class="content-cell success-color">10 GDD</span>
+	amountCell = "<span class=\"content-cell ";
+	if (negativeAmount) {
+		amountCell += "alert-color\">-";
+	}
+	else {
+		amountCell += "success-color\">";
+	}
+	amountCell += amountToString(amount);
+	//amountCell += " GDD</td>";
+	amountCell += " GDD</span>";
+}
+
+// ********************************************************************************************************************************
+
+//TransactionTransfer::TransactionTransfer(const std::string& memo, const model::messages::gradido::Transfer& protoTransfer)
+TransactionTransfer::TransactionTransfer(const std::string& memo, const proto::gradido::GradidoTransfer& protoTransfer)
+	: TransactionBase(memo), mProtoTransfer(protoTransfer)
+{
+
+}
+
+TransactionTransfer::~TransactionTransfer()
+{
+	mKontoTable.clear();
+}
+
+int TransactionTransfer::prepare()
+{
+	lock();
+	const static char functionName[] = { "TransactionTransfer::prepare" };
+	if (mProtoTransfer.senderamounts_size() == 0) {
+		addError(new Error(functionName, "hasn't sender amount(s)"));
+		unlock();
+		return -1;
+	}
+	if (mProtoTransfer.receiveramounts_size() == 0) {
+		addError(new Error(functionName, "hasn't receiver amount(s)"));
+		unlock();
+		return -2;
+	}
+	mKontoTable.reserve(mProtoTransfer.senderamounts_size() + mProtoTransfer.receiveramounts_size());
+
+	//auto receiverAmount = mProtoTransfer.receiveramount();
+	//auto senderAmount
+	int senderSum = 0;
+	int receiverSum = 0;
+
+	char pubkeyHexTemp[65];
+
+	/*
+	if (mProtoTransfer.has_local())
+	{
+		auto local_transfer = mProtoTransfer.local();
+		auto sender = local_transfer.sender();
+		auto sender_pubkey = sender.pubkey();
+		auto receiver_pubkey = local_transfer.receiver();
+		auto amount = sender.amount();
+		auto sender_user = controller::User::create();
+		auto receiver_user = controller::User::create();
+
+		if (!sender_user->load((const unsigned char*)sender_pubkey.data())) {
+			sodium_bin2hex(pubkeyHexTemp, 65, (const unsigned char*)sender_pubkey.data(), sender_pubkey.size());
+			mKontoTable.push_back(KontoTableEntry(pubkeyHexTemp, -amount, true));
+		}
+		else {
+			mKontoTable.push_back(KontoTableEntry(sender_user->getModel(), -amount, true));
+		}
+
+		if (!receiver_user->load((const unsigned char*)receiver_pubkey.data())) {
+			sodium_bin2hex(pubkeyHexTemp, 65, (const unsigned char*)receiver_pubkey.data(), receiver_pubkey.size());
+			mKontoTable.push_back(KontoTableEntry(pubkeyHexTemp, amount, true));
+		}
+		else {
+			mKontoTable.push_back(KontoTableEntry(sender_user->getModel(), amount, true));
+		}
+	}
+	*/
+	for (int i = 0; i < mProtoTransfer.senderamounts_size(); i++) {
+		auto senderAmount = mProtoTransfer.senderamounts(i);
+		auto pubkey = senderAmount.ed25519_sender_pubkey();
+		senderSum += senderAmount.amount();
+		if (pubkey.size() != 32) {
+			addError(new ParamError(functionName, "invalid public key for sender ", i));
+			unlock();
+			return -3;
+		}
+		//User user((const unsigned char*)pubkey.data());
+		auto user = controller::User::create();
+		if (!user->load((const unsigned char*)pubkey.data())) {
+			sodium_bin2hex(pubkeyHexTemp, 65, (const unsigned char*)pubkey.data(), pubkey.size());
+			mKontoTable.push_back(KontoTableEntry(pubkeyHexTemp, senderAmount.amount(), true));
+		}
+		else {
+			mKontoTable.push_back(KontoTableEntry(user->getModel(), senderAmount.amount(), true));
+		}
+	}
+	for (int i = 0; i < mProtoTransfer.receiveramounts_size(); i++) {
+		auto receiverAmount = mProtoTransfer.receiveramounts(i);
+		auto pubkey = receiverAmount.ed25519_receiver_pubkey();
+		receiverSum += receiverAmount.amount();
+		if (receiverAmount.ed25519_receiver_pubkey().size() != 32) {
+			addError(new ParamError(functionName, "invalid public key for receiver ", i));
+			unlock();
+			return -4;
+		}
+		auto user = controller::User::create();
+		if (!user->load((const unsigned char*)pubkey.data())) {
+			sodium_bin2hex(pubkeyHexTemp, 65, (const unsigned char*)pubkey.data(), pubkey.size());
+			mKontoTable.push_back(KontoTableEntry(pubkeyHexTemp, receiverAmount.amount(), false));
+		}
+		else {
+			mKontoTable.push_back(KontoTableEntry(user->getModel(), receiverAmount.amount(), false));
+		}
+	}
+	if (senderSum != receiverSum) {
+		addError(new Error(functionName, "sender amounts sum != receiver amounts sum"));
+		unlock();
+		return -5;
+	}
+	if (senderSum < 0) {
+		addError(new Error(functionName, "negative amount not supported"));
+		unlock();
+		return -6;
+	}
+
+
+	/*
+	mReceiverUser = new User(receiverPublic.data());
+	getErrors(mReceiverUser);
+	if (mReceiverUser->getUserState() == USER_EMPTY) {
+		sodium_bin2hex(mReceiverPublicHex, 65, (const unsigned char*)receiverPublic.data(), receiverPublic.size());
+		delete mReceiverUser;
+		mReceiverUser = nullptr;
+	}
+	else {
+		memcpy(mReceiverPublicHex, mReceiverUser->getPublicKeyHex().data(), 64);
+	}
+	//*/
+
+	unlock();
+	return 0;
+}
+
+const std::string& TransactionTransfer::getKontoNameCell(int index)
+{
+	
+	lock();
+	if (index >= mKontoTable.size()) {
+		unlock();
+		return mInvalidIndexMessage;
+	}
+	unlock();
+
+	return mKontoTable[index].kontoNameCell;
+}
+
+const std::string& TransactionTransfer::getAmountCell(int index)
+{
+	lock();
+	if (index >= mKontoTable.size()) {
+		unlock();
+		return mInvalidIndexMessage;
+	}
+	unlock();
+
+	return mKontoTable[index].amountCell;
+}
+
+>>>>>>> 1e4ae4a (update proto files matching with pauls proto version, update code which use them)
diff --git a/src/cpp/model/TransactionTransfer.h b/src/cpp/model/TransactionTransfer.h
index b57abd6b3..ff2acfa02 100644
--- a/src/cpp/model/TransactionTransfer.h
+++ b/src/cpp/model/TransactionTransfer.h
@@ -12,14 +12,14 @@
 #pragma warning(disable:4800)
 
 #include "TransactionBase.h"
-#include "../proto/gradido/Transfer.pb.h"
+#include "../proto/gradido/GradidoTransfer.pb.h"
 
 #include "../controller/User.h"
 
 class TransactionTransfer : public TransactionBase
 {
 public:
-	TransactionTransfer(const std::string& memo, const model::messages::gradido::Transfer& protoTransfer);
+	TransactionTransfer(const std::string& memo, const proto::gradido::GradidoTransfer& protoTransfer);
 	~TransactionTransfer();
 
 	int prepare(); 
@@ -44,7 +44,7 @@ protected:
 		void composeAmountCellString(google::protobuf::int64 amount, bool negativeAmount);
 	};
 
-	const model::messages::gradido::Transfer& mProtoTransfer;
+	const proto::gradido::GradidoTransfer& mProtoTransfer;
 	std::vector<KontoTableEntry> mKontoTable;
 };
 
diff --git a/src/cpp/tasks/ProcessingTransaction.h b/src/cpp/tasks/ProcessingTransaction.h
index 269cde176..916e54691 100644
--- a/src/cpp/tasks/ProcessingTransaction.h
+++ b/src/cpp/tasks/ProcessingTransaction.h
@@ -63,7 +63,7 @@ protected:
 	TransactionType mType;
 	std::string mProtoMessageBase64;
 
-	model::messages::gradido::TransactionBody mTransactionBody;
+	proto::gradido::TransactionBody mTransactionBody;
 	TransactionBase* mTransactionSpecific;
 
 	HASH mHash;
diff --git a/src/cpp/tasks/SigningTransaction.cpp b/src/cpp/tasks/SigningTransaction.cpp
index b05d84963..11392e0bd 100644
--- a/src/cpp/tasks/SigningTransaction.cpp
+++ b/src/cpp/tasks/SigningTransaction.cpp
@@ -11,8 +11,6 @@
 
 #include "../lib/Profiler.h"
 
-#include "../proto/gradido/Transaction.pb.h"
-
 #include "sodium.h"
 
 #include "../ServerConfig.h"
@@ -99,8 +97,8 @@ int SigningTransaction::run() {
 		}
 	}
 	// get body bytes
-	model::messages::gradido::Transaction transaction;
-	auto bodyBytes = transaction.mutable_bodybytes();
+	proto::gradido::GradidoTransaction transaction;
+	auto bodyBytes = transaction.mutable_body_bytes();
 	*bodyBytes = mProcessingeTransaction->getBodyBytes();
 	if (*bodyBytes == "") {
 		getErrors(mProcessingeTransaction);
@@ -135,7 +133,7 @@ int SigningTransaction::run() {
 	}
 	*/
 	// add to message
-	auto sigMap = transaction.mutable_sigmap();
+	auto sigMap = transaction.mutable_sig_map();
 	auto sigPair = sigMap->add_sigpair();
 
 	auto pubkeyBytes = sigPair->mutable_pubkey();
@@ -150,7 +148,7 @@ int SigningTransaction::run() {
 	/*std::string protoPrettyPrint;
 	google::protobuf::TextFormat::PrintToString(transaction, &protoPrettyPrint);
 	printf("transaction pretty: %s\n", protoPrettyPrint.data());
-	model::messages::gradido::TransactionBody transactionBody;
+	proto::gradido::TransactionBody transactionBody;
 	transactionBody.MergeFromString(transaction.bodybytes());
 	google::protobuf::TextFormat::PrintToString(transactionBody, &protoPrettyPrint);
 	printf("transaction body pretty: \n%s\n", protoPrettyPrint.data());
diff --git a/src/cpp/tasks/SigningTransaction.h b/src/cpp/tasks/SigningTransaction.h
index aaedbea0d..60f9c65c1 100644
--- a/src/cpp/tasks/SigningTransaction.h
+++ b/src/cpp/tasks/SigningTransaction.h
@@ -8,7 +8,7 @@
 #include "../model/User.h"
 #include "../controller/User.h"
 
-#include "../proto/gradido/Transaction.pb.h"
+#include "../proto/gradido/GradidoTransaction.pb.h"
 
 #include "ProcessingTransaction.h"
 
diff --git a/src/cpsp/decodeTransaction.cpsp b/src/cpsp/decodeTransaction.cpsp
index 2755c751d..89369ce8e 100644
--- a/src/cpsp/decodeTransaction.cpsp
+++ b/src/cpsp/decodeTransaction.cpsp
@@ -13,7 +13,7 @@
 %>
 <%%
 	const char* pageName = "Decode Transaction";
-	model::messages::gradido::TransactionBody transactionBody;
+	proto::gradido::TransactionBody transactionBody;
 	bool decoded = false;
 	bool adminUser = false;
 	if(mSession && mSession->getNewUser())  {
@@ -82,37 +82,36 @@
 		<p><%= transactionBody.memo() %></p>
 		<% if(transactionBody.has_transfer()) { 
 			auto transfer = transactionBody.transfer();
+			char hex[65]; memset(hex, 0, 65);
 		%>
-		<h3>Transfer</h3>
-		<b>Sender</b>
-		<% for(int i = 0; i < transfer.senderamounts_size(); i++) {
-			auto sender = transfer.senderamounts(i); 
-			char hex[65]; memset(hex, 0, 65);
-			sodium_bin2hex(hex, 65, (const unsigned char*)sender.ed25519_sender_pubkey().data(), sender.ed25519_sender_pubkey().size());
+			<% if(transfer.has_local()) { 
+				auto local_transfer = transfer.local();
+				auto sender_pubkey = local_transfer.sender().pubkey();
+				auto receiver_pubkey = local_transfer.receiver();
+				sodium_bin2hex(hex, 65, (const unsigned char*)sender_pubkey.data(), sender_pubkey.size());
 			%>
-			<p>pubkey: <%= hex %></p>
-			<p>amount: <%=  TransactionBase::amountToString(sender.amount()) %> GDD</p>
-		<% } %>
-		<b>Receiver</b>
-		<% for(int i = 0; i < transfer.receiveramounts_size(); i++) {
-			auto receiver = transfer.receiveramounts(i); 
-			char hex[65]; memset(hex, 0, 65);
-			sodium_bin2hex(hex, 65, (const unsigned char*)receiver.ed25519_receiver_pubkey().data(), receiver.ed25519_receiver_pubkey().size());
-			%>
-			<p>pubkey: <%= hex %></p>
-			<p>amount: <%=  TransactionBase::amountToString(receiver.amount()) %> GDD</p>
-		<% } %>
+				<h3>Local Transfer</h3>
+				<b>From: </b><%= hex %>
+				<% sodium_bin2hex(hex, 65, (const unsigned char*)receiver_pubkey.data(), receiver_pubkey.size()); %>
+				<b>To: </b><%= hex %>
+				<b>Amount: </b><%= TransactionBase::amountToString(local_transfer.sender().amount()) %>
+			<% } else { %>
+				<h3>- Not implemented yet (Group Transfer) -</h3>
+			<% } %>
+
 		<% } else if(transactionBody.has_creation()) { 
 			auto creation = transactionBody.creation();
+
 			TransactionCreation creationObject("", creation);
 			auto receiver = creation.receiveramount();
+
 			char hex[65]; memset(hex, 0, 65);
-			sodium_bin2hex(hex, 65, (const unsigned char*)receiver.ed25519_receiver_pubkey().data(), receiver.ed25519_receiver_pubkey().size());
+			sodium_bin2hex(hex, 65, (const unsigned char*)receiver.pubkey().data(), receiver.pubkey().size());
 			
 			Poco::AutoPtr<controller::User> user = nullptr;
 			if(adminUser) {
 				user = controller::User::create();
-				if(!user->load((const unsigned char*)receiver.ed25519_receiver_pubkey().data())) {
+				if(!user->load((const unsigned char*)receiver.pubkey().data())) {
 					user.assign(nullptr);
 				}
 			}