|
@@ -2,12 +2,16 @@
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
4
|
<list default="true" id="86492085-3833-4394-8353-122bd8bc6cb0" name="Default" comment="">
|
|
5
|
+<<<<<<< HEAD
|
5
|
6
|
<change beforePath="$PROJECT_DIR$/application.log" beforeDir="false" afterPath="$PROJECT_DIR$/application.log" afterDir="false" />
|
6
|
7
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" afterDir="false" />
|
7
|
8
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" afterDir="false" />
|
8
|
9
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java" afterDir="false" />
|
9
|
10
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" afterDir="false" />
|
10
|
11
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" afterDir="false" />
|
|
12
|
+=======
|
|
13
|
+ <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" />
|
|
14
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
11
|
15
|
</list>
|
12
|
16
|
<ignored path="$PROJECT_DIR$/target/" />
|
13
|
17
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -19,6 +23,7 @@
|
19
|
23
|
</component>
|
20
|
24
|
<component name="FileEditorManager">
|
21
|
25
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
26
|
+<<<<<<< HEAD
|
22
|
27
|
<file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
|
23
|
28
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
24
|
29
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -47,28 +52,125 @@
|
47
|
52
|
<element signature="e#1651#1652#0" expanded="true" />
|
48
|
53
|
<element signature="e#1679#1680#0" expanded="true" />
|
49
|
54
|
</folding>
|
|
55
|
+=======
|
|
56
|
+ <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
57
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
58
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
59
|
+ <state relative-caret-position="45">
|
|
60
|
+ <caret line="3" column="36" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="36" />
|
|
61
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
50
|
62
|
</state>
|
51
|
63
|
</provider>
|
52
|
64
|
</entry>
|
53
|
65
|
</file>
|
54
|
|
- <file leaf-file-name="BlockchainVerification.java" pinned="false" current-in-tab="false">
|
55
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
|
|
66
|
+ <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
|
|
67
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
56
|
68
|
<provider selected="true" editor-type-id="text-editor">
|
|
69
|
+<<<<<<< HEAD
|
57
|
70
|
<state relative-caret-position="675">
|
58
|
71
|
<caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
|
59
|
72
|
<folding>
|
60
|
73
|
<element signature="e#1933#1934#0" expanded="true" />
|
61
|
74
|
<element signature="e#1973#1974#0" expanded="true" />
|
|
75
|
+=======
|
|
76
|
+ <state relative-caret-position="390">
|
|
77
|
+ <caret line="26" selection-start-line="26" selection-end-line="26" />
|
|
78
|
+ <folding>
|
|
79
|
+ <element signature="imports" expanded="true" />
|
|
80
|
+ </folding>
|
|
81
|
+ </state>
|
|
82
|
+ </provider>
|
|
83
|
+ </entry>
|
|
84
|
+ </file>
|
|
85
|
+ <file leaf-file-name="Block.java" pinned="false" current-in-tab="false">
|
|
86
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
87
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
88
|
+ <state relative-caret-position="28">
|
|
89
|
+ <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
|
|
90
|
+ </state>
|
|
91
|
+ </provider>
|
|
92
|
+ </entry>
|
|
93
|
+ </file>
|
|
94
|
+ <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="true">
|
|
95
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
|
|
96
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
97
|
+ <state relative-caret-position="202">
|
|
98
|
+ <caret line="31" column="114" selection-start-line="31" selection-start-column="114" selection-end-line="31" selection-end-column="114" />
|
|
99
|
+ <folding>
|
|
100
|
+ <element signature="imports" expanded="true" />
|
|
101
|
+ <element signature="e#854#855#0" expanded="true" />
|
|
102
|
+ <element signature="e#879#880#0" expanded="true" />
|
|
103
|
+ <element signature="e#913#914#0" expanded="true" />
|
|
104
|
+ <element signature="e#941#942#0" expanded="true" />
|
|
105
|
+ <element signature="e#981#982#0" expanded="true" />
|
|
106
|
+ <element signature="e#1017#1018#0" expanded="true" />
|
|
107
|
+ <element signature="e#1075#1076#0" expanded="true" />
|
|
108
|
+ <element signature="e#1125#1126#0" expanded="true" />
|
|
109
|
+ <element signature="e#1158#1159#0" expanded="true" />
|
|
110
|
+ <element signature="e#1187#1188#0" expanded="true" />
|
|
111
|
+ <element signature="e#1231#1232#0" expanded="true" />
|
|
112
|
+ <element signature="e#1267#1268#0" expanded="true" />
|
|
113
|
+ <element signature="e#1298#1299#0" expanded="true" />
|
|
114
|
+ <element signature="e#1325#1326#0" expanded="true" />
|
|
115
|
+ <element signature="e#1365#1366#0" expanded="true" />
|
|
116
|
+ <element signature="e#1397#1398#0" expanded="true" />
|
|
117
|
+ <element signature="e#1429#1430#0" expanded="true" />
|
|
118
|
+ <element signature="e#1458#1459#0" expanded="true" />
|
|
119
|
+ <element signature="e#1501#1502#0" expanded="true" />
|
|
120
|
+ <element signature="e#1537#1538#0" expanded="true" />
|
|
121
|
+ <element signature="e#1580#1581#0" expanded="true" />
|
|
122
|
+ <element signature="e#1612#1613#0" expanded="true" />
|
|
123
|
+ <element signature="e#1669#1670#0" expanded="true" />
|
|
124
|
+ <element signature="e#1711#1712#0" expanded="true" />
|
|
125
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
62
|
126
|
</folding>
|
63
|
127
|
</state>
|
64
|
128
|
</provider>
|
65
|
129
|
</entry>
|
66
|
130
|
</file>
|
|
131
|
+<<<<<<< HEAD
|
67
|
132
|
<file leaf-file-name="WalletController.java" pinned="false" current-in-tab="true">
|
68
|
133
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
69
|
134
|
<provider selected="true" editor-type-id="text-editor">
|
70
|
135
|
<state relative-caret-position="255">
|
71
|
136
|
<caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
|
|
137
|
+=======
|
|
138
|
+ <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
|
|
139
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
140
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
141
|
+ <state relative-caret-position="966">
|
|
142
|
+ <caret line="121" column="45" lean-forward="true" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
|
|
143
|
+ <folding>
|
|
144
|
+ <element signature="imports" expanded="true" />
|
|
145
|
+ <element signature="e#925#926#0" expanded="true" />
|
|
146
|
+ <element signature="e#952#953#0" expanded="true" />
|
|
147
|
+ <element signature="e#992#993#0" expanded="true" />
|
|
148
|
+ <element signature="e#1024#1025#0" expanded="true" />
|
|
149
|
+ <element signature="e#1123#1124#0" expanded="true" />
|
|
150
|
+ <element signature="e#1156#1157#0" expanded="true" />
|
|
151
|
+ <element signature="e#1195#1196#0" expanded="true" />
|
|
152
|
+ <element signature="e#1227#1228#0" expanded="true" />
|
|
153
|
+ <element signature="e#1258#1259#0" expanded="true" />
|
|
154
|
+ <element signature="e#1287#1288#0" expanded="true" />
|
|
155
|
+ <element signature="e#1329#1330#0" expanded="true" />
|
|
156
|
+ <element signature="e#1365#1366#0" expanded="true" />
|
|
157
|
+ <element signature="e#1481#1482#0" expanded="true" />
|
|
158
|
+ <element signature="e#1521#1522#0" expanded="true" />
|
|
159
|
+ <element signature="e#1548#1549#0" expanded="true" />
|
|
160
|
+ <element signature="e#1573#1574#0" expanded="true" />
|
|
161
|
+ <element signature="e#1607#1608#0" expanded="true" />
|
|
162
|
+ <element signature="e#1635#1636#0" expanded="true" />
|
|
163
|
+ </folding>
|
|
164
|
+ </state>
|
|
165
|
+ </provider>
|
|
166
|
+ </entry>
|
|
167
|
+ </file>
|
|
168
|
+ <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
|
|
169
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
|
170
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
171
|
+ <state relative-caret-position="210">
|
|
172
|
+ <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
173
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
72
|
174
|
<folding>
|
73
|
175
|
<element signature="imports" expanded="true" />
|
74
|
176
|
</folding>
|
|
@@ -76,11 +178,22 @@
|
76
|
178
|
</provider>
|
77
|
179
|
</entry>
|
78
|
180
|
</file>
|
|
181
|
+<<<<<<< HEAD
|
79
|
182
|
<file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
|
80
|
183
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
81
|
184
|
<provider selected="true" editor-type-id="text-editor">
|
82
|
185
|
<state relative-caret-position="108">
|
83
|
186
|
<caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
|
|
187
|
+=======
|
|
188
|
+ <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
|
|
189
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
|
190
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
191
|
+ <state relative-caret-position="210">
|
|
192
|
+ <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
|
|
193
|
+ <folding>
|
|
194
|
+ <element signature="imports" expanded="true" />
|
|
195
|
+ </folding>
|
|
196
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
84
|
197
|
</state>
|
85
|
198
|
</provider>
|
86
|
199
|
</entry>
|
|
@@ -88,26 +201,53 @@
|
88
|
201
|
<file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
|
89
|
202
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java">
|
90
|
203
|
<provider selected="true" editor-type-id="text-editor">
|
|
204
|
+<<<<<<< HEAD
|
91
|
205
|
<state relative-caret-position="200">
|
92
|
206
|
<caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
|
|
207
|
+=======
|
|
208
|
+ <state relative-caret-position="639">
|
|
209
|
+ <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
210
|
+ <folding>
|
|
211
|
+ <element signature="imports" expanded="true" />
|
|
212
|
+ </folding>
|
|
213
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
93
|
214
|
</state>
|
94
|
215
|
</provider>
|
95
|
216
|
</entry>
|
96
|
217
|
</file>
|
|
218
|
+<<<<<<< HEAD
|
97
|
219
|
<file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
98
|
220
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
99
|
221
|
<provider selected="true" editor-type-id="text-editor">
|
100
|
222
|
<state relative-caret-position="150">
|
101
|
223
|
<caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
224
|
+=======
|
|
225
|
+ <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
|
|
226
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
|
227
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
228
|
+ <state relative-caret-position="180">
|
|
229
|
+ <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
|
|
230
|
+ <folding>
|
|
231
|
+ <element signature="imports" expanded="true" />
|
|
232
|
+ </folding>
|
|
233
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
102
|
234
|
</state>
|
103
|
235
|
</provider>
|
104
|
236
|
</entry>
|
105
|
237
|
</file>
|
|
238
|
+<<<<<<< HEAD
|
106
|
239
|
<file leaf-file-name="Application.java" pinned="false" current-in-tab="false">
|
107
|
240
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
108
|
241
|
<provider selected="true" editor-type-id="text-editor">
|
109
|
242
|
<state relative-caret-position="120">
|
110
|
243
|
<caret line="10" selection-start-line="10" selection-end-line="10" />
|
|
244
|
+=======
|
|
245
|
+ <file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="false">
|
|
246
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
|
|
247
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
248
|
+ <state relative-caret-position="75">
|
|
249
|
+ <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
|
|
250
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
111
|
251
|
</state>
|
112
|
252
|
</provider>
|
113
|
253
|
</entry>
|
|
@@ -119,6 +259,7 @@
|
119
|
259
|
<list>
|
120
|
260
|
<option value="Interface" />
|
121
|
261
|
<option value="Class" />
|
|
262
|
+ <option value="AnnotationType" />
|
122
|
263
|
</list>
|
123
|
264
|
</option>
|
124
|
265
|
</component>
|
|
@@ -137,6 +278,7 @@
|
137
|
278
|
<component name="IdeDocumentHistory">
|
138
|
279
|
<option name="CHANGED_PATHS">
|
139
|
280
|
<list>
|
|
281
|
+<<<<<<< HEAD
|
140
|
282
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java" />
|
141
|
283
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java" />
|
142
|
284
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
|
|
@@ -146,6 +288,22 @@
|
146
|
288
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" />
|
147
|
289
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
|
148
|
290
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
|
|
291
|
+=======
|
|
292
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java" />
|
|
293
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java" />
|
|
294
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" />
|
|
295
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java" />
|
|
296
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" />
|
|
297
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
|
|
298
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java" />
|
|
299
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java" />
|
|
300
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java" />
|
|
301
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
|
|
302
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
|
|
303
|
+ <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
|
304
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java" />
|
|
305
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
|
|
306
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
149
|
307
|
</list>
|
150
|
308
|
</option>
|
151
|
309
|
</component>
|
|
@@ -165,9 +323,9 @@
|
165
|
323
|
<component name="NodePackageJsonFileManager">
|
166
|
324
|
<packageJsonPaths />
|
167
|
325
|
</component>
|
168
|
|
- <component name="ProjectFrameBounds" extendedState="6">
|
169
|
|
- <option name="width" value="1440" />
|
170
|
|
- <option name="height" value="900" />
|
|
326
|
+ <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
|
|
327
|
+ <option name="width" value="1920" />
|
|
328
|
+ <option name="height" value="1080" />
|
171
|
329
|
</component>
|
172
|
330
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
173
|
331
|
<component name="ProjectView">
|
|
@@ -263,6 +421,7 @@
|
263
|
421
|
</pane>
|
264
|
422
|
<pane id="PackagesPane" />
|
265
|
423
|
<pane id="AndroidView" />
|
|
424
|
+ <pane id="Scope" />
|
266
|
425
|
</panes>
|
267
|
426
|
</component>
|
268
|
427
|
<component name="PropertiesComponent">
|
|
@@ -273,6 +432,11 @@
|
273
|
432
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
274
|
433
|
<property name="aspect.path.notification.shown" value="true" />
|
275
|
434
|
</component>
|
|
435
|
+ <component name="RecentsManager">
|
|
436
|
+ <key name="CreateClassDialog.RecentsKey">
|
|
437
|
+ <recent name="com.buecoin01" />
|
|
438
|
+ </key>
|
|
439
|
+ </component>
|
276
|
440
|
<component name="RunDashboard">
|
277
|
441
|
<option name="ruleStates">
|
278
|
442
|
<list>
|
|
@@ -285,7 +449,18 @@
|
285
|
449
|
</list>
|
286
|
450
|
</option>
|
287
|
451
|
</component>
|
288
|
|
- <component name="RunManager">
|
|
452
|
+ <component name="RunManager" selected="Spring Boot.Application">
|
|
453
|
+ <configuration name="BlockchainVerification" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
454
|
+ <option name="MAIN_CLASS_NAME" value="com.buecoin01.model.BlockchainVerification" />
|
|
455
|
+ <module name="0.1" />
|
|
456
|
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
457
|
+ <extension name="coverage">
|
|
458
|
+ <pattern>
|
|
459
|
+ <option name="PATTERN" value="com.buecoin01.model.*" />
|
|
460
|
+ <option name="ENABLED" value="true" />
|
|
461
|
+ </pattern>
|
|
462
|
+ </extension>
|
|
463
|
+ </configuration>
|
289
|
464
|
<configuration default="true" type="Application" factoryName="Application">
|
290
|
465
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
291
|
466
|
</configuration>
|
|
@@ -331,6 +506,15 @@
|
331
|
506
|
<properties />
|
332
|
507
|
<listeners />
|
333
|
508
|
</configuration>
|
|
509
|
+ <list>
|
|
510
|
+ <item itemvalue="Spring Boot.Application" />
|
|
511
|
+ <item itemvalue="Application.BlockchainVerification" />
|
|
512
|
+ </list>
|
|
513
|
+ <recent_temporary>
|
|
514
|
+ <list>
|
|
515
|
+ <item itemvalue="Application.BlockchainVerification" />
|
|
516
|
+ </list>
|
|
517
|
+ </recent_temporary>
|
334
|
518
|
</component>
|
335
|
519
|
<component name="SvnConfiguration">
|
336
|
520
|
<configuration />
|
|
@@ -347,10 +531,17 @@
|
347
|
531
|
<servers />
|
348
|
532
|
</component>
|
349
|
533
|
<component name="TimeTrackingManager">
|
|
534
|
+<<<<<<< HEAD
|
350
|
535
|
<option name="totallyTimeSpent" value="4624000" />
|
351
|
536
|
</component>
|
352
|
537
|
<component name="ToolWindowManager">
|
353
|
538
|
<frame x="0" y="0" width="1440" height="827" extended-state="6" />
|
|
539
|
+=======
|
|
540
|
+ <option name="totallyTimeSpent" value="9498000" />
|
|
541
|
+ </component>
|
|
542
|
+ <component name="ToolWindowManager">
|
|
543
|
+ <frame x="0" y="0" width="1280" height="800" extended-state="6" />
|
|
544
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
354
|
545
|
<editor active="true" />
|
355
|
546
|
<layout>
|
356
|
547
|
<window_info anchor="right" id="Palette" order="3" />
|
|
@@ -365,26 +556,71 @@
|
365
|
556
|
<window_info id="UI Designer" order="2" />
|
366
|
557
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
367
|
558
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
559
|
+<<<<<<< HEAD
|
368
|
560
|
<window_info anchor="bottom" id="Messages" weight="0.3281471" />
|
|
561
|
+=======
|
|
562
|
+ <window_info anchor="bottom" id="Messages" order="9" weight="0.27492878" />
|
|
563
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
369
|
564
|
<window_info anchor="right" id="Palette	" order="3" />
|
370
|
565
|
<window_info id="Image Layers" order="2" />
|
371
|
566
|
<window_info anchor="bottom" id="Java Enterprise" order="7" />
|
372
|
567
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
373
|
568
|
<window_info anchor="bottom" id="Version Control" order="7" />
|
|
569
|
+<<<<<<< HEAD
|
374
|
570
|
<window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3946252" />
|
375
|
571
|
<window_info anchor="bottom" id="Spring" order="7" />
|
376
|
572
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
377
|
573
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24177396" />
|
|
574
|
+=======
|
|
575
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32763532" />
|
|
576
|
+ <window_info anchor="bottom" id="Spring" order="7" weight="0.3299389" />
|
|
577
|
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.32905984" />
|
|
578
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
|
|
579
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
378
|
580
|
<window_info anchor="right" id="Bean Validation" order="3" />
|
379
|
581
|
<window_info id="Web" order="2" side_tool="true" />
|
380
|
582
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
381
|
583
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
584
|
+<<<<<<< HEAD
|
382
|
585
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
383
|
586
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
384
|
587
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
385
|
588
|
<window_info anchor="bottom" id="Message" order="0" />
|
386
|
589
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
387
|
590
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
591
|
+=======
|
|
592
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
593
|
+ <window_info anchor="bottom" id="Run" order="2" />
|
|
594
|
+ <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
595
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30329043" />
|
|
596
|
+ <window_info id="Favorites" order="5" side_tool="true" />
|
|
597
|
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
598
|
+ <window_info anchor="bottom" id="Java Enterprise" order="10" />
|
|
599
|
+ <window_info anchor="right" id="Bean Validation" order="6" />
|
|
600
|
+ <window_info anchor="bottom" id="Terminal" order="10" />
|
|
601
|
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
602
|
+ <window_info anchor="right" id="Palette" order="6" />
|
|
603
|
+ <window_info anchor="right" id="Palette	" order="6" />
|
|
604
|
+ <window_info anchor="right" id="Maven Projects" order="6" />
|
|
605
|
+ <window_info id="Web" order="5" side_tool="true" />
|
|
606
|
+ <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
|
|
607
|
+ <window_info anchor="bottom" id="Spring" order="10" />
|
|
608
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
609
|
+ <window_info id="Image Layers" order="5" />
|
|
610
|
+ <window_info anchor="right" id="Theme Preview" order="6" />
|
|
611
|
+ <window_info anchor="right" id="Database" order="6" />
|
|
612
|
+ <window_info id="Capture Tool" order="5" />
|
|
613
|
+ <window_info anchor="bottom" id="Version Control" order="10" />
|
|
614
|
+ <window_info anchor="right" id="Capture Analysis" order="6" />
|
|
615
|
+ <window_info anchor="bottom" id="TODO" order="6" />
|
|
616
|
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
617
|
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
618
|
+ <window_info id="UI Designer" order="5" />
|
|
619
|
+ <window_info anchor="bottom" id="Find" order="1" />
|
|
620
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
621
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
622
|
+ <window_info id="Designer" order="5" />
|
|
623
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
388
|
624
|
</layout>
|
389
|
625
|
<layout-to-restore>
|
390
|
626
|
<window_info id="Designer" order="0" />
|
|
@@ -428,6 +664,7 @@
|
428
|
664
|
</component>
|
429
|
665
|
<component name="editorHistoryManager">
|
430
|
666
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
667
|
+<<<<<<< HEAD
|
431
|
668
|
<provider selected="true" editor-type-id="text-editor">
|
432
|
669
|
<state relative-caret-position="75">
|
433
|
670
|
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
@@ -442,19 +679,82 @@
|
442
|
679
|
<element signature="e#1933#1934#0" expanded="true" />
|
443
|
680
|
<element signature="e#1973#1974#0" expanded="true" />
|
444
|
681
|
</folding>
|
|
682
|
+=======
|
|
683
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
684
|
+ <state relative-caret-position="360">
|
|
685
|
+ <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
|
|
686
|
+ <folding>
|
|
687
|
+ <element signature="e#581#582#0" expanded="true" />
|
|
688
|
+ <element signature="e#621#622#0" expanded="true" />
|
|
689
|
+ <element signature="e#653#654#0" expanded="true" />
|
|
690
|
+ </folding>
|
|
691
|
+ </state>
|
|
692
|
+ </provider>
|
|
693
|
+ </entry>
|
|
694
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
|
|
695
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
|
|
696
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
697
|
+ <state relative-caret-position="90">
|
|
698
|
+ <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
|
|
699
|
+ </state>
|
|
700
|
+ </provider>
|
|
701
|
+ </entry>
|
|
702
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
703
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
704
|
+ <state relative-caret-position="945">
|
|
705
|
+ <caret line="78" selection-start-line="78" selection-end-line="78" />
|
|
706
|
+ </state>
|
|
707
|
+ </provider>
|
|
708
|
+ </entry>
|
|
709
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
710
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
711
|
+ <state relative-caret-position="255">
|
|
712
|
+ <caret line="26" column="71" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
|
|
713
|
+ <folding>
|
|
714
|
+ <element signature="imports" expanded="true" />
|
|
715
|
+ </folding>
|
|
716
|
+ </state>
|
|
717
|
+ </provider>
|
|
718
|
+ </entry>
|
|
719
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
720
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
721
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
722
|
+ <state relative-caret-position="75">
|
|
723
|
+ <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
724
|
+ </state>
|
|
725
|
+ </provider>
|
|
726
|
+ </entry>
|
|
727
|
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
728
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
729
|
+ </entry>
|
|
730
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
731
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
732
|
+ <state relative-caret-position="150">
|
|
733
|
+ <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
734
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
445
|
735
|
</state>
|
446
|
736
|
</provider>
|
447
|
737
|
</entry>
|
448
|
738
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
449
|
739
|
<provider selected="true" editor-type-id="text-editor">
|
|
740
|
+<<<<<<< HEAD
|
450
|
741
|
<state relative-caret-position="450">
|
451
|
742
|
<caret line="37" column="42" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
|
452
|
743
|
<folding>
|
453
|
744
|
<element signature="imports" expanded="true" />
|
|
745
|
+=======
|
|
746
|
+ <state relative-caret-position="360">
|
|
747
|
+ <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
|
|
748
|
+ <folding>
|
|
749
|
+ <element signature="e#581#582#0" expanded="true" />
|
|
750
|
+ <element signature="e#621#622#0" expanded="true" />
|
|
751
|
+ <element signature="e#653#654#0" expanded="true" />
|
|
752
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
454
|
753
|
</folding>
|
455
|
754
|
</state>
|
456
|
755
|
</provider>
|
457
|
756
|
</entry>
|
|
757
|
+<<<<<<< HEAD
|
458
|
758
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
|
459
|
759
|
<provider selected="true" editor-type-id="text-editor">
|
460
|
760
|
<state relative-caret-position="75">
|
|
@@ -473,6 +773,27 @@
|
473
|
773
|
<provider selected="true" editor-type-id="text-editor">
|
474
|
774
|
<state relative-caret-position="600">
|
475
|
775
|
<caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
776
|
+=======
|
|
777
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
|
|
778
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
|
|
779
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
780
|
+ <state relative-caret-position="90">
|
|
781
|
+ <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
|
|
782
|
+ </state>
|
|
783
|
+ </provider>
|
|
784
|
+ </entry>
|
|
785
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
786
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
787
|
+ <state relative-caret-position="1046">
|
|
788
|
+ <caret line="78" selection-start-line="78" selection-end-line="78" />
|
|
789
|
+ </state>
|
|
790
|
+ </provider>
|
|
791
|
+ </entry>
|
|
792
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
793
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
794
|
+ <state relative-caret-position="293">
|
|
795
|
+ <caret line="26" column="71" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
|
|
796
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
476
|
797
|
<folding>
|
477
|
798
|
<element signature="imports" expanded="true" />
|
478
|
799
|
</folding>
|
|
@@ -486,6 +807,7 @@
|
486
|
807
|
</state>
|
487
|
808
|
</provider>
|
488
|
809
|
</entry>
|
|
810
|
+<<<<<<< HEAD
|
489
|
811
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
490
|
812
|
<provider selected="true" editor-type-id="text-editor">
|
491
|
813
|
<state relative-caret-position="150">
|
|
@@ -507,6 +829,217 @@
|
507
|
829
|
<folding>
|
508
|
830
|
<element signature="imports" expanded="true" />
|
509
|
831
|
</folding>
|
|
832
|
+=======
|
|
833
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
834
|
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
835
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
836
|
+ </entry>
|
|
837
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
838
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
839
|
+ <state relative-caret-position="75">
|
|
840
|
+ <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
841
|
+ </state>
|
|
842
|
+ </provider>
|
|
843
|
+ </entry>
|
|
844
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
845
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
846
|
+ <state relative-caret-position="345">
|
|
847
|
+ <caret line="31" column="11" lean-forward="true" selection-start-line="31" selection-start-column="11" selection-end-line="31" selection-end-column="11" />
|
|
848
|
+ </state>
|
|
849
|
+ </provider>
|
|
850
|
+ </entry>
|
|
851
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
852
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
|
|
853
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
854
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
855
|
+ <state relative-caret-position="567">
|
|
856
|
+ <caret line="50" selection-start-line="50" selection-end-line="50" />
|
|
857
|
+ </state>
|
|
858
|
+ </provider>
|
|
859
|
+ </entry>
|
|
860
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
861
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
862
|
+ <state relative-caret-position="1695">
|
|
863
|
+ <caret line="123" column="30" selection-start-line="123" selection-start-column="30" selection-end-line="123" selection-end-column="30" />
|
|
864
|
+ </state>
|
|
865
|
+ </provider>
|
|
866
|
+ </entry>
|
|
867
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
|
|
868
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
869
|
+ <state relative-caret-position="318">
|
|
870
|
+ <caret line="117" column="26" selection-start-line="117" selection-start-column="26" selection-end-line="117" selection-end-column="26" />
|
|
871
|
+ <folding>
|
|
872
|
+ <element signature="imports" expanded="true" />
|
|
873
|
+ <element signature="e#854#855#0" expanded="true" />
|
|
874
|
+ <element signature="e#879#880#0" expanded="true" />
|
|
875
|
+ <element signature="e#913#914#0" expanded="true" />
|
|
876
|
+ <element signature="e#941#942#0" expanded="true" />
|
|
877
|
+ <element signature="e#981#982#0" expanded="true" />
|
|
878
|
+ <element signature="e#1017#1018#0" expanded="true" />
|
|
879
|
+ <element signature="e#1075#1076#0" expanded="true" />
|
|
880
|
+ <element signature="e#1125#1126#0" expanded="true" />
|
|
881
|
+ <element signature="e#1158#1159#0" expanded="true" />
|
|
882
|
+ <element signature="e#1187#1188#0" expanded="true" />
|
|
883
|
+ <element signature="e#1231#1232#0" expanded="true" />
|
|
884
|
+ <element signature="e#1267#1268#0" expanded="true" />
|
|
885
|
+ <element signature="e#1298#1299#0" expanded="true" />
|
|
886
|
+ <element signature="e#1325#1326#0" expanded="true" />
|
|
887
|
+ <element signature="e#1365#1366#0" expanded="true" />
|
|
888
|
+ <element signature="e#1397#1398#0" expanded="true" />
|
|
889
|
+ <element signature="e#1429#1430#0" expanded="true" />
|
|
890
|
+ <element signature="e#1458#1459#0" expanded="true" />
|
|
891
|
+ <element signature="e#1501#1502#0" expanded="true" />
|
|
892
|
+ <element signature="e#1537#1538#0" expanded="true" />
|
|
893
|
+ <element signature="e#1580#1581#0" expanded="true" />
|
|
894
|
+ <element signature="e#1612#1613#0" expanded="true" />
|
|
895
|
+ <element signature="e#1669#1670#0" expanded="true" />
|
|
896
|
+ <element signature="e#1711#1712#0" expanded="true" />
|
|
897
|
+ </folding>
|
|
898
|
+ </state>
|
|
899
|
+ </provider>
|
|
900
|
+ </entry>
|
|
901
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/utility/TransactionInput.java">
|
|
902
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
903
|
+ <state relative-caret-position="120">
|
|
904
|
+ <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
|
|
905
|
+ <folding>
|
|
906
|
+ <element signature="e#237#238#0" expanded="true" />
|
|
907
|
+ <element signature="e#299#300#0" expanded="true" />
|
|
908
|
+ <element signature="e#556#557#0" expanded="true" />
|
|
909
|
+ <element signature="e#598#599#0" expanded="true" />
|
|
910
|
+ <element signature="e#668#669#0" expanded="true" />
|
|
911
|
+ <element signature="e#730#731#0" expanded="true" />
|
|
912
|
+ <element signature="e#772#773#0" expanded="true" />
|
|
913
|
+ <element signature="e#799#800#0" expanded="true" />
|
|
914
|
+ <element signature="e#850#851#0" expanded="true" />
|
|
915
|
+ <element signature="e#882#883#0" expanded="true" />
|
|
916
|
+ </folding>
|
|
917
|
+ </state>
|
|
918
|
+ </provider>
|
|
919
|
+ </entry>
|
|
920
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/utility/TransactionOutput.java">
|
|
921
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
922
|
+ <state relative-caret-position="314">
|
|
923
|
+ <caret line="25" column="38" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
|
|
924
|
+ <folding>
|
|
925
|
+ <element signature="e#651#652#0" expanded="true" />
|
|
926
|
+ <element signature="e#676#677#0" expanded="true" />
|
|
927
|
+ <element signature="e#712#713#0" expanded="true" />
|
|
928
|
+ <element signature="e#740#741#0" expanded="true" />
|
|
929
|
+ <element signature="e#813#814#0" expanded="true" />
|
|
930
|
+ <element signature="e#868#869#0" expanded="true" />
|
|
931
|
+ <element signature="e#912#913#0" expanded="true" />
|
|
932
|
+ <element signature="e#943#944#0" expanded="true" />
|
|
933
|
+ <element signature="e#971#972#0" expanded="true" />
|
|
934
|
+ <element signature="e#1012#1013#0" expanded="true" />
|
|
935
|
+ <element signature="e#1046#1047#0" expanded="true" />
|
|
936
|
+ <element signature="e#1092#1093#0" expanded="true" />
|
|
937
|
+ <element signature="e#1134#1135#0" expanded="true" />
|
|
938
|
+ <element signature="e#1204#1205#0" expanded="true" />
|
|
939
|
+ <element signature="e#1266#1267#0" expanded="true" />
|
|
940
|
+ <element signature="e#717#718#0" expanded="true" />
|
|
941
|
+ <element signature="e#762#763#0" expanded="true" />
|
|
942
|
+ </folding>
|
|
943
|
+ </state>
|
|
944
|
+ </provider>
|
|
945
|
+ </entry>
|
|
946
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/utility/Encryption.java">
|
|
947
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
948
|
+ <state relative-caret-position="-26">
|
|
949
|
+ <caret line="18" column="49" selection-start-line="18" selection-start-column="49" selection-end-line="18" selection-end-column="49" />
|
|
950
|
+ <folding>
|
|
951
|
+ <element signature="imports" expanded="true" />
|
|
952
|
+ <element signature="e#1724#1725#0" expanded="true" />
|
|
953
|
+ </folding>
|
|
954
|
+ </state>
|
|
955
|
+ </provider>
|
|
956
|
+ </entry>
|
|
957
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Blockchain.java">
|
|
958
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
959
|
+ <state relative-caret-position="347">
|
|
960
|
+ <caret line="34" selection-start-line="34" selection-end-line="34" />
|
|
961
|
+ <folding>
|
|
962
|
+ <element signature="imports" expanded="true" />
|
|
963
|
+ <element signature="e#1854#1855#0" expanded="true" />
|
|
964
|
+ </folding>
|
|
965
|
+ </state>
|
|
966
|
+ </provider>
|
|
967
|
+ </entry>
|
|
968
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
969
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
970
|
+ <state relative-caret-position="990">
|
|
971
|
+ <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
|
|
972
|
+ </state>
|
|
973
|
+ </provider>
|
|
974
|
+ </entry>
|
|
975
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
976
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
977
|
+ <state relative-caret-position="870">
|
|
978
|
+ <caret line="133" column="30" selection-start-line="133" selection-start-column="30" selection-end-line="133" selection-end-column="30" />
|
|
979
|
+ </state>
|
|
980
|
+ </provider>
|
|
981
|
+ </entry>
|
|
982
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
|
|
983
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
|
|
984
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
985
|
+ <state relative-caret-position="90">
|
|
986
|
+ <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
|
|
987
|
+ </state>
|
|
988
|
+ </provider>
|
|
989
|
+ </entry>
|
|
990
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
991
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
992
|
+ <state relative-caret-position="150">
|
|
993
|
+ <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
994
|
+ </state>
|
|
995
|
+ </provider>
|
|
996
|
+ </entry>
|
|
997
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
998
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
999
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1000
|
+ <state relative-caret-position="75">
|
|
1001
|
+ <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
1002
|
+ </state>
|
|
1003
|
+ </provider>
|
|
1004
|
+ </entry>
|
|
1005
|
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
1006
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
1007
|
+ </entry>
|
|
1008
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
1009
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
|
|
1010
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1011
|
+ <state relative-caret-position="285">
|
|
1012
|
+ <caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
|
|
1013
|
+ <folding>
|
|
1014
|
+ <element signature="imports" expanded="true" />
|
|
1015
|
+ <element signature="e#1872#1873#0" expanded="true" />
|
|
1016
|
+ <element signature="e#1900#1901#0" expanded="true" />
|
|
1017
|
+ <element signature="e#1973#1974#0" expanded="true" />
|
|
1018
|
+ <element signature="e#2025#2026#0" expanded="true" />
|
|
1019
|
+ <element signature="e#2074#2075#0" expanded="true" />
|
|
1020
|
+ <element signature="e#2107#2108#0" expanded="true" />
|
|
1021
|
+ <element signature="e#2162#2163#0" expanded="true" />
|
|
1022
|
+ <element signature="e#2199#2200#0" expanded="true" />
|
|
1023
|
+ <element signature="e#2251#2252#0" expanded="true" />
|
|
1024
|
+ <element signature="e#2291#2292#0" expanded="true" />
|
|
1025
|
+ <element signature="e#2331#2332#0" expanded="true" />
|
|
1026
|
+ <element signature="e#2371#2372#0" expanded="true" />
|
|
1027
|
+ </folding>
|
|
1028
|
+ </state>
|
|
1029
|
+ </provider>
|
|
1030
|
+ </entry>
|
|
1031
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/EnableMongoRepositories.java">
|
|
1032
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1033
|
+ <state relative-caret-position="30">
|
|
1034
|
+ <caret line="2" column="18" selection-start-line="2" selection-start-column="18" selection-end-line="2" selection-end-column="18" />
|
|
1035
|
+ </state>
|
|
1036
|
+ </provider>
|
|
1037
|
+ </entry>
|
|
1038
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
1039
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1040
|
+ <state relative-caret-position="60">
|
|
1041
|
+ <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
|
|
1042
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
510
|
1043
|
</state>
|
511
|
1044
|
</provider>
|
512
|
1045
|
</entry>
|
|
@@ -514,7 +1047,17 @@
|
514
|
1047
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
|
515
|
1048
|
<provider selected="true" editor-type-id="text-editor">
|
516
|
1049
|
<state relative-caret-position="75">
|
517
|
|
- <caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
|
|
1050
|
+ <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
|
|
1051
|
+ </state>
|
|
1052
|
+ </provider>
|
|
1053
|
+ </entry>
|
|
1054
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
|
1055
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1056
|
+ <state relative-caret-position="180">
|
|
1057
|
+ <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
|
|
1058
|
+ <folding>
|
|
1059
|
+ <element signature="imports" expanded="true" />
|
|
1060
|
+ </folding>
|
518
|
1061
|
</state>
|
519
|
1062
|
</provider>
|
520
|
1063
|
</entry>
|
|
@@ -527,8 +1070,13 @@
|
527
|
1070
|
</entry>
|
528
|
1071
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
529
|
1072
|
<provider selected="true" editor-type-id="text-editor">
|
|
1073
|
+<<<<<<< HEAD
|
530
|
1074
|
<state relative-caret-position="165">
|
531
|
1075
|
<caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
|
|
1076
|
+=======
|
|
1077
|
+ <state relative-caret-position="210">
|
|
1078
|
+ <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
|
|
1079
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
532
|
1080
|
<folding>
|
533
|
1081
|
<element signature="imports" expanded="true" />
|
534
|
1082
|
</folding>
|
|
@@ -537,7 +1085,11 @@
|
537
|
1085
|
</entry>
|
538
|
1086
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
|
539
|
1087
|
<provider selected="true" editor-type-id="text-editor">
|
|
1088
|
+<<<<<<< HEAD
|
540
|
1089
|
<state relative-caret-position="673">
|
|
1090
|
+=======
|
|
1091
|
+ <state relative-caret-position="639">
|
|
1092
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
541
|
1093
|
<caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
542
|
1094
|
<folding>
|
543
|
1095
|
<element signature="imports" expanded="true" />
|
|
@@ -545,6 +1097,7 @@
|
545
|
1097
|
</state>
|
546
|
1098
|
</provider>
|
547
|
1099
|
</entry>
|
|
1100
|
+<<<<<<< HEAD
|
548
|
1101
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
|
549
|
1102
|
<provider selected="true" editor-type-id="text-editor">
|
550
|
1103
|
<state relative-caret-position="675">
|
|
@@ -574,19 +1127,52 @@
|
574
|
1127
|
<provider selected="true" editor-type-id="text-editor">
|
575
|
1128
|
<state relative-caret-position="442">
|
576
|
1129
|
<caret line="135" column="14" lean-forward="true" selection-start-line="135" selection-start-column="14" selection-end-line="135" selection-end-column="14" />
|
|
1130
|
+=======
|
|
1131
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
1132
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1133
|
+ <state relative-caret-position="966">
|
|
1134
|
+ <caret line="121" column="45" lean-forward="true" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
|
|
1135
|
+ <folding>
|
|
1136
|
+ <element signature="imports" expanded="true" />
|
|
1137
|
+ <element signature="e#925#926#0" expanded="true" />
|
|
1138
|
+ <element signature="e#952#953#0" expanded="true" />
|
|
1139
|
+ <element signature="e#992#993#0" expanded="true" />
|
|
1140
|
+ <element signature="e#1024#1025#0" expanded="true" />
|
|
1141
|
+ <element signature="e#1123#1124#0" expanded="true" />
|
|
1142
|
+ <element signature="e#1156#1157#0" expanded="true" />
|
|
1143
|
+ <element signature="e#1195#1196#0" expanded="true" />
|
|
1144
|
+ <element signature="e#1227#1228#0" expanded="true" />
|
|
1145
|
+ <element signature="e#1258#1259#0" expanded="true" />
|
|
1146
|
+ <element signature="e#1287#1288#0" expanded="true" />
|
|
1147
|
+ <element signature="e#1329#1330#0" expanded="true" />
|
|
1148
|
+ <element signature="e#1365#1366#0" expanded="true" />
|
|
1149
|
+ <element signature="e#1481#1482#0" expanded="true" />
|
|
1150
|
+ <element signature="e#1521#1522#0" expanded="true" />
|
|
1151
|
+ <element signature="e#1548#1549#0" expanded="true" />
|
|
1152
|
+ <element signature="e#1573#1574#0" expanded="true" />
|
|
1153
|
+ <element signature="e#1607#1608#0" expanded="true" />
|
|
1154
|
+ <element signature="e#1635#1636#0" expanded="true" />
|
|
1155
|
+ </folding>
|
|
1156
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
577
|
1157
|
</state>
|
578
|
1158
|
</provider>
|
579
|
1159
|
</entry>
|
580
|
1160
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
581
|
1161
|
<provider selected="true" editor-type-id="text-editor">
|
|
1162
|
+<<<<<<< HEAD
|
582
|
1163
|
<state relative-caret-position="113">
|
583
|
1164
|
<caret line="37" column="42" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
|
|
1165
|
+=======
|
|
1166
|
+ <state relative-caret-position="210">
|
|
1167
|
+ <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
1168
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
584
|
1169
|
<folding>
|
585
|
1170
|
<element signature="imports" expanded="true" />
|
586
|
1171
|
</folding>
|
587
|
1172
|
</state>
|
588
|
1173
|
</provider>
|
589
|
1174
|
</entry>
|
|
1175
|
+<<<<<<< HEAD
|
590
|
1176
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
591
|
1177
|
<provider selected="true" editor-type-id="text-editor">
|
592
|
1178
|
<state relative-caret-position="136">
|
|
@@ -612,6 +1198,12 @@
|
612
|
1198
|
<provider selected="true" editor-type-id="text-editor">
|
613
|
1199
|
<state relative-caret-position="241">
|
614
|
1200
|
<caret line="46" selection-start-line="46" selection-end-line="46" />
|
|
1201
|
+=======
|
|
1202
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
1203
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1204
|
+ <state relative-caret-position="390">
|
|
1205
|
+ <caret line="26" selection-start-line="26" selection-end-line="26" />
|
|
1206
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
615
|
1207
|
<folding>
|
616
|
1208
|
<element signature="imports" expanded="true" />
|
617
|
1209
|
<element signature="e#971#972#0" expanded="true" />
|
|
@@ -640,11 +1232,12 @@
|
640
|
1232
|
</entry>
|
641
|
1233
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
642
|
1234
|
<provider selected="true" editor-type-id="text-editor">
|
643
|
|
- <state relative-caret-position="150">
|
644
|
|
- <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
1235
|
+ <state relative-caret-position="45">
|
|
1236
|
+ <caret line="3" column="36" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="36" />
|
645
|
1237
|
</state>
|
646
|
1238
|
</provider>
|
647
|
1239
|
</entry>
|
|
1240
|
+<<<<<<< HEAD
|
648
|
1241
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
649
|
1242
|
<provider selected="true" editor-type-id="text-editor">
|
650
|
1243
|
<state relative-caret-position="120">
|
|
@@ -692,15 +1285,45 @@
|
692
|
1285
|
<provider selected="true" editor-type-id="text-editor">
|
693
|
1286
|
<state relative-caret-position="150">
|
694
|
1287
|
<caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
1288
|
+=======
|
|
1289
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
1290
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1291
|
+ <state relative-caret-position="28">
|
|
1292
|
+ <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
|
|
1293
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
695
|
1294
|
</state>
|
696
|
1295
|
</provider>
|
697
|
1296
|
</entry>
|
698
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
|
1297
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
|
699
|
1298
|
<provider selected="true" editor-type-id="text-editor">
|
700
|
|
- <state relative-caret-position="195">
|
701
|
|
- <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
|
|
1299
|
+ <state relative-caret-position="202">
|
|
1300
|
+ <caret line="31" column="114" selection-start-line="31" selection-start-column="114" selection-end-line="31" selection-end-column="114" />
|
702
|
1301
|
<folding>
|
703
|
1302
|
<element signature="imports" expanded="true" />
|
|
1303
|
+ <element signature="e#854#855#0" expanded="true" />
|
|
1304
|
+ <element signature="e#879#880#0" expanded="true" />
|
|
1305
|
+ <element signature="e#913#914#0" expanded="true" />
|
|
1306
|
+ <element signature="e#941#942#0" expanded="true" />
|
|
1307
|
+ <element signature="e#981#982#0" expanded="true" />
|
|
1308
|
+ <element signature="e#1017#1018#0" expanded="true" />
|
|
1309
|
+ <element signature="e#1075#1076#0" expanded="true" />
|
|
1310
|
+ <element signature="e#1125#1126#0" expanded="true" />
|
|
1311
|
+ <element signature="e#1158#1159#0" expanded="true" />
|
|
1312
|
+ <element signature="e#1187#1188#0" expanded="true" />
|
|
1313
|
+ <element signature="e#1231#1232#0" expanded="true" />
|
|
1314
|
+ <element signature="e#1267#1268#0" expanded="true" />
|
|
1315
|
+ <element signature="e#1298#1299#0" expanded="true" />
|
|
1316
|
+ <element signature="e#1325#1326#0" expanded="true" />
|
|
1317
|
+ <element signature="e#1365#1366#0" expanded="true" />
|
|
1318
|
+ <element signature="e#1397#1398#0" expanded="true" />
|
|
1319
|
+ <element signature="e#1429#1430#0" expanded="true" />
|
|
1320
|
+ <element signature="e#1458#1459#0" expanded="true" />
|
|
1321
|
+ <element signature="e#1501#1502#0" expanded="true" />
|
|
1322
|
+ <element signature="e#1537#1538#0" expanded="true" />
|
|
1323
|
+ <element signature="e#1580#1581#0" expanded="true" />
|
|
1324
|
+ <element signature="e#1612#1613#0" expanded="true" />
|
|
1325
|
+ <element signature="e#1669#1670#0" expanded="true" />
|
|
1326
|
+ <element signature="e#1711#1712#0" expanded="true" />
|
704
|
1327
|
</folding>
|
705
|
1328
|
</state>
|
706
|
1329
|
</provider>
|