bitcoin2graphdb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0656566bb7bb0137ebbd55e71a542a93cfd5c10
-  data.tar.gz: 8cab3c87318083f179255f4d9fea1087785aa549
+  metadata.gz: 186af84d22b883f287e9f11d946b592f83ca6bc2
+  data.tar.gz: ccc22259ee9fed122c00bba36075258409bb7a05
 SHA512:
-  metadata.gz: 21f51cb0185d54b98c0570f630d21e853abe1871ce8189fb093b277ea15087ced068409bfb073cdc8a9d2d52919d4bdc7b3fa2033e110df2279c130237695343
-  data.tar.gz: 4e60e3234297aa8b04322def668d149e2c56d181d9df9773a497887aa6a4258c4031c3173f889002e5cc888f2171d6b87dbb235cb377ac8777352781e5e3351b
+  metadata.gz: ab9d19e3661d8d1eb375ecf74697ac8f680a2ef99f63b1f872c2b73e2eaacd9d05392bf526ef6246060b89b6d6415be0df33d1a8dd4cc080001f7969456e6f0e
+  data.tar.gz: e7d56c1e9246dd7d8a6406ba3c86fd94c56e64e5eaac5573ac0078638f60da784ca67c3a2ffbb1f5ae24de1c2718a6c49cbfa3879f6a0e236cd38b4cb1b50a11

data/README.md

@@ -60,6 +60,30 @@ $ bitcoin2graphdb start -c <configuration file path>
 $ bitcoin2graphdb stop 
 ```
 
+## Extensions
+
+Bitcoin2Graphdb currently supports following extensions.
+
+|Extension Key Name|Description|
+|:-----------|:------------|
+|open_assets| Add Open Assets Protocol support. If this extension is enabled, the asset quantity and Graphdb::Model::AssetId association will be added to the Graphdb::Model::TxOut.|
+* Open Assets Protocol  
+
+To enable extension, add an extension key name to enable the Configuration file like following.
+
+```yaml
+bitcoin2graphdb:
+...
+  extensions:
+   - 'open_assets'
+```
+
+# Testing
+
+When you run rspec, you need to run neo4j test server(http://localhost:7475) in advance.   
+Others are the same as normal rspec. 
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/haw-itn/bitcoin2graphdb. 

data/Rakefile

@@ -2,7 +2,17 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 load 'neo4j/tasks/neo4j_server.rake'
 load 'neo4j/tasks/migration.rake'
+require 'base'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+namespace :b2g do
+  desc 'Import specified block to neo4j database.'
+  task :import_block, [:block_height,:config_path] do |task, args|
+    config = YAML.load(File.read(args.config_path)).deep_symbolize_keys
+    puts "import #{args.block_height} block."
+    Bitcoin2Graphdb::Migration.new(config[:bitcoin2graphdb]).run_with_height(args.block_height.to_i)
+  end
+end

data/bitcoin2graphdb.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "openassets-ruby", "~> 0.3.7"
+  spec.add_runtime_dependency "openassets-ruby", "~> 0.3.8"
   spec.add_runtime_dependency "daemon-spawn"
   spec.add_runtime_dependency 'neo4j', '~> 5.0.0'
   spec.add_runtime_dependency "activesupport", "~> 4.0.2"

data/lib/bitcoin2graphdb/bitcoin/blockchain_provider.rb

@@ -35,6 +35,10 @@ module Bitcoin2Graphdb
         api.provider.getrawtransaction(txid, 1)
       end
 
+      def oa_outputs(txid)
+        api.get_outputs_from_txid(txid, true)
+      end
+
     end
   end
 end

data/lib/bitcoin2graphdb/migration.rb

@@ -1,9 +1,14 @@
+require 'base'
 module Bitcoin2Graphdb
   class Migration
 
     def initialize(config)
+      Graphdb.configure do |c|
+        c.neo4j_server = config[:neo4j][:server]
+        c.extensions = config[:extensions] unless config[:extensions].nil?
+      end
       Bitcoin2Graphdb::Bitcoin.provider = Bitcoin2Graphdb::Bitcoin::BlockchainProvider.new(config[:bitcoin])
-      Neo4j::Session.open(:server_db, config[:neo4j][:server_url], {basic_auth: config[:neo4j][:basic_auth]})
+      Neo4j::Session.open(:server_db, config[:neo4j][:server], {basic_auth: config[:neo4j][:basic_auth]})
     end
 
     def run
@@ -14,15 +19,18 @@ module Bitcoin2Graphdb
 
     def run_with_height(block_height)
       puts "start migration for block height = #{block_height}. #{Time.now}"
-      begin
-        Neo4j::Transaction.run do |tx|
+      Neo4j::Transaction.run do |tx|
+        begin
           Graphdb::Model::Block.create_from_block_height(block_height)
           @block_height = block_height
-        end
-      rescue OpenAssets::Provider::ApiError => e
-        if e.message == '{"code"=>-8, "message"=>"Block height out of range"}'
-          puts "Block height out of range. sleep 10 min."
-          sleep 600
+        rescue OpenAssets::Provider::ApiError => e
+          if e.message == '{"code"=>-8, "message"=>"Block height out of range"}'
+            puts "Block height out of range. sleep 10 min."
+            sleep 600
+          else
+            tx.failure
+            raise e
+          end
         end
       end
       puts "end migration for block height #{block_height}. #{Time.now}"

data/lib/bitcoin2graphdb/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin2Graphdb
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/graphdb.rb

@@ -13,4 +13,5 @@ module Graphdb
     configuration.load_extensions
   end
 
+  Neo4j::Config[:association_model_namespace] = Graphdb::Model
 end

data/lib/graphdb/model/extensions.rb

@@ -4,19 +4,19 @@ module Graphdb
       autoload :Base, 'graphdb/model/extensions/base'
       autoload :OpenAssets, 'graphdb/model/extensions/open_assets'
 
-      EXTENSIONS = {open_assets: 'graphdb/model/extensions/open_assets'}
-
       attr_accessor :extensions
 
       def load_extensions
         extensions.each do |e|
-          load_module = "Graphdb::Model::Extensions::#{e.camelize}".constantize
-          load_module::EXTENSIONS_TARGETS.each do |target|
-            target.origin_class.include target
-          end
+          require "graphdb/model/extensions/#{e}"
         end
       end
 
+      def unload_extensions
+        Graphdb::Model.send(:remove_const, :Transaction)
+        load 'graphdb/model/transaction.rb'
+      end
+
     end
   end
 end

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

@@ -1,10 +1,15 @@
 module Graphdb
   module Model
+
+    autoload :AssetId, 'graphdb/model/extensions/open_assets/asset_id'
+
     module Extensions
       module OpenAssets
-        autoload :OaTransaction, 'graphdb/model/extensions/open_assets/oa_transaction'
+        Graphdb::Model::Extensions::OpenAssets.autoload :TxOut, 'graphdb/model/extensions/open_assets/tx_out'
+        Graphdb::Model::Extensions::OpenAssets.autoload :Transaction, 'graphdb/model/extensions/open_assets/transaction'
 
-        EXTENSIONS_TARGETS = [OaTransaction]
+        Graphdb::Model::Transaction.prepend(Graphdb::Model::Extensions::OpenAssets::Transaction)
+        Graphdb::Model::TxOut.prepend(Graphdb::Model::Extensions::OpenAssets::TxOut)
       end
     end
   end

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

@@ -0,0 +1,22 @@
+module Graphdb
+  module Model
+
+    class AssetId < ActiveNodeBase
+      property :asset_id, index: :exact, constraint: :unique
+
+      validates :asset_id, :presence => true
+
+      scope :with_asset_id, ->(asset_id){where(asset_id: asset_id)}
+
+      def self.find_or_create(asset_id)
+        a = with_asset_id(asset_id).first
+        unless a
+          a = new
+          a.asset_id = asset_id
+          a.save!
+        end
+        a
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Graphdb
+  module Model
+    module Extensions
+      module OpenAssets
+
+        module Transaction
+
+          def self.prepended(base)
+            class << base
+              self.prepend(ClassMethods)
+            end
+          end
+
+          module ClassMethods
+
+            def create_from_txid(txid)
+              tx = super(txid)
+              outputs = Bitcoin2Graphdb::Bitcoin.provider.oa_outputs(txid)
+              outputs.each{|o|tx.outputs[o['vout']].apply_oa_attributes(o)}
+              tx.save!
+              tx
+            end
+
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Graphdb
+  module Model
+    module Extensions
+      module OpenAssets
+        module TxOut
+
+          def self.prepended(base)
+            class << base
+              self.prepend(ClassMethods)
+
+            end
+            base.class_eval do
+              property :asset_quantity, type: Integer
+              property :oa_output_type
+              has_one :out, :asset_id, type: :asset_id
+            end
+          end
+
+          module ClassMethods
+
+          end
+
+          def apply_oa_attributes(oa_out)
+            self.asset_quantity = oa_out['asset_quantity']
+            self.oa_output_type = oa_out['output_type']
+            self.asset_id = AssetId.find_or_create(oa_out['asset_id']) unless oa_out['asset_id'].nil?
+            self.oa_output_type = 'uncolored' if self.asset_id.nil? && self.oa_output_type != 'marker'
+            save!
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/graphdb/model/tx_in.rb

@@ -10,7 +10,7 @@ module Graphdb
       property :sequence
 
       has_one :out, :transaction, type: :transaction, model_class: Transaction
-      has_one :in, :out_point, origin: :out_point, model_class: TxOut
+      has_one :in, :out_point, origin: :out_point, model_class: Graphdb::Model::TxOut
 
       validates :sequence, :presence => true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: daemon-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -157,9 +157,10 @@ files:
 - lib/graphdb/model/address.rb
 - lib/graphdb/model/block.rb
 - lib/graphdb/model/extensions.rb
-- lib/graphdb/model/extensions/base.rb
 - lib/graphdb/model/extensions/open_assets.rb
-- lib/graphdb/model/extensions/open_assets/oa_transaction.rb
+- lib/graphdb/model/extensions/open_assets/asset_id.rb
+- lib/graphdb/model/extensions/open_assets/transaction.rb
+- lib/graphdb/model/extensions/open_assets/tx_out.rb
 - lib/graphdb/model/transaction.rb
 - lib/graphdb/model/tx_in.rb
 - lib/graphdb/model/tx_out.rb

data/lib/graphdb/model/extensions/base.rb

@@ -1,15 +0,0 @@
-module Graphdb
-  module Model
-    module Extensions
-      module Base
-
-        attr_accessor :origin_class
-
-        def set_origin(clazz)
-          @origin_class ||= clazz
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-module Graphdb
-  module Model
-    module Extensions
-      module OpenAssets
-
-        module OaTransaction
-
-          extend Graphdb::Model::Extensions::Base
-
-          def self.included(base)
-            base.class_eval do
-              # asset output type (:issuance, :transfer, :uncolored)
-              property :output_type
-            end
-          end
-
-          set_origin Graphdb::Model::Transaction
-
-        end
-
-      end
-    end
-  end
-end