brand new

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="86492085-3833-4394-8353-122bd8bc6cb0" name="Default" comment="">
 <<<<<<< HEAD
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/application.log" beforeDir="false" afterPath="$PROJECT_DIR$/application.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" 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" />
@@ -12,6 +13,24 @@
 =======
       <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" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" afterDir="false" />
+      <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/ProcessLoader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" 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$/src/main/java/com/buecoin01/model/Block.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java" afterDir="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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/ProcessLoader.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/ProcessLoader.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/TransactionController$UserController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/TransactionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/TransactionController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Block.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Block.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Transactions.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Transactions.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Wallet.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Wallet.class" afterDir="false" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,6 +43,7 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
 <<<<<<< HEAD
+<<<<<<< HEAD
       <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -78,19 +98,27 @@
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
+=======
+      <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" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
             </state>
           </provider>
         </entry>
       </file>
-      <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">
+      <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="28">
-              <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
+            <state relative-caret-position="15">
+              <caret line="1" selection-start-line="1" selection-end-line="1" />
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <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">
@@ -137,40 +165,31 @@
 =======
       <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
+=======
+      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="966">
-              <caret line="121" column="45" lean-forward="true" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
+            <state relative-caret-position="648">
+              <caret line="52" selection-start-line="52" selection-end-line="52" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#925#926#0" expanded="true" />
-                <element signature="e#952#953#0" expanded="true" />
-                <element signature="e#992#993#0" expanded="true" />
-                <element signature="e#1024#1025#0" expanded="true" />
-                <element signature="e#1123#1124#0" expanded="true" />
-                <element signature="e#1156#1157#0" expanded="true" />
-                <element signature="e#1195#1196#0" expanded="true" />
-                <element signature="e#1227#1228#0" expanded="true" />
-                <element signature="e#1258#1259#0" expanded="true" />
-                <element signature="e#1287#1288#0" expanded="true" />
-                <element signature="e#1329#1330#0" expanded="true" />
-                <element signature="e#1365#1366#0" expanded="true" />
-                <element signature="e#1481#1482#0" expanded="true" />
-                <element signature="e#1521#1522#0" expanded="true" />
-                <element signature="e#1548#1549#0" expanded="true" />
-                <element signature="e#1573#1574#0" expanded="true" />
-                <element signature="e#1607#1608#0" expanded="true" />
-                <element signature="e#1635#1636#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
+      <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
             <state relative-caret-position="210">
               <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+            <state relative-caret-position="510">
+              <caret line="34" selection-start-line="34" selection-end-line="34" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -179,6 +198,7 @@
         </entry>
       </file>
 <<<<<<< HEAD
+<<<<<<< HEAD
       <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -187,9 +207,13 @@
 =======
       <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
+=======
+      <file leaf-file-name="ConductTransactions.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java">
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
+            <state relative-caret-position="394">
+              <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -198,6 +222,7 @@
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -207,6 +232,13 @@
 =======
             <state relative-caret-position="639">
               <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
+=======
+      <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="false">
+        <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="825">
+              <caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -216,6 +248,7 @@
         </entry>
       </file>
 <<<<<<< HEAD
+<<<<<<< HEAD
       <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">
@@ -224,9 +257,13 @@
 =======
       <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
+=======
+      <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+            <state relative-caret-position="139">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -236,6 +273,7 @@
         </entry>
       </file>
 <<<<<<< HEAD
+<<<<<<< HEAD
       <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">
@@ -252,14 +290,16 @@
           </provider>
         </entry>
       </file>
+=======
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
-        <option value="Class" />
         <option value="AnnotationType" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -291,19 +331,23 @@
 =======
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" />
         <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/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/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/controller/WalletController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
+<<<<<<< HEAD
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.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/ConductTransactions.java" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
       </list>
     </option>
   </component>
@@ -333,7 +377,11 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+<<<<<<< HEAD
       <pane id="Scope" />
+=======
+      <pane id="AndroidView" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -415,13 +463,18 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="0.1" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CryptoCoin" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -431,6 +484,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
     <key name="CreateClassDialog.RecentsKey">
@@ -527,11 +581,13 @@
       <option name="presentableId" value="Default" />
       <updated>1532357794192</updated>
       <workItem from="1532357795573" duration="4040000" />
+      <workItem from="1532473422589" duration="716000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
 <<<<<<< HEAD
+<<<<<<< HEAD
     <option name="totallyTimeSpent" value="4624000" />
   </component>
   <component name="ToolWindowManager">
@@ -542,24 +598,31 @@
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1280" height="800" extended-state="6" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+    <option name="totallyTimeSpent" value="12326000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1920" height="1080" extended-state="6" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
     <editor active="true" />
     <layout>
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
-      <window_info anchor="right" id="Maven Projects" order="3" />
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info id="Capture Tool" order="2" />
-      <window_info id="Designer" order="2" />
-      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="right" id="Palette" order="6" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="right" id="Maven Projects" order="6" />
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Designer" order="5" />
+      <window_info anchor="right" id="Database" order="6" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info id="UI Designer" order="2" />
+      <window_info id="UI Designer" order="5" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
 <<<<<<< HEAD
       <window_info anchor="bottom" id="Messages" weight="0.3281471" />
 =======
       <window_info anchor="bottom" id="Messages" order="9" weight="0.27492878" />
+<<<<<<< HEAD
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
@@ -595,32 +658,34 @@
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30329043" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+=======
+      <window_info anchor="right" id="Palette&#9;" order="6" />
+      <window_info id="Image Layers" order="5" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
       <window_info anchor="bottom" id="Java Enterprise" order="10" />
-      <window_info anchor="right" id="Bean Validation" order="6" />
+      <window_info anchor="right" id="Capture Analysis" order="6" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3299389" />
+      <window_info anchor="bottom" id="Version Control" order="10" />
+      <window_info anchor="bottom" id="Spring" order="10" />
       <window_info anchor="bottom" id="Terminal" order="10" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="6" />
-      <window_info anchor="right" id="Maven Projects" order="6" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30298188" />
+      <window_info anchor="right" id="Bean Validation" order="6" />
       <window_info id="Web" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Spring" order="10" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info id="Image Layers" order="5" />
       <window_info anchor="right" id="Theme Preview" order="6" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info id="Capture Tool" order="5" />
-      <window_info anchor="bottom" id="Version Control" order="10" />
-      <window_info anchor="right" id="Capture Analysis" order="6" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info id="Favorites" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info id="UI Designer" order="5" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Find" order="1" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info id="Designer" order="5" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
     </layout>
     <layout-to-restore>
       <window_info id="Designer" order="0" />
@@ -663,6 +728,7 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
 <<<<<<< HEAD
       <provider selected="true" editor-type-id="text-editor">
@@ -691,6 +757,8 @@
         </state>
       </provider>
     </entry>
+=======
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -703,6 +771,10 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="945">
           <caret line="78" selection-start-line="78" selection-end-line="78" />
+          <folding>
+            <element signature="e#969#970#0" expanded="true" />
+            <element signature="e#996#997#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -746,10 +818,14 @@
         <state relative-caret-position="360">
           <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
           <folding>
+<<<<<<< HEAD
             <element signature="e#581#582#0" expanded="true" />
             <element signature="e#621#622#0" expanded="true" />
             <element signature="e#653#654#0" expanded="true" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+            <element signature="imports" expanded="true" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           </folding>
         </state>
       </provider>
@@ -870,30 +946,6 @@
           <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>
@@ -954,17 +1006,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Blockchain.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#1854#1855#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Blockchain.java" />
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="990">
@@ -1028,15 +1070,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="18" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
+        <state relative-caret-position="75">
+          <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <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" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
@@ -1045,52 +1089,71 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.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="639">
+          <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        <state relative-caret-position="148">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#969#970#0" expanded="true" />
+            <element signature="e#996#997#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
+        <state>
+          <caret column="35" lean-forward="true" selection-start-column="35" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="59" lean-forward="true" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
       <provider selected="true" editor-type-id="text-editor">
 <<<<<<< HEAD
+<<<<<<< HEAD
         <state relative-caret-position="165">
           <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
 =======
         <state relative-caret-position="210">
           <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+        <state relative-caret-position="599">
+          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
       <provider selected="true" editor-type-id="text-editor">
 <<<<<<< HEAD
+<<<<<<< HEAD
         <state relative-caret-position="673">
 =======
         <state relative-caret-position="639">
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
           <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
+=======
+        <state relative-caret-position="825">
+          <caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1098,6 +1161,7 @@
       </provider>
     </entry>
 <<<<<<< HEAD
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
@@ -1129,37 +1193,23 @@
           <caret line="135" column="14" lean-forward="true" selection-start-line="135" selection-start-column="14" selection-end-line="135" selection-end-column="14" />
 =======
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="966">
-          <caret line="121" column="45" lean-forward="true" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
+        <state relative-caret-position="510">
+          <caret line="34" selection-start-line="34" selection-end-line="34" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#925#926#0" expanded="true" />
-            <element signature="e#952#953#0" expanded="true" />
-            <element signature="e#992#993#0" expanded="true" />
-            <element signature="e#1024#1025#0" expanded="true" />
-            <element signature="e#1123#1124#0" expanded="true" />
-            <element signature="e#1156#1157#0" expanded="true" />
-            <element signature="e#1195#1196#0" expanded="true" />
-            <element signature="e#1227#1228#0" expanded="true" />
-            <element signature="e#1258#1259#0" expanded="true" />
-            <element signature="e#1287#1288#0" expanded="true" />
-            <element signature="e#1329#1330#0" expanded="true" />
-            <element signature="e#1365#1366#0" expanded="true" />
-            <element signature="e#1481#1482#0" expanded="true" />
-            <element signature="e#1521#1522#0" expanded="true" />
-            <element signature="e#1548#1549#0" expanded="true" />
-            <element signature="e#1573#1574#0" expanded="true" />
-            <element signature="e#1607#1608#0" expanded="true" />
-            <element signature="e#1635#1636#0" expanded="true" />
           </folding>
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
       <provider selected="true" editor-type-id="text-editor">
 <<<<<<< HEAD
+<<<<<<< HEAD
         <state relative-caret-position="113">
           <caret line="37" column="42" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
 =======
@@ -1204,6 +1254,17 @@
         <state relative-caret-position="390">
           <caret line="26" selection-start-line="26" selection-end-line="26" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+        <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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="139">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#971#972#0" expanded="true" />
@@ -1232,12 +1293,13 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="15">
+          <caret line="1" selection-start-line="1" selection-end-line="1" />
         </state>
       </provider>
     </entry>
 <<<<<<< HEAD
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -1291,39 +1353,24 @@
         <state relative-caret-position="28">
           <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
 >>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="648">
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.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" />
+        <state relative-caret-position="394">
+          <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
           <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>

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

@@ -0,0 +1,34 @@
+package com.buecoin01;
+
+import com.buecoin01.Repositories.BlockRepository;
+import com.buecoin01.Repositories.WalletRepository;
+
+import com.buecoin01.controller.ConductTransactions;
+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
+    WalletRepository repo1;
+
+    @Autowired
+    BlockRepository repo3;
+
+    @Autowired
+    ConductTransactions transaction;
+
+
+    @Override
+    public void run(ApplicationArguments args) {
+        transaction.transferMoney(2L,1L,500);
+
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.buecoin01.controller;
+
+import com.buecoin01.Repositories.TransactionRepository;
+import com.buecoin01.Repositories.WalletRepository;
+import com.buecoin01.model.Transactions;
+import com.buecoin01.model.Wallet;
+import com.buecoin01.utility.Encryption;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+@RestController
+public class ConductTransactions {
+    @Autowired
+    private TransactionRepository transactionRepository;
+
+    @Autowired
+    private WalletRepository walletRepository;
+
+
+    public double getBalance(Long id){
+        return walletRepository.getOne(id).getAmount();
+    }
+
+    public String transferMoney(Long toId, Long fromId, double amount){
+        String response;
+        if(amount <= getBalance(fromId)){
+            Wallet from = walletRepository.getOne(toId);
+            from.setAmount(getBalance(fromId) - amount);
+            walletRepository.save(from);
+            Wallet to = walletRepository.getOne(fromId);
+            to.setAmount(getBalance(fromId) + amount);
+            walletRepository.save(to);
+            Transactions n = new Transactions(Encryption.applySha256(toId.toString() + fromId.toString() + Double.toString(amount)), Encryption.applySha256(fromId.toString()), Encryption.applySha256(toId.toString()), amount, LocalDateTime.now());
+            transactionRepository.save(n);
+            response = "Success";
+        } else response = "Insufficient funds";
+
+        return response;
+    }
+
+
+
+
+}

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

@@ -0,0 +1,57 @@
+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;
+
+
+@CrossOrigin(origins = {"http://localhost:8100", "http://localhost:8080"})
+@RestController
+@RequestMapping(path = "/transaction")
+public class TransactionController {
+
+
+
+
+        @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

@@ -0,0 +1,58 @@
+package com.buecoin01.controller;
+
+import com.buecoin01.Repositories.WalletRepository;
+import com.buecoin01.model.Wallet;
+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;
+
+
+@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);
+
+        }
+
+        @RequestMapping(value = "/wallets", method = RequestMethod.GET)
+        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) {
+            walletRepository.save(wallet);
+            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);
+        }
+
+        @RequestMapping(path = "/updateWallet", method = RequestMethod.PUT)
+        public ResponseEntity<Wallet> updateWallet(@RequestBody Wallet wallet) {
+            walletRepository.save(wallet);
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
+
+
+
+
+    }
+
+
+

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

@@ -0,0 +1,82 @@
+package com.buecoin01.model;
+
+
+import com.buecoin01.utility.Encryption;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+
+@Entity
+public class Block {
+
+    private String minerID;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column
+    private String hash;
+    private String previousHash;
+    private String data;
+    public String merkleRoot;
+    public ArrayList<Transactions> transactionList = new ArrayList<>();
+    private LocalDateTime timeStamp;
+    private int nonce;
+
+    public Block() {
+    }
+
+    public Block(String previousHash, LocalDateTime time, int nonce) {
+        this.timeStamp = time;
+        this.previousHash = previousHash;
+        this.hash = calculateHash();
+    }
+
+    public String getHash() {
+        return hash;
+    }
+
+    public String getPreviousHash() {
+        return previousHash;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public LocalDateTime getTimeStamp() {
+        return timeStamp;
+    }
+
+    public String calculateHash() {
+        return Encryption.applySha256(
+                  previousHash +
+                        timeStamp.toString() +
+                        Integer.toString(nonce) +
+                        merkleRoot);
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void mineBlock(int difficulty) {
+        String target = new String(new char[difficulty]).replace('\0', '0'); //Create a string with difficulty * "0"
+        while(!hash.substring( 0, difficulty).equals(target)) {
+            nonce ++;
+            hash = calculateHash();
+            System.out.println(hash);
+        }
+        System.out.println("Block Mined " + hash);
+        System.out.println("You have been awarded 1 Zip!");
+    }
+
+    }

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

@@ -0,0 +1,91 @@
+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.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+@Entity
+public class Transactions {
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @Column
+    private String transactionId;
+    private String fromId;
+    private String toId;
+    private double amount;
+    private LocalDateTime timestamp;
+
+    public Transactions(String transactionId, String fromId, String toId, double amount, LocalDateTime timestamp) {
+        this.transactionId = transactionId;
+        this.fromId = fromId;
+        this.toId = toId;
+        this.amount = amount;
+        this.timestamp = timestamp;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getTransactionId() {
+        return transactionId;
+    }
+
+    public void setTransactionId(String transactionId) {
+        this.transactionId = transactionId;
+    }
+
+    public String getFromId() {
+        return fromId;
+    }
+
+    public void setFromId(String fromId) {
+        this.fromId = fromId;
+    }
+
+    public String getToId() {
+        return toId;
+    }
+
+    public void setToId(String toId) {
+        this.toId = toId;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public LocalDateTime getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(LocalDateTime timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public Transactions(){}
+
+
+}

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

@@ -0,0 +1,71 @@
+package com.buecoin01.model;
+
+import com.buecoin01.utility.TransactionInput;
+import com.buecoin01.utility.TransactionOutput;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.annotations.Proxy;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.*;
+import java.security.*;
+
+
+@Entity
+@Component
+@Proxy(lazy = false)
+public class Wallet {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+    @Column(name = "pubicId")
+    private String publicId;
+    @Column(name = "amount")
+    private double amount;
+    @Column(name = "name")
+    private String name;
+
+
+    public Wallet(){}
+
+    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 double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+
+    public String getPublicId() {
+
+        return publicId;
+    }
+
+    public void setPublicId(String publicId) {
+        this.publicId = publicId;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+}

src/main/resources/application.properties

@@ -0,0 +1,11 @@
+spring.jpa.hibernate.ddl-auto=update
+
+spring.datasource.url=jdbc:mysql://167.99.50.8:3306/bitcoin?useSSL=false
+spring.datasource.username=root
+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
+
+

target/classes/application.properties

@@ -0,0 +1,11 @@
+spring.jpa.hibernate.ddl-auto=update
+
+spring.datasource.url=jdbc:mysql://167.99.50.8:3306/bitcoin?useSSL=false
+spring.datasource.username=root
+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
+
+