Transaction posting...

ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/TransactionLoader.java

@@ -20,11 +20,11 @@ public class TransactionLoader implements ApplicationRunner {
   @Override
   public void run(ApplicationArguments applicationArguments){
       Transaction[] transactions = new Transaction[]{
-              new Transaction("shivam", "khalil", 10),
-              new Transaction("eric", "shivam", 100),
-              new Transaction("khalil", "eric", (float)30.22),
-              new Transaction("aleena", "navya", (float)43.32),
-              new Transaction("shivam", "ken", 1)
+              new Transaction("shivam", "khalil", (double) 10f),
+              new Transaction("eric", "shivam", (double) 100.34f),
+              new Transaction("khalil", "eric", (double) 30.000),
+              new Transaction("aleena", "navya", (double) 43.32),
+              new Transaction("shivam", "ken", (double) 1f)
       };
 
       for(Transaction t : transactions){

ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java

@@ -20,8 +20,8 @@ public class WalletLoader implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments applicationArguments) throws Exception {
         Wallet[] wallets = new Wallet[]{
-                new Wallet("ann","34",80),
-                new Wallet("sen","3564",8)
+                new Wallet("ann","34",80.45),
+                new Wallet("sen","3564",8.8)
         };
         for(Wallet wallet :wallets) {
             this.walletRepository.save(wallet);

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

@@ -12,16 +12,23 @@ public class Transaction {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    // private String transactionId;
+    private Long transactionId;
     private String senderPublicKey;
     private String recipientPublicKey;
     private String transactionHash;
-    private Float amount;
+    private Double amount;
     //@OneToMany
     //private List<Integer> coins;
     //public Signature signature;
 
-    public Transaction(String senderPublicKey, String recipientPublicKey, Float amount){
+    public Transaction(){
+
+    }
+
+    public Transaction(String senderPublicKey, String recipientPublicKey, Double amount){
+        this.senderPublicKey = senderPublicKey;
+        this.recipientPublicKey = recipientPublicKey;
+        this.amount = amount;
 
     }
 
@@ -33,14 +40,12 @@ public class Transaction {
         return recipientPublicKey;
     }
 
-    public Float getAmount() {
+    public Double getAmount() {
         return amount;
     }
 
-
-
     public void calculateAndSetHash() {
-        String transactionHash = DigestUtils.sha256Hex(senderPublicKey + recipientPublicKey + Float.toString(amount));
+        String transactionHash = DigestUtils.sha256Hex(senderPublicKey + recipientPublicKey + Double.toString(amount));
         setTransactionHash(transactionHash);
     }
 
@@ -48,16 +53,6 @@ public class Transaction {
         this.transactionHash = transactionHash;
     }
 
-
-//    public Transaction(String from, String to, float amount/*,List<Integer> coins*/) {
-//        this.sender = from;
-//        this.recipient = to;
-//        this.amount = amount;
-//        //this.coins=coins;
-//    }
-
-
-
 //    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

@@ -20,13 +20,13 @@ public class Wallet {
     private int id;
     private String name;
     private String publicKey;
-    private Float amount;
+    private Double amount;
 
     public Wallet() {
         generateKeyPair();
     }
 
-    public Wallet(String name, String publicKey, Float amount) {
+    public Wallet(String name, String publicKey, Double amount) {
         this.name=name;
         this.publicKey=publicKey;
         this.amount=amount;
@@ -36,11 +36,11 @@ public class Wallet {
         return publicKey;
     }
 
-    public Float getAmount(){
+    public Double getAmount(){
         return amount;
     }
 
-    public void setAmount(Float amount){
+    public void setAmount(Double amount){
         this.amount = amount;
     }
 

ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/TransactionRepository.java

@@ -16,5 +16,5 @@ import java.util.List;
 
 @Repository
 public interface TransactionRepository extends JpaRepository<Transaction, Long> {
-    Collection<Transaction> findTransactionBySenderOrRecipient(String sender, String recipient);
+    Collection<Transaction> findTransactionBySenderPublicKeyOrRecipientPublicKey(String senderPublicKey, String recipientPublicKey);
 }

ZipCoinRedJavaServer/src/main/java/com/zipcoin/service/TransactionService.java

@@ -33,7 +33,6 @@ public class TransactionService {
 
         transaction.calculateAndSetHash();
         return transactionRepository.save(transaction);
-
     }
 
     public Collection<Transaction> getAllTransactions(){
@@ -41,7 +40,7 @@ public class TransactionService {
     }
 
     public Collection<Transaction> getTransactionsByPublicKey(String publicKey) {
-        return transactionRepository.findTransactionBySenderOrRecipient(publicKey, publicKey);
+        return transactionRepository.findTransactionBySenderPublicKeyOrRecipientPublicKey(publicKey, publicKey);
     }