From c268af59626a6e76f9d3caeefd84b19bff4bb38b Mon Sep 17 00:00:00 2001
From: Dario Rekowski on RockPI <dario.rekowski@gmx.de>
Date: Tue, 5 Nov 2019 15:35:03 +0000
Subject: [PATCH] remove protobuf, preparing for adding as submodule

---
 mithril_client                                |   2 +-
 src/Model/Transactions/Transaction.php        | 130 +++++++++---------
 src/Model/Transactions/TransactionBase.php    |  12 +-
 src/protobuf/gradido/BasicTypes.proto         |  44 ------
 src/protobuf/gradido/StateCreateGroup.proto   |  15 --
 .../gradido/StateGroupChangeParent.proto      |  12 --
 src/protobuf/gradido/Transaction.proto        |  19 ---
 src/protobuf/gradido/TransactionBody.proto    |  18 ---
 .../gradido/TransactionCreation.proto         |  13 --
 src/protobuf/gradido/Transfer.proto           |  10 --
 10 files changed, 72 insertions(+), 203 deletions(-)
 delete mode 100644 src/protobuf/gradido/BasicTypes.proto
 delete mode 100644 src/protobuf/gradido/StateCreateGroup.proto
 delete mode 100644 src/protobuf/gradido/StateGroupChangeParent.proto
 delete mode 100644 src/protobuf/gradido/Transaction.proto
 delete mode 100644 src/protobuf/gradido/TransactionBody.proto
 delete mode 100644 src/protobuf/gradido/TransactionCreation.proto
 delete mode 100644 src/protobuf/gradido/Transfer.proto

diff --git a/mithril_client b/mithril_client
index 680e56876..f0b1d113c 160000
--- a/mithril_client
+++ b/mithril_client
@@ -1 +1 @@
-Subproject commit 680e56876d6e7f2778bff4eb49c880063716b391
+Subproject commit f0b1d113cee2a76e9dbb098b315f4acaf38410d0
diff --git a/src/Model/Transactions/Transaction.php b/src/Model/Transactions/Transaction.php
index eb818f38b..3c55f804c 100644
--- a/src/Model/Transactions/Transaction.php
+++ b/src/Model/Transactions/Transaction.php
@@ -1,66 +1,66 @@
-<?php
-
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-namespace Model\Transactions;
-
-//use Model\Messages\Gradido\Transaction;
-//use Model\Messages\Gradido\TransactionBody;
-
-class Transaction extends TransactionBase {
-  
-    private $mProtoTransaction = null;
-    private $mProtoTransactionBody = null;
-    private $errors = [];
-  
-    public function __construct($base64Data) {
-        $transactionBin = base64_decode($base64Data);
-        if($transactionBin == FALSE) {
-          //$this->addError('base64 decode failed');
-          $this->addError(['data' => $base64Data, 'bin' => $transactionBin, 'msg' => 'base64 decode error']);
-        } else {
-          $this->mProtoTransaction = new \Model\Messages\Gradido\Transaction();
-          $this->mProtoTransaction->mergeFromString($transactionBin);
-          
-          $this->mProtoTransactionBody = new \Model\Messages\Gradido\TransactionBody();
-          $this->mProtoTransactionBody->mergeFromString($this->mProtoTransaction->getBodyBytes());
-          
-          $data = $this->mProtoTransactionBody->getData();
-          var_dump($data);
-        }
-    }
-    
-    public function validate() {
-        $sigPairs = $this->mProtoTransaction->getSigMap()->getSigPair();
-        $bodyBytes = $this->mProtoTransaction->getBodyBytes();
-        
-        // check signature(s)
-        foreach($sigPairs as $sigPair) {
-          $pubkey = $sigPair->getPubKey();
-          $signature = $sigPair->getEd25519();
-          if (!\Sodium\crypto_sign_verify_detached($signature, $bodyBytes, $pubkey)) {
-              $this->addError('signature for key ' . bin2hex($pubkey) . ' isn\'t valid ' );
-              return false;
-          } 
-        }
-        
-        return true;
-    }
-    
-    public function getErrors() {
-      return $this->errors;
-    }
-    
-    public function hasErrors() {
-       return count($this->errors) > 0;
-    }
-            
-    
-    private function addError($message) {
-      array_push($this->errors, $message);
-    }
+<?php
+
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace Model\Transactions;
+
+//use Model\Messages\Gradido\Transaction;
+//use Model\Messages\Gradido\TransactionBody;
+
+class Transaction extends TransactionBase {
+  
+    private $mProtoTransaction = null;
+    private $mProtoTransactionBody = null;
+    private $errors = [];
+  
+    public function __construct($base64Data) {
+        $transactionBin = base64_decode($base64Data);
+        if($transactionBin == FALSE) {
+          //$this->addError('base64 decode failed');
+          $this->addError(['data' => $base64Data, 'bin' => $transactionBin, 'msg' => 'base64 decode error']);
+        } else {
+          $this->mProtoTransaction = new \Model\Messages\Gradido\Transaction();
+          $this->mProtoTransaction->mergeFromString($transactionBin);
+          
+          $this->mProtoTransactionBody = new \Model\Messages\Gradido\TransactionBody();
+          $this->mProtoTransactionBody->mergeFromString($this->mProtoTransaction->getBodyBytes());
+          
+          $data = $this->mProtoTransactionBody->getData();
+          var_dump($data);
+        }
+    }
+    
+    public function validate() {
+        $sigPairs = $this->mProtoTransaction->getSigMap()->getSigPair();
+        $bodyBytes = $this->mProtoTransaction->getBodyBytes();
+        
+        // check signature(s)
+        foreach($sigPairs as $sigPair) {
+          $pubkey = $sigPair->getPubKey();
+          $signature = $sigPair->getEd25519();
+          if (!\Sodium\crypto_sign_verify_detached($signature, $bodyBytes, $pubkey)) {
+              $this->addError('signature for key ' . bin2hex($pubkey) . ' isn\'t valid ' );
+              return false;
+          } 
+        }
+        
+        return true;
+    }
+    
+    public function getErrors() {
+      return $this->errors;
+    }
+    
+    public function hasErrors() {
+       return count($this->errors) > 0;
+    }
+            
+    
+    private function addError($message) {
+      array_push($this->errors, $message);
+    }
 }
\ No newline at end of file
diff --git a/src/Model/Transactions/TransactionBase.php b/src/Model/Transactions/TransactionBase.php
index c9ba5cdcd..ddf20798c 100644
--- a/src/Model/Transactions/TransactionBase.php
+++ b/src/Model/Transactions/TransactionBase.php
@@ -1,7 +1,7 @@
-<?php
-
-namespace Model\Transactions;
-
-class TransactionBase {
-  
+<?php
+
+namespace Model\Transactions;
+
+class TransactionBase {
+  
 }
\ No newline at end of file
diff --git a/src/protobuf/gradido/BasicTypes.proto b/src/protobuf/gradido/BasicTypes.proto
deleted file mode 100644
index 62494b52a..000000000
--- a/src/protobuf/gradido/BasicTypes.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-message Key {
-    oneof key {
-        bytes ed25519 = 2; // ed25519 signature (libsodium default)
-		bytes ed25519_ref10 = 3; // ed25519 ref10 signature
-    }
-}
-
-message SignaturePair {
-    bytes pubKey = 1;  
-    oneof signature {
-        bytes ed25519 = 2; // ed25519 signature (libsodium default)
-		bytes ed25519_ref10 = 3; // ed25519 ref10 signature
-    }
-}
-
-message SignatureMap {
-    repeated SignaturePair sigPair = 1; // Each signature pair corresponds to a unique Key required to sign the transaction.
-}
-
-/* An exact date and time. This is the same data structure as the protobuf Timestamp.proto (see the comments in https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto) */
-message Timestamp {
-    int64 seconds = 1; // Number of complete seconds since the start of the epoch
-    int32 nanos = 2; // Number of nanoseconds since the start of the last second
-}
-
-/* An exact date and time,  with a resolution of one second (no nanoseconds). */
-message TimestampSeconds {
-    int64 seconds = 1; // Number of complete seconds since the start of the epoch
-}
-
-message SenderAmount {
-	bytes ed25519_sender_pubkey = 1;
-	sint64 amount = 2;
-	sint64 senderFinalBalance = 3; // sender balance after transaction, including perishability
-}
-
-message ReceiverAmount {
-	bytes ed25519_receiver_pubkey = 1;
-	sint64 amount = 2;
-}
diff --git a/src/protobuf/gradido/StateCreateGroup.proto b/src/protobuf/gradido/StateCreateGroup.proto
deleted file mode 100644
index 37d5fbaad..000000000
--- a/src/protobuf/gradido/StateCreateGroup.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-import "BasicTypes.proto";
-
-// need signature from this group and from parent (if it isn't zero)
-message StateCreateGroup {
-	string name = 1;
-	Key groupPublicKey = 2;
-	Key parentGroupPublicKey = 3;
-	reserved "hederaConsensusId";
-	reserved 4;
-	
-}
diff --git a/src/protobuf/gradido/StateGroupChangeParent.proto b/src/protobuf/gradido/StateGroupChangeParent.proto
deleted file mode 100644
index f87631942..000000000
--- a/src/protobuf/gradido/StateGroupChangeParent.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-import "BasicTypes.proto";
-
-// need signature from this group and from both parents (if it isn't zero)
-message StateGroupChangeParent {
-	Key groupPublicKey = 1;
-	Key newParentGroupPublicKey = 2;
-	Key oldParentGroupPublicKey = 3;
-}
diff --git a/src/protobuf/gradido/Transaction.proto b/src/protobuf/gradido/Transaction.proto
deleted file mode 100644
index a5d3a41d9..000000000
--- a/src/protobuf/gradido/Transaction.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-import "BasicTypes.proto";
-
-/*
-	id will be set by Node server
-	txHash will be also set by Node server,
-	  calculated from previous transaction txHash and this id, sigMap and received;
-*/
-
-message Transaction {
-	uint64 	id = 1;
-	TimestampSeconds received = 2;
-	SignatureMap sigMap = 3;
-	bytes txHash = 4;
-	bytes bodyBytes = 5;
-}
diff --git a/src/protobuf/gradido/TransactionBody.proto b/src/protobuf/gradido/TransactionBody.proto
deleted file mode 100644
index b45475e85..000000000
--- a/src/protobuf/gradido/TransactionBody.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-import "Transfer.proto";
-import "StateCreateGroup.proto";
-import "StateGroupChangeParent.proto";
-import "TransactionCreation.proto";
-
-message TransactionBody {
-	string memo = 1; // max 150 chars
-	oneof data {
-		StateCreateGroup createGroup = 2;
-		StateGroupChangeParent groupChangeParent = 3;
-		Transfer transfer = 4;
-		TransactionCreation creation = 5;
-	}
-}
diff --git a/src/protobuf/gradido/TransactionCreation.proto b/src/protobuf/gradido/TransactionCreation.proto
deleted file mode 100644
index 79455fa94..000000000
--- a/src/protobuf/gradido/TransactionCreation.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-import "BasicTypes.proto";
-
-// need signature from group admin or 
-// percent of group users another than the receiver
-message TransactionCreation {
-	ReceiverAmount receiverAmount = 1;
-	sint32 ident_hash = 2;
-	
-}
diff --git a/src/protobuf/gradido/Transfer.proto b/src/protobuf/gradido/Transfer.proto
deleted file mode 100644
index afde70308..000000000
--- a/src/protobuf/gradido/Transfer.proto
+++ /dev/null
@@ -1,10 +0,0 @@
-syntax = "proto3";
-
-package model.messages.gradido;
-
-import "BasicTypes.proto";
-
-message Transfer {
-	repeated SenderAmount senderAmounts = 1;
-	repeated ReceiverAmount receiverAmounts = 2; 
-}