meeseeker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad89ce6d8e55cafd5dcca2f0ddc2455c23ece9dab83c2d5e1a3f0a59df6c6a4a
-  data.tar.gz: e709c970eddc2c22c92d6f9482757305b851efc9603ccc725892e1feeb5a966d
+  metadata.gz: 857cc4efa38d7428ba13457a6ffc3db8cb01aab92a26a3cf052b15698d91ca56
+  data.tar.gz: 3f6398e6bbad560624fe0b5e331f0cba2b3b207edfa15074627b7f964edd262d
 SHA512:
-  metadata.gz: 2a443c55716a8b6c605cb8cd5e72aee8008ba12f5641df0d1dd717e7db2535b4df9895b3d011ca07ab4c80df8164806243ff41eb82de68aa1fdfd0ce76962356
-  data.tar.gz: 53d277d9d1a8c848691bee1c4ecf6406ca61987a3b5010c657bad7485b87a25fd579fef8d7fc06108c2e06b91b50b97ff4b94e70414b2d2afefb1e2c7390b5dd
+  metadata.gz: 6ae2f1bdea39419820d35ce2fedb63ceac5c0c59d61c63ef9f7a01470baea9cc0d784a630996997750ece65fdee78ec5b8deb7b339b2e8343e82db3c38682527
+  data.tar.gz: 635057da03b642a258436e6d78c0bb2c830ddb475a595c16cfdc80b33b4b92cf58e5782bd4a4cd0b6dd3e85c06f7d137170f2ae6395543086e9070cf595a2cfd

data/README.md

@@ -302,13 +302,17 @@ When running `meeseeker sync steem_engine`, the following channels are available
 
 * `steem_engine:block`
 * `steem_engine:transaction`
+* `steem_engine:market`
 * `steem_engine:market:buy`
 * `steem_engine:market:cancel`
 * `steem_engine:market:sell`
+* `steem_engine:sscstore`
 * `steem_engine:sscstore:buy`
+* `steem_engine:steempegged`
 * `steem_engine:steempegged:buy`
 * `steem_engine:steempegged:removeWithdrawal`
 * `steem_engine:steempegged:withdraw`
+* `steem_engine:tokens`
 * `steem_engine:tokens:create`
 * `steem_engine:tokens:issue`
 * `steem_engine:tokens:transfer`

data/Rakefile

@@ -92,10 +92,16 @@ task(:find, [:what, :key, :chain] => [:check_schema]) do |t, args|
   end
 end
 
-task reset: [:check_schema] do
-  print 'Dropping keys ...'
-  keys = Meeseeker.redis.keys('steem:*')
-  keys += Meeseeker.redis.keys('steem_engine:*')
+task :reset, [:chain] => [:check_schema] do |t, args|
+  chain = (args[:chain] || 'all').to_sym
+  keys = []
+  
+  print 'Dropping keys for set: %s ...' % chain.to_s
+  
+  case chain
+  when :steem, :all then keys += Meeseeker.redis.keys('steem:*')
+  when :steem_engine, :all then keys += Meeseeker.redis.keys('steem_engine:*')
+  end
   
   if keys.any?
     print " found #{keys.size} keys ..."
@@ -355,6 +361,60 @@ namespace :verify do
       end
     end
   end
+  
+  desc 'Verifies Steem Engine sidechain against the mainnet.'
+  task :steem_engine_ref_blocks do |t|
+    redis_url = ENV.fetch('MEESEEKER_REDIS_URL', 'redis://127.0.0.1:6379/0')
+    ctx = ctx = Redis.new(url: redis_url)
+    keys = ctx.keys('steem_engine:*')
+    block_api = Steem::BlockApi.new
+    block_trxs = {}
+    
+    puts "Checking Steem Engine keys: #{keys.size}"
+    
+    keys.each do |key|
+      transaction = JSON[ctx.get(key)]
+      block_num = transaction['refSteemBlockNumber']
+      
+      block_trxs[block_num] ||= []
+      block_trxs[block_num] << transaction['transactionId'].split('-').first
+    end
+    
+    puts "Related mainnet blocks: #{block_trxs.keys.size}"
+    
+    skipped_blocks = []
+    
+    block_api.get_blocks(block_range: block_trxs.keys) do |block, block_num|
+      if block.nil? || block[:transaction_ids].nil?
+        print 'S'
+        skipped_blocks << block_num
+        
+        next
+      else
+        print '.'
+      end
+    
+      if (block.transaction_ids & block_trxs[block_num]).none?
+        puts "\nNo intersection in #{block_num}!"
+        puts "Expected the following sidechain trx_ids: #{block_trxs[block_num].join(', ')}"
+      end
+    end
+    
+    puts "\nBlocks to retry: #{skipped_blocks.size}"
+    
+    skipped_blocks.each do |block_num|
+      block_api.get_block(block_num: block_num) do |result|
+        block = result.block
+        
+        if (block.transaction_ids & block_trxs[block_num]).none?
+          puts "No intersection in #{block_num}!"
+          puts "Expected the following sidechain trx_ids: #{block_trxs[block_num].join(', ')}"
+        end
+      end
+    end
+    
+    puts "Done."
+  end
     
   namespace :witness do
     desc 'Verifies witnessses in the schedule produced a block.'

data/lib/meeseeker.rb

@@ -9,7 +9,7 @@ require 'meeseeker/steem_engine/follower_job'
 
 module Meeseeker
   LAST_BLOCK_NUM_KEY = 'steem:meeseeker:last_block_num'
-  LAST_STEEM_ENGINE_BLOCK_NUM_KEY = 'steem:meeseeker:last_steem_engine_block_num'
+  LAST_STEEM_ENGINE_BLOCK_NUM_KEY = 'steem_engine:meeseeker:last_block_num'
   BLOCKS_PER_DAY = 28800
   VIRTUAL_TRX_ID = '0000000000000000000000000000000000000000'
   @redis = Redis.new(url: ENV.fetch('MEESEEKER_REDIS_URL', 'redis://127.0.0.1:6379/0'))

data/lib/meeseeker/steem_engine/follower_job.rb

@@ -52,6 +52,7 @@ module Meeseeker::SteemEngine
           current_block_num = block_num
         end
         
+        redis.publish("steem_engine:#{contract}", {key: key}.to_json)
         redis.publish("steem_engine:#{contract}:#{action}", {key: key}.to_json)
       end
     end
@@ -60,22 +61,30 @@ module Meeseeker::SteemEngine
       redis = Meeseeker.redis
       last_block_num = nil
       agent = Agent.new
+      until_block_num = options[:until_block_num].to_i
       
       if !!options[:at_block_num]
         last_block_num = options[:at_block_num].to_i
       else
-        last_block_num = redis.get(Meeseeker::LAST_STEEM_ENGINE_BLOCK_NUM_KEY).to_i + 1
+        new_sync = false
+        last_block_num = redis.get(Meeseeker::LAST_STEEM_ENGINE_BLOCK_NUM_KEY)
         block_info = agent.latest_block_info
         block_num = block_info['blockNumber']
-        
-        last_block = agent.block(last_block_num)
+        last_block = agent.block(block_num)
         last_block_timestamp = Time.parse(last_block['timestamp'] + 'Z')
+                
+        if last_block_num.nil?
+          new_sync = true
+          last_block_num = block_num
+        else
+          last_block_num = last_block_num.to_i + 1
+        end
         
         if Meeseeker.expire_keys == -1
           last_block_num = [last_block_num, block_num].max
           
           puts "Sync Steem Engine from: #{last_block_num}"
-        elsif Time.now.utc - last_block_timestamp > Meeseeker.expire_keys
+        elsif new_sync || (Time.now.utc - last_block_timestamp > Meeseeker.expire_keys)
           last_block_num = block_num + 1
           
           puts 'Starting new Steem Engine sync.'
@@ -100,6 +109,8 @@ module Meeseeker::SteemEngine
           yield transaction.merge(timestamp: block['timestamp']), block
         end
         
+        break if until_block_num != 0 && block_num > until_block_num
+        
         block_num = block_num + 1
       end
     end

data/lib/meeseeker/version.rb

@@ -1,4 +1,4 @@
 module Meeseeker
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   AGENT_ID = "meeseeker/#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meeseeker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake