SimBot 0.1.33 → 0.1.34

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.idea/.rakeTasks +1 -1
  3. data/.idea/SimBot.iml +18 -26
  4. data/.idea/workspace.xml +365 -115
  5. data/Gemfile.lock +1 -1
  6. data/lib/Deamons/bitcoind-abc.rb +1 -1
  7. data/lib/SimBot/version.rb +1 -1
  8. data/lib/utils.rb +1 -11
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5a14023b9e039b7830e29484a9d603c7cb7636aa0a89f5f3fdadfda9f1b8d3c7
4
- data.tar.gz: d236ef9ac859539ef63d5d152880eb1a4bd893933584d9aa9edfaa0d45018ab2
3
+ metadata.gz: f0287a406b7fd7b870999926c9073b8aeb5cb748de34d3c9ae551d8790c134f8
4
+ data.tar.gz: fbafb4c874d597caef1b13a157cd31e38b706dd4a42424513b70fa07936ac4f0
5
5
  SHA512:
6
- metadata.gz: 22b9c3f65147f0251b9b6c3af09eb105847def099b76de988f0f4f56501b475d7ddc22d63f68308a389e4583ec564382aad471a0ffa4534f0d6668e9fad3fc7b
7
- data.tar.gz: a72eb70fa6b4a0dbdd66014fb73c810cdad08f2148ad13cbd57bb6467355aeb01d2917e0b8f90a71cbc5e4d2206dad7f556792ab286ab6e70c89ccf56f9e2410
6
+ metadata.gz: 7eb3e8125302a7f40fc5109155efa009d2c912e6f677b771d1c87eb4b7d364b2eb602bffc49b601b9319945280249a213f25f667d14c60ef1c41a5d919e66d03
7
+ data.tar.gz: 971181e32ca3556792aaf7139fd277be2b0272d734f6d3fd468e8d7959f5c90d2e35ae8d12ae93c72f5a6b6f675f26e79d2d50552ccfcfd46b776788f75884de
data/.idea/.rakeTasks CHANGED
@@ -4,4 +4,4 @@ You are allowed to:
4
4
  1. Remove rake task
5
5
  2. Add existing rake tasks
6
6
  To add existing rake tasks automatically delete this file and reload the project.
7
- --><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build SimBot-0.1.32.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install SimBot-0.1.32.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install SimBot-0.1.32.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.32 and build and push SimBot-0.1.32.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>
7
+ --><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build SimBot-0.1.31.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install SimBot-0.1.31.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install SimBot-0.1.31.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.31 and build and push SimBot-0.1.31.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>
data/.idea/SimBot.iml CHANGED
@@ -5,32 +5,24 @@
5
5
  </component>
6
6
  <component name="NewModuleRootManager">
7
7
  <content url="file://$MODULE_DIR$" />
8
- <orderEntry type="jdk" jdkName="RVM: ruby-2.5.0" jdkType="RUBY_SDK" />
8
+ <orderEntry type="jdk" jdkName="RVM: ruby-2.5.1" jdkType="RUBY_SDK" />
9
9
  <orderEntry type="sourceFolder" forTests="false" />
10
- <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.3, RVM: ruby-2.5.0) [gem]" level="application" />
11
- <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.5.0) [gem]" level="application" />
12
- <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20180417, RVM: ruby-2.5.0) [gem]" level="application" />
13
- <orderEntry type="library" scope="PROVIDED" name="event_emitter (v0.2.6, RVM: ruby-2.5.0) [gem]" level="application" />
14
- <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, RVM: ruby-2.5.0) [gem]" level="application" />
15
- <orderEntry type="library" scope="PROVIDED" name="json (v2.1.0, RVM: ruby-2.5.0) [gem]" level="application" />
16
- <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.1, RVM: ruby-2.5.0) [gem]" level="application" />
17
- <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.2.2, RVM: ruby-2.5.0) [gem]" level="application" />
18
- <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2018.0812, RVM: ruby-2.5.0) [gem]" level="application" />
19
- <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.1, RVM: ruby-2.5.0) [gem]" level="application" />
20
- <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.5.0) [gem]" level="application" />
21
- <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, RVM: ruby-2.5.0) [gem]" level="application" />
22
- <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.0.2, RVM: ruby-2.5.0) [gem]" level="application" />
23
- <orderEntry type="library" scope="PROVIDED" name="rspec (v3.7.0, RVM: ruby-2.5.0) [gem]" level="application" />
24
- <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.7.1, RVM: ruby-2.5.0) [gem]" level="application" />
25
- <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.7.0, RVM: ruby-2.5.0) [gem]" level="application" />
26
- <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.7.0, RVM: ruby-2.5.0) [gem]" level="application" />
27
- <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.7.1, RVM: ruby-2.5.0) [gem]" level="application" />
28
- <orderEntry type="library" scope="PROVIDED" name="ruby-ole (v1.2.12.1, RVM: ruby-2.5.0) [gem]" level="application" />
29
- <orderEntry type="library" scope="PROVIDED" name="spreadsheet (v1.1.8, RVM: ruby-2.5.0) [gem]" level="application" />
30
- <orderEntry type="library" scope="PROVIDED" name="thor (v0.20.0, RVM: ruby-2.5.0) [gem]" level="application" />
31
- <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-2.5.0) [gem]" level="application" />
32
- <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.5, RVM: ruby-2.5.0) [gem]" level="application" />
33
- <orderEntry type="library" scope="PROVIDED" name="websocket (v1.2.8, RVM: ruby-2.5.0) [gem]" level="application" />
34
- <orderEntry type="library" scope="PROVIDED" name="websocket-client-simple (v0.3.0, RVM: ruby-2.5.0) [gem]" level="application" />
10
+ <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.2, RVM: ruby-2.5.1) [gem]" level="application" />
11
+ <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.5.1) [gem]" level="application" />
12
+ <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20180417, RVM: ruby-2.5.1) [gem]" level="application" />
13
+ <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, RVM: ruby-2.5.1) [gem]" level="application" />
14
+ <orderEntry type="library" scope="PROVIDED" name="json (v2.1.0, RVM: ruby-2.5.1) [gem]" level="application" />
15
+ <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.0, RVM: ruby-2.5.1) [gem]" level="application" />
16
+ <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.5.1) [gem]" level="application" />
17
+ <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.0.2, RVM: ruby-2.5.1) [gem]" level="application" />
18
+ <orderEntry type="library" scope="PROVIDED" name="rspec (v3.7.0, RVM: ruby-2.5.1) [gem]" level="application" />
19
+ <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.7.1, RVM: ruby-2.5.1) [gem]" level="application" />
20
+ <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.7.0, RVM: ruby-2.5.1) [gem]" level="application" />
21
+ <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.7.0, RVM: ruby-2.5.1) [gem]" level="application" />
22
+ <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.7.1, RVM: ruby-2.5.1) [gem]" level="application" />
23
+ <orderEntry type="library" scope="PROVIDED" name="thor (v0.20.0, RVM: ruby-2.5.1) [gem]" level="application" />
24
+ <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-2.5.1) [gem]" level="application" />
25
+ <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.5, RVM: ruby-2.5.1) [gem]" level="application" />
26
+ <orderEntry type="library" scope="PROVIDED" name="websocket (v1.2.8, RVM: ruby-2.5.1) [gem]" level="application" />
35
27
  </component>
36
28
  </module>
data/.idea/workspace.xml CHANGED
@@ -1,17 +1,15 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <project version="4">
3
3
  <component name="ChangeListManager">
4
+ <<<<<<< HEAD
4
5
  <list default="true" id="d905eaf2-5cab-434b-a4d1-1ccf165356a4" name="Default" comment="">
5
- <change beforePath="$PROJECT_DIR$/.idea/.rakeTasks" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" afterDir="false" />
6
- <change beforePath="$PROJECT_DIR$/.idea/SimBot.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/SimBot.iml" afterDir="false" />
7
6
  <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
- <change beforePath="$PROJECT_DIR$/.ruby-gemset" beforeDir="false" afterPath="$PROJECT_DIR$/.ruby-gemset" afterDir="false" />
9
- <change beforePath="$PROJECT_DIR$/.ruby-version" beforeDir="false" afterPath="$PROJECT_DIR$/.ruby-version" afterDir="false" />
10
- <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
11
- <change beforePath="$PROJECT_DIR$/SimBot.gemspec" beforeDir="false" afterPath="$PROJECT_DIR$/SimBot.gemspec" afterDir="false" />
12
- <change beforePath="$PROJECT_DIR$/lib/SimBot.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SimBot.rb" afterDir="false" />
13
- <change beforePath="$PROJECT_DIR$/lib/utils.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils.rb" afterDir="false" />
7
+ <change beforePath="$PROJECT_DIR$/SimBot-0.1.30.gem" beforeDir="false" />
8
+ <change beforePath="$PROJECT_DIR$/lib/SimBot/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SimBot/version.rb" afterDir="false" />
14
9
  </list>
10
+ =======
11
+ <list default="true" id="d905eaf2-5cab-434b-a4d1-1ccf165356a4" name="Default" comment="" />
12
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
15
13
  <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16
14
  <option name="TRACKING_ENABLED" value="true" />
17
15
  <option name="SHOW_DIALOG" value="false" />
@@ -20,7 +18,7 @@
20
18
  <option name="LAST_RESOLUTION" value="IGNORE" />
21
19
  </component>
22
20
  <component name="CoverageDataManager">
23
- <SUITE FILE_PATH="coverage/SimBot@Install_My_Gem.rcov" NAME="Install My Gem Coverage Results" MODIFIED="1540398933959" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="SimBot" />
21
+ <SUITE FILE_PATH="coverage/SimBot@Install_My_Gem.rcov" NAME="Install My Gem Coverage Results" MODIFIED="1528479809312" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="SimBot" />
24
22
  <SUITE FILE_PATH="coverage/simbot@Install_My_Gem.rcov" NAME="Install My Gem Coverage Results" MODIFIED="1540290531990" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="SimBot" />
25
23
  </component>
26
24
  <component name="ExportToHTMLSettings">
@@ -31,7 +29,7 @@
31
29
  <session id="-694921373">
32
30
  <usages-collector id="statistics.lifecycle.project">
33
31
  <counts>
34
- <entry key="project.closed" value="2" />
32
+ <entry key="project.closed" value="3" />
35
33
  <entry key="project.open.time.10" value="1" />
36
34
  <entry key="project.open.time.2" value="1" />
37
35
  <entry key="project.open.time.9" value="1" />
@@ -44,18 +42,22 @@
44
42
  <entry key="SimBot" value="1" />
45
43
  <entry key="console" value="1" />
46
44
  <entry key="gemspec" value="1" />
45
+ <entry key="gitignore" value="1" />
47
46
  <entry key="lock" value="1" />
47
+ <entry key="rakeTasks" value="1" />
48
48
  <entry key="rb" value="13" />
49
49
  <entry key="ruby-gemset" value="2" />
50
50
  <entry key="ruby-version" value="2" />
51
51
  <entry key="setup" value="1" />
52
+ <entry key="xml" value="1" />
52
53
  </counts>
53
54
  </usages-collector>
54
55
  <usages-collector id="statistics.file.types.open">
55
56
  <counts>
56
- <entry key="PLAIN_TEXT" value="4" />
57
+ <entry key="PLAIN_TEXT" value="6" />
57
58
  <entry key="RbenvGemsets" value="2" />
58
59
  <entry key="Ruby" value="19" />
60
+ <entry key="XML" value="1" />
59
61
  </counts>
60
62
  </usages-collector>
61
63
  <usages-collector id="statistics.file.extensions.edit">
@@ -74,26 +76,128 @@
74
76
  </session>
75
77
  </component>
76
78
  <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
+ =======
77
199
  <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
78
- <file leaf-file-name="SimBot.gemspec" pinned="false" current-in-tab="false">
79
- <entry file="file://$PROJECT_DIR$/SimBot.gemspec">
80
- <provider selected="true" editor-type-id="text-editor">
81
- <state relative-caret-position="690">
82
- <caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
83
- </state>
84
- </provider>
85
- </entry>
86
- </file>
87
- <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
88
- <entry file="file://$PROJECT_DIR$/Gemfile">
89
- <provider selected="true" editor-type-id="text-editor">
90
- <state relative-caret-position="115">
91
- <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
92
- </state>
93
- </provider>
94
- </entry>
95
- </file>
96
- <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">
200
+ <file pinned="false" current-in-tab="false">
97
201
  <entry file="file://$PROJECT_DIR$/.ruby-version">
98
202
  <provider selected="true" editor-type-id="text-editor">
99
203
  <state>
@@ -102,61 +206,67 @@
102
206
  </provider>
103
207
  </entry>
104
208
  </file>
105
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
209
+ <file pinned="false" current-in-tab="false">
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">
106
215
  <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
107
216
  <provider selected="true" editor-type-id="text-editor">
108
- <state relative-caret-position="46">
109
- <caret line="2" column="3" lean-forward="true" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
217
+ <state>
218
+ <caret column="13" selection-start-column="13" selection-end-column="13" />
110
219
  </state>
111
220
  </provider>
112
221
  </entry>
113
222
  </file>
114
- <file leaf-file-name="bitcoind.rb" pinned="false" current-in-tab="false">
223
+ <file pinned="false" current-in-tab="false">
115
224
  <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
116
225
  <provider selected="true" editor-type-id="text-editor">
117
- <state relative-caret-position="92">
226
+ <state relative-caret-position="60">
118
227
  <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
119
228
  </state>
120
229
  </provider>
121
230
  </entry>
122
231
  </file>
123
- <file leaf-file-name="SimBot.rb" pinned="false" current-in-tab="false">
232
+ <file pinned="false" current-in-tab="true">
124
233
  <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
125
234
  <provider selected="true" editor-type-id="text-editor">
126
- <state relative-caret-position="322">
127
- <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
235
+ <state relative-caret-position="195">
236
+ <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
128
237
  </state>
129
238
  </provider>
130
239
  </entry>
131
240
  </file>
132
- <file leaf-file-name="utils.rb" pinned="false" current-in-tab="true">
241
+ <file pinned="false" current-in-tab="false">
133
242
  <entry file="file://$PROJECT_DIR$/lib/utils.rb">
134
243
  <provider selected="true" editor-type-id="text-editor">
135
- <state relative-caret-position="345">
136
- <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
244
+ <state relative-caret-position="-1675">
245
+ <caret line="100" column="64" selection-start-line="100" selection-start-column="64" selection-end-line="100" selection-end-column="64" />
137
246
  </state>
138
247
  </provider>
139
248
  </entry>
140
249
  </file>
141
- <file leaf-file-name="geth.rb" pinned="false" current-in-tab="false">
250
+ <file pinned="false" current-in-tab="false">
142
251
  <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
143
252
  <provider selected="true" editor-type-id="text-editor">
144
- <state relative-caret-position="644">
253
+ <state relative-caret-position="420">
145
254
  <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
146
255
  </state>
147
256
  </provider>
148
257
  </entry>
149
258
  </file>
150
- <file leaf-file-name="bitcoind-abc.rb" pinned="false" current-in-tab="false">
259
+ <file pinned="false" current-in-tab="false">
151
260
  <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
152
261
  <provider selected="true" editor-type-id="text-editor">
153
- <state relative-caret-position="149">
154
- <caret line="25" selection-start-line="25" selection-end-line="25" />
262
+ <state relative-caret-position="285">
263
+ <caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
155
264
  </state>
156
265
  </provider>
157
266
  </entry>
158
267
  </file>
159
268
  </leaf>
269
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
160
270
  </component>
161
271
  <component name="FileTemplateManagerImpl">
162
272
  <option name="RECENT_TEMPLATES">
@@ -201,8 +311,15 @@
201
311
  <option value="$PROJECT_DIR$/lib/ApiController/peatio.rb" />
202
312
  <option value="$PROJECT_DIR$/lib/Deamons/wash_trade.rb" />
203
313
  <option value="$PROJECT_DIR$/lib/Deamons/simple_mm.rb" />
314
+ <option value="$PROJECT_DIR$/lib/ApiController/barong.rb" />
204
315
  <option value="$PROJECT_DIR$/lib/Deamons/geth.rb" />
205
316
  <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" />
206
323
  <option value="$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb" />
207
324
  <option value="$PROJECT_DIR$/lib/Deamons/litecoind.rb" />
208
325
  <option value="$PROJECT_DIR$/lib/ApiController/barong.rb" />
@@ -211,7 +328,7 @@
211
328
  <option value="$PROJECT_DIR$/.ruby-version" />
212
329
  <option value="$PROJECT_DIR$/lib/SimBot/version.rb" />
213
330
  <option value="$PROJECT_DIR$/lib/SimBot.rb" />
214
- <option value="$PROJECT_DIR$/lib/utils.rb" />
331
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
215
332
  </list>
216
333
  </option>
217
334
  </component>
@@ -225,17 +342,16 @@
225
342
  <packageJsonPaths />
226
343
  </component>
227
344
  <component name="ProjectFrameBounds">
228
- <option name="x" value="1639" />
229
- <option name="y" value="23" />
230
- <option name="width" value="1484" />
231
- <option name="height" value="1057" />
345
+ <option name="x" value="1565" />
346
+ <option name="y" value="40" />
347
+ <option name="width" value="1440" />
348
+ <option name="height" value="877" />
232
349
  </component>
233
350
  <component name="ProjectView">
234
351
  <navigator proportions="" version="1">
235
352
  <foldersAlwaysOnTop value="true" />
236
353
  </navigator>
237
354
  <panes>
238
- <pane id="Scope" />
239
355
  <pane id="ProjectPane">
240
356
  <subPane>
241
357
  <expand>
@@ -243,6 +359,7 @@
243
359
  <item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
244
360
  <item name="SimBot" type="462c0819:PsiDirectoryNode" />
245
361
  </path>
362
+ <<<<<<< HEAD
246
363
  <path>
247
364
  <item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
248
365
  <item name="SimBot" type="462c0819:PsiDirectoryNode" />
@@ -252,21 +369,24 @@
252
369
  <item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
253
370
  <item name="SimBot" type="462c0819:PsiDirectoryNode" />
254
371
  <item name="lib" type="462c0819:PsiDirectoryNode" />
255
- <item name="Deamons" type="462c0819:PsiDirectoryNode" />
372
+ <item name="SimBot" type="462c0819:PsiDirectoryNode" />
256
373
  </path>
257
374
  <path>
258
375
  <item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
259
376
  <item name="SimBot" type="462c0819:PsiDirectoryNode" />
260
- <item name="lib" type="462c0819:PsiDirectoryNode" />
261
- <item name="SimBot" type="462c0819:PsiDirectoryNode" />
377
+ <item name="spec" type="462c0819:PsiDirectoryNode" />
262
378
  </path>
379
+ =======
380
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
263
381
  </expand>
264
382
  <select />
265
383
  </subPane>
266
384
  </pane>
385
+ <pane id="Scope" />
267
386
  </panes>
268
387
  </component>
269
388
  <component name="PropertiesComponent">
389
+ <property name="SearchEverywhereHistoryKey" value="workspace.xml&#9;FILE&#9;file:///Users/nikhar/Git/OVEX-Bitbucket/simbot/.idea/workspace.xml" />
270
390
  <property name="WebServerToolWindowFactoryState" value="false" />
271
391
  <property name="last_opened_file_path" value="$PROJECT_DIR$" />
272
392
  <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -299,7 +419,7 @@
299
419
  <component name="RunManager">
300
420
  <configuration name="Install My Gem" type="CommandRunConfigurationType" factoryName="Gem Command">
301
421
  <module name="SimBot" />
302
- <COMMAND_RUN_CONFIGURATION NAME="RUBY_ARGS" VALUE="" />
422
+ <COMMAND_RUN_CONFIGURATION NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
303
423
  <COMMAND_RUN_CONFIGURATION NAME="WORK DIR" VALUE="$MODULE_DIR$" />
304
424
  <COMMAND_RUN_CONFIGURATION NAME="SHOULD_USE_SDK" VALUE="false" />
305
425
  <COMMAND_RUN_CONFIGURATION NAME="ALTERN_SDK_NAME" VALUE="" />
@@ -340,16 +460,24 @@
340
460
  <workItem from="1535884475044" duration="1850000" />
341
461
  <workItem from="1538040677596" duration="5889000" />
342
462
  <workItem from="1539353817379" duration="2621000" />
463
+ <<<<<<< HEAD
464
+ <workItem from="1539876285945" duration="1050000" />
465
+ <workItem from="1540108116200" duration="1082000" />
466
+ =======
343
467
  <workItem from="1539876285945" duration="739000" />
344
468
  <workItem from="1539962617528" duration="7924000" />
345
469
  <workItem from="1540289900445" duration="2400000" />
346
- <workItem from="1540392568366" duration="340000" />
347
- <workItem from="1540393269263" duration="744000" />
470
+ <workItem from="1540392568366" duration="1094000" />
471
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
348
472
  </task>
349
473
  <servers />
350
474
  </component>
351
475
  <component name="TimeTrackingManager">
352
- <option name="totallyTimeSpent" value="181547000" />
476
+ <<<<<<< HEAD
477
+ <option name="totallyTimeSpent" value="177145000" />
478
+ =======
479
+ <option name="totallyTimeSpent" value="181557000" />
480
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
353
481
  </component>
354
482
  <component name="TodoView">
355
483
  <todo-panel id="selected-file">
@@ -361,29 +489,58 @@
361
489
  </todo-panel>
362
490
  </component>
363
491
  <component name="ToolWindowManager">
364
- <frame x="1639" y="23" width="1484" height="1057" extended-state="0" />
492
+ <frame x="1565" y="40" width="1440" height="877" extended-state="0" />
365
493
  <editor active="true" />
366
494
  <layout>
367
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18099861" />
495
+ <<<<<<< HEAD
496
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
368
497
  <window_info anchor="bottom" id="TODO" order="6" weight="0.32995495" />
369
498
  <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
370
- <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.3962804" side_tool="true" weight="0.35325366" />
499
+ <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50904554" side_tool="true" weight="0.3457207" />
371
500
  <window_info anchor="right" id="Database" order="3" />
372
- <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
373
- <window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
374
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6037196" visible="true" weight="0.35262594" />
501
+ <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
502
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.48658764" weight="0.35192564" />
503
+ <window_info anchor="bottom" id="Version Control" order="7" weight="0.3292683" />
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" />
375
508
  <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
376
- <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.7010014" weight="0.35691318" />
377
509
  <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
378
514
  <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
515
+ <window_info id="Favorites" order="2" side_tool="true" />
379
516
  <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
380
519
  <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
381
529
  <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
382
530
  <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
383
- <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49928468" weight="0.3283767" />
531
+ <window_info anchor="bottom" id="TODO" order="6" weight="0.32995495" />
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" />
384
537
  <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" />
385
540
  <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
386
541
  <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" />
387
544
  </layout>
388
545
  <layout-to-restore>
389
546
  <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -417,53 +574,74 @@
417
574
  <component name="VcsContentAnnotationSettings">
418
575
  <option name="myLimit" value="2678400000" />
419
576
  </component>
577
+ <component name="XDebuggerManager">
578
+ <breakpoint-manager>
579
+ <option name="time" value="8" />
580
+ </breakpoint-manager>
581
+ </component>
420
582
  <component name="editorHistoryManager">
421
- <entry file="file://$PROJECT_DIR$/.ruby-version">
583
+ <entry file="file://$PROJECT_DIR$/5834.errfile" />
584
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
422
585
  <provider selected="true" editor-type-id="text-editor">
423
- <state>
424
- <caret column="10" selection-start-column="10" selection-end-column="10" />
586
+ <state relative-caret-position="621">
587
+ <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
425
588
  </state>
426
589
  </provider>
427
590
  </entry>
428
- <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
591
+ <entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
429
592
  <provider selected="true" editor-type-id="text-editor">
430
- <state>
431
- <caret column="13" selection-start-column="13" selection-end-column="13" />
593
+ <state relative-caret-position="345">
594
+ <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
432
595
  </state>
433
596
  </provider>
434
597
  </entry>
435
- <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
598
+ <entry file="file://$PROJECT_DIR$/18301.outfile" />
599
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
436
600
  <provider selected="true" editor-type-id="text-editor">
437
- <state relative-caret-position="92">
438
- <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
601
+ <state relative-caret-position="552">
602
+ <caret line="24" column="31" selection-start-line="24" selection-start-column="31" selection-end-line="24" selection-end-column="31" />
439
603
  </state>
440
604
  </provider>
441
605
  </entry>
442
- <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
606
+ <entry file="file://$PROJECT_DIR$/19071.errfile">
443
607
  <provider selected="true" editor-type-id="text-editor">
444
- <state relative-caret-position="322">
445
- <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
608
+ <state relative-caret-position="391">
609
+ <caret line="17" selection-start-line="17" selection-end-line="17" />
446
610
  </state>
447
611
  </provider>
448
612
  </entry>
449
- <entry file="file://$PROJECT_DIR$/lib/utils.rb">
613
+ <entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
450
614
  <provider selected="true" editor-type-id="text-editor">
451
- <state relative-caret-position="2300">
452
- <caret line="100" column="64" selection-start-line="100" selection-start-column="64" selection-end-line="100" selection-end-column="64" />
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" />
453
617
  </state>
454
618
  </provider>
455
619
  </entry>
456
- <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
620
+ <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
457
621
  <provider selected="true" editor-type-id="text-editor">
458
- <state relative-caret-position="644">
459
- <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
622
+ <state relative-caret-position="23">
623
+ <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
460
624
  </state>
461
625
  </provider>
462
626
  </entry>
463
- <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
627
+ <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
464
628
  <provider selected="true" editor-type-id="text-editor">
465
- <state relative-caret-position="437">
466
- <caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
629
+ <state relative-caret-position="1173">
630
+ <caret line="51" column="15" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
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" />
467
645
  </state>
468
646
  </provider>
469
647
  </entry>
@@ -500,50 +678,73 @@
500
678
  <entry file="file://$PROJECT_DIR$/18301.outfile" />
501
679
  <entry file="file://$PROJECT_DIR$/19071.errfile">
502
680
  <provider selected="true" editor-type-id="text-editor">
503
- <state relative-caret-position="255">
681
+ <state relative-caret-position="391">
504
682
  <caret line="17" selection-start-line="17" selection-end-line="17" />
505
683
  </state>
506
684
  </provider>
507
685
  </entry>
508
686
  <entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
509
687
  <provider selected="true" editor-type-id="text-editor">
510
- <state relative-caret-position="105">
688
+ <state relative-caret-position="161">
511
689
  <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
512
690
  </state>
513
691
  </provider>
514
692
  </entry>
693
+ <<<<<<< HEAD
515
694
  <entry file="file://$PROJECT_DIR$/.gitignore">
516
695
  <provider selected="true" editor-type-id="text-editor">
517
- <state relative-caret-position="210">
696
+ <state relative-caret-position="322">
518
697
  <caret line="14" selection-start-line="14" selection-end-line="14" />
519
698
  </state>
520
699
  </provider>
521
700
  </entry>
701
+ =======
702
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
522
703
  <entry file="file://$PROJECT_DIR$/lib/ApiController/peatio.rb">
523
704
  <provider selected="true" editor-type-id="text-editor">
524
- <state relative-caret-position="315">
705
+ <state relative-caret-position="483">
525
706
  <caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
526
707
  </state>
527
708
  </provider>
528
709
  </entry>
529
710
  <entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
530
711
  <provider selected="true" editor-type-id="text-editor">
531
- <state relative-caret-position="405">
712
+ <state relative-caret-position="621">
532
713
  <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
533
714
  </state>
534
715
  </provider>
535
716
  </entry>
536
717
  <entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
537
718
  <provider selected="true" editor-type-id="text-editor">
538
- <state relative-caret-position="307">
539
- <caret line="23" column="24" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
719
+ <state relative-caret-position="376">
720
+ <caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
540
721
  </state>
541
722
  </provider>
542
723
  </entry>
543
724
  <entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
544
725
  <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
+ =======
545
730
  <state relative-caret-position="315">
546
731
  <caret line="21" column="56" selection-start-line="21" selection-start-column="56" selection-end-line="21" selection-end-column="56" />
732
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
733
+ </state>
734
+ </provider>
735
+ </entry>
736
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
737
+ <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
+ <state relative-caret-position="540">
747
+ <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
547
748
  </state>
548
749
  </provider>
549
750
  </entry>
@@ -554,6 +755,15 @@
554
755
  </state>
555
756
  </provider>
556
757
  </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>
557
767
  <entry file="file://$PROJECT_DIR$/Gemfile.lock">
558
768
  <provider selected="true" editor-type-id="text-editor">
559
769
  <state relative-caret-position="30">
@@ -563,14 +773,14 @@
563
773
  </entry>
564
774
  <entry file="file://$PROJECT_DIR$/SimBot.gemspec">
565
775
  <provider selected="true" editor-type-id="text-editor">
566
- <state relative-caret-position="690">
776
+ <state relative-caret-position="450">
567
777
  <caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
568
778
  </state>
569
779
  </provider>
570
780
  </entry>
571
781
  <entry file="file://$PROJECT_DIR$/Gemfile">
572
782
  <provider selected="true" editor-type-id="text-editor">
573
- <state relative-caret-position="115">
783
+ <state relative-caret-position="75">
574
784
  <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
575
785
  </state>
576
786
  </provider>
@@ -582,52 +792,92 @@
582
792
  </state>
583
793
  </provider>
584
794
  </entry>
585
- <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
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">
586
799
  <provider selected="true" editor-type-id="text-editor">
587
- <state relative-caret-position="644">
588
- <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
800
+ <state>
801
+ <caret column="13" selection-start-column="13" selection-end-column="13" />
589
802
  </state>
590
803
  </provider>
591
804
  </entry>
592
805
  <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
806
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
593
807
  <provider selected="true" editor-type-id="text-editor">
594
- <state relative-caret-position="92">
808
+ <state relative-caret-position="60">
595
809
  <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
596
810
  </state>
597
811
  </provider>
598
812
  </entry>
599
- <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
813
+ <entry file="file://$PROJECT_DIR$/.idea/.rakeTasks">
600
814
  <provider selected="true" editor-type-id="text-editor">
601
- <state relative-caret-position="322">
602
- <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
815
+ <state relative-caret-position="105">
816
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
603
817
  </state>
604
818
  </provider>
605
819
  </entry>
606
820
  <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
607
821
  <provider selected="true" editor-type-id="text-editor">
608
- <state relative-caret-position="149">
609
- <caret line="25" selection-start-line="25" selection-end-line="25" />
822
+ <<<<<<< HEAD
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">
827
+ <caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
828
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
610
829
  </state>
611
830
  </provider>
612
831
  </entry>
613
- <entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
832
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
614
833
  <provider selected="true" editor-type-id="text-editor">
615
- <state relative-caret-position="-398">
616
- <caret line="18" column="13" lean-forward="true" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
834
+ <<<<<<< HEAD
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">
839
+ <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
840
+ >>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
617
841
  </state>
618
842
  </provider>
619
843
  </entry>
620
- <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
844
+ <entry file="file://$PROJECT_DIR$/lib/utils.rb">
621
845
  <provider selected="true" editor-type-id="text-editor">
622
- <state relative-caret-position="46">
623
- <caret line="2" column="3" lean-forward="true" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
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
624
853
  </state>
625
854
  </provider>
626
855
  </entry>
627
- <entry file="file://$PROJECT_DIR$/lib/utils.rb">
856
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
628
857
  <provider selected="true" editor-type-id="text-editor">
629
- <state relative-caret-position="345">
630
- <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
858
+ <state relative-caret-position="120">
859
+ <caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" />
860
+ </state>
861
+ </provider>
862
+ </entry>
863
+ <entry file="file://$PROJECT_DIR$/.gitignore">
864
+ <provider selected="true" editor-type-id="text-editor">
865
+ <state relative-caret-position="210">
866
+ <caret line="14" selection-start-line="14" selection-end-line="14" />
867
+ </state>
868
+ </provider>
869
+ </entry>
870
+ <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
871
+ <provider selected="true" editor-type-id="text-editor">
872
+ <state relative-caret-position="195">
873
+ <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
874
+ </state>
875
+ </provider>
876
+ </entry>
877
+ <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
878
+ <provider selected="true" editor-type-id="text-editor">
879
+ <state relative-caret-position="23">
880
+ <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
631
881
  </state>
632
882
  </provider>
633
883
  </entry>
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- SimBot (0.1.32)
4
+ SimBot (0.1.31)
5
5
  json
6
6
  mail
7
7
  rest-client
data/lib/Deamons/bitcoind-abc.rb CHANGED
@@ -17,7 +17,7 @@ module Deamons
17
17
  end
18
18
 
19
19
  def start
20
- cmd = "bitcoind-abc --daemon --testnet --rpcport=8442 --datadir=/home/nikhar/.bitcoin-abc --usecashaddr=0 --rest --server --rpcuser=ovex --rpcpassword=Pass123"
20
+ cmd = "bitcoind-abc --daemon --testnet --rpcport=8442 --datadir=/home/nikhar/.bitcoin-abc --usecashaddr=0 --rest --server --rpcuser=ovex --rpcpassword=Pass123 -txindex"
21
21
  system(cmd)
22
22
  rescue ::StandardError => e
23
23
  STDERR.puts e.backtrace
data/lib/SimBot/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SimBot
2
- VERSION = "0.1.33"
2
+ VERSION = "0.1.34"
3
3
  end
data/lib/utils.rb CHANGED
@@ -6,10 +6,6 @@ class Utils
6
6
  # @return [FalseClass and Float]
7
7
  def self.quote(market)
8
8
  case market
9
- when 'btceth'
10
- btceth_price
11
- when 'tusdbtc'
12
- 1 / btcusd_price
13
9
  when 'bchxrp'
14
10
  bchxrp_price
15
11
  when 'bchbtc'
@@ -82,13 +78,7 @@ class Utils
82
78
  hash = JSON.parse(response.body)
83
79
  hash['data']['quotes']['LTC']['price'].to_f.round(4)
84
80
  end
85
- # fetch btc/eth price from coin market cap
86
- # @return [float] rate
87
- def self.btceth_price
88
- response = RestClient.get('https://api.coinmarketcap.com/v2/ticker/1/?convert=ETH')
89
- hash = JSON.parse(response.body)
90
- hash['data']['quotes']['ETH']['price'].to_f.round(4)
91
- end
81
+
92
82
  # fetch bch/xrp price from coin market cap
93
83
  # @return [float] rate
94
84
  def self.bchxrp_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.33
4
+ version: 0.1.34
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-10-24 00:00:00.000000000 Z
11
+ date: 2018-11-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
210
210
  version: '0'
211
211
  requirements: []
212
212
  rubyforge_project:
213
- rubygems_version: 2.7.3
213
+ rubygems_version: 2.7.6
214
214
  signing_key:
215
215
  specification_version: 4
216
216
  summary: OVEX simulation Bot CLI used to simulate real world trading activity on the