SimBot 0.1.35 → 0.1.36
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.idea/workspace.xml +79 -343
- data/lib/SimBot/version.rb +1 -1
- data/lib/utils.rb +12 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1a131bbc24d1d271499159a7f3d2158f4162fe17876387402e5bc63270f90bf4
|
|
4
|
+
data.tar.gz: '013194149ded8754810c4b8512c266697db06d32cc69f990a2bf241ea25fd205'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bb068c09f9e10954913aef7fa9b5e56f498f8c3fe03a12fa559deb34fc8107e5c9493c6ef9ed6fca12226b7956e96d72d283e7403d939fb6ff5e0060e60a4382
|
|
7
|
+
data.tar.gz: 7f68ba69b5bea9756a947e887a6b3ce8d6fcbb8d0ea56f6c42b91b205e5eecf0cb5a4e1f09238af965e54dc6629f7fb0c1427a5aa9332de9abd36cad0fc26c6d
|
data/.idea/workspace.xml
CHANGED
|
@@ -1,15 +1,20 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<project version="4">
|
|
3
3
|
<component name="ChangeListManager">
|
|
4
|
-
<<<<<<< HEAD
|
|
5
4
|
<list default="true" id="d905eaf2-5cab-434b-a4d1-1ccf165356a4" name="Default" comment="">
|
|
5
|
+
<change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
|
|
6
|
+
<change beforePath="$PROJECT_DIR$/.idea/.rakeTasks" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" afterDir="false" />
|
|
7
|
+
<change beforePath="$PROJECT_DIR$/.idea/SimBot.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/SimBot.iml" afterDir="false" />
|
|
6
8
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
7
|
-
<change beforePath="$PROJECT_DIR
|
|
9
|
+
<change beforePath="$PROJECT_DIR$/.ruby-gemset" beforeDir="false" afterPath="$PROJECT_DIR$/.ruby-gemset" afterDir="false" />
|
|
10
|
+
<change beforePath="$PROJECT_DIR$/.ruby-version" beforeDir="false" afterPath="$PROJECT_DIR$/.ruby-version" afterDir="false" />
|
|
11
|
+
<change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
|
|
12
|
+
<change beforePath="$PROJECT_DIR$/SimBot.gemspec" beforeDir="false" afterPath="$PROJECT_DIR$/SimBot.gemspec" afterDir="false" />
|
|
13
|
+
<change beforePath="$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb" afterDir="false" />
|
|
14
|
+
<change beforePath="$PROJECT_DIR$/lib/SimBot.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SimBot.rb" afterDir="false" />
|
|
8
15
|
<change beforePath="$PROJECT_DIR$/lib/SimBot/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SimBot/version.rb" afterDir="false" />
|
|
16
|
+
<change beforePath="$PROJECT_DIR$/lib/utils.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils.rb" afterDir="false" />
|
|
9
17
|
</list>
|
|
10
|
-
=======
|
|
11
|
-
<list default="true" id="d905eaf2-5cab-434b-a4d1-1ccf165356a4" name="Default" comment="" />
|
|
12
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
13
18
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
14
19
|
<option name="TRACKING_ENABLED" value="true" />
|
|
15
20
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -76,128 +81,8 @@
|
|
|
76
81
|
</session>
|
|
77
82
|
</component>
|
|
78
83
|
<component name="FileEditorManager">
|
|
79
|
-
<<<<<<< HEAD
|
|
80
|
-
<splitter split-orientation="horizontal" split-proportion="0.5059264">
|
|
81
|
-
<split-first>
|
|
82
|
-
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
83
|
-
<file leaf-file-name="SimBot.rb" pinned="false" current-in-tab="false">
|
|
84
|
-
<entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
|
|
85
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
86
|
-
<state relative-caret-position="1173">
|
|
87
|
-
<caret line="63" column="15" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="15" />
|
|
88
|
-
</state>
|
|
89
|
-
</provider>
|
|
90
|
-
</entry>
|
|
91
|
-
</file>
|
|
92
|
-
<file leaf-file-name="19071.errfile" pinned="false" current-in-tab="false">
|
|
93
|
-
<entry file="file://$PROJECT_DIR$/19071.errfile">
|
|
94
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
95
|
-
<state relative-caret-position="391">
|
|
96
|
-
<caret line="17" selection-start-line="17" selection-end-line="17" />
|
|
97
|
-
</state>
|
|
98
|
-
</provider>
|
|
99
|
-
</entry>
|
|
100
|
-
</file>
|
|
101
|
-
<file leaf-file-name="SimBot_spec.rb" pinned="false" current-in-tab="false">
|
|
102
|
-
<entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
|
|
103
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
104
|
-
<state relative-caret-position="161">
|
|
105
|
-
<caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
|
|
106
|
-
</state>
|
|
107
|
-
</provider>
|
|
108
|
-
</entry>
|
|
109
|
-
</file>
|
|
110
|
-
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
|
|
111
|
-
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
112
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
113
|
-
<state relative-caret-position="322">
|
|
114
|
-
<caret line="14" selection-start-line="14" selection-end-line="14" />
|
|
115
|
-
</state>
|
|
116
|
-
</provider>
|
|
117
|
-
</entry>
|
|
118
|
-
</file>
|
|
119
|
-
<file leaf-file-name="utils.rb" pinned="false" current-in-tab="true">
|
|
120
|
-
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
|
|
121
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
122
|
-
<state relative-caret-position="290">
|
|
123
|
-
<caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
|
|
124
|
-
</state>
|
|
125
|
-
</provider>
|
|
126
|
-
</entry>
|
|
127
|
-
</file>
|
|
128
|
-
</leaf>
|
|
129
|
-
</split-first>
|
|
130
|
-
<split-second>
|
|
131
|
-
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
132
|
-
<file leaf-file-name="barong.rb" pinned="false" current-in-tab="false">
|
|
133
|
-
<entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
|
|
134
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
135
|
-
<state relative-caret-position="345">
|
|
136
|
-
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
|
|
137
|
-
</state>
|
|
138
|
-
</provider>
|
|
139
|
-
</entry>
|
|
140
|
-
</file>
|
|
141
|
-
<file leaf-file-name="geth.rb" pinned="false" current-in-tab="false">
|
|
142
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
|
|
143
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
144
|
-
<state relative-caret-position="506">
|
|
145
|
-
<caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
|
|
146
|
-
</state>
|
|
147
|
-
</provider>
|
|
148
|
-
</entry>
|
|
149
|
-
</file>
|
|
150
|
-
<file leaf-file-name="ngrok.rb" pinned="false" current-in-tab="false">
|
|
151
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
|
|
152
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
153
|
-
<state relative-caret-position="376">
|
|
154
|
-
<caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
|
|
155
|
-
</state>
|
|
156
|
-
</provider>
|
|
157
|
-
</entry>
|
|
158
|
-
</file>
|
|
159
|
-
<file leaf-file-name="peatio.rb" pinned="false" current-in-tab="false">
|
|
160
|
-
<entry file="file://$PROJECT_DIR$/lib/ApiController/peatio.rb">
|
|
161
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
162
|
-
<state relative-caret-position="483">
|
|
163
|
-
<caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
|
|
164
|
-
</state>
|
|
165
|
-
</provider>
|
|
166
|
-
</entry>
|
|
167
|
-
</file>
|
|
168
|
-
<file leaf-file-name="wash_trade.rb" pinned="false" current-in-tab="false">
|
|
169
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
|
|
170
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
171
|
-
<state relative-caret-position="667">
|
|
172
|
-
<caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
|
|
173
|
-
</state>
|
|
174
|
-
</provider>
|
|
175
|
-
</entry>
|
|
176
|
-
</file>
|
|
177
|
-
<file leaf-file-name="simple_mm.rb" pinned="false" current-in-tab="false">
|
|
178
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
|
|
179
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
180
|
-
<state relative-caret-position="621">
|
|
181
|
-
<caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
|
|
182
|
-
</state>
|
|
183
|
-
</provider>
|
|
184
|
-
</entry>
|
|
185
|
-
</file>
|
|
186
|
-
<file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
|
|
187
|
-
<entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
|
|
188
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
189
|
-
<state relative-caret-position="23">
|
|
190
|
-
<caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
|
|
191
|
-
</state>
|
|
192
|
-
</provider>
|
|
193
|
-
</entry>
|
|
194
|
-
</file>
|
|
195
|
-
</leaf>
|
|
196
|
-
</split-second>
|
|
197
|
-
</splitter>
|
|
198
|
-
=======
|
|
199
84
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
200
|
-
<file pinned="false" current-in-tab="false">
|
|
85
|
+
<file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">
|
|
201
86
|
<entry file="file://$PROJECT_DIR$/.ruby-version">
|
|
202
87
|
<provider selected="true" editor-type-id="text-editor">
|
|
203
88
|
<state>
|
|
@@ -206,67 +91,61 @@
|
|
|
206
91
|
</provider>
|
|
207
92
|
</entry>
|
|
208
93
|
</file>
|
|
209
|
-
<file pinned="false" current-in-tab="
|
|
210
|
-
<entry file="file://$PROJECT_DIR$/.ruby-gemset">
|
|
211
|
-
<provider selected="true" editor-type-id="text-editor" />
|
|
212
|
-
</entry>
|
|
213
|
-
</file>
|
|
214
|
-
<file pinned="false" current-in-tab="false">
|
|
94
|
+
<file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
|
|
215
95
|
<entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
|
|
216
96
|
<provider selected="true" editor-type-id="text-editor">
|
|
217
|
-
<state>
|
|
218
|
-
<caret column="
|
|
97
|
+
<state relative-caret-position="23">
|
|
98
|
+
<caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
|
|
219
99
|
</state>
|
|
220
100
|
</provider>
|
|
221
101
|
</entry>
|
|
222
102
|
</file>
|
|
223
|
-
<file pinned="false" current-in-tab="false">
|
|
103
|
+
<file leaf-file-name="bitcoind.rb" pinned="false" current-in-tab="false">
|
|
224
104
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
|
|
225
105
|
<provider selected="true" editor-type-id="text-editor">
|
|
226
|
-
<state relative-caret-position="
|
|
106
|
+
<state relative-caret-position="92">
|
|
227
107
|
<caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
|
|
228
108
|
</state>
|
|
229
109
|
</provider>
|
|
230
110
|
</entry>
|
|
231
111
|
</file>
|
|
232
|
-
<file pinned="false" current-in-tab="
|
|
112
|
+
<file leaf-file-name="SimBot.rb" pinned="false" current-in-tab="false">
|
|
233
113
|
<entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
|
|
234
114
|
<provider selected="true" editor-type-id="text-editor">
|
|
235
|
-
<state relative-caret-position="
|
|
236
|
-
<caret line="
|
|
115
|
+
<state relative-caret-position="-408">
|
|
116
|
+
<caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
|
|
237
117
|
</state>
|
|
238
118
|
</provider>
|
|
239
119
|
</entry>
|
|
240
120
|
</file>
|
|
241
|
-
<file pinned="false" current-in-tab="false">
|
|
121
|
+
<file leaf-file-name="utils.rb" pinned="false" current-in-tab="false">
|
|
242
122
|
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
|
|
243
123
|
<provider selected="true" editor-type-id="text-editor">
|
|
244
|
-
<state relative-caret-position="
|
|
245
|
-
<caret line="
|
|
124
|
+
<state relative-caret-position="103">
|
|
125
|
+
<caret line="5" column="34" lean-forward="true" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
|
|
246
126
|
</state>
|
|
247
127
|
</provider>
|
|
248
128
|
</entry>
|
|
249
129
|
</file>
|
|
250
|
-
<file pinned="false" current-in-tab="false">
|
|
130
|
+
<file leaf-file-name="geth.rb" pinned="false" current-in-tab="false">
|
|
251
131
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
|
|
252
132
|
<provider selected="true" editor-type-id="text-editor">
|
|
253
|
-
<state relative-caret-position="
|
|
133
|
+
<state relative-caret-position="644">
|
|
254
134
|
<caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
|
|
255
135
|
</state>
|
|
256
136
|
</provider>
|
|
257
137
|
</entry>
|
|
258
138
|
</file>
|
|
259
|
-
<file pinned="false" current-in-tab="false">
|
|
139
|
+
<file leaf-file-name="bitcoind-abc.rb" pinned="false" current-in-tab="false">
|
|
260
140
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
|
|
261
141
|
<provider selected="true" editor-type-id="text-editor">
|
|
262
|
-
<state relative-caret-position="
|
|
142
|
+
<state relative-caret-position="437">
|
|
263
143
|
<caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
|
|
264
144
|
</state>
|
|
265
145
|
</provider>
|
|
266
146
|
</entry>
|
|
267
147
|
</file>
|
|
268
148
|
</leaf>
|
|
269
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
270
149
|
</component>
|
|
271
150
|
<component name="FileTemplateManagerImpl">
|
|
272
151
|
<option name="RECENT_TEMPLATES">
|
|
@@ -311,24 +190,17 @@
|
|
|
311
190
|
<option value="$PROJECT_DIR$/lib/ApiController/peatio.rb" />
|
|
312
191
|
<option value="$PROJECT_DIR$/lib/Deamons/wash_trade.rb" />
|
|
313
192
|
<option value="$PROJECT_DIR$/lib/Deamons/simple_mm.rb" />
|
|
314
|
-
<option value="$PROJECT_DIR$/lib/ApiController/barong.rb" />
|
|
315
193
|
<option value="$PROJECT_DIR$/lib/Deamons/geth.rb" />
|
|
316
194
|
<option value="$PROJECT_DIR$/lib/Deamons/ngrok.rb" />
|
|
317
|
-
<<<<<<< HEAD
|
|
318
|
-
<option value="$PROJECT_DIR$/lib/SimBot.rb" />
|
|
319
|
-
<option value="$PROJECT_DIR$/lib/utils.rb" />
|
|
320
|
-
<option value="$PROJECT_DIR$/lib/SimBot/version.rb" />
|
|
321
|
-
=======
|
|
322
|
-
<option value="$PROJECT_DIR$/lib/utils.rb" />
|
|
323
195
|
<option value="$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb" />
|
|
324
196
|
<option value="$PROJECT_DIR$/lib/Deamons/litecoind.rb" />
|
|
325
197
|
<option value="$PROJECT_DIR$/lib/ApiController/barong.rb" />
|
|
326
198
|
<option value="$PROJECT_DIR$/lib/Deamons/bitcoind.rb" />
|
|
327
199
|
<option value="$PROJECT_DIR$/SimBot.gemspec" />
|
|
328
200
|
<option value="$PROJECT_DIR$/.ruby-version" />
|
|
329
|
-
<option value="$PROJECT_DIR$/lib/SimBot/version.rb" />
|
|
330
201
|
<option value="$PROJECT_DIR$/lib/SimBot.rb" />
|
|
331
|
-
|
|
202
|
+
<option value="$PROJECT_DIR$/lib/utils.rb" />
|
|
203
|
+
<option value="$PROJECT_DIR$/lib/SimBot/version.rb" />
|
|
332
204
|
</list>
|
|
333
205
|
</option>
|
|
334
206
|
</component>
|
|
@@ -342,16 +214,17 @@
|
|
|
342
214
|
<packageJsonPaths />
|
|
343
215
|
</component>
|
|
344
216
|
<component name="ProjectFrameBounds">
|
|
345
|
-
<option name="x" value="
|
|
346
|
-
<option name="y" value="
|
|
347
|
-
<option name="width" value="
|
|
348
|
-
<option name="height" value="
|
|
217
|
+
<option name="x" value="1647" />
|
|
218
|
+
<option name="y" value="23" />
|
|
219
|
+
<option name="width" value="1615" />
|
|
220
|
+
<option name="height" value="1057" />
|
|
349
221
|
</component>
|
|
350
222
|
<component name="ProjectView">
|
|
351
223
|
<navigator proportions="" version="1">
|
|
352
224
|
<foldersAlwaysOnTop value="true" />
|
|
353
225
|
</navigator>
|
|
354
226
|
<panes>
|
|
227
|
+
<pane id="Scope" />
|
|
355
228
|
<pane id="ProjectPane">
|
|
356
229
|
<subPane>
|
|
357
230
|
<expand>
|
|
@@ -359,7 +232,6 @@
|
|
|
359
232
|
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
|
|
360
233
|
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
|
|
361
234
|
</path>
|
|
362
|
-
<<<<<<< HEAD
|
|
363
235
|
<path>
|
|
364
236
|
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
|
|
365
237
|
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
|
|
@@ -371,18 +243,10 @@
|
|
|
371
243
|
<item name="lib" type="462c0819:PsiDirectoryNode" />
|
|
372
244
|
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
|
|
373
245
|
</path>
|
|
374
|
-
<path>
|
|
375
|
-
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
|
|
376
|
-
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
|
|
377
|
-
<item name="spec" type="462c0819:PsiDirectoryNode" />
|
|
378
|
-
</path>
|
|
379
|
-
=======
|
|
380
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
381
246
|
</expand>
|
|
382
247
|
<select />
|
|
383
248
|
</subPane>
|
|
384
249
|
</pane>
|
|
385
|
-
<pane id="Scope" />
|
|
386
250
|
</panes>
|
|
387
251
|
</component>
|
|
388
252
|
<component name="PropertiesComponent">
|
|
@@ -419,7 +283,7 @@
|
|
|
419
283
|
<component name="RunManager">
|
|
420
284
|
<configuration name="Install My Gem" type="CommandRunConfigurationType" factoryName="Gem Command">
|
|
421
285
|
<module name="SimBot" />
|
|
422
|
-
<COMMAND_RUN_CONFIGURATION NAME="RUBY_ARGS" VALUE="
|
|
286
|
+
<COMMAND_RUN_CONFIGURATION NAME="RUBY_ARGS" VALUE="" />
|
|
423
287
|
<COMMAND_RUN_CONFIGURATION NAME="WORK DIR" VALUE="$MODULE_DIR$" />
|
|
424
288
|
<COMMAND_RUN_CONFIGURATION NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
425
289
|
<COMMAND_RUN_CONFIGURATION NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
@@ -460,24 +324,18 @@
|
|
|
460
324
|
<workItem from="1535884475044" duration="1850000" />
|
|
461
325
|
<workItem from="1538040677596" duration="5889000" />
|
|
462
326
|
<workItem from="1539353817379" duration="2621000" />
|
|
463
|
-
<<<<<<< HEAD
|
|
464
|
-
<workItem from="1539876285945" duration="1050000" />
|
|
465
|
-
<workItem from="1540108116200" duration="1082000" />
|
|
466
|
-
=======
|
|
467
327
|
<workItem from="1539876285945" duration="739000" />
|
|
468
328
|
<workItem from="1539962617528" duration="7924000" />
|
|
469
329
|
<workItem from="1540289900445" duration="2400000" />
|
|
470
330
|
<workItem from="1540392568366" duration="1094000" />
|
|
471
|
-
|
|
331
|
+
<workItem from="1543308539466" duration="4000" />
|
|
332
|
+
<workItem from="1543413426007" duration="137000" />
|
|
333
|
+
<workItem from="1543938137760" duration="650000" />
|
|
472
334
|
</task>
|
|
473
335
|
<servers />
|
|
474
336
|
</component>
|
|
475
337
|
<component name="TimeTrackingManager">
|
|
476
|
-
|
|
477
|
-
<option name="totallyTimeSpent" value="177145000" />
|
|
478
|
-
=======
|
|
479
|
-
<option name="totallyTimeSpent" value="181557000" />
|
|
480
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
338
|
+
<option name="totallyTimeSpent" value="182348000" />
|
|
481
339
|
</component>
|
|
482
340
|
<component name="TodoView">
|
|
483
341
|
<todo-panel id="selected-file">
|
|
@@ -489,69 +347,39 @@
|
|
|
489
347
|
</todo-panel>
|
|
490
348
|
</component>
|
|
491
349
|
<component name="ToolWindowManager">
|
|
492
|
-
<frame x="
|
|
350
|
+
<frame x="1647" y="23" width="1615" height="1057" extended-state="0" />
|
|
493
351
|
<editor active="true" />
|
|
494
352
|
<layout>
|
|
495
|
-
|
|
496
|
-
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
|
|
353
|
+
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16973935" />
|
|
497
354
|
<window_info anchor="bottom" id="TODO" order="6" weight="0.32995495" />
|
|
498
355
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
499
|
-
<window_info anchor="bottom" id="Event Log" order="
|
|
356
|
+
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.30114448" side_tool="true" weight="0.44097695" />
|
|
500
357
|
<window_info anchor="right" id="Database" order="3" />
|
|
501
|
-
<window_info anchor="bottom" id="Database Changes" order="
|
|
502
|
-
<window_info anchor="bottom" id="
|
|
503
|
-
<window_info anchor="bottom" id="
|
|
504
|
-
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
505
|
-
<window_info active="true" anchor="bottom" id="Terminal" order="7" sideWeight="0.49095446" visible="true" weight="0.34794158" />
|
|
506
|
-
=======
|
|
507
|
-
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18454936" />
|
|
358
|
+
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
359
|
+
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
|
|
360
|
+
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.6044349" weight="0.35342467" />
|
|
508
361
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
362
|
+
<window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.6988555" weight="0.44097695" />
|
|
509
363
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
510
|
-
<window_info anchor="bottom" id="Message" order="0" />
|
|
511
|
-
<window_info anchor="bottom" id="Find" order="1" sideWeight="0.49896193" weight="0.32876712" />
|
|
512
|
-
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.6044349" weight="0.35342467" />
|
|
513
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
514
364
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
515
|
-
<window_info id="Favorites" order="2" side_tool="true" />
|
|
516
365
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
517
|
-
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
518
|
-
<<<<<<< HEAD
|
|
519
366
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
520
|
-
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
|
|
521
|
-
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
522
|
-
=======
|
|
523
|
-
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
524
|
-
<window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.70028615" visible="true" weight="0.44246575" />
|
|
525
|
-
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
|
|
526
|
-
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.29971388" side_tool="true" visible="true" weight="0.44246575" />
|
|
527
|
-
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49928468" weight="0.3283767" />
|
|
528
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
529
367
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
530
368
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
531
|
-
<window_info anchor="bottom" id="
|
|
532
|
-
<window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
|
|
533
|
-
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.48658764" weight="0.3528761" />
|
|
534
|
-
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
535
|
-
<window_info anchor="right" id="Database" order="3" />
|
|
536
|
-
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49965397" weight="0.3293348" />
|
|
369
|
+
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49928468" weight="0.3283767" />
|
|
537
370
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
538
|
-
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50904554" side_tool="true" weight="0.3457207" />
|
|
539
|
-
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
540
371
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
541
372
|
<window_info anchor="bottom" id="Find" order="1" sideWeight="0.49896193" weight="0.32876712" />
|
|
542
|
-
<window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49095446" weight="0.22328767" />
|
|
543
|
-
<window_info id="Favorites" order="2" side_tool="true" />
|
|
544
373
|
</layout>
|
|
545
374
|
<layout-to-restore>
|
|
546
375
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
547
376
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
548
377
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
549
|
-
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
550
378
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2123369" />
|
|
551
379
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
552
380
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
381
|
+
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
553
382
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
554
|
-
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
555
383
|
<window_info anchor="bottom" id="Version Control" order="11" />
|
|
556
384
|
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.48719722" weight="0.28540304" />
|
|
557
385
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -559,6 +387,7 @@
|
|
|
559
387
|
<window_info anchor="right" id="Database" order="3" />
|
|
560
388
|
<window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49619377" weight="0.41463414" />
|
|
561
389
|
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50380623" side_tool="true" weight="0.28540304" />
|
|
390
|
+
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
562
391
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
563
392
|
<window_info anchor="bottom" id="Find" order="1" sideWeight="0.49896193" weight="0.32897604" />
|
|
564
393
|
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49965397" weight="0.3293348" />
|
|
@@ -574,74 +403,39 @@
|
|
|
574
403
|
<component name="VcsContentAnnotationSettings">
|
|
575
404
|
<option name="myLimit" value="2678400000" />
|
|
576
405
|
</component>
|
|
577
|
-
<component name="XDebuggerManager">
|
|
578
|
-
<breakpoint-manager>
|
|
579
|
-
<option name="time" value="8" />
|
|
580
|
-
</breakpoint-manager>
|
|
581
|
-
</component>
|
|
582
406
|
<component name="editorHistoryManager">
|
|
583
|
-
<entry file="file://$PROJECT_DIR$/
|
|
584
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
|
|
407
|
+
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
|
|
585
408
|
<provider selected="true" editor-type-id="text-editor">
|
|
586
|
-
<state relative-caret-position="
|
|
587
|
-
<caret line="
|
|
409
|
+
<state relative-caret-position="92">
|
|
410
|
+
<caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
|
|
588
411
|
</state>
|
|
589
412
|
</provider>
|
|
590
413
|
</entry>
|
|
591
|
-
<entry file="file://$PROJECT_DIR$/lib/
|
|
414
|
+
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
|
|
592
415
|
<provider selected="true" editor-type-id="text-editor">
|
|
593
|
-
<state relative-caret-position="
|
|
594
|
-
<caret line="
|
|
416
|
+
<state relative-caret-position="2300">
|
|
417
|
+
<caret line="100" column="24" lean-forward="true" selection-start-line="100" selection-start-column="24" selection-end-line="100" selection-end-column="24" />
|
|
595
418
|
</state>
|
|
596
419
|
</provider>
|
|
597
420
|
</entry>
|
|
598
|
-
<entry file="file://$PROJECT_DIR$/18301.outfile" />
|
|
599
421
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
|
|
600
422
|
<provider selected="true" editor-type-id="text-editor">
|
|
601
|
-
<state relative-caret-position="
|
|
602
|
-
<caret line="
|
|
603
|
-
</state>
|
|
604
|
-
</provider>
|
|
605
|
-
</entry>
|
|
606
|
-
<entry file="file://$PROJECT_DIR$/19071.errfile">
|
|
607
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
608
|
-
<state relative-caret-position="391">
|
|
609
|
-
<caret line="17" selection-start-line="17" selection-end-line="17" />
|
|
610
|
-
</state>
|
|
611
|
-
</provider>
|
|
612
|
-
</entry>
|
|
613
|
-
<entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
|
|
614
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
615
|
-
<state relative-caret-position="161">
|
|
616
|
-
<caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
|
|
423
|
+
<state relative-caret-position="644">
|
|
424
|
+
<caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
|
|
617
425
|
</state>
|
|
618
426
|
</provider>
|
|
619
427
|
</entry>
|
|
620
|
-
<entry file="file://$PROJECT_DIR$/lib/
|
|
428
|
+
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
|
|
621
429
|
<provider selected="true" editor-type-id="text-editor">
|
|
622
|
-
<state relative-caret-position="
|
|
623
|
-
<caret line="
|
|
430
|
+
<state relative-caret-position="437">
|
|
431
|
+
<caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
|
|
624
432
|
</state>
|
|
625
433
|
</provider>
|
|
626
434
|
</entry>
|
|
627
435
|
<entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
|
|
628
436
|
<provider selected="true" editor-type-id="text-editor">
|
|
629
|
-
<state relative-caret-position="
|
|
630
|
-
<caret line="
|
|
631
|
-
</state>
|
|
632
|
-
</provider>
|
|
633
|
-
</entry>
|
|
634
|
-
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
|
|
635
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
636
|
-
<state relative-caret-position="290">
|
|
637
|
-
<caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
|
|
638
|
-
</state>
|
|
639
|
-
</provider>
|
|
640
|
-
</entry>
|
|
641
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
|
|
642
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
643
|
-
<state relative-caret-position="376">
|
|
644
|
-
<caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
|
|
437
|
+
<state relative-caret-position="299">
|
|
438
|
+
<caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
|
|
645
439
|
</state>
|
|
646
440
|
</provider>
|
|
647
441
|
</entry>
|
|
@@ -678,71 +472,48 @@
|
|
|
678
472
|
<entry file="file://$PROJECT_DIR$/18301.outfile" />
|
|
679
473
|
<entry file="file://$PROJECT_DIR$/19071.errfile">
|
|
680
474
|
<provider selected="true" editor-type-id="text-editor">
|
|
681
|
-
<state relative-caret-position="
|
|
475
|
+
<state relative-caret-position="255">
|
|
682
476
|
<caret line="17" selection-start-line="17" selection-end-line="17" />
|
|
683
477
|
</state>
|
|
684
478
|
</provider>
|
|
685
479
|
</entry>
|
|
686
480
|
<entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
|
|
687
481
|
<provider selected="true" editor-type-id="text-editor">
|
|
688
|
-
<state relative-caret-position="
|
|
482
|
+
<state relative-caret-position="105">
|
|
689
483
|
<caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
|
|
690
484
|
</state>
|
|
691
485
|
</provider>
|
|
692
486
|
</entry>
|
|
693
|
-
<<<<<<< HEAD
|
|
694
|
-
<entry file="file://$PROJECT_DIR$/.gitignore">
|
|
695
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
696
|
-
<state relative-caret-position="322">
|
|
697
|
-
<caret line="14" selection-start-line="14" selection-end-line="14" />
|
|
698
|
-
</state>
|
|
699
|
-
</provider>
|
|
700
|
-
</entry>
|
|
701
|
-
=======
|
|
702
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
703
487
|
<entry file="file://$PROJECT_DIR$/lib/ApiController/peatio.rb">
|
|
704
488
|
<provider selected="true" editor-type-id="text-editor">
|
|
705
|
-
<state relative-caret-position="
|
|
489
|
+
<state relative-caret-position="315">
|
|
706
490
|
<caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
|
|
707
491
|
</state>
|
|
708
492
|
</provider>
|
|
709
493
|
</entry>
|
|
710
494
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
|
|
711
495
|
<provider selected="true" editor-type-id="text-editor">
|
|
712
|
-
<state relative-caret-position="
|
|
496
|
+
<state relative-caret-position="405">
|
|
713
497
|
<caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
|
|
714
498
|
</state>
|
|
715
499
|
</provider>
|
|
716
500
|
</entry>
|
|
717
501
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
|
|
718
502
|
<provider selected="true" editor-type-id="text-editor">
|
|
719
|
-
<state relative-caret-position="
|
|
720
|
-
<caret line="
|
|
503
|
+
<state relative-caret-position="307">
|
|
504
|
+
<caret line="23" column="24" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
|
|
721
505
|
</state>
|
|
722
506
|
</provider>
|
|
723
507
|
</entry>
|
|
724
508
|
<entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
|
|
725
509
|
<provider selected="true" editor-type-id="text-editor">
|
|
726
|
-
<<<<<<< HEAD
|
|
727
|
-
<state relative-caret-position="290">
|
|
728
|
-
<caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
|
|
729
|
-
=======
|
|
730
510
|
<state relative-caret-position="315">
|
|
731
511
|
<caret line="21" column="56" selection-start-line="21" selection-start-column="56" selection-end-line="21" selection-end-column="56" />
|
|
732
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
733
512
|
</state>
|
|
734
513
|
</provider>
|
|
735
514
|
</entry>
|
|
736
515
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
|
|
737
516
|
<provider selected="true" editor-type-id="text-editor">
|
|
738
|
-
<<<<<<< HEAD
|
|
739
|
-
<state relative-caret-position="506">
|
|
740
|
-
<caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
|
|
741
|
-
</state>
|
|
742
|
-
</provider>
|
|
743
|
-
</entry>
|
|
744
|
-
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
|
|
745
|
-
=======
|
|
746
517
|
<state relative-caret-position="540">
|
|
747
518
|
<caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
|
|
748
519
|
</state>
|
|
@@ -755,15 +526,6 @@
|
|
|
755
526
|
</state>
|
|
756
527
|
</provider>
|
|
757
528
|
</entry>
|
|
758
|
-
<entry file="file://$PROJECT_DIR$/bin/console">
|
|
759
|
-
<provider selected="true" editor-type-id="text-editor" />
|
|
760
|
-
</entry>
|
|
761
|
-
<entry file="file://$PROJECT_DIR$/bin/setup">
|
|
762
|
-
<provider selected="true" editor-type-id="text-editor" />
|
|
763
|
-
</entry>
|
|
764
|
-
<entry file="file://$PROJECT_DIR$/exe/SimBot">
|
|
765
|
-
<provider selected="true" editor-type-id="text-editor" />
|
|
766
|
-
</entry>
|
|
767
529
|
<entry file="file://$PROJECT_DIR$/Gemfile.lock">
|
|
768
530
|
<provider selected="true" editor-type-id="text-editor">
|
|
769
531
|
<state relative-caret-position="30">
|
|
@@ -792,20 +554,9 @@
|
|
|
792
554
|
</state>
|
|
793
555
|
</provider>
|
|
794
556
|
</entry>
|
|
795
|
-
<entry file="file://$PROJECT_DIR$/.ruby-gemset">
|
|
796
|
-
<provider selected="true" editor-type-id="text-editor" />
|
|
797
|
-
</entry>
|
|
798
|
-
<entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
|
|
799
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
800
|
-
<state>
|
|
801
|
-
<caret column="13" selection-start-column="13" selection-end-column="13" />
|
|
802
|
-
</state>
|
|
803
|
-
</provider>
|
|
804
|
-
</entry>
|
|
805
557
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
|
|
806
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
807
558
|
<provider selected="true" editor-type-id="text-editor">
|
|
808
|
-
<state relative-caret-position="
|
|
559
|
+
<state relative-caret-position="92">
|
|
809
560
|
<caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
|
|
810
561
|
</state>
|
|
811
562
|
</provider>
|
|
@@ -819,37 +570,15 @@
|
|
|
819
570
|
</entry>
|
|
820
571
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
|
|
821
572
|
<provider selected="true" editor-type-id="text-editor">
|
|
822
|
-
|
|
823
|
-
<state relative-caret-position="1173">
|
|
824
|
-
<caret line="63" column="15" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="15" />
|
|
825
|
-
=======
|
|
826
|
-
<state relative-caret-position="285">
|
|
573
|
+
<state relative-caret-position="437">
|
|
827
574
|
<caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
|
|
828
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
829
575
|
</state>
|
|
830
576
|
</provider>
|
|
831
577
|
</entry>
|
|
832
578
|
<entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
|
|
833
579
|
<provider selected="true" editor-type-id="text-editor">
|
|
834
|
-
|
|
835
|
-
<state relative-caret-position="345">
|
|
836
|
-
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
|
|
837
|
-
=======
|
|
838
|
-
<state relative-caret-position="420">
|
|
580
|
+
<state relative-caret-position="644">
|
|
839
581
|
<caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
|
|
840
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
841
|
-
</state>
|
|
842
|
-
</provider>
|
|
843
|
-
</entry>
|
|
844
|
-
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
|
|
845
|
-
<provider selected="true" editor-type-id="text-editor">
|
|
846
|
-
<<<<<<< HEAD
|
|
847
|
-
<state relative-caret-position="667">
|
|
848
|
-
<caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
|
|
849
|
-
=======
|
|
850
|
-
<state relative-caret-position="-1675">
|
|
851
|
-
<caret line="100" column="64" selection-start-line="100" selection-start-column="64" selection-end-line="100" selection-end-column="64" />
|
|
852
|
-
>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
|
|
853
582
|
</state>
|
|
854
583
|
</provider>
|
|
855
584
|
</entry>
|
|
@@ -869,8 +598,15 @@
|
|
|
869
598
|
</entry>
|
|
870
599
|
<entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
|
|
871
600
|
<provider selected="true" editor-type-id="text-editor">
|
|
872
|
-
<state relative-caret-position="
|
|
873
|
-
<caret line="
|
|
601
|
+
<state relative-caret-position="-408">
|
|
602
|
+
<caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
|
|
603
|
+
</state>
|
|
604
|
+
</provider>
|
|
605
|
+
</entry>
|
|
606
|
+
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
|
|
607
|
+
<provider selected="true" editor-type-id="text-editor">
|
|
608
|
+
<state relative-caret-position="103">
|
|
609
|
+
<caret line="5" column="34" lean-forward="true" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
|
|
874
610
|
</state>
|
|
875
611
|
</provider>
|
|
876
612
|
</entry>
|
data/lib/SimBot/version.rb
CHANGED
data/lib/utils.rb
CHANGED
|
@@ -8,6 +8,10 @@ class Utils
|
|
|
8
8
|
case market
|
|
9
9
|
when 'bchxrp'
|
|
10
10
|
bchxrp_price
|
|
11
|
+
when 'xrpzar'
|
|
12
|
+
xrpusd_price*14
|
|
13
|
+
when 'tusdzar'
|
|
14
|
+
bchxrp_price
|
|
11
15
|
when 'btczar'
|
|
12
16
|
btcusd_price*14
|
|
13
17
|
when 'bchbtc'
|
|
@@ -33,6 +37,14 @@ class Utils
|
|
|
33
37
|
end
|
|
34
38
|
end
|
|
35
39
|
|
|
40
|
+
# fetch btc/usd price from coin market cap
|
|
41
|
+
# @return [float] rate
|
|
42
|
+
def self.xrpusd_price
|
|
43
|
+
response = RestClient.get('https://api.coinmarketcap.com/v2/ticker/52/?convert=USD')
|
|
44
|
+
hash = JSON.parse(response.body)
|
|
45
|
+
hash['data']['quotes']['USD']['price'].to_f.round(4)
|
|
46
|
+
end
|
|
47
|
+
|
|
36
48
|
# fetch btc/usd price from coin market cap
|
|
37
49
|
# @return [float] rate
|
|
38
50
|
def self.btcusd_price
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: SimBot
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.36
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jonathan Ovadia
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-
|
|
11
|
+
date: 2018-12-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|