Shivam Patel 6 years ago
parent
commit
5c7aa8d0cd

+ 103
- 143
.idea/workspace.xml View File

@@ -27,13 +27,7 @@
27 27
   </component>
28 28
   <component name="FileEditorManager">
29 29
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
30
-<<<<<<< HEAD
31
-      <file leaf-file-name="TransactionAndWalletTest.java" pinned="false" current-in-tab="false">
32
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java">
33
-          <provider selected="true" editor-type-id="text-editor">
34
-            <state relative-caret-position="91">
35
-              <caret line="15" selection-start-line="15" selection-end-line="15" />
36
-=======
30
+
37 31
       <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
38 32
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
39 33
           <provider selected="true" editor-type-id="text-editor">
@@ -62,47 +56,35 @@
62 56
                 <element signature="e#1170#1171#0" expanded="true" />
63 57
                 <element signature="e#1209#1210#0" expanded="true" />
64 58
               </folding>
65
->>>>>>> dev
66 59
             </state>
67 60
           </provider>
68 61
         </entry>
69 62
       </file>
70
-<<<<<<< HEAD
71
-      <file leaf-file-name="PersistenceConfiguration.java" pinned="false" current-in-tab="true">
72
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java">
73
-          <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="90">
75
-              <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
76
-=======
63
+
77 64
       <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
78 65
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
79 66
           <provider selected="true" editor-type-id="text-editor">
80 67
             <state relative-caret-position="45">
81 68
               <caret line="3" selection-start-line="3" selection-end-line="3" />
82
->>>>>>> dev
83 69
             </state>
84 70
           </provider>
85 71
         </entry>
86 72
       </file>
87
-      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
88
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
73
+      <file leaf-file-name="BlockLoader.java" pinned="false" current-in-tab="false">
74
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/BlockLoader.java">
89 75
           <provider selected="true" editor-type-id="text-editor">
90
-<<<<<<< HEAD
91
-            <state>
92
-              <caret column="1" selection-start-column="1" selection-end-column="1" />
93
-=======
76
+
94 77
             <state relative-caret-position="232">
95 78
               <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
96
->>>>>>> dev
97 79
             </state>
98 80
           </provider>
99 81
         </entry>
100 82
       </file>
101
-      <file leaf-file-name="Miner.java" pinned="false" current-in-tab="false">
102
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/Miner.java">
83
+      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
84
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
103 85
           <provider selected="true" editor-type-id="text-editor">
104
-            <state relative-caret-position="60">
105
-              <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
86
+            <state relative-caret-position="135">
87
+              <caret line="15" column="21" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="21" />
106 88
             </state>
107 89
           </provider>
108 90
         </entry>
@@ -110,17 +92,31 @@
110 92
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
111 93
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
112 94
           <provider selected="true" editor-type-id="text-editor">
113
-            <state relative-caret-position="-80">
95
+            <state relative-caret-position="465">
114 96
               <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
115 97
             </state>
116 98
           </provider>
117 99
         </entry>
118 100
       </file>
119
-      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="true">
101
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="false">
120 102
         <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java">
121 103
           <provider selected="true" editor-type-id="text-editor">
122
-            <state relative-caret-position="60">
123
-              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
104
+            <state relative-caret-position="305">
105
+              <caret line="23" column="41" lean-forward="true" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" />
106
+              <folding>
107
+                <element signature="imports" expanded="true" />
108
+                <element signature="e#523#524#0" expanded="true" />
109
+                <element signature="e#579#580#0" expanded="true" />
110
+              </folding>
111
+            </state>
112
+          </provider>
113
+        </entry>
114
+      </file>
115
+      <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
116
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/TransactionController.java">
117
+          <provider selected="true" editor-type-id="text-editor">
118
+            <state relative-caret-position="105">
119
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
124 120
             </state>
125 121
           </provider>
126 122
         </entry>
@@ -143,11 +139,11 @@
143 139
           </provider>
144 140
         </entry>
145 141
       </file>
146
-      <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
147
-        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/repository/WalletRepository.java">
142
+      <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
143
+        <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java">
148 144
           <provider selected="true" editor-type-id="text-editor">
149
-            <state relative-caret-position="150">
150
-              <caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
145
+            <state relative-caret-position="405">
146
+              <caret line="36" column="35" selection-start-line="36" selection-start-column="35" selection-end-line="36" selection-end-column="35" />
151 147
             </state>
152 148
           </provider>
153 149
         </entry>
@@ -194,7 +190,6 @@
194 190
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java" />
195 191
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/StringUtil.java" />
196 192
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java" />
197
-        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java" />
198 193
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_wallet.sql" />
199 194
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V3__create_wallet.sql" />
200 195
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java" />
@@ -202,6 +197,8 @@
202 197
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql" />
203 198
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties" />
204 199
         <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml" />
200
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java" />
201
+        <option value="$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java" />
205 202
       </list>
206 203
     </option>
207 204
   </component>
@@ -234,16 +231,8 @@
234 231
   </component>
235 232
   <component name="ProjectFrameBounds">
236 233
     <option name="y" value="23" />
237
-<<<<<<< HEAD
238
-    <option name="width" value="1280" />
239
-    <option name="height" value="702" />
240
-  </component>
241
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
242
-    <ConfirmationsSetting value="2" id="Add" />
243
-=======
244 234
     <option name="width" value="1426" />
245 235
     <option name="height" value="804" />
246
->>>>>>> dev
247 236
   </component>
248 237
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
249 238
   <component name="ProjectView">
@@ -251,11 +240,8 @@
251 240
       <foldersAlwaysOnTop value="true" />
252 241
     </navigator>
253 242
     <panes>
254
-<<<<<<< HEAD
255
-      <pane id="PackagesPane" />
256
-=======
243
+
257 244
       <pane id="AndroidView" />
258
->>>>>>> dev
259 245
       <pane id="ProjectPane">
260 246
         <subPane>
261 247
           <expand>
@@ -266,6 +252,11 @@
266 252
             <path>
267 253
               <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
268 254
               <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
255
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
256
+            </path>
257
+            <path>
258
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
259
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
269 260
               <item name="src" type="462c0819:PsiDirectoryNode" />
270 261
             </path>
271 262
             <path>
@@ -298,17 +289,49 @@
298 289
               <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
299 290
               <item name="config" type="462c0819:PsiDirectoryNode" />
300 291
             </path>
292
+            <path>
293
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
294
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
295
+              <item name="src" type="462c0819:PsiDirectoryNode" />
296
+              <item name="main" type="462c0819:PsiDirectoryNode" />
297
+              <item name="java" type="462c0819:PsiDirectoryNode" />
298
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
299
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
300
+            </path>
301
+            <path>
302
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
303
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
304
+              <item name="src" type="462c0819:PsiDirectoryNode" />
305
+              <item name="main" type="462c0819:PsiDirectoryNode" />
306
+              <item name="java" type="462c0819:PsiDirectoryNode" />
307
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
308
+              <item name="model" type="462c0819:PsiDirectoryNode" />
309
+            </path>
310
+            <path>
311
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
312
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
313
+              <item name="src" type="462c0819:PsiDirectoryNode" />
314
+              <item name="main" type="462c0819:PsiDirectoryNode" />
315
+              <item name="java" type="462c0819:PsiDirectoryNode" />
316
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
317
+              <item name="repository" type="462c0819:PsiDirectoryNode" />
318
+            </path>
319
+            <path>
320
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
321
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
322
+              <item name="src" type="462c0819:PsiDirectoryNode" />
323
+              <item name="main" type="462c0819:PsiDirectoryNode" />
324
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
325
+            </path>
301 326
           </expand>
302 327
           <select />
303 328
         </subPane>
304 329
       </pane>
305
-<<<<<<< HEAD
330
+
306 331
       <pane id="Scope" />
307 332
       <pane id="AndroidView" />
308
-=======
309
-      <pane id="PackagesPane" />
310 333
       <pane id="Scope" />
311
->>>>>>> dev
334
+
312 335
       <pane id="Course" />
313 336
     </panes>
314 337
   </component>
@@ -511,14 +534,11 @@
511 534
       <workItem from="1531837614306" duration="20000" />
512 535
       <workItem from="1532024920972" duration="1933000" />
513 536
       <workItem from="1532095197895" duration="1931000" />
514
-<<<<<<< HEAD
515
-      <workItem from="1532704326578" duration="306000" />
516
-=======
537
+
517 538
       <workItem from="1532460873998" duration="385000" />
518 539
       <workItem from="1532523890378" duration="1028000" />
519 540
       <workItem from="1532528099328" duration="14938000" />
520 541
       <workItem from="1532701223355" duration="2106000" />
521
->>>>>>> dev
522 542
     </task>
523 543
     <servers />
524 544
   </component>
@@ -552,18 +572,12 @@
552 572
     </history-entry>
553 573
   </component>
554 574
   <component name="TimeTrackingManager">
555
-<<<<<<< HEAD
556
-    <option name="totallyTimeSpent" value="18491000" />
557
-  </component>
558
-  <component name="ToolWindowManager">
559
-    <frame x="0" y="23" width="1280" height="702" extended-state="0" />
560
-=======
575
+
561 576
     <option name="totallyTimeSpent" value="40895000" />
562 577
   </component>
563 578
   <component name="ToolWindowManager">
564 579
     <frame x="0" y="23" width="1426" height="804" extended-state="0" />
565 580
     <editor active="true" />
566
->>>>>>> dev
567 581
     <layout>
568 582
       <window_info anchor="right" id="Palette" order="3" />
569 583
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -572,36 +586,24 @@
572 586
       <window_info id="Capture Tool" order="2" />
573 587
       <window_info id="Designer" order="2" />
574 588
       <window_info anchor="right" id="Database" order="3" />
575
-<<<<<<< HEAD
576
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
577
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
578
-      <window_info id="UI Designer" order="2" />
579
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
580
-      <window_info anchor="bottom" id="TODO" order="6" />
581
-=======
589
+
582 590
       <window_info id="Structure" order="1" sideWeight="0.17450981" side_tool="true" visible="true" weight="0.2550578" />
583 591
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
584 592
       <window_info id="UI Designer" order="2" />
585 593
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39886847" />
586 594
       <window_info anchor="bottom" id="TODO" order="6" />
587 595
       <window_info anchor="bottom" id="Messages" order="9" weight="0.3289256" />
588
->>>>>>> dev
589 596
       <window_info anchor="right" id="Palette&#9;" order="3" />
590 597
       <window_info id="Image Layers" order="2" />
591 598
       <window_info anchor="bottom" id="Java Enterprise" order="8" />
592 599
       <window_info anchor="right" id="Capture Analysis" order="3" />
600
+
593 601
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
594
-<<<<<<< HEAD
595
-      <window_info anchor="bottom" id="Run" order="2" weight="0.0" />
596
-      <window_info anchor="bottom" id="Spring" order="9" />
597
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.4" />
598
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.28109854" />
599
-=======
600 602
       <window_info anchor="bottom" id="Run" order="2" weight="0.3493635" />
603
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
601 604
       <window_info anchor="bottom" id="Spring" order="9" weight="0.32956153" />
602 605
       <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.27864215" />
603 606
       <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8254902" visible="true" weight="0.2550578" />
604
->>>>>>> dev
605 607
       <window_info anchor="right" id="Bean Validation" order="4" />
606 608
       <window_info id="Web" order="4" side_tool="true" />
607 609
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -610,23 +612,16 @@
610 612
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
611 613
       <window_info anchor="bottom" id="Message" order="0" />
612 614
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
613
-<<<<<<< HEAD
614
-      <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
615
-=======
616
->>>>>>> dev
615
+
617 616
       <window_info id="Learn" order="5" />
618 617
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
619 618
       <window_info anchor="bottom" id="Find" order="1" weight="0.32954547" />
620 619
     </layout>
621 620
     <layout-to-restore>
622 621
       <window_info anchor="right" id="Palette" order="3" />
623
-<<<<<<< HEAD
624
-      <window_info anchor="bottom" id="Find" order="1" />
625
-=======
626
->>>>>>> dev
622
+
627 623
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
628 624
       <window_info anchor="right" id="Capture Analysis" order="4" />
629
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
630 625
       <window_info anchor="bottom" id="Run" order="2" />
631 626
       <window_info anchor="right" id="Theme Preview" order="5" />
632 627
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2358643" />
@@ -634,22 +629,16 @@
634 629
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
635 630
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
636 631
       <window_info anchor="bottom" id="TODO" order="6" />
637
-      <window_info anchor="bottom" id="Version Control" order="10" />
638 632
       <window_info id="Image Layers" order="2" />
639 633
       <window_info id="Designer" order="3" />
640 634
       <window_info id="UI Designer" order="4" />
641
-      <window_info anchor="bottom" id="Find" order="1" />
635
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
642 636
       <window_info anchor="right" id="Database" order="6" />
643 637
       <window_info anchor="right" id="Palette&#9;" order="7" />
644 638
       <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49919224" weight="0.65384614" />
645 639
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
646
-<<<<<<< HEAD
647
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
648
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
649
-=======
650 640
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
651 641
       <window_info anchor="bottom" id="Version Control" order="10" />
652
->>>>>>> dev
653 642
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50080776" side_tool="true" weight="0.30936456" />
654 643
       <window_info id="Capture Tool" order="5" />
655 644
       <window_info anchor="bottom" id="Message" order="0" />
@@ -710,9 +699,6 @@
710 699
         </state>
711 700
       </provider>
712 701
     </entry>
713
-<<<<<<< HEAD
714
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/chain/test/chainTest.java">
715
-=======
716 702
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.3.1.RELEASE/spring-boot-1.3.1.RELEASE.jar!/org/springframework/boot/SpringApplication.class">
717 703
       <provider selected="true" editor-type-id="text-editor">
718 704
         <state>
@@ -721,7 +707,6 @@
721 707
       </provider>
722 708
     </entry>
723 709
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/block/test/BlockTest.java">
724
->>>>>>> dev
725 710
       <provider selected="true" editor-type-id="text-editor">
726 711
         <state relative-caret-position="308">
727 712
           <caret line="32" column="5" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
@@ -775,19 +760,10 @@
775 760
       <provider selected="true" editor-type-id="text-editor">
776 761
         <state relative-caret-position="120">
777 762
           <caret line="9" selection-start-line="9" selection-end-line="9" />
778
-          <folding>
779
-            <element signature="e#296#297#0" expanded="true" />
780
-          </folding>
781
-        </state>
782
-      </provider>
783
-    </entry>
784
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql">
785
-      <provider selected="true" editor-type-id="text-editor">
786
-        <state relative-caret-position="210">
787
-          <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
788 763
         </state>
789 764
       </provider>
790 765
     </entry>
766
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/db/migration/V2__create_block.sql" />
791 767
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/test/java/com/zipcoin/redCoin/TransactionAndWallet/TransactionAndWalletTest.java">
792 768
       <provider selected="true" editor-type-id="text-editor">
793 769
         <state relative-caret-position="105">
@@ -795,21 +771,10 @@
795 771
         </state>
796 772
       </provider>
797 773
     </entry>
798
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java">
799
-      <provider selected="true" editor-type-id="text-editor">
800
-        <state relative-caret-position="270">
801
-          <caret line="27" column="95" selection-start-line="27" selection-start-column="95" selection-end-line="27" selection-end-column="95" />
802
-        </state>
803
-      </provider>
804
-    </entry>
805 774
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/utilities/StringUtil.java">
806 775
       <provider selected="true" editor-type-id="text-editor">
807 776
         <state relative-caret-position="525">
808 777
           <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
809
-          <folding>
810
-            <element signature="e#1170#1171#0" expanded="true" />
811
-            <element signature="e#1209#1210#0" expanded="true" />
812
-          </folding>
813 778
         </state>
814 779
       </provider>
815 780
     </entry>
@@ -843,22 +808,16 @@
843 808
     </entry>
844 809
     <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Transaction.java">
845 810
       <provider selected="true" editor-type-id="text-editor">
846
-<<<<<<< HEAD
847
-        <state>
848
-          <caret column="1" selection-start-column="1" selection-end-column="1" />
849
-=======
811
+
850 812
         <state relative-caret-position="232">
851 813
           <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
852
->>>>>>> dev
853 814
         </state>
854 815
       </provider>
855 816
     </entry>
856
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
817
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java" />
818
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
857 819
       <provider selected="true" editor-type-id="text-editor">
858
-<<<<<<< HEAD
859
-        <state relative-caret-position="91">
860
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
861
-=======
820
+
862 821
         <state relative-caret-position="285">
863 822
           <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
864 823
           <folding>
@@ -871,40 +830,41 @@
871 830
             <element signature="e#622#623#0" expanded="true" />
872 831
             <element signature="e#664#665#0" expanded="true" />
873 832
           </folding>
874
->>>>>>> dev
833
+
875 834
         </state>
876 835
       </provider>
877 836
     </entry>
878
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/PersistenceConfiguration.java">
837
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
879 838
       <provider selected="true" editor-type-id="text-editor">
880
-<<<<<<< HEAD
881
-        <state relative-caret-position="90">
882
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
883
-=======
839
+
884 840
         <state relative-caret-position="270">
885 841
           <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
886 842
         </state>
887 843
       </provider>
888 844
     </entry>
889
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/resources/application.properties">
845
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/controller/WalletController.java">
890 846
       <provider selected="true" editor-type-id="text-editor">
891
-        <state relative-caret-position="45">
892
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
847
+        <state relative-caret-position="405">
848
+          <caret line="36" column="35" selection-start-line="36" selection-start-column="35" selection-end-line="36" selection-end-column="35" />
893 849
         </state>
894 850
       </provider>
895 851
     </entry>
896
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/pom.xml">
852
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java">
897 853
       <provider selected="true" editor-type-id="text-editor">
898
-        <state relative-caret-position="-80">
899
-          <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
854
+        <state relative-caret-position="305">
855
+          <caret line="23" column="41" lean-forward="true" selection-start-line="23" selection-start-column="41" selection-end-line="23" selection-end-column="41" />
856
+          <folding>
857
+            <element signature="imports" expanded="true" />
858
+            <element signature="e#523#524#0" expanded="true" />
859
+            <element signature="e#579#580#0" expanded="true" />
860
+          </folding>
900 861
         </state>
901 862
       </provider>
902 863
     </entry>
903
-    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java">
864
+    <entry file="file://$PROJECT_DIR$/ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java">
904 865
       <provider selected="true" editor-type-id="text-editor">
905 866
         <state relative-caret-position="60">
906 867
           <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
907
->>>>>>> dev
908 868
         </state>
909 869
       </provider>
910 870
     </entry>

+ 1
- 1
ZipCoinRedIonicClient/.sourcemaps/main.js.map
File diff suppressed because it is too large
View File


+ 3
- 2
ZipCoinRedIonicClient/ionic.config.json View File

@@ -1,5 +1,6 @@
1 1
 {
2 2
   "name": "ZipCoinRed",
3 3
   "integrations": {},
4
-  "type": "ionic-angular"
5
-}
4
+  "type": "ionic-angular",
5
+  "app_id": ""
6
+}

+ 6
- 6
ZipCoinRedIonicClient/src/pages/wallet/wallet.html View File

@@ -20,8 +20,8 @@
20 20
   <ion-item>
21 21
       <ion-label>Name</ion-label>
22 22
       <ion-select [(ngModel)]="name">
23
-        <ion-option value="navya">navya</ion-option>
24
-        <ion-option value="aleena">aleena</ion-option>
23
+        <ion-option value="ann">Ann</ion-option>
24
+        <ion-option value="sen">Sen</ion-option>
25 25
       </ion-select>
26 26
      </ion-item>
27 27
      <ion-item>
@@ -40,15 +40,15 @@
40 40
        <ion-item>
41 41
           <ion-label>From</ion-label>
42 42
           <ion-select [(ngModel)]="name">
43
-            <ion-option value="navya">navya</ion-option>
44
-            <ion-option value="aleena">aleena</ion-option>
43
+            <ion-option value="ann">Ann</ion-option>
44
+            <ion-option value="sen">Sen</ion-option>
45 45
           </ion-select>
46 46
          </ion-item>
47 47
          <ion-item>
48 48
             <ion-label>To</ion-label>
49 49
             <ion-select [(ngModel)]="to">
50
-              <ion-option value="navya">navya</ion-option>
51
-              <ion-option value="aleena">aleena</ion-option>
50
+              <ion-option value="ann">Ann</ion-option>
51
+              <ion-option value="sen">Sen</ion-option>
52 52
             </ion-select>
53 53
            </ion-item>
54 54
       

+ 1
- 1
ZipCoinRedIonicClient/www/build/0.js View File

@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "WalletPageModule", function() { return WalletPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(104);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet__ = __webpack_require__(103);
12 12
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__providers_transaction_service__ = __webpack_require__(50);
13 13
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
14 14
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

+ 2
- 2
ZipCoinRedIonicClient/www/build/1.js View File

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([1],{
2 2
 
3
-/***/ 281:
3
+/***/ 282:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransactionPageModule", function() { return TransactionPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(101);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__transaction__ = __webpack_require__(104);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 2
- 2
ZipCoinRedIonicClient/www/build/2.js View File

@@ -1,6 +1,6 @@
1 1
 webpackJsonp([2],{
2 2
 
3
-/***/ 282:
3
+/***/ 281:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
@@ -8,7 +8,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
8 8
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TabsPageModule", function() { return TabsPageModule; });
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
10 10
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
11
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(103);
11
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__tabs__ = __webpack_require__(102);
12 12
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
13 13
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
14 14
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

+ 139
- 74
ZipCoinRedIonicClient/www/build/main.js View File

@@ -1,10 +1,10 @@
1 1
 webpackJsonp([4],{
2 2
 
3
-/***/ 100:
3
+/***/ 101:
4 4
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
5 5
 
6 6
 "use strict";
7
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
7
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
8 8
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
9 9
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
10 10
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -19,6 +19,54 @@ var __metadata = (this && this.__metadata) || function (k, v) {
19 19
 
20 20
 
21 21
 /**
22
+ * Generated class for the Tab4Page page.
23
+ *
24
+ * See https://ionicframework.com/docs/components/#navigation for more info on
25
+ * Ionic pages and navigation.
26
+ */
27
+var Tab4Page = /** @class */ (function () {
28
+    function Tab4Page(navCtrl, navParams) {
29
+        this.navCtrl = navCtrl;
30
+        this.navParams = navParams;
31
+    }
32
+    Tab4Page.prototype.ionViewDidLoad = function () {
33
+        console.log('ionViewDidLoad Tab4Page');
34
+    };
35
+    Tab4Page = __decorate([
36
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
37
+            selector: 'page-tab4',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
38
+        }),
39
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
40
+    ], Tab4Page);
41
+    return Tab4Page;
42
+}());
43
+
44
+//# sourceMappingURL=tab4.js.map
45
+
46
+/***/ }),
47
+
48
+/***/ 102:
49
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
50
+
51
+"use strict";
52
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return WalletPage; });
53
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(159);
55
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(103);
56
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(104);
57
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(101);
58
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
59
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
60
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
61
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
62
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
63
+};
64
+var __metadata = (this && this.__metadata) || function (k, v) {
65
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
66
+};
67
+
68
+
69
+/**
22 70
  * Generated class for the WalletPage page.
23 71
  *
24 72
  * See https://ionicframework.com/docs/components/#navigation for more info on
@@ -34,7 +82,7 @@ var WalletPage = /** @class */ (function () {
34 82
     };
35 83
     WalletPage = __decorate([
36 84
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
37
-            selector: 'page-wallet',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="navya">navya</ion-option>\n        <ion-option value="aleena">aleena</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="navya">navya</ion-option>\n            <ion-option value="aleena">aleena</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="navya">navya</ion-option>\n              <ion-option value="aleena">aleena</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
85
+            selector: 'page-tabs',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
38 86
         }),
39 87
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
40 88
     ], WalletPage);
@@ -45,13 +93,14 @@ var WalletPage = /** @class */ (function () {
45 93
 
46 94
 /***/ }),
47 95
 
48
-/***/ 101:
96
+/***/ 103:
49 97
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
50 98
 
51 99
 "use strict";
52 100
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionPage; });
53 101
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
54 102
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
103
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
55 104
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
56 105
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
57 106
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -63,40 +112,46 @@ var __metadata = (this && this.__metadata) || function (k, v) {
63 112
 };
64 113
 
65 114
 
115
+
66 116
 /**
67 117
  * Generated class for the TransactionPage page.
68 118
  *
69 119
  * See https://ionicframework.com/docs/components/#navigation for more info on
70 120
  * Ionic pages and navigation.
71 121
  */
72
-var TransactionPage = /** @class */ (function () {
73
-    function TransactionPage(navCtrl, navParams) {
122
+var WalletPage = /** @class */ (function () {
123
+    function WalletPage(navCtrl, navParams, transactionService) {
74 124
         this.navCtrl = navCtrl;
75 125
         this.navParams = navParams;
126
+        this.transactionService = transactionService;
76 127
     }
77 128
     TransactionPage.prototype.ionViewDidLoad = function () {
78 129
         console.log('ionViewDidLoad TransactionPage');
79 130
     };
80
-    TransactionPage = __decorate([
131
+    WalletPage.prototype.createTransaction = function () {
132
+        this.transactionService.createTransaction(this.transaction);
133
+    };
134
+    WalletPage = __decorate([
81 135
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
82
-            selector: 'page-transaction',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ block.recipient }}</div>\n                  <div>Amount: {{ block.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
136
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="ann">Ann</ion-option>\n        <ion-option value="sen">Sen</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="ann">Ann</ion-option>\n            <ion-option value="sen">Sen</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="ann">Ann</ion-option>\n              <ion-option value="sen">Sen</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
83 137
         }),
84
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
85
-    ], TransactionPage);
86
-    return TransactionPage;
138
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
139
+    ], WalletPage);
140
+    return WalletPage;
87 141
 }());
88 142
 
89 143
 //# sourceMappingURL=transaction.js.map
90 144
 
91 145
 /***/ }),
92 146
 
93
-/***/ 102:
147
+/***/ 104:
94 148
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
95 149
 
96 150
 "use strict";
97 151
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Tab4Page; });
98 152
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
99 153
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
154
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__ = __webpack_require__(50);
100 155
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
101 156
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
102 157
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -108,34 +163,44 @@ var __metadata = (this && this.__metadata) || function (k, v) {
108 163
 };
109 164
 
110 165
 
166
+
111 167
 /**
112 168
  * Generated class for the Tab4Page page.
113 169
  *
114 170
  * See https://ionicframework.com/docs/components/#navigation for more info on
115 171
  * Ionic pages and navigation.
116 172
  */
117
-var Tab4Page = /** @class */ (function () {
118
-    function Tab4Page(navCtrl, navParams) {
173
+var TransactionPage = /** @class */ (function () {
174
+    function TransactionPage(navCtrl, navParams, transactionService) {
119 175
         this.navCtrl = navCtrl;
120 176
         this.navParams = navParams;
177
+        this.transactionService = transactionService;
178
+        this.getAllTransactions;
121 179
     }
122 180
     Tab4Page.prototype.ionViewDidLoad = function () {
123 181
         console.log('ionViewDidLoad Tab4Page');
124 182
     };
125
-    Tab4Page = __decorate([
183
+    TransactionPage.prototype.getAllTransactions = function () {
184
+        var _this = this;
185
+        this.transactionService.getAllTransactions().subscribe(function (transactions) {
186
+            _this.transactions = transactions;
187
+        });
188
+    };
189
+    TransactionPage = __decorate([
126 190
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
127
-            selector: 'page-tab4',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
191
+            selector: 'page-transaction',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ block.recipient }}</div>\n                  <div>Amount: {{ block.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
128 192
         }),
129
-        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
130
-    ], Tab4Page);
131
-    return Tab4Page;
193
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
194
+            __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
195
+    ], TransactionPage);
196
+    return TransactionPage;
132 197
 }());
133 198
 
134 199
 //# sourceMappingURL=tab4.js.map
135 200
 
136 201
 /***/ }),
137 202
 
138
-/***/ 114:
203
+/***/ 116:
139 204
 /***/ (function(module, exports) {
140 205
 
141 206
 function webpackEmptyAsyncContext(req) {
@@ -148,11 +213,11 @@ function webpackEmptyAsyncContext(req) {
148 213
 webpackEmptyAsyncContext.keys = function() { return []; };
149 214
 webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
150 215
 module.exports = webpackEmptyAsyncContext;
151
-webpackEmptyAsyncContext.id = 114;
216
+webpackEmptyAsyncContext.id = 116;
152 217
 
153 218
 /***/ }),
154 219
 
155
-/***/ 156:
220
+/***/ 158:
156 221
 /***/ (function(module, exports, __webpack_require__) {
157 222
 
158 223
 var map = {
@@ -161,15 +226,15 @@ var map = {
161 226
 		3
162 227
 	],
163 228
 	"../pages/tabs/tabs.module": [
164
-		279,
229
+		281,
165 230
 		2
166 231
 	],
167 232
 	"../pages/transaction/transaction.module": [
168
-		281,
233
+		282,
169 234
 		1
170 235
 	],
171 236
 	"../pages/wallet/wallet.module": [
172
-		282,
237
+		283,
173 238
 		0
174 239
 	]
175 240
 };
@@ -184,19 +249,19 @@ function webpackAsyncContext(req) {
184 249
 webpackAsyncContext.keys = function webpackAsyncContextKeys() {
185 250
 	return Object.keys(map);
186 251
 };
187
-webpackAsyncContext.id = 156;
252
+webpackAsyncContext.id = 158;
188 253
 module.exports = webpackAsyncContext;
189 254
 
190 255
 /***/ }),
191 256
 
192
-/***/ 157:
257
+/***/ 159:
193 258
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
194 259
 
195 260
 "use strict";
196 261
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HomePage; });
197 262
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
198 263
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
199
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(158);
264
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__providers_block_service__ = __webpack_require__(160);
200 265
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
201 266
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
202 267
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -236,7 +301,7 @@ var HomePage = /** @class */ (function () {
236 301
     };
237 302
     HomePage = __decorate([
238 303
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
239
-            selector: 'page-home',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
304
+            selector: 'page-home',template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
240 305
         }),
241 306
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
242 307
     ], HomePage);
@@ -253,12 +318,12 @@ var HomePage = /** @class */ (function () {
253 318
 
254 319
 /***/ }),
255 320
 
256
-/***/ 158:
321
+/***/ 160:
257 322
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
258 323
 
259 324
 "use strict";
260 325
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BlockService; });
261
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(159);
326
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_common_http__ = __webpack_require__(78);
262 327
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
263 328
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
264 329
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -297,13 +362,13 @@ var BlockService = /** @class */ (function () {
297 362
 
298 363
 /***/ }),
299 364
 
300
-/***/ 203:
365
+/***/ 204:
301 366
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
302 367
 
303 368
 "use strict";
304 369
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
305
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(204);
306
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(224);
370
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__ = __webpack_require__(205);
371
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__app_module__ = __webpack_require__(225);
307 372
 
308 373
 
309 374
 Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* platformBrowserDynamic */])().bootstrapModule(__WEBPACK_IMPORTED_MODULE_1__app_module__["a" /* AppModule */]);
@@ -311,7 +376,7 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
311 376
 
312 377
 /***/ }),
313 378
 
314
-/***/ 224:
379
+/***/ 225:
315 380
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
316 381
 
317 382
 "use strict";
@@ -319,16 +384,17 @@ Object(__WEBPACK_IMPORTED_MODULE_0__angular_platform_browser_dynamic__["a" /* pl
319 384
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_platform_browser__ = __webpack_require__(31);
320 385
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_core__ = __webpack_require__(0);
321 386
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_ionic_angular__ = __webpack_require__(28);
322
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
323
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(202);
324
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(278);
325
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(159);
326
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(158);
327
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(157);
328
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(100);
329
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(101);
330
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(99);
331
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(102);
387
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
388
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__ = __webpack_require__(203);
389
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__app_component__ = __webpack_require__(279);
390
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__angular_common_http__ = __webpack_require__(78);
391
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__providers_block_service__ = __webpack_require__(160);
392
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__pages_home_home__ = __webpack_require__(159);
393
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__pages_wallet_wallet__ = __webpack_require__(103);
394
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__pages_transaction_transaction__ = __webpack_require__(104);
395
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__pages_tabs_tabs__ = __webpack_require__(102);
396
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__pages_tab4_tab4__ = __webpack_require__(101);
397
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__ = __webpack_require__(50);
332 398
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
333 399
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
334 400
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -348,6 +414,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
348 414
 
349 415
 
350 416
 
417
+
351 418
 var AppModule = /** @class */ (function () {
352 419
     function AppModule() {
353 420
     }
@@ -386,6 +453,7 @@ var AppModule = /** @class */ (function () {
386 453
                 __WEBPACK_IMPORTED_MODULE_4__ionic_native_status_bar__["a" /* StatusBar */],
387 454
                 __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */],
388 455
                 __WEBPACK_IMPORTED_MODULE_7__providers_block_service__["a" /* BlockService */],
456
+                __WEBPACK_IMPORTED_MODULE_13__providers_transaction_service__["a" /* TransactionService */],
389 457
                 { provide: __WEBPACK_IMPORTED_MODULE_1__angular_core__["u" /* ErrorHandler */], useClass: __WEBPACK_IMPORTED_MODULE_2_ionic_angular__["b" /* IonicErrorHandler */] }
390 458
             ]
391 459
         })
@@ -397,16 +465,16 @@ var AppModule = /** @class */ (function () {
397 465
 
398 466
 /***/ }),
399 467
 
400
-/***/ 278:
468
+/***/ 279:
401 469
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
402 470
 
403 471
 "use strict";
404 472
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return MyApp; });
405 473
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
406 474
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_ionic_angular__ = __webpack_require__(28);
407
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(202);
408
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(199);
409
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(99);
475
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__ = __webpack_require__(203);
476
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__ = __webpack_require__(200);
477
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__pages_tabs_tabs__ = __webpack_require__(102);
410 478
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
411 479
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
412 480
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -432,7 +500,7 @@ var MyApp = /** @class */ (function () {
432 500
         });
433 501
     }
434 502
     MyApp = __decorate([
435
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
503
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/AleenaRM/Labi/zipcoin/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
436 504
         }),
437 505
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* Platform */], __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__["a" /* StatusBar */], __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */]])
438 506
     ], MyApp);
@@ -443,16 +511,13 @@ var MyApp = /** @class */ (function () {
443 511
 
444 512
 /***/ }),
445 513
 
446
-/***/ 99:
514
+/***/ 50:
447 515
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
448 516
 
449 517
 "use strict";
450
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TabsPage; });
518
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TransactionService; });
451 519
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_core__ = __webpack_require__(0);
452
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__home_home__ = __webpack_require__(157);
453
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__ = __webpack_require__(100);
454
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__ = __webpack_require__(101);
455
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__ = __webpack_require__(102);
520
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__angular_common_http__ = __webpack_require__(78);
456 521
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
457 522
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
458 523
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -464,28 +529,28 @@ var __metadata = (this && this.__metadata) || function (k, v) {
464 529
 };
465 530
 
466 531
 
467
-
468
-
469
-
470
-var TabsPage = /** @class */ (function () {
471
-    function TabsPage() {
472
-        this.homePage = __WEBPACK_IMPORTED_MODULE_1__home_home__["a" /* HomePage */];
473
-        this.walletPage = __WEBPACK_IMPORTED_MODULE_2__wallet_wallet__["a" /* WalletPage */];
474
-        this.transactionPage = __WEBPACK_IMPORTED_MODULE_3__transaction_transaction__["a" /* TransactionPage */];
475
-        this.tab4 = __WEBPACK_IMPORTED_MODULE_4__tab4_tab4__["a" /* Tab4Page */];
532
+var TransactionService = /** @class */ (function () {
533
+    function TransactionService(http) {
534
+        this.http = http;
535
+        this.API = 'http://localhost:8080/api/v1';
536
+        this.TRANSACTION_API = this.API + '/transactions';
476 537
     }
477
-    TabsPage = __decorate([
478
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
479
-            selector: 'page-tabs',template:/*ion-inline-start:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/shivamp/labs/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
480
-        }),
481
-        __metadata("design:paramtypes", [])
482
-    ], TabsPage);
483
-    return TabsPage;
538
+    TransactionService.prototype.createTransaction = function (transaction) {
539
+        return this.http.post(this.TRANSACTION_API, transaction);
540
+    };
541
+    TransactionService.prototype.getAllTransactions = function () {
542
+        return this.http.get(this.TRANSACTION_API);
543
+    };
544
+    TransactionService = __decorate([
545
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["A" /* Injectable */])(),
546
+        __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1__angular_common_http__["a" /* HttpClient */]])
547
+    ], TransactionService);
548
+    return TransactionService;
484 549
 }());
485 550
 
486
-//# sourceMappingURL=tabs.js.map
551
+//# sourceMappingURL=transaction-service.js.map
487 552
 
488 553
 /***/ })
489 554
 
490
-},[203]);
555
+},[204]);
491 556
 //# sourceMappingURL=main.js.map

+ 1
- 1
ZipCoinRedIonicClient/www/build/main.js.map
File diff suppressed because it is too large
View File


+ 1
- 1
ZipCoinRedIonicClient/www/build/vendor.js.map
File diff suppressed because it is too large
View File


+ 366
- 27
ZipCoinRedJavaServer/.idea/workspace.xml View File

@@ -10,12 +10,82 @@
10 10
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11 11
     <option name="LAST_RESOLUTION" value="IGNORE" />
12 12
   </component>
13
+  <component name="FileEditorManager">
14
+    <leaf>
15
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/pom.xml">
17
+          <provider selected="true" editor-type-id="text-editor">
18
+            <state relative-caret-position="840">
19
+              <caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
20
+            </state>
21
+          </provider>
22
+        </entry>
23
+      </file>
24
+      <file leaf-file-name="BlockLoader.java" pinned="false" current-in-tab="false">
25
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
26
+          <provider selected="true" editor-type-id="text-editor">
27
+            <state relative-caret-position="150">
28
+              <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
29
+              <folding>
30
+                <element signature="imports" expanded="true" />
31
+              </folding>
32
+            </state>
33
+          </provider>
34
+        </entry>
35
+      </file>
36
+      <file leaf-file-name="TransactionLoader.java" pinned="false" current-in-tab="false">
37
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
38
+          <provider selected="true" editor-type-id="text-editor">
39
+            <state relative-caret-position="75">
40
+              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
41
+            </state>
42
+          </provider>
43
+        </entry>
44
+      </file>
45
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="true">
46
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
47
+          <provider selected="true" editor-type-id="text-editor">
48
+            <state relative-caret-position="517">
49
+              <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
50
+              <folding>
51
+                <element signature="imports" expanded="true" />
52
+                <element signature="e#523#524#0" expanded="true" />
53
+                <element signature="e#579#580#0" expanded="true" />
54
+              </folding>
55
+            </state>
56
+          </provider>
57
+        </entry>
58
+      </file>
59
+    </leaf>
60
+  </component>
61
+  <component name="Git.Settings">
62
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
63
+  </component>
64
+  <component name="IdeDocumentHistory">
65
+    <option name="CHANGED_PATHS">
66
+      <list>
67
+        <option value="$PROJECT_DIR$/pom.xml" />
68
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java" />
69
+      </list>
70
+    </option>
71
+  </component>
13 72
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
14 73
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
15 74
   <component name="JsGulpfileManager">
16 75
     <detection-done>true</detection-done>
17 76
     <sorting>DEFINITION_ORDER</sorting>
18 77
   </component>
78
+  <component name="MavenProjectNavigator">
79
+    <treeState>
80
+      <expand>
81
+        <path>
82
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
83
+          <item name="zip-coin" type="9519ce18:MavenProjectsStructure$ProjectNode" />
84
+        </path>
85
+      </expand>
86
+      <select />
87
+    </treeState>
88
+  </component>
19 89
   <component name="NodePackageJsonFileManager">
20 90
     <packageJsonPaths />
21 91
   </component>
@@ -29,13 +99,74 @@
29 99
       <foldersAlwaysOnTop value="true" />
30 100
     </navigator>
31 101
     <panes>
102
+      <pane id="PackagesPane" />
32 103
       <pane id="Scope" />
104
+      <pane id="ProjectPane">
105
+        <subPane>
106
+          <expand>
107
+            <path>
108
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
109
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
110
+            </path>
111
+            <path>
112
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
113
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
114
+              <item name="src" type="462c0819:PsiDirectoryNode" />
115
+            </path>
116
+            <path>
117
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
118
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
119
+              <item name="src" type="462c0819:PsiDirectoryNode" />
120
+              <item name="main" type="462c0819:PsiDirectoryNode" />
121
+            </path>
122
+            <path>
123
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
124
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
125
+              <item name="src" type="462c0819:PsiDirectoryNode" />
126
+              <item name="main" type="462c0819:PsiDirectoryNode" />
127
+              <item name="java" type="462c0819:PsiDirectoryNode" />
128
+            </path>
129
+            <path>
130
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
131
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
132
+              <item name="src" type="462c0819:PsiDirectoryNode" />
133
+              <item name="main" type="462c0819:PsiDirectoryNode" />
134
+              <item name="java" type="462c0819:PsiDirectoryNode" />
135
+              <item name="com" type="462c0819:PsiDirectoryNode" />
136
+            </path>
137
+            <path>
138
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
139
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
140
+              <item name="src" type="462c0819:PsiDirectoryNode" />
141
+              <item name="main" type="462c0819:PsiDirectoryNode" />
142
+              <item name="java" type="462c0819:PsiDirectoryNode" />
143
+              <item name="com" type="462c0819:PsiDirectoryNode" />
144
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
145
+            </path>
146
+            <path>
147
+              <item name="ZipCoinRedJavaServer" type="b2602c69:ProjectViewProjectNode" />
148
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
149
+              <item name="src" type="462c0819:PsiDirectoryNode" />
150
+              <item name="main" type="462c0819:PsiDirectoryNode" />
151
+              <item name="java" type="462c0819:PsiDirectoryNode" />
152
+              <item name="com" type="462c0819:PsiDirectoryNode" />
153
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
154
+              <item name="config" type="462c0819:PsiDirectoryNode" />
155
+            </path>
156
+          </expand>
157
+          <select />
158
+        </subPane>
159
+      </pane>
33 160
       <pane id="AndroidView" />
34
-      <pane id="PackagesPane" />
35
-      <pane id="ProjectPane" />
36 161
     </panes>
37 162
   </component>
38 163
   <component name="PropertiesComponent">
164
+    <property name="RequestMappingsPanelOrder0" value="0" />
165
+    <property name="RequestMappingsPanelOrder1" value="1" />
166
+    <property name="RequestMappingsPanelOrder2" value="2" />
167
+    <property name="RequestMappingsPanelWidth0" value="75" />
168
+    <property name="RequestMappingsPanelWidth1" value="75" />
169
+    <property name="RequestMappingsPanelWidth2" value="75" />
39 170
     <property name="WebServerToolWindowFactoryState" value="false" />
40 171
     <property name="aspect.path.notification.shown" value="true" />
41 172
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -130,42 +261,69 @@
130 261
     <servers />
131 262
   </component>
132 263
   <component name="TimeTrackingManager">
133
-    <option name="totallyTimeSpent" value="17000" />
264
+    <option name="totallyTimeSpent" value="1555000" />
134 265
   </component>
135 266
   <component name="ToolWindowManager">
136
-    <frame x="0" y="23" width="1280" height="713" extended-state="0" />
267
+    <frame x="0" y="0" width="1680" height="1050" extended-state="6" />
137 268
     <layout>
138
-      <window_info anchor="right" id="Palette" />
139
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
140
-      <window_info anchor="right" id="Maven Projects" />
141
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
142
-      <window_info id="Capture Tool" />
143
-      <window_info id="Designer" />
144
-      <window_info anchor="right" id="Database" />
269
+      <window_info anchor="right" id="Palette" order="3" />
270
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
271
+      <window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.32967034" />
272
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
273
+      <window_info id="Capture Tool" order="2" />
274
+      <window_info id="Designer" order="2" />
275
+      <window_info anchor="right" id="Database" order="3" />
145 276
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
146 277
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
147
-      <window_info id="UI Designer" />
278
+      <window_info id="UI Designer" order="2" />
148 279
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
149 280
       <window_info anchor="bottom" id="TODO" order="6" />
150
-      <window_info anchor="right" id="Palette&#9;" />
151
-      <window_info id="Image Layers" />
152
-      <window_info anchor="bottom" id="Java Enterprise" />
153
-      <window_info anchor="right" id="Capture Analysis" />
281
+      <window_info anchor="bottom" id="Messages" />
282
+      <window_info anchor="right" id="Palette&#9;" order="3" />
283
+      <window_info id="Image Layers" order="2" />
284
+      <window_info anchor="bottom" id="Java Enterprise" order="7" />
285
+      <window_info anchor="right" id="Capture Analysis" order="3" />
286
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
287
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32923076" />
288
+      <window_info anchor="bottom" id="Spring" order="7" />
289
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32923076" />
290
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24969475" />
291
+      <window_info anchor="right" id="Bean Validation" order="3" />
292
+      <window_info id="Web" order="2" side_tool="true" />
293
+      <window_info anchor="right" id="Theme Preview" order="3" />
294
+      <window_info id="Favorites" order="2" side_tool="true" />
295
+      <window_info anchor="bottom" id="Message" order="0" />
296
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.3298969" />
154 297
       <window_info anchor="bottom" id="Run" order="2" />
155
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
156
-      <window_info anchor="bottom" id="Spring" />
157
-      <window_info anchor="bottom" id="Terminal" />
298
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
158 299
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959612" />
159
-      <window_info anchor="right" id="Bean Validation" />
160
-      <window_info id="Web" side_tool="true" />
161
-      <window_info anchor="right" id="Theme Preview" />
162
-      <window_info id="Favorites" side_tool="true" />
163
-      <window_info anchor="bottom" id="Find" order="1" />
164
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
165
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
300
+      <window_info id="Favorites" order="5" side_tool="true" />
301
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
302
+      <window_info anchor="bottom" id="Java Enterprise" order="8" />
303
+      <window_info anchor="right" id="Theme Preview" order="5" />
304
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
305
+      <window_info anchor="right" id="Palette" order="5" />
306
+      <window_info anchor="right" id="Palette&#9;" order="5" />
307
+      <window_info anchor="right" id="Maven Projects" order="5" />
308
+      <window_info id="Web" order="5" side_tool="true" />
309
+      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
310
+      <window_info anchor="bottom" id="Spring" order="10" />
166 311
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
167
-      <window_info anchor="bottom" id="Message" order="0" />
312
+      <window_info id="Image Layers" order="5" />
313
+      <window_info anchor="right" id="Bean Validation" order="5" />
314
+      <window_info anchor="right" id="Database" order="5" />
315
+      <window_info id="Capture Tool" order="5" />
316
+      <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
317
+      <window_info anchor="right" id="Capture Analysis" order="5" />
318
+      <window_info anchor="bottom" id="TODO" order="6" />
319
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
168 320
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
321
+      <window_info id="UI Designer" order="5" />
322
+      <window_info anchor="bottom" id="Find" order="1" />
323
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
324
+      <window_info anchor="bottom" id="Terminal" order="10" />
325
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
326
+      <window_info id="Designer" order="5" />
169 327
     </layout>
170 328
   </component>
171 329
   <component name="TypeScriptGeneratedFilesManager">
@@ -174,6 +332,187 @@
174 332
   <component name="VcsContentAnnotationSettings">
175 333
     <option name="myLimit" value="2678400000" />
176 334
   </component>
335
+  <component name="editorHistoryManager">
336
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
337
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
338
+      <provider selected="true" editor-type-id="text-editor">
339
+        <state relative-caret-position="405">
340
+          <caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="12" />
341
+        </state>
342
+      </provider>
343
+    </entry>
344
+    <entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
345
+    <entry file="file://$PROJECT_DIR$/pom.xml">
346
+      <provider selected="true" editor-type-id="text-editor">
347
+        <state relative-caret-position="270">
348
+          <caret line="18" column="10" lean-forward="true" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
349
+        </state>
350
+      </provider>
351
+    </entry>
352
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
353
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
354
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
355
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
356
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
357
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
358
+    <entry file="file://$PROJECT_DIR$/pom.xml">
359
+      <provider selected="true" editor-type-id="text-editor">
360
+        <state relative-caret-position="90">
361
+          <caret line="6" column="20" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="20" />
362
+        </state>
363
+      </provider>
364
+    </entry>
365
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
366
+    <entry file="file://$PROJECT_DIR$/ZipCoin-RED.iml" />
367
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/block/test/BlockControllerTest.java">
368
+      <provider selected="true" editor-type-id="text-editor">
369
+        <state relative-caret-position="30">
370
+          <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
371
+        </state>
372
+      </provider>
373
+    </entry>
374
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
375
+      <provider selected="true" editor-type-id="text-editor">
376
+        <state relative-caret-position="438">
377
+          <caret line="461" column="19" selection-start-line="461" selection-start-column="19" selection-end-line="461" selection-end-column="19" />
378
+        </state>
379
+      </provider>
380
+    </entry>
381
+    <entry file="file://$PROJECT_DIR$/pom.xml">
382
+      <provider selected="true" editor-type-id="text-editor">
383
+        <state relative-caret-position="60">
384
+          <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
385
+        </state>
386
+      </provider>
387
+    </entry>
388
+    <entry file="file://$PROJECT_DIR$/src/main/java/Main.java" />
389
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Main.java" />
390
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/testMain.java" />
391
+    <entry file="file://$PROJECT_DIR$/pom.xml">
392
+      <provider selected="true" editor-type-id="text-editor">
393
+        <state relative-caret-position="165">
394
+          <caret line="11" column="10" lean-forward="true" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
395
+        </state>
396
+      </provider>
397
+    </entry>
398
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/minerTest.java" />
399
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
400
+      <provider selected="true" editor-type-id="text-editor">
401
+        <state relative-caret-position="-4617">
402
+          <caret line="124" column="19" selection-start-line="124" selection-start-column="19" selection-end-line="124" selection-end-column="19" />
403
+        </state>
404
+      </provider>
405
+    </entry>
406
+    <entry file="file://$PROJECT_DIR$/.idea/ZipCoin-RED.iml" />
407
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Main.java" />
408
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/testMain.java" />
409
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Main.java" />
410
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/testMain.java" />
411
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/redCoin/Main.java" />
412
+    <entry file="file://$PROJECT_DIR$/src/test/java/mainTest.java" />
413
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/testMain.java" />
414
+    <entry file="file://$PROJECT_DIR$/README.md" />
415
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/mine_block.sql" />
416
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db.migration/V2__mine_block.sql" />
417
+    <entry file="file://$PROJECT_DIR$/src/main/java/redCoin/Miner/Miner.java" />
418
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/block/test/BlockTest.java">
419
+      <provider selected="true" editor-type-id="text-editor">
420
+        <state relative-caret-position="449">
421
+          <caret line="78" lean-forward="true" selection-start-line="78" selection-end-line="78" />
422
+        </state>
423
+      </provider>
424
+    </entry>
425
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java" />
426
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/PersistenceConfiguration.java" />
427
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
428
+      <provider selected="true" editor-type-id="text-editor">
429
+        <state relative-caret-position="75">
430
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
431
+        </state>
432
+      </provider>
433
+    </entry>
434
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
435
+      <provider selected="true" editor-type-id="text-editor">
436
+        <state relative-caret-position="75">
437
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
438
+          <folding>
439
+            <element signature="imports" expanded="true" />
440
+          </folding>
441
+        </state>
442
+      </provider>
443
+    </entry>
444
+    <entry file="file://$PROJECT_DIR$/src/main/resources/db/migration/V2__create_block.sql" />
445
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
446
+      <provider selected="true" editor-type-id="text-editor">
447
+        <state relative-caret-position="60">
448
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
449
+        </state>
450
+      </provider>
451
+    </entry>
452
+    <entry file="file://$PROJECT_DIR$/src/test/java/redCoin/Miner/minerTest.java" />
453
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Miner.java" />
454
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcoin/redCoin/miner/test/minerTest.java">
455
+      <provider selected="true" editor-type-id="text-editor">
456
+        <state relative-caret-position="135">
457
+          <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
458
+        </state>
459
+      </provider>
460
+    </entry>
461
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
462
+      <provider selected="true" editor-type-id="text-editor">
463
+        <state relative-caret-position="930">
464
+          <caret line="82" column="4" selection-start-line="82" selection-start-column="4" selection-end-line="82" selection-end-column="4" />
465
+        </state>
466
+      </provider>
467
+    </entry>
468
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
469
+      <provider selected="true" editor-type-id="text-editor">
470
+        <state relative-caret-position="105">
471
+          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
472
+        </state>
473
+      </provider>
474
+    </entry>
475
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/HomeController.java">
476
+      <provider selected="true" editor-type-id="text-editor">
477
+        <state relative-caret-position="90">
478
+          <caret line="9" column="5" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
479
+        </state>
480
+      </provider>
481
+    </entry>
482
+    <entry file="file://$PROJECT_DIR$/pom.xml">
483
+      <provider selected="true" editor-type-id="text-editor">
484
+        <state relative-caret-position="840">
485
+          <caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
486
+        </state>
487
+      </provider>
488
+    </entry>
489
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
490
+      <provider selected="true" editor-type-id="text-editor">
491
+        <state relative-caret-position="525">
492
+          <caret line="42" selection-start-line="42" selection-end-line="42" />
493
+        </state>
494
+      </provider>
495
+    </entry>
496
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/WalletController.java">
497
+      <provider selected="true" editor-type-id="text-editor">
498
+        <state relative-caret-position="66">
499
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
500
+        </state>
501
+      </provider>
502
+    </entry>
503
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
504
+      <provider selected="true" editor-type-id="text-editor">
505
+        <state relative-caret-position="517">
506
+          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
507
+          <folding>
508
+            <element signature="imports" expanded="true" />
509
+            <element signature="e#523#524#0" expanded="true" />
510
+            <element signature="e#579#580#0" expanded="true" />
511
+          </folding>
512
+        </state>
513
+      </provider>
514
+    </entry>
515
+  </component>
177 516
   <component name="masterDetails">
178 517
     <states>
179 518
       <state key="GlobalLibrariesConfigurable.UI">

+ 1
- 1
ZipCoinRedJavaServer/pom.xml View File

@@ -11,7 +11,7 @@
11 11
     <parent>
12 12
         <groupId>org.springframework.boot</groupId>
13 13
         <artifactId>spring-boot-starter-parent</artifactId>
14
-        <version>1.3.1.RELEASE</version>
14
+        <version>1.3.2.RELEASE</version>
15 15
     </parent>
16 16
 
17 17
     <name>zip-coin</name>

+ 23
- 0
ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/WalletLoader.java View File

@@ -1,5 +1,8 @@
1 1
 package com.zipcoin.config;
2 2
 
3
+import com.zipcoin.model.Wallet;
4
+import com.zipcoin.repository.WalletRepository;
5
+import org.springframework.beans.factory.annotation.Autowired;
3 6
 import org.springframework.boot.ApplicationArguments;
4 7
 import org.springframework.boot.ApplicationRunner;
5 8
 import org.springframework.stereotype.Component;
@@ -7,8 +10,28 @@ import org.springframework.stereotype.Component;
7 10
 @Component
8 11
 public class WalletLoader implements ApplicationRunner {
9 12
 
13
+    private WalletRepository walletRepository;
14
+
15
+    @Autowired
16
+    public WalletLoader(WalletRepository walletRepository)
17
+    {
18
+        this.walletRepository = walletRepository;
19
+    }
10 20
     @Override
11 21
     public void run(ApplicationArguments applicationArguments) throws Exception {
22
+        Wallet[] wallets = new Wallet[]
23
+                {
24
+                        new Wallet("ann","34",80),
25
+                        new Wallet("sen","3564",8)
26
+
27
+
28
+                };
29
+        for(Wallet wallet :wallets)
30
+        {
31
+            this.walletRepository.save(wallet);
32
+        }
33
+
12 34
 
13 35
     }
14 36
 }
37
+

+ 6
- 1
ZipCoinRedJavaServer/src/main/java/com/zipcoin/model/Wallet.java View File

@@ -12,7 +12,6 @@ import java.util.Random;
12 12
 @Entity
13 13
 public class Wallet {
14 14
 
15
-
16 15
     @Id
17 16
     @GeneratedValue(strategy = GenerationType.AUTO)
18 17
     private int id;
@@ -42,6 +41,12 @@ public class Wallet {
42 41
         generateKeyPair();
43 42
 
44 43
     }
44
+    public Wallet(String name,String publickey,double amount)
45
+    {
46
+        this.name=name;
47
+        this.publickey=publickey;
48
+        this.amount=amount;
49
+    }
45 50
 
46 51
     public Double getAmount()
47 52
     {

BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/config/WalletLoader.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Wallet.class View File