hope this works

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java

@@ -12,29 +12,83 @@ public class Transaction {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long transactionId;
-    private String sender;
-    private String recipient;
-    private float amount;
+    // private String transactionId;
+    private Wallet sender;
+    private Wallet recipient;
+    private int transactionHash;
+    //    private String sender;
+//    private String recipient;
+    private Float amount;
     //@OneToMany
     //private List<Integer> coins;
     //public Signature signature;
 
-    public Transaction() {
+//    public Transaction(String from, String to, float amount/*,List<Integer> coins*/) {
+//        this.sender = from;
+//        this.recipient = to;
+//        this.amount = amount;
+//        //this.coins=coins;
+//    }
+
+    public Transaction(){
 
     }
 
-    public Transaction(String from, String to, float amount/*,List<Integer> coins*/) {
-        this.sender = from;
-        this.recipient = to;
+    public Transaction(Wallet sender, Wallet recipient, Float amount){
+        this.sender = sender;
+        this.recipient = recipient;
         this.amount = amount;
-        //this.coins=coins;
+        this.transactionHash = (sender.toString() + recipient.toString() + amount.toString()).hashCode();
+
     }
 
-    private String calculateHash() {
-        return DigestUtils.sha256Hex(sender + recipient + Float.toString(amount));
+    public void transact(Wallet sender, Wallet recipient, Float amount){
+        new Transaction(sender, recipient, amount);
+
+        sender.setAmount(sender.getAmount() - amount);
+        recipient.setAmount(recipient.getAmount() + amount);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//
+//    private String calculateHash() {
+//        return DigestUtils.sha256Hex(sender + recipient + Float.toString(amount));
+//    }
+
+    //Above commented out by Ken
+
 //    public void generateSignature(PrivateKey privateKey) throws NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException {
 //        String data = StringUtil.getStringFromKey(sender) + StringUtil.getStringFromKey(reciepient) + Float.toString(value)    ;
 //        signature = StringUtil.applyECDSASig(privateKey,data);

ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java

@@ -32,6 +32,18 @@ public class Wallet {
         this.amount=amount;
     }
 
+    public String getPublicKey(){
+        return publicKey;
+    }
+
+    public Double getAmount(){
+        return amount;
+    }
+
+    public void setAmount(Double x){
+        amount = amount + x;
+    }
+
     public void generateKeyPair() {
         Random random =new SecureRandom();
         Integer random10digit= random.nextInt(10);
@@ -56,4 +68,4 @@ public class Wallet {
 //        }
     }
 
-}
+}