.idea/libraries/Maven__bouncycastle_bcprov_jdk15_136.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: bouncycastle:bcprov-jdk15:136">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/bouncycastle/bcprov-jdk15/136/bcprov-jdk15-136.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/bouncycastle/bcprov-jdk15/136/bcprov-jdk15-136-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/bouncycastle/bcprov-jdk15/136/bcprov-jdk15-136-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_ow2_util_bundles_bouncycastle_java5_136_1_0_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.util.bundles:bouncycastle-java5-136:1.0.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/util/bundles/bouncycastle-java5-136/1.0.0/bouncycastle-java5-136-1.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/util/bundles/bouncycastle-java5-136/1.0.0/bouncycastle-java5-136-1.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/util/bundles/bouncycastle-java5-136/1.0.0/bouncycastle-java5-136-1.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-context:5.0.7.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-core:5.0.7.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/misc 2.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>

.idea/modules 2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/0.1.iml" filepath="$PROJECT_DIR$/0.1.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs 2.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

0.1.iml

@@ -105,5 +105,7 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.7.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.util.bundles:bouncycastle-java5-136:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk15:136" level="project" />
   </component>
 </module>

pom.xml

@@ -59,6 +59,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.ow2.util.bundles</groupId>
+            <artifactId>bouncycastle-java5-136</artifactId>
+            <version>1.0.0</version>
+        </dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/buecoin01/ProcessLoader.java

@@ -2,16 +2,18 @@ package com.buecoin01;
 
 import com.buecoin01.Repositories.BlockRepository;
 import com.buecoin01.Repositories.WalletRepository;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
+import java.security.Security;
+import java.time.LocalDateTime;
+
 @Component
 public class ProcessLoader implements ApplicationRunner {
 
-    @Autowired
-    CoinRepository repo;
 
     @Autowired
     WalletRepository repo1;
@@ -22,19 +24,6 @@ public class ProcessLoader implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) {
-        //CREATES COINS TO LOCALHOST DB, PROBABLY NOT GOING TO USE THIS
-//        for (int i = 0; i <= 100000; i++) {
-//            Coin b = new Coin("6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b");
-//            repo.save(b);
-//        }
-//
-        //CREATES 37 EMPTY WALLETS
-//        for(int i = 0; i <=37; i++){
-//            Wallet n = new Wallet(Encryption.applySha256(Integer.toString(i)), 0);
-//        }
-//
-
-
 
     }
 }

src/main/java/com/buecoin01/Repositories/TransactionRepository.java

@@ -1,5 +1,6 @@
 package com.buecoin01.Repositories;
 
+import com.buecoin01.model.Transactions;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -9,5 +10,5 @@ import javax.transaction.Transaction;
 
 @CrossOrigin(origins = {"http://localhost:8100","http://localhost:8080"})
 @Repository
-public interface TransactionRepository extends JpaRepository<Transaction, Long> {
+public interface TransactionRepository extends JpaRepository<Transactions, Long> {
 }

src/main/java/com/buecoin01/controller/TransactionController.java

@@ -1,57 +1,57 @@
-//package com.buecoin01.controller;
-//
-//import com.buecoin01.Repositories.TransactionRepository;
-//import com.buecoin01.model.Transaction;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.http.HttpStatus;
-//import org.springframework.http.ResponseEntity;
-//import org.springframework.web.bind.annotation.*;
-//import java.util.Optional;
-//
-//public class TransactionController {
-//
-//    @CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
-//    @RestController
-//    @RequestMapping(path = "/transaction")
-//
-//    public class UserController {
-//
-//
-//        @Autowired
-//        private TransactionRepository transactionRepository;
-//
-//        @RequestMapping(value = "/user/{id}", method = RequestMethod.GET)
-//        public ResponseEntity get(@PathVariable Long id) {
-//            Optional<Transaction> transaction = transactionRepository.findById(id);
-//            return new ResponseEntity <>(transaction, HttpStatus.OK );
-//
-//        }
-//
-//        @RequestMapping(value = "/users", method = RequestMethod.GET)
-//        public ResponseEntity <Iterable <Transaction>> getAllUsers() {
-//            Iterable <Transaction> allTransactions = transactionRepository.findAll();
-//            return new ResponseEntity <>( allTransactions, HttpStatus.OK );
-//
-//        }
-//
-//        @RequestMapping(path = "/add", method = RequestMethod.POST)
-//        public ResponseEntity <?> create(@RequestBody Transaction transaction) {
-//            transactionRepository.save(transaction);
-//            return new ResponseEntity <>( transaction, HttpStatus.CREATED );
-//        }
-//
-//        @RequestMapping(path = "/delete", method = RequestMethod.DELETE)
-//        public ResponseEntity <Transaction> deleteUser(@RequestBody Transaction transaction) {
-//            transactionRepository.delete(transaction);
-//            return new ResponseEntity <>( HttpStatus.OK );
-//        }
-//
-//        @RequestMapping(path = "/updateUser", method = RequestMethod.PUT)
-//        public ResponseEntity <Transaction> updateUser(@RequestBody Transaction transaction) {
-//            transactionRepository.save(transaction);
-//            return new ResponseEntity <>( HttpStatus.OK );
-//        }
-//
-//
-//    }
-//}
+package com.buecoin01.controller;
+
+import com.buecoin01.Repositories.TransactionRepository;
+import com.buecoin01.model.Transactions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import java.util.Optional;
+
+public class TransactionController {
+
+    @CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
+    @RestController
+    @RequestMapping(path = "/transaction")
+
+    public class UserController {
+
+
+        @Autowired
+        private TransactionRepository transactionRepository;
+
+        @RequestMapping(value = "/user/{id}", method = RequestMethod.GET)
+        public ResponseEntity get(@PathVariable Long id) {
+            Optional<Transactions> transaction = transactionRepository.findById(id);
+            return new ResponseEntity <>(transaction, HttpStatus.OK );
+
+        }
+
+        @RequestMapping(value = "/users", method = RequestMethod.GET)
+        public ResponseEntity <Iterable <Transactions>> getAllUsers() {
+            Iterable <Transactions> allTransactions = transactionRepository.findAll();
+            return new ResponseEntity <>( allTransactions, HttpStatus.OK );
+
+        }
+
+        @RequestMapping(path = "/add", method = RequestMethod.POST)
+        public ResponseEntity <?> create(@RequestBody Transactions transactions) {
+            transactionRepository.save(transactions);
+            return new ResponseEntity <>(transactions, HttpStatus.CREATED );
+        }
+
+        @RequestMapping(path = "/delete", method = RequestMethod.DELETE)
+        public ResponseEntity <Transactions> deleteUser(@RequestBody Transactions transactions) {
+            transactionRepository.delete(transactions);
+            return new ResponseEntity <>( HttpStatus.OK );
+        }
+
+        @RequestMapping(path = "/updateUser", method = RequestMethod.PUT)
+        public ResponseEntity <Transactions> updateUser(@RequestBody Transactions transactions) {
+            transactionRepository.save(transactions);
+            return new ResponseEntity <>( HttpStatus.OK );
+        }
+
+
+    }
+}

src/main/java/com/buecoin01/controller/WalletController.java

@@ -6,55 +6,51 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.Optional;
 
-public class WalletController {
-    @CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
-    @RestController
-
 
-    public class UserController {
+@RestController
+@CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
+public class WalletController {
 
 
         @Autowired
         private WalletRepository walletRepository;
 
-
         @RequestMapping(value = "/wallet/{id}", method = RequestMethod.GET)
         public ResponseEntity get(@PathVariable Long id) {
-            Optional <Wallet> wallet = walletRepository.findById( id );
-            return new ResponseEntity <>( wallet, HttpStatus.OK );
+            Optional<Wallet> wallet = walletRepository.findById(id);
+            return new ResponseEntity<>(wallet, HttpStatus.OK);
 
         }
 
         @RequestMapping(value = "/wallets", method = RequestMethod.GET)
-        public ResponseEntity <Iterable <Wallet>> getAllUsers() {
-            Iterable <Wallet> allWallets = walletRepository.findAll();
-            return new ResponseEntity <>( allWallets, HttpStatus.OK );
+        public ResponseEntity<Iterable<Wallet>> getAllUsers() {
+            Iterable<Wallet> allWallets = walletRepository.findAll();
+            return new ResponseEntity<>(allWallets, HttpStatus.OK);
 
         }
 
         @RequestMapping(path = "/addWallet", method = RequestMethod.POST)
-        public ResponseEntity <?> create(@RequestBody Wallet wallet) {
+        public ResponseEntity<?> create(@RequestBody Wallet wallet) {
             walletRepository.save(wallet);
-            return new ResponseEntity <>( wallet, HttpStatus.CREATED );
+            return new ResponseEntity<>(wallet, HttpStatus.CREATED);
         }
 
         @RequestMapping(path = "/deleteWallet", method = RequestMethod.DELETE)
-        public ResponseEntity <Wallet> deleteWallet(@RequestBody Wallet wallet) {
-            walletRepository.delete(wallet );
-            return new ResponseEntity <>( HttpStatus.OK );
+        public ResponseEntity<Wallet> deleteWallet(@RequestBody Wallet wallet) {
+            walletRepository.delete(wallet);
+            return new ResponseEntity<>(HttpStatus.OK);
         }
 
         @RequestMapping(path = "/updateWallet", method = RequestMethod.PUT)
-        public ResponseEntity <Wallet> updateWallet(@RequestBody Wallet wallet) {
+        public ResponseEntity<Wallet> updateWallet(@RequestBody Wallet wallet) {
             walletRepository.save(wallet);
-            return new ResponseEntity <>( HttpStatus.OK );
+            return new ResponseEntity<>(HttpStatus.OK);
         }
 
 
     }
 
 
-}
+

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

@@ -5,6 +5,7 @@ import com.buecoin01.utility.Encryption;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 
 
 @Entity
@@ -20,13 +21,19 @@ public class Block {
     @Column
     private String hash;
     private String previousHash;
-    private String data;
+    //private String data;
+    public String merkleRoot;
+    public ArrayList<Transactions> transactionList = new ArrayList<>();
     private LocalDateTime timeStamp;
     private int nonce;
 
-    public Block(String previousHash, LocalDateTime time) {
+    public Block() {
+    }
+
+    public Block(String previousHash, LocalDateTime time, int nonce) {
         this.timeStamp = time;
         this.previousHash = previousHash;
+        this.hash = calculateHash();
     }
 
     public String getHash() {
@@ -37,9 +44,9 @@ public class Block {
         return previousHash;
     }
 
-    public String getData() {
-        return data;
-    }
+//    public String getData() {
+//        return data;
+//    }
 
     public LocalDateTime getTimeStamp() {
         return timeStamp;
@@ -50,7 +57,7 @@ public class Block {
                   previousHash +
                         timeStamp.toString() +
                         Integer.toString(nonce) +
-                        data);
+                        merkleRoot);
     }
 
     public long getId() {
@@ -70,6 +77,20 @@ public class Block {
         }
         System.out.println("Block Mined " + hash);
         System.out.println("You have been awarded 1 Zip!");
-        Coin coin = new Coin(minerID);
+    }
+
+    //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/BlockchainVerification.java

@@ -2,14 +2,42 @@ package com.buecoin01.model;
 
 import com.buecoin01.model.Block;
 import com.buecoin01.utility.Encryption;
+import com.buecoin01.utility.TransactionOutput;
 import com.google.gson.GsonBuilder;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.security.Security;
+import java.util.*;
 
 public class  BlockchainVerification {
     private static List<Block> blockchain = new ArrayList<>();
+    private static Map<String, TransactionOutput> UTXOs = new HashMap<>();
+    public static float minimumTransaction = 0.1f;
     private static int difficulty = 5;
+    public static Wallet walletA;
+    public static Wallet walletB;
+    //public static Transaction genesisTransaction;
+
+//    public static void main(String[] args) {
+//        //Setup Bouncey castle as a Security Provider
+//        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+//
+//        //Create the new wallets
+//        walletA = new Wallet();
+//        walletB = new Wallet();
+//
+//        //Test public and private keys
+//        System.out.println("Private and public keys:");
+//        System.out.println(Encryption.getStringFromKey(walletA.getPrivateKey()));
+//        System.out.println(Encryption.getStringFromKey(walletA.getPublicKey()));
+//        //Create a test transaction from WalletA to walletB
+//        Transaction transaction = new Transaction(walletA.getPublicKey(), walletB.getPublicKey(), 5, null);
+//        transaction.generateSignature(walletA.getPrivateKey());
+//
+//        //Verify the signature works and verify it from the public key
+//        System.out.println("Is signature verified");
+//        System.out.println(transaction.verifySignature());
+
+ //   }
 
     public String chainToJson() {
         return new GsonBuilder()
@@ -18,6 +46,14 @@ public class  BlockchainVerification {
                 .toJson(blockchain);
     }
 
+    public static Map<String, TransactionOutput> getUTXOs() {
+        return UTXOs;
+    }
+
+    public static void setUTXOs(Map<String, TransactionOutput> UTXOs) {
+        BlockchainVerification.UTXOs = UTXOs;
+    }
+
     public static List<Block> getBlockchain() {
         return blockchain;
     }

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

@@ -1,4 +0,0 @@
-package com.buecoin01.model;
-
-public class Transaction {
-}

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

@@ -0,0 +1,145 @@
+package com.buecoin01.model;
+
+import com.buecoin01.utility.Encryption;
+import com.buecoin01.utility.TransactionInput;
+import com.buecoin01.utility.TransactionOutput;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.*;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+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;
+
+
+public Transactions(){}
+
+    public Transactions( PublicKey from, PublicKey to, float value, ArrayList <TransactionInput> inputs) {
+        this.sender = from;
+        this.reciepient = to;
+        this.value = value;
+        this.inputs = inputs;
+    }
+
+    //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
+        );
+    }
+
+
+    //WRITE METHOD TO TURN SIGNATURE DEOM BYTE ARRAY TO STRING
+
+
+    //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 );
+    }
+
+    //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 );
+    }
+
+    //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;
+    }
+
+    // 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 float getOutPutsValue() {
+        float total = 0;
+        for (TransactionOutput o : outputs) {
+            total = total + o.getValue();
+        }
+        return total;
+    }
+
+    // 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;
+    }
+}

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

@@ -1,28 +1,58 @@
 package com.buecoin01.model;
 
+import com.buecoin01.utility.TransactionInput;
+import com.buecoin01.utility.TransactionOutput;
+
 import javax.persistence.*;
+import java.security.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @Entity
 public class Wallet {
+
+    private PrivateKey privateKey;
+    private PublicKey publicKey;
+    public HashMap<String, TransactionOutput> UTXOs = new HashMap<>(); // only UTXOs owned by this wallet
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
-
     @Column(name = "pubicId")
     private String publicId;
     @Column(name = "amount")
     private long amount;
+    @Column(name = "name")
+    private String name;
 
 
-    public Wallet(String publicId, long amount) {
+    public Wallet(String publicId, long amount, String name) {
         this.publicId = publicId;
         this.amount = amount;
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 
     public Wallet() {
+        //generateKeyPair();
+    }
+
+    public PrivateKey getPrivateKey() {
+        return privateKey;
+    }
 
+    public PublicKey getPublicKey() {
+        return publicKey;
     }
+
     public long getAmount() {
         return amount;
     }
@@ -48,4 +78,58 @@ 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;
+    }
 }

src/main/java/com/buecoin01/utility/Encryption.java

@@ -3,6 +3,11 @@ package com.buecoin01.utility;
 import com.google.common.hash.Hashing;
 
 import java.nio.charset.StandardCharsets;
+import java.security.Key;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.util.Base64;
 
 public class Encryption {
     public static String applySha256(String input) {
@@ -14,4 +19,37 @@ public class Encryption {
     public static String createTarget(int difficulty) {
         return new String(new char[difficulty]).replace('\0', '0');
     }
+
+    //Apply ECDSA Signature and return result as bytes
+    public static byte[] applyECDSASig(PrivateKey privateKey, String input) {
+        Signature dsa;
+        byte[] realSig;
+        try {
+            dsa = Signature.getInstance("ECDSA","BC");
+            dsa.initSign(privateKey);
+            byte[] strByte = input.getBytes();
+            dsa.update(strByte);
+            realSig = dsa.sign();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return realSig;
+    }
+
+    //Verify a String Signature
+    public static boolean verifyECDSASig(PublicKey publicKey, String data, byte[] signature) {
+        try {
+            Signature ecdsaVerify = Signature.getInstance("ECDSA", "BC");
+            ecdsaVerify.initVerify(publicKey);
+            ecdsaVerify.update(data.getBytes());
+            return  ecdsaVerify.verify(signature);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    //Return encoded string from a key
+    public static String getStringFromKey(Key key) {
+        return Base64.getEncoder().encodeToString(key.getEncoded());
+    }
 }

src/main/java/com/buecoin01/utility/TransactionInput.java

@@ -0,0 +1,30 @@
+package com.buecoin01.utility;
+
+
+//This class will be used to reference TransactionOutputs that have not yet been spent.
+//The transactionOutputId will be used to find the relevant TransactionOutput, allowing miners to check your ownership.
+public class TransactionInput {
+    private String transactionOutputId;
+   // private TransactionOutput UTXO; // UTXO means Unspent Transaction Outputs
+   private TransactionOutput UTXO;
+
+    public TransactionInput(String transactionOutputId) {
+        this.transactionOutputId = transactionOutputId;
+    }
+
+    public String getTransactionOutputId() {
+        return transactionOutputId;
+    }
+
+    public void setTransactionOutputId(String transactionOutputId) {
+        this.transactionOutputId = transactionOutputId;
+    }
+
+    public TransactionOutput getUTXO() {
+        return UTXO;
+    }
+
+    public void setUTXO(TransactionOutput UTXO) {
+        this.UTXO = UTXO;
+    }
+}

src/main/java/com/buecoin01/utility/TransactionOutput.java

@@ -0,0 +1,54 @@
+package com.buecoin01.utility;
+
+import java.security.PublicKey;
+
+public class TransactionOutput {
+    private String id;
+    private PublicKey reciepient; //new owner of the coins
+    private float value; //the amount of coins they own
+    private String parentTransactionId;
+
+    public TransactionOutput(PublicKey reciepient, float value, String parentTransactionId) {
+        this.reciepient = reciepient;
+        this.value = value;
+        this.parentTransactionId = parentTransactionId;
+        this.id = Encryption.applySha256(Encryption.getStringFromKey(reciepient)+Float.toString(value)+parentTransactionId);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public PublicKey getReciepient() {
+        return reciepient;
+    }
+
+    public void setReciepient(PublicKey reciepient) {
+        this.reciepient = reciepient;
+    }
+
+    public float getValue() {
+        return value;
+    }
+
+    public void setValue(float value) {
+        this.value = value;
+    }
+
+    public String getParentTransactionId() {
+        return parentTransactionId;
+    }
+
+    public void setParentTransactionId(String parentTransactionId) {
+        this.parentTransactionId = parentTransactionId;
+    }
+
+    //Check if coin belongs to publicKey
+    public boolean isMine(PublicKey publicKey) {
+        return publicKey == reciepient;
+    }
+}

src/main/resources/application.properties

@@ -1,11 +1,11 @@
 spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:mysql://localhost:3306/bluecoin?useSSL=false
+spring.datasource.url=jdbc:mysql://167.99.50.8:3306/bitcoin?useSSL=false
 spring.datasource.username=root
-spring.datasource.password=
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
-spring.datasource.testWhileIdle = true
-spring.datasource.validationQuery = SELECT 1
-
-
-logging.file= ./application.log
+spring.datasource.password=098poilkj
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+#spring.datasource.testWhileIdle = true
+#spring.datasource.validationQuery = SELECT 1
+#
+#
+#logging.file= ./application.log

target/classes/application.properties

@@ -1,11 +1,11 @@
 spring.jpa.hibernate.ddl-auto=update
-spring.datasource.url=jdbc:mysql://localhost:3306/bluecoin?useSSL=false
+spring.datasource.url=jdbc:mysql://167.99.50.8:3306/bitcoin?useSSL=false
 spring.datasource.username=root
-spring.datasource.password=
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
-spring.datasource.testWhileIdle = true
-spring.datasource.validationQuery = SELECT 1
-
-
-logging.file= ./application.log
+spring.datasource.password=098poilkj
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect
+#spring.datasource.testWhileIdle = true
+#spring.datasource.validationQuery = SELECT 1
+#
+#
+#logging.file= ./application.log