made project way simpler

.idea/workspace.xml

@@ -2,9 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="86492085-3833-4394-8353-122bd8bc6cb0" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/WalletController$UserController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,20 +14,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Application.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="true">
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" selection-start-line="4" selection-start-column="1" selection-end-line="10" selection-end-column="32" />
+            <state relative-caret-position="45">
+              <caret line="3" column="36" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -46,11 +35,47 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
+      <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+            <state relative-caret-position="28">
+              <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="202">
+              <caret line="31" column="114" selection-start-line="31" selection-start-column="114" selection-end-line="31" selection-end-column="114" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#854#855#0" expanded="true" />
+                <element signature="e#879#880#0" expanded="true" />
+                <element signature="e#913#914#0" expanded="true" />
+                <element signature="e#941#942#0" expanded="true" />
+                <element signature="e#981#982#0" expanded="true" />
+                <element signature="e#1017#1018#0" expanded="true" />
+                <element signature="e#1075#1076#0" expanded="true" />
+                <element signature="e#1125#1126#0" expanded="true" />
+                <element signature="e#1158#1159#0" expanded="true" />
+                <element signature="e#1187#1188#0" expanded="true" />
+                <element signature="e#1231#1232#0" expanded="true" />
+                <element signature="e#1267#1268#0" expanded="true" />
+                <element signature="e#1298#1299#0" expanded="true" />
+                <element signature="e#1325#1326#0" expanded="true" />
+                <element signature="e#1365#1366#0" expanded="true" />
+                <element signature="e#1397#1398#0" expanded="true" />
+                <element signature="e#1429#1430#0" expanded="true" />
+                <element signature="e#1458#1459#0" expanded="true" />
+                <element signature="e#1501#1502#0" expanded="true" />
+                <element signature="e#1537#1538#0" expanded="true" />
+                <element signature="e#1580#1581#0" expanded="true" />
+                <element signature="e#1612#1613#0" expanded="true" />
+                <element signature="e#1669#1670#0" expanded="true" />
+                <element signature="e#1711#1712#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -174,14 +199,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
       </list>
     </option>
   </component>
@@ -408,7 +433,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="8831000" />
+    <option name="totallyTimeSpent" value="9498000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="6" />
@@ -652,6 +677,30 @@
           <caret line="117" column="26" selection-start-line="117" selection-start-column="26" selection-end-line="117" selection-end-column="26" />
           <folding>
             <element signature="imports" expanded="true" />
+            <element signature="e#854#855#0" expanded="true" />
+            <element signature="e#879#880#0" expanded="true" />
+            <element signature="e#913#914#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+            <element signature="e#981#982#0" expanded="true" />
+            <element signature="e#1017#1018#0" expanded="true" />
+            <element signature="e#1075#1076#0" expanded="true" />
+            <element signature="e#1125#1126#0" expanded="true" />
+            <element signature="e#1158#1159#0" expanded="true" />
+            <element signature="e#1187#1188#0" expanded="true" />
+            <element signature="e#1231#1232#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1298#1299#0" expanded="true" />
+            <element signature="e#1325#1326#0" expanded="true" />
+            <element signature="e#1365#1366#0" expanded="true" />
+            <element signature="e#1397#1398#0" expanded="true" />
+            <element signature="e#1429#1430#0" expanded="true" />
+            <element signature="e#1458#1459#0" expanded="true" />
+            <element signature="e#1501#1502#0" expanded="true" />
+            <element signature="e#1537#1538#0" expanded="true" />
+            <element signature="e#1580#1581#0" expanded="true" />
+            <element signature="e#1612#1613#0" expanded="true" />
+            <element signature="e#1669#1670#0" expanded="true" />
+            <element signature="e#1711#1712#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -786,13 +835,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="18" column="20" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="18" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -800,16 +842,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="586">
-          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
@@ -911,8 +943,49 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" selection-start-line="4" selection-start-column="1" selection-end-line="10" selection-end-column="32" />
+        <state relative-caret-position="45">
+          <caret line="3" column="36" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="28">
+          <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="31" column="114" selection-start-line="31" selection-start-column="114" selection-end-line="31" selection-end-column="114" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#854#855#0" expanded="true" />
+            <element signature="e#879#880#0" expanded="true" />
+            <element signature="e#913#914#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+            <element signature="e#981#982#0" expanded="true" />
+            <element signature="e#1017#1018#0" expanded="true" />
+            <element signature="e#1075#1076#0" expanded="true" />
+            <element signature="e#1125#1126#0" expanded="true" />
+            <element signature="e#1158#1159#0" expanded="true" />
+            <element signature="e#1187#1188#0" expanded="true" />
+            <element signature="e#1231#1232#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1298#1299#0" expanded="true" />
+            <element signature="e#1325#1326#0" expanded="true" />
+            <element signature="e#1365#1366#0" expanded="true" />
+            <element signature="e#1397#1398#0" expanded="true" />
+            <element signature="e#1429#1430#0" expanded="true" />
+            <element signature="e#1458#1459#0" expanded="true" />
+            <element signature="e#1501#1502#0" expanded="true" />
+            <element signature="e#1537#1538#0" expanded="true" />
+            <element signature="e#1580#1581#0" expanded="true" />
+            <element signature="e#1612#1613#0" expanded="true" />
+            <element signature="e#1669#1670#0" expanded="true" />
+            <element signature="e#1711#1712#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

src/main/java/com/buecoin01/model/Block.java

@@ -79,18 +79,4 @@ public class Block {
         System.out.println("You have been awarded 1 Zip!");
     }
 
-    //add transactions to this block
-    public boolean addTransaction(Transactions transactions){
-        //process transaction and check if valid, unless block is genesis block then ignore
-        if (transactions == null) return false;
-        if (previousHash != "0"){
-            if (!(transactions.processTransaction())){
-                System.out.println("Transaction failed to process. Discarded.");
-                return false;
-            }
-        }
-        transactionList.add(transactions);
-        System.out.println("Transaction Successfully added to the Block!");
-        return true;
     }
-}

src/main/java/com/buecoin01/model/Transactions.java

@@ -10,136 +10,82 @@ import org.springframework.stereotype.Component;
 import javax.persistence.*;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
 @Component
 @Entity
 public class Transactions {
-    @Transient
-    private static int sequence = 0; //how many transactions have been generated
-    @Transient
-    private List <TransactionInput> inputs = new ArrayList <>();
-    @Transient
-    private List <TransactionOutput> outputs = new ArrayList <>();
-    @Transient
-    private byte[] signature;
-
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
     @Column
-    private String transactionId; //hash of the transaction
-
-    private PublicKey sender;
-    private PublicKey reciepient;
-    private String senderName;
-    private String reciepientName;
-    private float value;
-    private String signature2;
-
+    private String transactionId;
+    private String fromId;
+    private String toId;
+    private float amount;
+    private LocalDateTime timestamp;
+
+    public Transactions(String transactionId, String fromId, String toId, float amount, LocalDateTime timestamp) {
+        this.transactionId = transactionId;
+        this.fromId = fromId;
+        this.toId = toId;
+        this.amount = amount;
+        this.timestamp = timestamp;
+    }
 
-public Transactions(){}
+    public long getId() {
+        return id;
+    }
 
-    public Transactions( PublicKey from, PublicKey to, float value, ArrayList <TransactionInput> inputs) {
-        this.sender = from;
-        this.reciepient = to;
-        this.value = value;
-        this.inputs = inputs;
+    public void setId(long id) {
+        this.id = id;
     }
 
-    //generating transactionId
-    private String calculateHash() {
-        sequence++; //increasing tho avoid identical hash codes
-        return Encryption.applySha256(
-                Encryption.getStringFromKey( sender ) +
-                        Encryption.getStringFromKey( reciepient ) +
-                        Float.toString( value ) + sequence
-        );
+    public String getTransactionId() {
+        return transactionId;
     }
 
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
 
-    //WRITE METHOD TO TURN SIGNATURE DEOM BYTE ARRAY TO STRING
+    public String getFromId() {
+        return fromId;
+    }
 
+    public void setFromId(String fromId) {
+        this.fromId = fromId;
+    }
 
-    //Sign all the data that should not be tempered
-    public void generateSignature(PrivateKey privateKey) {
-        String data = Encryption.getStringFromKey( sender ) + Encryption.getStringFromKey( reciepient ) + Float.toString( value );
-        signature = Encryption.applyECDSASig( privateKey, data );
+    public String getToId() {
+        return toId;
     }
 
-    //Verify the data we signed hasn't been tampered with
-    public boolean verifySignature() {
-        String data = Encryption.getStringFromKey( sender ) + Encryption.getStringFromKey( reciepient ) + Float.toString( value );
-        return Encryption.verifyECDSASig( sender, data, signature );
+    public void setToId(String toId) {
+        this.toId = toId;
     }
 
-    //Check if transaction can be created
-    public boolean processTransaction() {
-        if ( !verifySignature() ) {
-            System.out.println( "Transaction Signature failed to verify" );
-            return false;
-        }
-
-        //gather transaction inputs to make sure they're unspent
-        for (TransactionInput i : inputs) {
-            i.setUTXO( BlockchainVerification.getUTXOs().get( i.getTransactionOutputId() ) );
-
-        }
-        //check if transaction is valid
-        if ( getInputsValue() <  BlockchainVerification.minimumTransaction ) {
-            System.out.println( "Transaction Input to small: " + getInputsValue() );
-            return false;
-        }
-        //add outputs to Unspent list
-        for (TransactionOutput o : outputs) {
-            BlockchainVerification.getUTXOs().put( o.getId(), o );
-        }
-        //remove transaction inputs from UXTO lists as spent
-        for (TransactionInput i : inputs) {
-            if ( i.getUTXO() == null ) continue; // if Transaction cant be found, skip
-            BlockchainVerification.getUTXOs().remove( i.getUTXO().getId() );
-        }
-        return true;
+    public float getAmount() {
+        return amount;
     }
 
-    // returns sum of inputs(UXTOs) values
-    public float getInputsValue() {
-        float total = 0;
-        for (TransactionInput i : inputs) {
-            if ( i.getUTXO() == null ) continue; // if Transaction cant be found, skip
-            total = total + i.getUTXO().getValue();
-        }
-        return total;
+    public void setAmount(float amount) {
+        this.amount = amount;
     }
 
-    public float getOutPutsValue() {
-        float total = 0;
-        for (TransactionOutput o : outputs) {
-            total = total + o.getValue();
-        }
-        return total;
+    public LocalDateTime getTimestamp() {
+        return timestamp;
     }
 
-    // tacks in array of transactions and returns a merkle root
-    public static String getMerkleRoot(ArrayList <Transactions> transactions) {
-        int count = transactions.size();
-        ArrayList <String> previousTreeLayer = new ArrayList <>();
-        for (Transactions transaction : transactions) {
-            previousTreeLayer.add( transaction.transactionId );
-        }
-        ArrayList <String> treeLayer = previousTreeLayer;
-        while (count > 1) {
-            treeLayer = new ArrayList <>();
-            for (int i = 1; i < previousTreeLayer.size(); i++) {
-                treeLayer.add( Encryption.applySha256( previousTreeLayer.get( i - 1 ) ) + previousTreeLayer.get( i ) );
-            }
-            count = treeLayer.size();
-            previousTreeLayer = treeLayer;
-        }
-        String merkleRoot = ( treeLayer.size() == 1 ) ? treeLayer.get( 0 ) : "";
-        return merkleRoot;
+    public void setTimestamp(LocalDateTime timestamp) {
+        this.timestamp = timestamp;
     }
-}
+
+    public Transactions(){}
+
+
+}

src/main/java/com/buecoin01/model/Wallet.java

@@ -27,6 +27,8 @@ public class Wallet {
     private String name;
 
 
+    public Wallet(){}
+
     public Wallet(String publicId, long amount, String name) {
         this.publicId = publicId;
         this.amount = amount;
@@ -41,10 +43,6 @@ public class Wallet {
         this.name = name;
     }
 
-    public Wallet() {
-        //generateKeyPair();
-    }
-
     public PrivateKey getPrivateKey() {
         return privateKey;
     }
@@ -78,58 +76,4 @@ public class Wallet {
     public void setId(long id) {
         this.id = id;
     }
-
-//    public void generateKeyPair() {
-//        try {
-//            KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ECDSA","BC");
-//            SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
-//            ECGenParameterSpec ecSpec = new ECGenParameterSpec("prime192v1");
-//
-//            keyGen.initialize(ecSpec, random);
-//            KeyPair keyPair = keyGen.generateKeyPair();
-//            privateKey = keyPair.getPrivate();
-//            publicKey = keyPair.getPublic();
-//        } catch(Exception e) {
-//            throw new RuntimeException(e);
-//        }
-//    }
-    //returns balance and store the UTXO's owned by this wallet in this.UXTOs
-    public float getBalance(){
-        float total = 0;
-        for (Map.Entry<String, TransactionOutput> item: BlockchainVerification.getUTXOs().entrySet()){
-            TransactionOutput UTXO = item.getValue();
-            if (UTXO.isMine(publicKey)){ //if output belongs to me (if coins belong to me)
-                UTXOs.put(UTXO.getId(), UTXO);   // add it to our list of unspent transaction
-                total = total + UTXO.getValue();
-
-            }
-        }
-        return total;
-    }
-
-    //generates and returns a new transaction from this wallet
-
-
-    public Transactions sendFunds(PublicKey _recipient, float value){
-        if(getBalance() < value) {  //gather balance and check funds
-            System.out.println("Not Enough Funds. Transaction Discarded.");
-            return null;
-       }
-
-       // create arraylist of inputs
-        ArrayList<TransactionInput> inputs = new ArrayList<>();
-        float total = 0;
-        for(Map.Entry<String, TransactionOutput> item: UTXOs.entrySet()){
-            TransactionOutput UTXO = item.getValue();
-            total= total + UTXO.getValue();
-            inputs.add(new TransactionInput(UTXO.getId()));
-            if (total > value) break;
-        }
-        Transactions newTransactions = new Transactions(publicKey, _recipient,value, inputs);
-        newTransactions.generateSignature(privateKey);
-        for (TransactionInput input : inputs){
-            UTXOs.remove(input.getTransactionOutputId());
-        }
-        return newTransactions;
-    }
 }