bitcoin2graphdb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ac28219e6acc4dd69b308b06455aaf8ff0ec94bf4c3877cc3e44cfcd674948f
-  data.tar.gz: 8defec9f49d8f193cb56a41f63ea124469fddb1f349e6b833595f735d5a1227a
+  metadata.gz: 77c42d4d43f05abb3a9f38f21eac5163347176edfc7383c4438c93075bc2586a
+  data.tar.gz: 5a52c195991931f348485de1a9e213dd7cd88c694df504380d669bf753b2a1e2
 SHA512:
-  metadata.gz: a66eb8c0226b4e3c4a55ebd5dfb3ff1d7221bab3aa6603119ae0ebe572ce50d028da4bc2f2e4817215a39c4ccbbc144d7a62a16eb8bbaa50ad725b10d387b25c
-  data.tar.gz: 1ca94b824c0a3f23458dd05bd01ef3d9e40a2a141dd530f0d51131a08896d7ea31193ecd1b9b48d5ac92e46ccbb9a69868061080990d84d13ec96f61a94618dc
+  metadata.gz: 7bf099d17a30aa1471cd0d9024e9ab65dcb8c4348ea91079079af35b6495fd656f2d39f1add2c746c450706d7ea0b96ea581f2e0da48e807cad101f5cb6964bd
+  data.tar.gz: 555a9b1acee7df09ce2d72e14224850341e0e8dc3705e470d7d1db8f3064f58c3ef9abf01ad367d401521f19b74fab0c079bae9e6ba7505618aa85d941495b2d

data/README.md

@@ -25,7 +25,8 @@ Or install it yourself as:
 This tool requires the following software.
 
 * Bitcoin Core
-* Neo4j
+* Neo4j (>= 3.0)
+  * gem neo4j-core `>= 9.0.0`
 
 ## Configuration
 
@@ -54,6 +55,29 @@ bitcoin2graphdb:
         open_timeout: 2
 ```
 
+You can use bolt protocol if you want more performance.
+
+```yaml
+bitcoin2graphdb:
+  bitcoin:
+    network: 'mainnet or testnet or regtest'
+    rpc:
+      user: 'Bitcoin Core rpc user.'
+      password: 'Bitcoin Core rpc password.'
+      schema: 'Bitcoin Core server schema. ex, http'
+      port: 'Bitcoin Core server port. ex, 8332'
+      host: 'Bitcoin Core server host. ex, xxx.xxx.xxx.xxx'
+    sleep_interval: 600
+    min_block_confirmation: 2
+  neo4j:
+    server: 'neo4j server url. ex, bolt://localhost:7472 or bolt://user:password@localhost:7472'
+    options:
+      read_timeout: -1 # No timeout. It is blocking mode. Non blocking mode have a problem. 
+      write_timeout: -1 # No timeout. It is blocking mode. Non blocking mode have a problem.
+      connect_timeout: 10
+      ssl: false # It is not support SSL yet.
+```
+
 ## Usage
 
 * Show usage

data/lib/base.rb

@@ -1,4 +1,5 @@
 require 'active_support/all'
 require 'bitcoin2graphdb'
 require 'graphdb'
-require 'neo4j/core/cypher_session/adaptors/http'
+require 'neo4j/core/cypher_session/adaptors/http'
+require 'neo4j/core/cypher_session/adaptors/bolt'

data/lib/bitcoin2graphdb/migration.rb

@@ -9,9 +9,8 @@ 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: neo4j_timeout_ops(config)}
       Bitcoin2Graphdb::Bitcoin.provider = Bitcoin2Graphdb::Bitcoin::BlockchainProvider.new(config[:bitcoin])
-      neo4j_adaptor = Neo4j::Core::CypherSession::Adaptors::HTTP.new(config[:neo4j][:server], neo4j_config)
+      neo4j_adaptor = create_neo4j_adaptor(config)
       Neo4j::ActiveBase.on_establish_session { Neo4j::Core::CypherSession.new(neo4j_adaptor) }
       @sleep_interval = config[:bitcoin][:sleep_interval].nil? ? 600 : config[:bitcoin][:sleep_interval].to_i
 
@@ -140,6 +139,33 @@ module Bitcoin2Graphdb
       end
     end
 
+    def create_neo4j_adaptor(config)
+      uri = URI(config[:neo4j][:server])
+      case uri.scheme
+      when 'http'
+        faraday_configurator = proc do |faraday|
+          require 'typhoeus'
+          require 'typhoeus/adapters/faraday'
+          faraday.adapter :typhoeus
+          faraday.options.merge!(neo4j_timeout_ops(config)[:request])
+        end
+        neo4j_config = {basic_auth: config[:neo4j][:basic_auth], faraday_configurator: faraday_configurator}
+        Neo4j::Core::CypherSession::Adaptors::HTTP.new(config[:neo4j][:server], neo4j_config)
+      when 'bolt'
+        Neo4j::Core::CypherSession::Adaptors::Bolt.new(config[:neo4j][:server], neo4j_bolt_options(config))
+      else
+        fail ArgumentError, "Invalid URL: #{uri.inspect}"
+      end
+    end
+
+    def neo4j_bolt_options(config)
+      if config[:neo4j][:options]
+        config[:neo4j][:options]
+      else
+        { ssl: false }
+      end
+    end
+
     def asset_outputs(txid)
       tx = Graphdb::Model::Transaction.with_txid(txid).first
       not_oa_tx = Bitcoin2Graphdb::Bitcoin.provider.oa_outputs(txid, false).find{|o|!o['asset_id'].nil?}.nil?

data/lib/bitcoin2graphdb/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin2Graphdb
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/graphdb/model/extensions/open_assets/transaction.rb

@@ -32,11 +32,12 @@ module Graphdb
 
           def apply_oa_outputs
             oa_outputs = Bitcoin2Graphdb::Bitcoin.provider.oa_outputs(txid)
-            graph_outputs = outputs.to_a
-            oa_outputs.each{|o|
-              output = graph_outputs.find{|graph_out|graph_out.n == o['vout']}
-              output.apply_oa_attributes(o)
-            }
+            if oa_outputs.any?{ |tx_out| tx_out['output_type'] == 'marker' }
+              oa_outputs.each{|o|
+                output = outputs.find_by(n: o['vout'])
+                output.apply_oa_attributes(o)
+              }
+            end
           end
 
         end

data/lib/graphdb/model/extensions/open_assets/tx_out.rb

@@ -10,8 +10,8 @@ module Graphdb
 
             end
             base.class_eval do
-              property :asset_quantity, type: Integer
-              property :oa_output_type
+              property :asset_quantity, type: Integer, default: 0
+              property :oa_output_type, default: 'uncolored'
               has_one :out, :asset_id, type: :asset_id, model_class: 'Graphdb::Model::AssetId'
             end
           end

data/lib/graphdb/model/tx_out.rb

@@ -41,9 +41,7 @@ module Graphdb
       def self.find_by_outpoint(txid, n)
         tx = Graphdb::Model::Transaction.with_txid(txid).first
         if tx
-          tx.outputs.each{|o|
-            return o if o.n == n
-          }
+          tx.outputs.find_by(n: n)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A tool for import Bitcoin blockchain data into neo4j database.