|
@@ -2,6 +2,18 @@
|
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
|
|
6
|
+<<<<<<< HEAD
|
|
7
|
+ <change beforePath="$PROJECT_DIR$/application.log" beforeDir="false" afterPath="$PROJECT_DIR$/application.log" afterDir="false" />
|
|
8
|
+ <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" />
|
|
9
|
+ <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" />
|
|
10
|
+ <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" />
|
|
11
|
+ <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" />
|
|
12
|
+ <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" />
|
|
13
|
+=======
|
|
14
|
+ <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" />
|
|
15
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
16
|
+=======
|
5
|
17
|
<change afterPath="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" afterDir="false" />
|
6
|
18
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
7
|
19
|
<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" />
|
|
@@ -18,6 +30,7 @@
|
18
|
30
|
<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" />
|
19
|
31
|
<change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Transactions.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Transactions.class" afterDir="false" />
|
20
|
32
|
<change beforePath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Wallet.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/buecoin01/model/Wallet.class" afterDir="false" />
|
|
33
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
21
|
34
|
</list>
|
22
|
35
|
<ignored path="$PROJECT_DIR$/target/" />
|
23
|
36
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -29,11 +42,69 @@
|
29
|
42
|
</component>
|
30
|
43
|
<component name="FileEditorManager">
|
31
|
44
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
45
|
+<<<<<<< HEAD
|
|
46
|
+<<<<<<< HEAD
|
|
47
|
+ <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
|
|
48
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
49
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
50
|
+ <state relative-caret-position="-1093">
|
|
51
|
+ <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
|
|
52
|
+ <folding>
|
|
53
|
+ <element signature="imports" expanded="true" />
|
|
54
|
+ <element signature="e#971#972#0" expanded="true" />
|
|
55
|
+ <element signature="e#998#999#0" expanded="true" />
|
|
56
|
+ <element signature="e#1038#1039#0" expanded="true" />
|
|
57
|
+ <element signature="e#1070#1071#0" expanded="true" />
|
|
58
|
+ <element signature="e#1093#1094#0" expanded="true" />
|
|
59
|
+ <element signature="e#1126#1127#0" expanded="true" />
|
|
60
|
+ <element signature="e#1167#1168#0" expanded="true" />
|
|
61
|
+ <element signature="e#1200#1201#0" expanded="true" />
|
|
62
|
+ <element signature="e#1239#1240#0" expanded="true" />
|
|
63
|
+ <element signature="e#1271#1272#0" expanded="true" />
|
|
64
|
+ <element signature="e#1302#1303#0" expanded="true" />
|
|
65
|
+ <element signature="e#1331#1332#0" expanded="true" />
|
|
66
|
+ <element signature="e#1373#1374#0" expanded="true" />
|
|
67
|
+ <element signature="e#1409#1410#0" expanded="true" />
|
|
68
|
+ <element signature="e#1525#1526#0" expanded="true" />
|
|
69
|
+ <element signature="e#1565#1566#0" expanded="true" />
|
|
70
|
+ <element signature="e#1592#1593#0" expanded="true" />
|
|
71
|
+ <element signature="e#1617#1618#0" expanded="true" />
|
|
72
|
+ <element signature="e#1651#1652#0" expanded="true" />
|
|
73
|
+ <element signature="e#1679#1680#0" expanded="true" />
|
|
74
|
+ </folding>
|
|
75
|
+=======
|
|
76
|
+ <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
77
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
78
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
79
|
+ <state relative-caret-position="45">
|
|
80
|
+ <caret line="3" column="36" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="36" />
|
|
81
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
82
|
+ </state>
|
|
83
|
+ </provider>
|
|
84
|
+ </entry>
|
|
85
|
+ </file>
|
|
86
|
+ <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
|
|
87
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
88
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
89
|
+<<<<<<< HEAD
|
|
90
|
+ <state relative-caret-position="675">
|
|
91
|
+ <caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
|
|
92
|
+ <folding>
|
|
93
|
+ <element signature="e#1933#1934#0" expanded="true" />
|
|
94
|
+ <element signature="e#1973#1974#0" expanded="true" />
|
|
95
|
+=======
|
|
96
|
+ <state relative-caret-position="390">
|
|
97
|
+ <caret line="26" selection-start-line="26" selection-end-line="26" />
|
|
98
|
+ <folding>
|
|
99
|
+ <element signature="imports" expanded="true" />
|
|
100
|
+ </folding>
|
|
101
|
+=======
|
32
|
102
|
<file leaf-file-name="Application.java" pinned="false" current-in-tab="false">
|
33
|
103
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
34
|
104
|
<provider selected="true" editor-type-id="text-editor">
|
35
|
105
|
<state relative-caret-position="60">
|
36
|
106
|
<caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
|
|
107
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
37
|
108
|
</state>
|
38
|
109
|
</provider>
|
39
|
110
|
</entry>
|
|
@@ -47,8 +118,57 @@
|
47
|
118
|
</provider>
|
48
|
119
|
</entry>
|
49
|
120
|
</file>
|
|
121
|
+<<<<<<< HEAD
|
|
122
|
+ <file leaf-file-name="Transactions.java" pinned="false" current-in-tab="true">
|
|
123
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
|
|
124
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
125
|
+ <state relative-caret-position="202">
|
|
126
|
+ <caret line="31" column="114" selection-start-line="31" selection-start-column="114" selection-end-line="31" selection-end-column="114" />
|
|
127
|
+ <folding>
|
|
128
|
+ <element signature="imports" expanded="true" />
|
|
129
|
+ <element signature="e#854#855#0" expanded="true" />
|
|
130
|
+ <element signature="e#879#880#0" expanded="true" />
|
|
131
|
+ <element signature="e#913#914#0" expanded="true" />
|
|
132
|
+ <element signature="e#941#942#0" expanded="true" />
|
|
133
|
+ <element signature="e#981#982#0" expanded="true" />
|
|
134
|
+ <element signature="e#1017#1018#0" expanded="true" />
|
|
135
|
+ <element signature="e#1075#1076#0" expanded="true" />
|
|
136
|
+ <element signature="e#1125#1126#0" expanded="true" />
|
|
137
|
+ <element signature="e#1158#1159#0" expanded="true" />
|
|
138
|
+ <element signature="e#1187#1188#0" expanded="true" />
|
|
139
|
+ <element signature="e#1231#1232#0" expanded="true" />
|
|
140
|
+ <element signature="e#1267#1268#0" expanded="true" />
|
|
141
|
+ <element signature="e#1298#1299#0" expanded="true" />
|
|
142
|
+ <element signature="e#1325#1326#0" expanded="true" />
|
|
143
|
+ <element signature="e#1365#1366#0" expanded="true" />
|
|
144
|
+ <element signature="e#1397#1398#0" expanded="true" />
|
|
145
|
+ <element signature="e#1429#1430#0" expanded="true" />
|
|
146
|
+ <element signature="e#1458#1459#0" expanded="true" />
|
|
147
|
+ <element signature="e#1501#1502#0" expanded="true" />
|
|
148
|
+ <element signature="e#1537#1538#0" expanded="true" />
|
|
149
|
+ <element signature="e#1580#1581#0" expanded="true" />
|
|
150
|
+ <element signature="e#1612#1613#0" expanded="true" />
|
|
151
|
+ <element signature="e#1669#1670#0" expanded="true" />
|
|
152
|
+ <element signature="e#1711#1712#0" expanded="true" />
|
|
153
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
154
|
+ </folding>
|
|
155
|
+ </state>
|
|
156
|
+ </provider>
|
|
157
|
+ </entry>
|
|
158
|
+ </file>
|
|
159
|
+<<<<<<< HEAD
|
|
160
|
+ <file leaf-file-name="WalletController.java" pinned="false" current-in-tab="true">
|
|
161
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
|
162
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
163
|
+ <state relative-caret-position="255">
|
|
164
|
+ <caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
|
|
165
|
+=======
|
|
166
|
+ <file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
|
|
167
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
168
|
+=======
|
50
|
169
|
<file leaf-file-name="WalletController.java" pinned="false" current-in-tab="false">
|
51
|
170
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
|
171
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
52
|
172
|
<provider selected="true" editor-type-id="text-editor">
|
53
|
173
|
<state relative-caret-position="648">
|
54
|
174
|
<caret line="52" selection-start-line="52" selection-end-line="52" />
|
|
@@ -62,8 +182,14 @@
|
62
|
182
|
<file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
|
63
|
183
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
64
|
184
|
<provider selected="true" editor-type-id="text-editor">
|
|
185
|
+<<<<<<< HEAD
|
|
186
|
+ <state relative-caret-position="210">
|
|
187
|
+ <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
188
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
189
|
+=======
|
65
|
190
|
<state relative-caret-position="510">
|
66
|
191
|
<caret line="34" selection-start-line="34" selection-end-line="34" />
|
|
192
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
67
|
193
|
<folding>
|
68
|
194
|
<element signature="imports" expanded="true" />
|
69
|
195
|
</folding>
|
|
@@ -71,42 +197,101 @@
|
71
|
197
|
</provider>
|
72
|
198
|
</entry>
|
73
|
199
|
</file>
|
|
200
|
+<<<<<<< HEAD
|
|
201
|
+<<<<<<< HEAD
|
|
202
|
+ <file leaf-file-name="ProcessLoader.java" pinned="false" current-in-tab="false">
|
|
203
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
204
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
205
|
+ <state relative-caret-position="108">
|
|
206
|
+ <caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
|
|
207
|
+=======
|
|
208
|
+ <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
|
|
209
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
|
210
|
+=======
|
74
|
211
|
<file leaf-file-name="ConductTransactions.java" pinned="false" current-in-tab="true">
|
75
|
212
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java">
|
|
213
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
76
|
214
|
<provider selected="true" editor-type-id="text-editor">
|
77
|
215
|
<state relative-caret-position="394">
|
78
|
216
|
<caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
|
79
|
217
|
<folding>
|
80
|
218
|
<element signature="imports" expanded="true" />
|
81
|
219
|
</folding>
|
|
220
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
82
|
221
|
</state>
|
83
|
222
|
</provider>
|
84
|
223
|
</entry>
|
85
|
224
|
</file>
|
|
225
|
+<<<<<<< HEAD
|
|
226
|
+ <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="false">
|
|
227
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java">
|
|
228
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
229
|
+<<<<<<< HEAD
|
|
230
|
+ <state relative-caret-position="200">
|
|
231
|
+ <caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
|
|
232
|
+=======
|
|
233
|
+ <state relative-caret-position="639">
|
|
234
|
+ <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
235
|
+=======
|
86
|
236
|
<file leaf-file-name="Transactions.java" pinned="false" current-in-tab="false">
|
87
|
237
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
|
88
|
238
|
<provider selected="true" editor-type-id="text-editor">
|
89
|
239
|
<state relative-caret-position="825">
|
90
|
240
|
<caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
|
|
241
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
91
|
242
|
<folding>
|
92
|
243
|
<element signature="imports" expanded="true" />
|
93
|
244
|
</folding>
|
|
245
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
94
|
246
|
</state>
|
95
|
247
|
</provider>
|
96
|
248
|
</entry>
|
97
|
249
|
</file>
|
|
250
|
+<<<<<<< HEAD
|
|
251
|
+<<<<<<< HEAD
|
|
252
|
+ <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
253
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
254
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
255
|
+ <state relative-caret-position="150">
|
|
256
|
+ <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
257
|
+=======
|
|
258
|
+ <file leaf-file-name="TransactionRepository.java" pinned="false" current-in-tab="false">
|
|
259
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
|
260
|
+=======
|
98
|
261
|
<file leaf-file-name="Wallet.java" pinned="false" current-in-tab="false">
|
99
|
262
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
263
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
100
|
264
|
<provider selected="true" editor-type-id="text-editor">
|
101
|
265
|
<state relative-caret-position="139">
|
102
|
266
|
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
|
103
|
267
|
<folding>
|
104
|
268
|
<element signature="imports" expanded="true" />
|
105
|
269
|
</folding>
|
|
270
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
271
|
+ </state>
|
|
272
|
+ </provider>
|
|
273
|
+ </entry>
|
|
274
|
+ </file>
|
|
275
|
+<<<<<<< HEAD
|
|
276
|
+<<<<<<< HEAD
|
|
277
|
+ <file leaf-file-name="Application.java" pinned="false" current-in-tab="false">
|
|
278
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
279
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
280
|
+ <state relative-caret-position="120">
|
|
281
|
+ <caret line="10" selection-start-line="10" selection-end-line="10" />
|
|
282
|
+=======
|
|
283
|
+ <file leaf-file-name="BlockRepository.java" pinned="false" current-in-tab="false">
|
|
284
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
|
|
285
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
286
|
+ <state relative-caret-position="75">
|
|
287
|
+ <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
|
|
288
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
106
|
289
|
</state>
|
107
|
290
|
</provider>
|
108
|
291
|
</entry>
|
109
|
292
|
</file>
|
|
293
|
+=======
|
|
294
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
110
|
295
|
</leaf>
|
111
|
296
|
</component>
|
112
|
297
|
<component name="FileTemplateManagerImpl">
|
|
@@ -133,6 +318,17 @@
|
133
|
318
|
<component name="IdeDocumentHistory">
|
134
|
319
|
<option name="CHANGED_PATHS">
|
135
|
320
|
<list>
|
|
321
|
+<<<<<<< HEAD
|
|
322
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java" />
|
|
323
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java" />
|
|
324
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
|
|
325
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java" />
|
|
326
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java" />
|
|
327
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" />
|
|
328
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java" />
|
|
329
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
|
|
330
|
+ <option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
|
|
331
|
+=======
|
136
|
332
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java" />
|
137
|
333
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java" />
|
138
|
334
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java" />
|
|
@@ -144,10 +340,14 @@
|
144
|
340
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java" />
|
145
|
341
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java" />
|
146
|
342
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java" />
|
|
343
|
+<<<<<<< HEAD
|
|
344
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
345
|
+=======
|
147
|
346
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java" />
|
148
|
347
|
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
|
149
|
348
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java" />
|
150
|
349
|
<option value="$PROJECT_DIR$/src/main/java/com/buecoin01/controller/ConductTransactions.java" />
|
|
350
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
151
|
351
|
</list>
|
152
|
352
|
</option>
|
153
|
353
|
</component>
|
|
@@ -177,7 +377,11 @@
|
177
|
377
|
<foldersAlwaysOnTop value="true" />
|
178
|
378
|
</navigator>
|
179
|
379
|
<panes>
|
|
380
|
+<<<<<<< HEAD
|
|
381
|
+ <pane id="Scope" />
|
|
382
|
+=======
|
180
|
383
|
<pane id="AndroidView" />
|
|
384
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
181
|
385
|
<pane id="ProjectPane">
|
182
|
386
|
<subPane>
|
183
|
387
|
<expand>
|
|
@@ -382,10 +586,24 @@
|
382
|
586
|
<servers />
|
383
|
587
|
</component>
|
384
|
588
|
<component name="TimeTrackingManager">
|
|
589
|
+<<<<<<< HEAD
|
|
590
|
+<<<<<<< HEAD
|
|
591
|
+ <option name="totallyTimeSpent" value="4624000" />
|
|
592
|
+ </component>
|
|
593
|
+ <component name="ToolWindowManager">
|
|
594
|
+ <frame x="0" y="0" width="1440" height="827" extended-state="6" />
|
|
595
|
+=======
|
|
596
|
+ <option name="totallyTimeSpent" value="9498000" />
|
|
597
|
+ </component>
|
|
598
|
+ <component name="ToolWindowManager">
|
|
599
|
+ <frame x="0" y="0" width="1280" height="800" extended-state="6" />
|
|
600
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
601
|
+=======
|
385
|
602
|
<option name="totallyTimeSpent" value="12326000" />
|
386
|
603
|
</component>
|
387
|
604
|
<component name="ToolWindowManager">
|
388
|
605
|
<frame x="0" y="0" width="1920" height="1080" extended-state="6" />
|
|
606
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
389
|
607
|
<editor active="true" />
|
390
|
608
|
<layout>
|
391
|
609
|
<window_info anchor="right" id="Palette" order="6" />
|
|
@@ -400,9 +618,50 @@
|
400
|
618
|
<window_info id="UI Designer" order="5" />
|
401
|
619
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
402
|
620
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
621
|
+<<<<<<< HEAD
|
|
622
|
+ <window_info anchor="bottom" id="Messages" weight="0.3281471" />
|
|
623
|
+=======
|
403
|
624
|
<window_info anchor="bottom" id="Messages" order="9" weight="0.27492878" />
|
|
625
|
+<<<<<<< HEAD
|
|
626
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
627
|
+ <window_info anchor="right" id="Palette	" order="3" />
|
|
628
|
+ <window_info id="Image Layers" order="2" />
|
|
629
|
+ <window_info anchor="bottom" id="Java Enterprise" order="7" />
|
|
630
|
+ <window_info anchor="right" id="Capture Analysis" order="3" />
|
|
631
|
+ <window_info anchor="bottom" id="Version Control" order="7" />
|
|
632
|
+<<<<<<< HEAD
|
|
633
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3946252" />
|
|
634
|
+ <window_info anchor="bottom" id="Spring" order="7" />
|
|
635
|
+ <window_info anchor="bottom" id="Terminal" order="7" />
|
|
636
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24177396" />
|
|
637
|
+=======
|
|
638
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32763532" />
|
|
639
|
+ <window_info anchor="bottom" id="Spring" order="7" weight="0.3299389" />
|
|
640
|
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.32905984" />
|
|
641
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536349" />
|
|
642
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
643
|
+ <window_info anchor="right" id="Bean Validation" order="3" />
|
|
644
|
+ <window_info id="Web" order="2" side_tool="true" />
|
|
645
|
+ <window_info anchor="right" id="Theme Preview" order="3" />
|
|
646
|
+ <window_info id="Favorites" order="2" side_tool="true" />
|
|
647
|
+<<<<<<< HEAD
|
|
648
|
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
649
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
650
|
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
651
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
652
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
653
|
+ <window_info anchor="bottom" id="Find" order="1" />
|
|
654
|
+=======
|
|
655
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
656
|
+ <window_info anchor="bottom" id="Run" order="2" />
|
|
657
|
+ <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
658
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30329043" />
|
|
659
|
+ <window_info id="Favorites" order="5" side_tool="true" />
|
|
660
|
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
661
|
+=======
|
404
|
662
|
<window_info anchor="right" id="Palette	" order="6" />
|
405
|
663
|
<window_info id="Image Layers" order="5" />
|
|
664
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
406
|
665
|
<window_info anchor="bottom" id="Java Enterprise" order="10" />
|
407
|
666
|
<window_info anchor="right" id="Capture Analysis" order="6" />
|
408
|
667
|
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3299389" />
|
|
@@ -420,6 +679,13 @@
|
420
|
679
|
<window_info anchor="bottom" id="Message" order="0" />
|
421
|
680
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
422
|
681
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
682
|
+<<<<<<< HEAD
|
|
683
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
684
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
685
|
+ <window_info id="Designer" order="5" />
|
|
686
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
687
|
+=======
|
|
688
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
423
|
689
|
</layout>
|
424
|
690
|
<layout-to-restore>
|
425
|
691
|
<window_info id="Designer" order="0" />
|
|
@@ -462,6 +728,37 @@
|
462
|
728
|
<option name="myLimit" value="2678400000" />
|
463
|
729
|
</component>
|
464
|
730
|
<component name="editorHistoryManager">
|
|
731
|
+<<<<<<< HEAD
|
|
732
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
733
|
+<<<<<<< HEAD
|
|
734
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
735
|
+ <state relative-caret-position="75">
|
|
736
|
+ <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
|
|
737
|
+ </state>
|
|
738
|
+ </provider>
|
|
739
|
+ </entry>
|
|
740
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
|
|
741
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
742
|
+ <state relative-caret-position="60">
|
|
743
|
+ <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
|
|
744
|
+ <folding>
|
|
745
|
+ <element signature="e#1933#1934#0" expanded="true" />
|
|
746
|
+ <element signature="e#1973#1974#0" expanded="true" />
|
|
747
|
+ </folding>
|
|
748
|
+=======
|
|
749
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
750
|
+ <state relative-caret-position="360">
|
|
751
|
+ <caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
|
|
752
|
+ <folding>
|
|
753
|
+ <element signature="e#581#582#0" expanded="true" />
|
|
754
|
+ <element signature="e#621#622#0" expanded="true" />
|
|
755
|
+ <element signature="e#653#654#0" expanded="true" />
|
|
756
|
+ </folding>
|
|
757
|
+ </state>
|
|
758
|
+ </provider>
|
|
759
|
+ </entry>
|
|
760
|
+=======
|
|
761
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
465
|
762
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
|
466
|
763
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
|
467
|
764
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -506,19 +803,53 @@
|
506
|
803
|
<provider selected="true" editor-type-id="text-editor">
|
507
|
804
|
<state relative-caret-position="150">
|
508
|
805
|
<caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
806
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
509
|
807
|
</state>
|
510
|
808
|
</provider>
|
511
|
809
|
</entry>
|
512
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
810
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
513
|
811
|
<provider selected="true" editor-type-id="text-editor">
|
|
812
|
+<<<<<<< HEAD
|
|
813
|
+ <state relative-caret-position="450">
|
|
814
|
+ <caret line="37" column="42" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
|
|
815
|
+ <folding>
|
|
816
|
+ <element signature="imports" expanded="true" />
|
|
817
|
+=======
|
514
|
818
|
<state relative-caret-position="360">
|
515
|
819
|
<caret line="24" column="29" selection-start-line="24" selection-start-column="29" selection-end-line="24" selection-end-column="29" />
|
516
|
820
|
<folding>
|
|
821
|
+<<<<<<< HEAD
|
|
822
|
+ <element signature="e#581#582#0" expanded="true" />
|
|
823
|
+ <element signature="e#621#622#0" expanded="true" />
|
|
824
|
+ <element signature="e#653#654#0" expanded="true" />
|
|
825
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
826
|
+=======
|
517
|
827
|
<element signature="imports" expanded="true" />
|
|
828
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
518
|
829
|
</folding>
|
519
|
830
|
</state>
|
520
|
831
|
</provider>
|
521
|
832
|
</entry>
|
|
833
|
+<<<<<<< HEAD
|
|
834
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
|
|
835
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
836
|
+ <state relative-caret-position="75">
|
|
837
|
+ <caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
|
|
838
|
+ </state>
|
|
839
|
+ </provider>
|
|
840
|
+ </entry>
|
|
841
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
|
|
842
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
843
|
+ <state relative-caret-position="75">
|
|
844
|
+ <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
|
|
845
|
+ </state>
|
|
846
|
+ </provider>
|
|
847
|
+ </entry>
|
|
848
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
|
|
849
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
850
|
+ <state relative-caret-position="600">
|
|
851
|
+ <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
852
|
+=======
|
522
|
853
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/CoinRepository.java" />
|
523
|
854
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/buecoin01/ApplicationTests.java">
|
524
|
855
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -538,6 +869,7 @@
|
538
|
869
|
<provider selected="true" editor-type-id="text-editor">
|
539
|
870
|
<state relative-caret-position="293">
|
540
|
871
|
<caret line="26" column="71" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
|
|
872
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
541
|
873
|
<folding>
|
542
|
874
|
<element signature="imports" expanded="true" />
|
543
|
875
|
</folding>
|
|
@@ -551,6 +883,29 @@
|
551
|
883
|
</state>
|
552
|
884
|
</provider>
|
553
|
885
|
</entry>
|
|
886
|
+<<<<<<< HEAD
|
|
887
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
|
888
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
889
|
+ <state relative-caret-position="150">
|
|
890
|
+ <caret line="10" column="20" selection-end-line="57" />
|
|
891
|
+ </state>
|
|
892
|
+ </provider>
|
|
893
|
+ </entry>
|
|
894
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java">
|
|
895
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
896
|
+ <state relative-caret-position="1065">
|
|
897
|
+ <caret line="78" column="34" selection-start-line="78" selection-start-column="34" selection-end-line="78" selection-end-column="34" />
|
|
898
|
+ </state>
|
|
899
|
+ </provider>
|
|
900
|
+ </entry>
|
|
901
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
|
902
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
903
|
+ <state relative-caret-position="120">
|
|
904
|
+ <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
|
|
905
|
+ <folding>
|
|
906
|
+ <element signature="imports" expanded="true" />
|
|
907
|
+ </folding>
|
|
908
|
+=======
|
554
|
909
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
555
|
910
|
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
556
|
911
|
<provider selected="true" editor-type-id="text-editor" />
|
|
@@ -725,12 +1080,23 @@
|
725
|
1080
|
</entry>
|
726
|
1081
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
|
727
|
1082
|
<provider selected="true" editor-type-id="text-editor">
|
|
1083
|
+<<<<<<< HEAD
|
|
1084
|
+ <state relative-caret-position="60">
|
|
1085
|
+ <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
|
|
1086
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
1087
|
+ </state>
|
|
1088
|
+ </provider>
|
|
1089
|
+ </entry>
|
|
1090
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
1091
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
|
|
1092
|
+=======
|
728
|
1093
|
<state relative-caret-position="639">
|
729
|
1094
|
<caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
730
|
1095
|
</state>
|
731
|
1096
|
</provider>
|
732
|
1097
|
</entry>
|
733
|
1098
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
1099
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
734
|
1100
|
<provider selected="true" editor-type-id="text-editor">
|
735
|
1101
|
<state relative-caret-position="148">
|
736
|
1102
|
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
@@ -755,10 +1121,20 @@
|
755
|
1121
|
</state>
|
756
|
1122
|
</provider>
|
757
|
1123
|
</entry>
|
758
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
|
1124
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/TransactionRepository.java">
|
759
|
1125
|
<provider selected="true" editor-type-id="text-editor">
|
|
1126
|
+<<<<<<< HEAD
|
|
1127
|
+<<<<<<< HEAD
|
|
1128
|
+ <state relative-caret-position="165">
|
|
1129
|
+ <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
|
|
1130
|
+=======
|
|
1131
|
+ <state relative-caret-position="210">
|
|
1132
|
+ <caret line="14" column="42" lean-forward="true" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
|
|
1133
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
1134
|
+=======
|
760
|
1135
|
<state relative-caret-position="599">
|
761
|
1136
|
<caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
|
|
1137
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
762
|
1138
|
<folding>
|
763
|
1139
|
<element signature="imports" expanded="true" />
|
764
|
1140
|
</folding>
|
|
@@ -767,26 +1143,118 @@
|
767
|
1143
|
</entry>
|
768
|
1144
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transactions.java">
|
769
|
1145
|
<provider selected="true" editor-type-id="text-editor">
|
|
1146
|
+<<<<<<< HEAD
|
|
1147
|
+<<<<<<< HEAD
|
|
1148
|
+ <state relative-caret-position="673">
|
|
1149
|
+=======
|
|
1150
|
+ <state relative-caret-position="639">
|
|
1151
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
1152
|
+ <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
1153
|
+=======
|
770
|
1154
|
<state relative-caret-position="825">
|
771
|
1155
|
<caret line="71" column="17" selection-start-line="71" selection-start-column="17" selection-end-line="71" selection-end-column="17" />
|
|
1156
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
772
|
1157
|
<folding>
|
773
|
1158
|
<element signature="imports" expanded="true" />
|
774
|
1159
|
</folding>
|
775
|
1160
|
</state>
|
776
|
1161
|
</provider>
|
777
|
1162
|
</entry>
|
|
1163
|
+<<<<<<< HEAD
|
|
1164
|
+<<<<<<< HEAD
|
|
1165
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
|
|
1166
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1167
|
+ <state relative-caret-position="675">
|
|
1168
|
+ <caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
|
|
1169
|
+ <folding>
|
|
1170
|
+ <element signature="e#1933#1934#0" expanded="true" />
|
|
1171
|
+ <element signature="e#1973#1974#0" expanded="true" />
|
|
1172
|
+ </folding>
|
|
1173
|
+ </state>
|
|
1174
|
+ </provider>
|
|
1175
|
+ </entry>
|
|
1176
|
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java">
|
|
1177
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1178
|
+ <state relative-caret-position="345">
|
|
1179
|
+ <caret line="56" selection-start-line="56" selection-end-line="56" />
|
|
1180
|
+ </state>
|
|
1181
|
+ </provider>
|
|
1182
|
+ </entry>
|
|
1183
|
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBean.java">
|
|
1184
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1185
|
+ <state relative-caret-position="165">
|
|
1186
|
+ <caret line="364" selection-start-line="364" selection-end-line="364" />
|
|
1187
|
+ </state>
|
|
1188
|
+ </provider>
|
|
1189
|
+ </entry>
|
|
1190
|
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.3.RELEASE/spring-boot-autoconfigure-2.0.3.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java">
|
|
1191
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1192
|
+ <state relative-caret-position="442">
|
|
1193
|
+ <caret line="135" column="14" lean-forward="true" selection-start-line="135" selection-start-column="14" selection-end-line="135" selection-end-column="14" />
|
|
1194
|
+=======
|
|
1195
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
1196
|
+=======
|
778
|
1197
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
1198
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
779
|
1199
|
<provider selected="true" editor-type-id="text-editor">
|
780
|
1200
|
<state relative-caret-position="510">
|
781
|
1201
|
<caret line="34" selection-start-line="34" selection-end-line="34" />
|
782
|
1202
|
<folding>
|
783
|
1203
|
<element signature="imports" expanded="true" />
|
784
|
1204
|
</folding>
|
|
1205
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
785
|
1206
|
</state>
|
786
|
1207
|
</provider>
|
787
|
1208
|
</entry>
|
788
|
1209
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
789
|
1210
|
<provider selected="true" editor-type-id="text-editor">
|
|
1211
|
+<<<<<<< HEAD
|
|
1212
|
+<<<<<<< HEAD
|
|
1213
|
+ <state relative-caret-position="113">
|
|
1214
|
+ <caret line="37" column="42" selection-start-line="37" selection-start-column="42" selection-end-line="37" selection-end-column="42" />
|
|
1215
|
+=======
|
|
1216
|
+ <state relative-caret-position="210">
|
|
1217
|
+ <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
1218
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
1219
|
+ <folding>
|
|
1220
|
+ <element signature="imports" expanded="true" />
|
|
1221
|
+ </folding>
|
|
1222
|
+ </state>
|
|
1223
|
+ </provider>
|
|
1224
|
+ </entry>
|
|
1225
|
+<<<<<<< HEAD
|
|
1226
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
|
1227
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1228
|
+ <state relative-caret-position="136">
|
|
1229
|
+ <caret line="10" column="20" selection-end-line="57" />
|
|
1230
|
+ </state>
|
|
1231
|
+ </provider>
|
|
1232
|
+ </entry>
|
|
1233
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java">
|
|
1234
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1235
|
+ <state relative-caret-position="-1201">
|
|
1236
|
+ <caret line="16" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
|
|
1237
|
+ </state>
|
|
1238
|
+ </provider>
|
|
1239
|
+ </entry>
|
|
1240
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
1241
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1242
|
+ <state relative-caret-position="152">
|
|
1243
|
+ <caret line="67" lean-forward="true" selection-start-line="67" selection-end-line="67" />
|
|
1244
|
+ </state>
|
|
1245
|
+ </provider>
|
|
1246
|
+ </entry>
|
|
1247
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
1248
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1249
|
+ <state relative-caret-position="241">
|
|
1250
|
+ <caret line="46" selection-start-line="46" selection-end-line="46" />
|
|
1251
|
+=======
|
|
1252
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
1253
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1254
|
+ <state relative-caret-position="390">
|
|
1255
|
+ <caret line="26" selection-start-line="26" selection-end-line="26" />
|
|
1256
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
1257
|
+=======
|
790
|
1258
|
<state relative-caret-position="60">
|
791
|
1259
|
<caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
|
792
|
1260
|
</state>
|
|
@@ -796,8 +1264,29 @@
|
796
|
1264
|
<provider selected="true" editor-type-id="text-editor">
|
797
|
1265
|
<state relative-caret-position="139">
|
798
|
1266
|
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
|
|
1267
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
799
|
1268
|
<folding>
|
800
|
1269
|
<element signature="imports" expanded="true" />
|
|
1270
|
+ <element signature="e#971#972#0" expanded="true" />
|
|
1271
|
+ <element signature="e#998#999#0" expanded="true" />
|
|
1272
|
+ <element signature="e#1038#1039#0" expanded="true" />
|
|
1273
|
+ <element signature="e#1070#1071#0" expanded="true" />
|
|
1274
|
+ <element signature="e#1093#1094#0" expanded="true" />
|
|
1275
|
+ <element signature="e#1126#1127#0" expanded="true" />
|
|
1276
|
+ <element signature="e#1167#1168#0" expanded="true" />
|
|
1277
|
+ <element signature="e#1200#1201#0" expanded="true" />
|
|
1278
|
+ <element signature="e#1239#1240#0" expanded="true" />
|
|
1279
|
+ <element signature="e#1271#1272#0" expanded="true" />
|
|
1280
|
+ <element signature="e#1302#1303#0" expanded="true" />
|
|
1281
|
+ <element signature="e#1331#1332#0" expanded="true" />
|
|
1282
|
+ <element signature="e#1373#1374#0" expanded="true" />
|
|
1283
|
+ <element signature="e#1409#1410#0" expanded="true" />
|
|
1284
|
+ <element signature="e#1525#1526#0" expanded="true" />
|
|
1285
|
+ <element signature="e#1565#1566#0" expanded="true" />
|
|
1286
|
+ <element signature="e#1592#1593#0" expanded="true" />
|
|
1287
|
+ <element signature="e#1617#1618#0" expanded="true" />
|
|
1288
|
+ <element signature="e#1651#1652#0" expanded="true" />
|
|
1289
|
+ <element signature="e#1679#1680#0" expanded="true" />
|
801
|
1290
|
</folding>
|
802
|
1291
|
</state>
|
803
|
1292
|
</provider>
|
|
@@ -809,6 +1298,62 @@
|
809
|
1298
|
</state>
|
810
|
1299
|
</provider>
|
811
|
1300
|
</entry>
|
|
1301
|
+<<<<<<< HEAD
|
|
1302
|
+<<<<<<< HEAD
|
|
1303
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
1304
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1305
|
+ <state relative-caret-position="120">
|
|
1306
|
+ <caret line="10" selection-start-line="10" selection-end-line="10" />
|
|
1307
|
+ </state>
|
|
1308
|
+ </provider>
|
|
1309
|
+ </entry>
|
|
1310
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Application.java">
|
|
1311
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1312
|
+ <state relative-caret-position="120">
|
|
1313
|
+ <caret line="10" selection-start-line="10" selection-end-line="10" />
|
|
1314
|
+ </state>
|
|
1315
|
+ </provider>
|
|
1316
|
+ </entry>
|
|
1317
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Coin.java" />
|
|
1318
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/WalletRepository.java">
|
|
1319
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1320
|
+ <state relative-caret-position="75">
|
|
1321
|
+ <caret line="8" column="73" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="73" />
|
|
1322
|
+ </state>
|
|
1323
|
+ </provider>
|
|
1324
|
+ </entry>
|
|
1325
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/Repositories/BlockRepository.java">
|
|
1326
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1327
|
+ <state relative-caret-position="90">
|
|
1328
|
+ <caret line="8" column="1" selection-start-line="8" selection-end-line="9" />
|
|
1329
|
+ </state>
|
|
1330
|
+ </provider>
|
|
1331
|
+ </entry>
|
|
1332
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/TransactionController.java">
|
|
1333
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1334
|
+ <state relative-caret-position="136">
|
|
1335
|
+ <caret line="10" column="20" selection-end-line="57" />
|
|
1336
|
+ </state>
|
|
1337
|
+ </provider>
|
|
1338
|
+ </entry>
|
|
1339
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/BlockController.java">
|
|
1340
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1341
|
+ <state relative-caret-position="673">
|
|
1342
|
+ <caret line="47" column="40" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
1343
|
+ </state>
|
|
1344
|
+ </provider>
|
|
1345
|
+ </entry>
|
|
1346
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
|
|
1347
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1348
|
+ <state relative-caret-position="150">
|
|
1349
|
+ <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
1350
|
+=======
|
|
1351
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Block.java">
|
|
1352
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1353
|
+ <state relative-caret-position="28">
|
|
1354
|
+ <caret line="24" column="16" lean-forward="true" selection-start-line="24" selection-end-line="25" />
|
|
1355
|
+>>>>>>> 8f54c3eecc5bed7d04144a96ce991b00bf0a29ef
|
|
1356
|
+=======
|
812
|
1357
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
813
|
1358
|
<provider selected="true" editor-type-id="text-editor">
|
814
|
1359
|
<state relative-caret-position="648">
|
|
@@ -816,6 +1361,7 @@
|
816
|
1361
|
<folding>
|
817
|
1362
|
<element signature="imports" expanded="true" />
|
818
|
1363
|
</folding>
|
|
1364
|
+>>>>>>> 83b86f0a924ec01b4de5bc873174ce272b8219a1
|
819
|
1365
|
</state>
|
820
|
1366
|
</provider>
|
821
|
1367
|
</entry>
|
|
@@ -829,5 +1375,70 @@
|
829
|
1375
|
</state>
|
830
|
1376
|
</provider>
|
831
|
1377
|
</entry>
|
|
1378
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/BlockchainVerification.java">
|
|
1379
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1380
|
+ <state relative-caret-position="675">
|
|
1381
|
+ <caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
|
|
1382
|
+ <folding>
|
|
1383
|
+ <element signature="e#1933#1934#0" expanded="true" />
|
|
1384
|
+ <element signature="e#1973#1974#0" expanded="true" />
|
|
1385
|
+ </folding>
|
|
1386
|
+ </state>
|
|
1387
|
+ </provider>
|
|
1388
|
+ </entry>
|
|
1389
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/ProcessLoader.java">
|
|
1390
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1391
|
+ <state relative-caret-position="108">
|
|
1392
|
+ <caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
|
|
1393
|
+ </state>
|
|
1394
|
+ </provider>
|
|
1395
|
+ </entry>
|
|
1396
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Transaction.java">
|
|
1397
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1398
|
+ <state relative-caret-position="200">
|
|
1399
|
+ <caret line="25" column="26" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
|
|
1400
|
+ </state>
|
|
1401
|
+ </provider>
|
|
1402
|
+ </entry>
|
|
1403
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/model/Wallet.java">
|
|
1404
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1405
|
+ <state relative-caret-position="-1093">
|
|
1406
|
+ <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
|
|
1407
|
+ <folding>
|
|
1408
|
+ <element signature="imports" expanded="true" />
|
|
1409
|
+ <element signature="e#971#972#0" expanded="true" />
|
|
1410
|
+ <element signature="e#998#999#0" expanded="true" />
|
|
1411
|
+ <element signature="e#1038#1039#0" expanded="true" />
|
|
1412
|
+ <element signature="e#1070#1071#0" expanded="true" />
|
|
1413
|
+ <element signature="e#1093#1094#0" expanded="true" />
|
|
1414
|
+ <element signature="e#1126#1127#0" expanded="true" />
|
|
1415
|
+ <element signature="e#1167#1168#0" expanded="true" />
|
|
1416
|
+ <element signature="e#1200#1201#0" expanded="true" />
|
|
1417
|
+ <element signature="e#1239#1240#0" expanded="true" />
|
|
1418
|
+ <element signature="e#1271#1272#0" expanded="true" />
|
|
1419
|
+ <element signature="e#1302#1303#0" expanded="true" />
|
|
1420
|
+ <element signature="e#1331#1332#0" expanded="true" />
|
|
1421
|
+ <element signature="e#1373#1374#0" expanded="true" />
|
|
1422
|
+ <element signature="e#1409#1410#0" expanded="true" />
|
|
1423
|
+ <element signature="e#1525#1526#0" expanded="true" />
|
|
1424
|
+ <element signature="e#1565#1566#0" expanded="true" />
|
|
1425
|
+ <element signature="e#1592#1593#0" expanded="true" />
|
|
1426
|
+ <element signature="e#1617#1618#0" expanded="true" />
|
|
1427
|
+ <element signature="e#1651#1652#0" expanded="true" />
|
|
1428
|
+ <element signature="e#1679#1680#0" expanded="true" />
|
|
1429
|
+ </folding>
|
|
1430
|
+ </state>
|
|
1431
|
+ </provider>
|
|
1432
|
+ </entry>
|
|
1433
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/buecoin01/controller/WalletController.java">
|
|
1434
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
1435
|
+ <state relative-caret-position="255">
|
|
1436
|
+ <caret line="17" column="8" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
|
|
1437
|
+ <folding>
|
|
1438
|
+ <element signature="imports" expanded="true" />
|
|
1439
|
+ </folding>
|
|
1440
|
+ </state>
|
|
1441
|
+ </provider>
|
|
1442
|
+ </entry>
|
832
|
1443
|
</component>
|
833
|
1444
|
</project>
|