Mexi пре 6 година
родитељ
комит
763ed3e653

+ 13
- 0
.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE2.xml Прегледај датотеку

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework:spring-context:5.0.7.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE2.xml Прегледај датотеку

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework:spring-core:5.0.7.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE2.xml Прегледај датотеку

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 1
- 1
.idea/misc.xml Прегледај датотеку

@@ -7,7 +7,7 @@
7 7
       </list>
8 8
     </option>
9 9
   </component>
10
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
10
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="10" project-jdk-type="JavaSDK">
11 11
     <output url="file://$PROJECT_DIR$/classes" />
12 12
   </component>
13 13
 </project>

+ 103
- 120
.idea/workspace.xml Прегледај датотеку

@@ -1,7 +1,22 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="86492085-3833-4394-8353-122bd8bc6cb0" name="Default" comment="" />
4
+    <list default="true" id="86492085-3833-4394-8353-122bd8bc6cb0" name="Default" comment="">
5
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE2.xml" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE2.xml" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE2.xml" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/ConductTransactions.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/ConductTransactions.class" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/TransactionController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/controller/TransactionController.class" afterDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Block.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Block.class" afterDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/BlockchainVerification.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/BlockchainVerification.class" afterDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/utility/Encryption.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/utility/Encryption.class" afterDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/utility/Mining.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/utility/Mining.class" afterDir="false" />
19
+    </list>
5 20
     <ignored path="$PROJECT_DIR$/target/" />
6 21
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 22
     <option name="TRACKING_ENABLED" value="true" />
@@ -26,11 +41,11 @@
26 41
   </component>
27 42
   <component name="FileEditorManager">
28 43
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29
-      <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="true">
44
+      <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
30 45
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
31 46
           <provider selected="true" editor-type-id="text-editor">
32
-            <state relative-caret-position="583">
33
-              <caret line="41" column="76" lean-forward="true" selection-start-line="41" selection-start-column="76" selection-end-line="41" selection-end-column="76" />
47
+            <state relative-caret-position="283">
48
+              <caret line="41" column="26" lean-forward="true" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
34 49
               <folding>
35 50
                 <element signature="imports" expanded="true" />
36 51
               </folding>
@@ -38,37 +53,41 @@
38 53
           </provider>
39 54
         </entry>
40 55
       </file>
41
-      <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="false">
42
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
56
+      <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
57
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
43 58
           <provider selected="true" editor-type-id="text-editor">
44
-            <state relative-caret-position="132">
45
-              <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
59
+            <state relative-caret-position="465">
60
+              <caret line="31" selection-start-line="31" selection-end-line="31" />
46 61
               <folding>
47 62
                 <element signature="imports" expanded="true" />
48
-                <element signature="e#1108#1109#0" expanded="true" />
49
-                <element signature="e#1137#1138#0" expanded="true" />
50 63
               </folding>
51 64
             </state>
52 65
           </provider>
53 66
         </entry>
54 67
       </file>
68
+      <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="false">
69
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
70
+          <provider selected="true" editor-type-id="text-editor">
71
+            <state relative-caret-position="146">
72
+              <caret line="31" column="11" selection-start-line="31" selection-start-column="11" selection-end-line="31" selection-end-column="11" />
73
+            </state>
74
+          </provider>
75
+        </entry>
76
+      </file>
55 77
       <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
56 78
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
57 79
           <provider selected="true" editor-type-id="text-editor">
58
-            <state relative-caret-position="15">
59
-              <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
80
+            <state relative-caret-position="195">
81
+              <caret line="14" selection-start-line="14" selection-end-line="14" />
60 82
             </state>
61 83
           </provider>
62 84
         </entry>
63 85
       </file>
64
-      <file leaf-file-name="ConductTransactions.java" pinned="false" current-in-tab="false">
86
+      <file leaf-file-name="ConductTransactions.java" pinned="false" current-in-tab="true">
65 87
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java">
66 88
           <provider selected="true" editor-type-id="text-editor">
67
-            <state relative-caret-position="292">
68
-              <caret line="34" column="77" selection-start-line="34" selection-start-column="77" selection-end-line="34" selection-end-column="77" />
69
-              <folding>
70
-                <element signature="imports" expanded="true" />
71
-              </folding>
89
+            <state relative-caret-position="339">
90
+              <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
72 91
             </state>
73 92
           </provider>
74 93
         </entry>
@@ -76,8 +95,8 @@
76 95
       <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
77 96
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
78 97
           <provider selected="true" editor-type-id="text-editor">
79
-            <state relative-caret-position="660">
80
-              <caret line="51" column="1" lean-forward="true" selection-start-line="51" selection-start-column="1" selection-end-line="51" selection-end-column="1" />
98
+            <state relative-caret-position="615">
99
+              <caret line="48" column="1" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
81 100
             </state>
82 101
           </provider>
83 102
         </entry>
@@ -85,11 +104,8 @@
85 104
       <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
86 105
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
87 106
           <provider selected="true" editor-type-id="text-editor">
88
-            <state relative-caret-position="229">
89
-              <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
90
-              <folding>
91
-                <element signature="imports" expanded="true" />
92
-              </folding>
107
+            <state relative-caret-position="270">
108
+              <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
93 109
             </state>
94 110
           </provider>
95 111
         </entry>
@@ -97,8 +113,8 @@
97 113
       <file leaf-file-name="WalletRepository.java" pinned="false" current-in-tab="false">
98 114
         <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
99 115
           <provider selected="true" editor-type-id="text-editor">
100
-            <state relative-caret-position="195">
101
-              <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
116
+            <state relative-caret-position="120">
117
+              <caret line="20" selection-start-line="20" selection-end-line="20" />
102 118
               <folding>
103 119
                 <element signature="imports" expanded="true" />
104 120
               </folding>
@@ -146,10 +162,10 @@
146 162
         <option value="$APPLICATION_CONFIG_DIR$/consoles/db/9e5d39f9-b664-4d5a-a0eb-fa8b2386a1ce/console.sql" />
147 163
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
148 164
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/utility/Encryption.java" />
149
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
150 165
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java" />
151
-        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" />
152 166
         <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
167
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
168
+        <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" />
153 169
       </list>
154 170
     </option>
155 171
   </component>
@@ -169,11 +185,9 @@
169 185
   <component name="NodePackageJsonFileManager">
170 186
     <packageJsonPaths />
171 187
   </component>
172
-  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
173
-    <option name="x" value="-372" />
174
-    <option name="y" value="-1080" />
175
-    <option name="width" value="1920" />
176
-    <option name="height" value="1080" />
188
+  <component name="ProjectFrameBounds" fullScreen="true">
189
+    <option name="width" value="1280" />
190
+    <option name="height" value="800" />
177 191
   </component>
178 192
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
179 193
   <component name="ProjectView">
@@ -181,7 +195,6 @@
181 195
       <foldersAlwaysOnTop value="true" />
182 196
     </navigator>
183 197
     <panes>
184
-      <pane id="PackagesPane" />
185 198
       <pane id="Scope" />
186 199
       <pane id="AndroidView" />
187 200
       <pane id="ProjectPane">
@@ -223,6 +236,7 @@
223 236
               <item name="src" type="462c0819:PsiDirectoryNode" />
224 237
               <item name="main" type="462c0819:PsiDirectoryNode" />
225 238
               <item name="java" type="462c0819:PsiDirectoryNode" />
239
+              <item name="buecoin01" type="462c0819:PsiDirectoryNode" />
226 240
               <item name="controller" type="462c0819:PsiDirectoryNode" />
227 241
             </path>
228 242
             <path>
@@ -231,6 +245,7 @@
231 245
               <item name="src" type="462c0819:PsiDirectoryNode" />
232 246
               <item name="main" type="462c0819:PsiDirectoryNode" />
233 247
               <item name="java" type="462c0819:PsiDirectoryNode" />
248
+              <item name="buecoin01" type="462c0819:PsiDirectoryNode" />
234 249
               <item name="model" type="462c0819:PsiDirectoryNode" />
235 250
             </path>
236 251
             <path>
@@ -238,28 +253,13 @@
238 253
               <item name="CryptoCoin" type="462c0819:PsiDirectoryNode" />
239 254
               <item name="src" type="462c0819:PsiDirectoryNode" />
240 255
               <item name="main" type="462c0819:PsiDirectoryNode" />
241
-              <item name="java" type="462c0819:PsiDirectoryNode" />
242
-              <item name="Repositories" type="462c0819:PsiDirectoryNode" />
243
-            </path>
244
-            <path>
245
-              <item name="0.1" type="b2602c69:ProjectViewProjectNode" />
246
-              <item name="CryptoCoin" type="462c0819:PsiDirectoryNode" />
247
-              <item name="src" type="462c0819:PsiDirectoryNode" />
248
-              <item name="main" type="462c0819:PsiDirectoryNode" />
249
-              <item name="java" type="462c0819:PsiDirectoryNode" />
250
-              <item name="utility" type="462c0819:PsiDirectoryNode" />
251
-            </path>
252
-            <path>
253
-              <item name="0.1" type="b2602c69:ProjectViewProjectNode" />
254
-              <item name="CryptoCoin" type="462c0819:PsiDirectoryNode" />
255
-              <item name="src" type="462c0819:PsiDirectoryNode" />
256
-              <item name="main" type="462c0819:PsiDirectoryNode" />
257 256
               <item name="resources" type="462c0819:PsiDirectoryNode" />
258 257
             </path>
259 258
           </expand>
260 259
           <select />
261 260
         </subPane>
262 261
       </pane>
262
+      <pane id="PackagesPane" />
263 263
     </panes>
264 264
   </component>
265 265
   <component name="PropertiesComponent">
@@ -371,11 +371,12 @@
371 371
       <workItem from="1532357795573" duration="4040000" />
372 372
       <workItem from="1532473422589" duration="716000" />
373 373
       <workItem from="1533219920414" duration="26349000" />
374
+      <workItem from="1533328457998" duration="1829000" />
374 375
     </task>
375 376
     <servers />
376 377
   </component>
377 378
   <component name="TimeTrackingManager">
378
-    <option name="totallyTimeSpent" value="44842000" />
379
+    <option name="totallyTimeSpent" value="46671000" />
379 380
   </component>
380 381
   <component name="TodoView">
381 382
     <todo-panel id="selected-file">
@@ -387,7 +388,8 @@
387 388
     </todo-panel>
388 389
   </component>
389 390
   <component name="ToolWindowManager">
390
-    <frame x="-372" y="-1080" width="1920" height="1080" extended-state="6" />
391
+    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
392
+    <editor active="true" />
391 393
     <layout>
392 394
       <window_info anchor="right" id="Palette" order="3" />
393 395
       <window_info anchor="bottom" id="Event Log" order="14" sideWeight="0.5005325" side_tool="true" weight="0.43383086" />
@@ -406,14 +408,13 @@
406 408
       <window_info id="Image Layers" order="3" />
407 409
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
408 410
       <window_info anchor="right" id="Capture Analysis" order="4" />
411
+      <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49946752" visible="true" weight="0.32827586" />
409 412
       <window_info anchor="bottom" id="Version Control" order="13" />
410
-      <window_info anchor="bottom" id="Run" order="3" sideWeight="0.49946752" weight="0.43383086" />
411 413
       <window_info anchor="bottom" id="Spring" order="9" weight="0.32935324" />
412
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.32935324" />
413
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17092651" />
414
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32827586" />
415
+      <window_info content_ui="combo" id="Project" order="0" side_tool="true" visible="true" weight="0.1736672" />
414 416
       <window_info anchor="right" id="Bean Validation" order="9" />
415 417
       <window_info id="Web" order="6" side_tool="true" />
416
-      <window_info anchor="bottom" id="Find" order="2" />
417 418
       <window_info anchor="right" id="Theme Preview" order="8" />
418 419
       <window_info id="Favorites" order="5" side_tool="true" />
419 420
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
@@ -422,15 +423,14 @@
422 423
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
423 424
       <window_info anchor="bottom" id="Message" order="1" />
424 425
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
426
+      <window_info anchor="bottom" id="Find" order="2" />
425 427
     </layout>
426 428
     <layout-to-restore>
427 429
       <window_info id="Designer" order="2" />
428
-      <window_info anchor="bottom" id="Database Console" order="0" weight="0.32935324" />
429 430
       <window_info anchor="right" id="Palette" order="3" />
430
-      <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49946752" visible="true" weight="0.43383086" />
431 431
       <window_info anchor="bottom" id="Spring" order="9" />
432
-      <window_info id="Image Layers" order="3" />
433
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
432
+      <window_info anchor="bottom" id="Database Console" order="0" weight="0.32935324" />
433
+      <window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49946752" visible="true" weight="0.43383086" />
434 434
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
435 435
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
436 436
       <window_info id="UI Designer" order="4" />
@@ -438,15 +438,16 @@
438 438
       <window_info anchor="bottom" id="Terminal" order="10" weight="0.32965517" />
439 439
       <window_info id="Capture Tool" order="7" />
440 440
       <window_info anchor="right" id="Capture Analysis" order="4" />
441
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
441 442
       <window_info anchor="bottom" id="Event Log" order="14" sideWeight="0.5005325" side_tool="true" weight="0.43383086" />
442 443
       <window_info anchor="bottom" id="Messages" order="8" weight="0.27462685" />
443 444
       <window_info anchor="bottom" id="TODO" order="7" />
444 445
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
446
+      <window_info id="Image Layers" order="3" />
445 447
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
446 448
       <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
447 449
       <window_info anchor="bottom" id="Version Control" order="13" />
448 450
       <window_info anchor="right" id="Maven Projects" order="5" />
449
-      <window_info anchor="bottom" id="Find" order="2" />
450 451
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17092651" />
451 452
       <window_info anchor="right" id="Database" order="6" weight="0.10915868" />
452 453
       <window_info anchor="bottom" id="Message" order="1" />
@@ -455,8 +456,9 @@
455 456
       <window_info anchor="right" id="Theme Preview" order="8" />
456 457
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
457 458
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
458
-      <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
459
+      <window_info anchor="bottom" id="Find" order="2" />
459 460
       <window_info anchor="right" id="Bean Validation" order="9" />
461
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
460 462
     </layout-to-restore>
461 463
   </component>
462 464
   <component name="TypeScriptGeneratedFilesManager">
@@ -471,13 +473,6 @@
471 473
     </breakpoint-manager>
472 474
   </component>
473 475
   <component name="editorHistoryManager">
474
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
475
-      <provider selected="true" editor-type-id="text-editor">
476
-        <state relative-caret-position="90">
477
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
478
-        </state>
479
-      </provider>
480
-    </entry>
481 476
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
482 477
       <provider selected="true" editor-type-id="text-editor">
483 478
         <state relative-caret-position="945">
@@ -517,9 +512,6 @@
517 512
       <provider selected="true" editor-type-id="text-editor">
518 513
         <state relative-caret-position="360">
519 514
           <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
520
-          <folding>
521
-            <element signature="imports" expanded="true" />
522
-          </folding>
523 515
         </state>
524 516
       </provider>
525 517
     </entry>
@@ -646,16 +638,6 @@
646 638
         </state>
647 639
       </provider>
648 640
     </entry>
649
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
650
-      <provider selected="true" editor-type-id="text-editor">
651
-        <state relative-caret-position="251">
652
-          <caret line="29" column="21" lean-forward="true" selection-start-line="29" selection-start-column="21" selection-end-line="29" selection-end-column="21" />
653
-          <folding>
654
-            <element signature="imports" expanded="true" />
655
-          </folding>
656
-        </state>
657
-      </provider>
658
-    </entry>
659 641
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/utility/TransactionInput.java">
660 642
       <provider selected="true" editor-type-id="text-editor">
661 643
         <state relative-caret-position="120">
@@ -667,19 +649,10 @@
667 649
       <provider selected="true" editor-type-id="text-editor">
668 650
         <state relative-caret-position="64">
669 651
           <caret line="25" column="38" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
670
-          <folding>
671
-            <element signature="e#813#814#0" expanded="true" />
672
-          </folding>
673
-        </state>
674
-      </provider>
675
-    </entry>
676
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/9e5d39f9-b664-4d5a-a0eb-fa8b2386a1ce/console.sql">
677
-      <provider selected="true" editor-type-id="text-editor">
678
-        <state>
679
-          <caret column="34" selection-start-column="34" selection-end-column="34" />
680 652
         </state>
681 653
       </provider>
682 654
     </entry>
655
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/9e5d39f9-b664-4d5a-a0eb-fa8b2386a1ce/console.sql" />
683 656
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
684 657
       <provider selected="true" editor-type-id="text-editor">
685 658
         <state relative-caret-position="150">
@@ -717,8 +690,8 @@
717 690
     </entry>
718 691
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
719 692
       <provider selected="true" editor-type-id="text-editor">
720
-        <state relative-caret-position="660">
721
-          <caret line="51" column="1" lean-forward="true" selection-start-line="51" selection-start-column="1" selection-end-line="51" selection-end-column="1" />
693
+        <state relative-caret-position="615">
694
+          <caret line="48" column="1" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
722 695
         </state>
723 696
       </provider>
724 697
     </entry>
@@ -734,18 +707,8 @@
734 707
     </entry>
735 708
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
736 709
       <provider selected="true" editor-type-id="text-editor">
737
-        <state relative-caret-position="195">
738
-          <caret line="13" column="17" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
739
-          <folding>
740
-            <element signature="imports" expanded="true" />
741
-          </folding>
742
-        </state>
743
-      </provider>
744
-    </entry>
745
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
746
-      <provider selected="true" editor-type-id="text-editor">
747
-        <state relative-caret-position="229">
748
-          <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
710
+        <state relative-caret-position="120">
711
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
749 712
           <folding>
750 713
             <element signature="imports" expanded="true" />
751 714
           </folding>
@@ -754,8 +717,8 @@
754 717
     </entry>
755 718
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
756 719
       <provider selected="true" editor-type-id="text-editor">
757
-        <state relative-caret-position="15">
758
-          <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
720
+        <state relative-caret-position="195">
721
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
759 722
         </state>
760 723
       </provider>
761 724
     </entry>
@@ -766,37 +729,57 @@
766 729
         </state>
767 730
       </provider>
768 731
     </entry>
769
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java">
732
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
770 733
       <provider selected="true" editor-type-id="text-editor">
771
-        <state relative-caret-position="292">
772
-          <caret line="34" column="77" selection-start-line="34" selection-start-column="77" selection-end-line="34" selection-end-column="77" />
734
+        <state relative-caret-position="465">
735
+          <caret line="31" selection-start-line="31" selection-end-line="31" />
773 736
           <folding>
774 737
             <element signature="imports" expanded="true" />
775 738
           </folding>
776 739
         </state>
777 740
       </provider>
778 741
     </entry>
779
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
742
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
780 743
       <provider selected="true" editor-type-id="text-editor">
781
-        <state relative-caret-position="132">
782
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
744
+        <state relative-caret-position="270">
745
+          <caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
746
+        </state>
747
+      </provider>
748
+    </entry>
749
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE.jar!/org/springframework/http/ResponseEntity.class">
750
+      <provider selected="true" editor-type-id="text-editor">
751
+        <state relative-caret-position="154">
752
+          <caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
783 753
           <folding>
784
-            <element signature="imports" expanded="true" />
785
-            <element signature="e#1108#1109#0" expanded="true" />
786
-            <element signature="e#1137#1138#0" expanded="true" />
754
+            <element signature="e#669#670#0" expanded="true" />
755
+            <element signature="e#736#737#0" expanded="true" />
787 756
           </folding>
788 757
         </state>
789 758
       </provider>
790 759
     </entry>
760
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
761
+      <provider selected="true" editor-type-id="text-editor">
762
+        <state relative-caret-position="146">
763
+          <caret line="31" column="11" selection-start-line="31" selection-start-column="11" selection-end-line="31" selection-end-column="11" />
764
+        </state>
765
+      </provider>
766
+    </entry>
791 767
     <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
792 768
       <provider selected="true" editor-type-id="text-editor">
793
-        <state relative-caret-position="583">
794
-          <caret line="41" column="76" lean-forward="true" selection-start-line="41" selection-start-column="76" selection-end-line="41" selection-end-column="76" />
769
+        <state relative-caret-position="283">
770
+          <caret line="41" column="26" lean-forward="true" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
795 771
           <folding>
796 772
             <element signature="imports" expanded="true" />
797 773
           </folding>
798 774
         </state>
799 775
       </provider>
800 776
     </entry>
777
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java">
778
+      <provider selected="true" editor-type-id="text-editor">
779
+        <state relative-caret-position="339">
780
+          <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
781
+        </state>
782
+      </provider>
783
+    </entry>
801 784
   </component>
802 785
 </project>

+ 1
- 1
src/main/java/com/buecoin01/controller/ConductTransactions.java Прегледај датотеку

@@ -44,7 +44,7 @@ public class ConductTransactions {
44 44
                walletRepository.save(receiver);
45 45
 
46 46
                Transactions n = new Transactions(Encryption.applySha256(sender.getPublicId() + receiver.getPublicId() + Double.toString(transaction.getAmount()) + LocalDateTime.now()),
47
-                       sender.getPublicId(), receiver.getPublicId(), transaction.getAmount(), LocalDateTime.now());
47
+                       transaction.getFromId(), transaction.getToId(), transaction.getAmount(), LocalDateTime.now());
48 48
                logger.info("got here");
49 49
 
50 50
                transactionRepository.save(n);

+ 1
- 0
src/main/java/com/buecoin01/controller/TransactionController.java Прегледај датотеку

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
6 6
 import org.springframework.http.HttpStatus;
7 7
 import org.springframework.http.ResponseEntity;
8 8
 import org.springframework.web.bind.annotation.*;
9
+
9 10
 import java.util.Optional;
10 11
 
11 12
 

+ 12
- 5
src/main/java/com/buecoin01/model/Transactions.java Прегледај датотеку

@@ -15,9 +15,16 @@ public class Transactions {
15 15
 
16 16
     @Column
17 17
     private String transactionId;
18
+    @Column(name = "fromId")
18 19
     private String fromId;
20
+
21
+    @Column(name = "toId")
19 22
     private String toId;
23
+
24
+    @Column(name = "amount")
20 25
     private double amount;
26
+
27
+    @Column(name = "timestamp")
21 28
     private LocalDateTime timestamp;
22 29
 
23 30
     public Transactions(){}
@@ -31,7 +38,7 @@ public class Transactions {
31 38
     }
32 39
 
33 40
     public long getId() {
34
-        return id;
41
+        return this.id;
35 42
     }
36 43
 
37 44
     public void setId(long id) {
@@ -47,7 +54,7 @@ public class Transactions {
47 54
     }
48 55
 
49 56
     public String getFromId() {
50
-        return fromId;
57
+        return this.fromId;
51 58
     }
52 59
 
53 60
     public void setFromId(String fromId) {
@@ -55,7 +62,7 @@ public class Transactions {
55 62
     }
56 63
 
57 64
     public String getToId() {
58
-        return toId;
65
+        return this.toId;
59 66
     }
60 67
 
61 68
     public void setToId(String toId) {
@@ -63,7 +70,7 @@ public class Transactions {
63 70
     }
64 71
 
65 72
     public double getAmount() {
66
-        return amount;
73
+        return this.amount;
67 74
     }
68 75
 
69 76
     public void setAmount(double amount) {
@@ -71,7 +78,7 @@ public class Transactions {
71 78
     }
72 79
 
73 80
     public LocalDateTime getTimestamp() {
74
-        return timestamp;
81
+        return this.timestamp;
75 82
     }
76 83
 
77 84
     public void setTimestamp(LocalDateTime timestamp) {

BIN
target/classes/com/buecoin01/controller/ConductTransactions.class Прегледај датотеку


BIN
target/classes/com/buecoin01/controller/TransactionController.class Прегледај датотеку


BIN
target/classes/com/buecoin01/model/Block.class Прегледај датотеку


BIN
target/classes/com/buecoin01/model/BlockchainVerification.class Прегледај датотеку


BIN
target/classes/com/buecoin01/model/Transactions.class Прегледај датотеку


BIN
target/classes/com/buecoin01/utility/Encryption.class Прегледај датотеку


BIN
target/classes/com/buecoin01/utility/Mining.class Прегледај датотеку