cosgrove 0.0.1rc3 → 0.0.1rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a35112fa8f737be48b28f0e8eabdb56f4f449cf0
-  data.tar.gz: 821506ba2a2e772a54d4afea0a5bbea72f8b2e5e
+  metadata.gz: e74c8020277e8316a984eae78b29dbf9923c32f5
+  data.tar.gz: 254b125746cb995e652235f4519da800701bb659
 SHA512:
-  metadata.gz: 70a414f368e2dbaded90e754004368d938ec44fd1130d22ddf8ba270e529ec286b06e84afb1cf2788faf4fb4d9447588ad8304aaf4d129744d382218420043ba
-  data.tar.gz: abff66b69feaa2ba4e939e8398d2df74ba3a36a5b6d295ce8a514e5cb75726145ac3a6e0d73c93a2baab684808236c7b9b7f92df2f2929cf8ea020703c3efacd
+  metadata.gz: 9e635bbd7aaf83d6e57ce0a0ede3725bfd44652a9174ca201ba5a595eb675e2b662d578d89e67e472ef398c39840b39e9ccd684d6543a5ec16ff7ae186dc48d7
+  data.tar.gz: 1ee7aa717a7df2e00c07c811b9567cbee0f4b89d84686fc318474e5e408998241b106ce5cf68f9c894246d59f802877d32a31bfb837f884f09b88df89ca3ad34

data/Gemfile.lock

@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    cosgrove (0.0.1rc3)
+    cosgrove (0.0.1rc4)
       activesupport (~> 5.1, >= 5.1.1)
       ai4r (~> 1.13, >= 1.13)
       discordrb (~> 3.2, >= 3.2.1)
@@ -79,7 +79,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.6.0)
+    erubi (1.6.1)
     ethon (0.10.1)
       ffi (>= 1.3.0)
     event_emitter (0.2.5)

data/Rakefile

@@ -41,3 +41,7 @@ end
 # task :yank do
 #   exec "gem yank cosgrove -v #{Cosgrove::VERSION}"
 # end
+
+task :rebuild_accounts do
+  Cosgrove::Bot.new.rebuild_accounts
+end

data/lib/cosgrove/bot.rb

@@ -145,5 +145,35 @@ module Cosgrove
         Cosgrove::UpvoteJob.new(options).perform(event, slug)
       end
     end
+    
+    def rebuild_accounts
+      chain = :steem
+      puts "Rebuilding #{Account::ACCOUNTS_FILE} ..."
+      
+      self.run(:async)
+      discord_users = self.users
+      ops = SteemData::AccountOperation.where(account: steem_account, to: steem_account, memo: {'$regex' => /.*[a-z]*-[a-z]*-[a-z]*.*/})
+      memo_map = {}
+      
+      puts "Discord users: #{discord_users.size}; memos to search: #{ops.count}"
+      
+      ops.each do |op|
+        memo_map[op.from] = op.memo
+      end
+      
+      discord_users.each do |discord_id, discord_user|
+        a = Account.find_by_discord_id(discord_id)
+        next if !!a
+        
+        puts "Account not found: #{discord_user.username}"
+        
+        memo_map.each do |from, memo|
+          a = Account.new(from, chain)
+          if memo == a.memo_key(discord_id)
+            puts "Found matching memo key: #{from}"
+          end
+        end
+      end
+    end
   end
 end

data/lib/cosgrove/market.rb

@@ -57,7 +57,17 @@ module Cosgrove
       btx_usdt_golos = btx_usdt_btc * btx_btc_golos
       # btx_gbg_golos = btx_usdt_gbg * ( btx_usdt_btc * btx_btc_golos )
       
-      [pol_usdt_steem, pol_usdt_sbd, btx_usdt_golos, btx_usdt_gbg]
+      btx_btc_steem = JSON[open("https://bittrex.com/api/v1.1/public/getmarketsummary?market=btc-steem").read]
+      btx_btc_sbd = JSON[open("https://bittrex.com/api/v1.1/public/getmarketsummary?market=btc-sbd").read]
+      
+      btx_btc_steem = btx_btc_steem['result'].first['Ask'].to_f
+      btx_btc_sbd = btx_btc_sbd['result'].first['Ask'].to_f
+      
+      btx_usdt_sbd = btx_usdt_btc * btx_btc_sbd
+      btx_usdt_steem = btx_usdt_btc * btx_btc_steem
+      # btx_sbd = btx_usdt_sbd * ( btx_usdt_btc * btx_btc_steem )
+      
+      [pol_usdt_steem, pol_usdt_sbd, btx_usdt_golos, btx_usdt_gbg, btx_usdt_steem, btx_usdt_sbd]
     end
     
     def mvests(chain = :steem, account_names = [])
@@ -224,15 +234,18 @@ module Cosgrove
     end
     
     def ticker
-      pol_usdt_steem, pol_usdt_sbd, btx_usdt_golos, btx_usdt_gbg = market_data
+      pol_usdt_steem, pol_usdt_sbd, btx_usdt_golos, btx_usdt_gbg, btx_usdt_steem, btx_usdt_sbd = market_data
       
       pol_usdt_steem = number_to_currency(pol_usdt_steem, precision: 4)
       pol_usdt_sbd = number_to_currency(pol_usdt_sbd, precision: 4)
+      btx_usdt_steem = number_to_currency(btx_usdt_steem, precision: 4)
+      btx_usdt_sbd = number_to_currency(btx_usdt_sbd, precision: 4)
       btx_usdt_golos = number_to_currency(btx_usdt_golos, precision: 4)
       btx_usdt_gbg = number_to_currency(btx_usdt_gbg, precision: 4)
 
       ticker = []
       ticker << "`Poloniex: USD/STEEM: #{pol_usdt_steem}; USD/SBD: #{pol_usdt_sbd}`"
+      ticker << "`Bittrex: USD/STEEM: #{btx_usdt_steem}; USD/SBD: #{btx_usdt_sbd}`"
       ticker << "`Bittrex: USD/GOLOS: #{btx_usdt_golos}; USD/GBG: #{btx_usdt_gbg}`"
       ticker.join("\n")
     end

data/lib/cosgrove/utils.rb

@@ -44,7 +44,7 @@ module Cosgrove
     end
     
     def steem_data_head_block_number
-      SteemData::Setting.last.last_block
+      [SteemData::Setting.last.last_block, SteemData::AccountOperation.last.block].min
     end
     
     def properties(chain)

data/lib/cosgrove/version.rb

@@ -1,4 +1,4 @@
 module Cosgrove
-  VERSION = '0.0.1rc3'
+  VERSION = '0.0.1rc4'
   AGENT_ID = "cosgrove/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cosgrove
 version: !ruby/object:Gem::Version
-  version: 0.0.1rc3
+  version: 0.0.1rc4
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -613,7 +613,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Cosgrove Discord Bo t