bitcoin2graphdb 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a25d7c3e0df7e46dea42c3679d604d70f70ae69
-  data.tar.gz: 0cf2fbe186da4cba65663b85676a64fd36393a95
+  metadata.gz: 854f7412869212c2bb0dbc2f8047e726549d4eae
+  data.tar.gz: 3f8ee5b4fa09baec2983899e13446d707eb36bc0
 SHA512:
-  metadata.gz: 68db0c05c3a3ddcf9c3c9a699d42ad8bfe2c0d4372b6342a50c89efbf044fb9ba92ebc88d8125f0fe64814085401a9030d10a788679efa03254c8ca83454c4c1
-  data.tar.gz: 53f05da93364eb9023cbef6a36a98b862d2fc06f068050da85dbaf23df7bfd1a34a543ce878c2103be56b5fca38373ff7da8e091a4018008685eee037f112b7d
+  metadata.gz: 7d743166100b6e74aea5df416eecc80362dc269353f10e9f979eea1e9618edb25925f18fbcff1c3befdf7b9c7673ad12c31474a12f201fc78263b342727cad6e
+  data.tar.gz: 19186986c5b135664350ce0b9d4227a6bb49530d14cfc3aa152c7518493a3126a4e4bf4114eb4a437f2d3d1b29570f6cd753f66809e02e165ffbe518ac65aa54

data/README.md

@@ -47,6 +47,10 @@ bitcoin2graphdb:
     basic_auth:
       username: 'neo4j username'
       password: 'neo4j password'
+    initialize:
+      request:
+        timeout: 600
+        open_timeout: 2
 ```
 
 ## Usage

data/lib/bitcoin2graphdb/migration.rb

@@ -9,7 +9,7 @@ module Bitcoin2Graphdb
         c.neo4j_server = config[:neo4j][:server]
         c.extensions = config[:extensions] unless config[:extensions].nil?
       end
-      neo4j_config = {basic_auth: config[:neo4j][:basic_auth], initialize: {request: {timeout: 600, open_timeout: 5}}}
+      neo4j_config = {basic_auth: config[:neo4j][:basic_auth], initialize: neo4j_timeout_ops(config)}
       Bitcoin2Graphdb::Bitcoin.provider = Bitcoin2Graphdb::Bitcoin::BlockchainProvider.new(config[:bitcoin])
       Neo4j::Session.open(:server_db, config[:neo4j][:server], neo4j_config)
       @sleep_interval = config[:bitcoin][:sleep_interval].nil? ? 600 : config[:bitcoin][:sleep_interval].to_i
@@ -40,6 +40,29 @@ module Bitcoin2Graphdb
       puts "end migration for block height #{block_height}. #{Time.now}"
     end
 
+    def repair_assign_txs(block_height)
+      Neo4j::Transaction.run do |tx|
+        begin
+          block = Graphdb::Model::Block.with_height(block_height).first
+          if block
+            hash = Bitcoin2Graphdb::Bitcoin.provider.block(block.block_hash)
+            tx_list = block.transactions.to_a
+            hash['tx'].each do |txid|
+              target = tx_list.find{|t|t.txid == txid}
+              if target.nil?
+                block.transactions << Graphdb::Model::Transaction.with_txid(txid).first
+                puts "repair tx = #{txid}"
+              end
+            end
+            block.save!
+          end
+        rescue => e
+          tx.failure
+          raise e
+        end
+      end
+    end
+
     def remove_block(block_height)
       Neo4j::Transaction.run do |tx|
         begin
@@ -98,5 +121,13 @@ module Bitcoin2Graphdb
       @block_height = block.nil? ? -1 : block.height
     end
 
+    def neo4j_timeout_ops(config)
+      if config[:neo4j][:initialize]
+        config[:neo4j][:initialize]
+      else
+        {request: {timeout: 600, open_timeout: 2}}
+      end
+    end
+
   end
 end

data/lib/bitcoin2graphdb/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin2Graphdb
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby