bitcoin2graphdb 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2303b59d58b209277d63533cc25e263c046e8a5a
-  data.tar.gz: 5b1f7c1f96fe501de34bfcbb0b39206dfc0dae2b
+  metadata.gz: ac24982aeb0f636c36886c4129bb9b47073a2074
+  data.tar.gz: 776a7afb5c0358738b08613cec44c865b5a037ab
 SHA512:
-  metadata.gz: b04cb6d39b86a39cd72dccfb941c93df684eaff531be523046c3ae9efe374e40c9ba65728c7de32814a544e1dfe88d97166e2045416f4fe3e206ba2d3ec7605f
-  data.tar.gz: de26297d8880a9324c8e4d09421e857471b6aca5cf1098abd6060ef47f94a836e31fcf65a65e97b03ce0ab3285f371d6d2224457a616e8b7f04e8193eca89f97
+  metadata.gz: 728557e3109c45e5de06e142edaecab23ebac01e5a884cc68431b059e85ebb3038d447bdb94cb7b74f8079d0654275b5ccc7b76759b39de767d14cfb109ad1c4
+  data.tar.gz: f92eb546dd47085e81a1b8f839d77bf9e01756f92ab60b7a38360c544c9b07c3c861f43a45c326f6e779b8cd5f7dd113d0580555185a445c672981a6f6e9504c

data/Rakefile

@@ -1,8 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'base'
-load 'neo4j/tasks/neo4j_server.rake'
-load 'neo4j/tasks/migration.rake'
+require 'neo4j/rake_tasks'
 load 'bitcoin2graphdb/tasks/migration.rake'
 
 RSpec::Core::RakeTask.new(:spec)

data/bitcoin2graphdb.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "openassets-ruby", ">= 0.5.1"
   spec.add_runtime_dependency "daemon-spawn"
-  spec.add_runtime_dependency 'neo4j', '~> 5.0.0'
+  spec.add_runtime_dependency "neo4j", "~>7.1.0"
   spec.add_runtime_dependency "activesupport", ">= 4.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.10"

data/lib/bitcoin2graphdb/bitcoin/blockchain_provider.rb

@@ -33,8 +33,8 @@ module Bitcoin2Graphdb
         api.provider.getrawtransaction(txid, 1)
       end
 
-      def oa_outputs(txid)
-        api.get_outputs_from_txid(txid, true)
+      def oa_outputs(txid, cache = true)
+        api.get_outputs_from_txid(txid, cache)
       end
 
       private

data/lib/bitcoin2graphdb/migration.rb

@@ -13,6 +13,8 @@ module Bitcoin2Graphdb
       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
+
+      Graphdb::Model.constants.each {|const_name| Graphdb::Model.const_get(const_name)}
     end
 
     def run
@@ -114,6 +116,14 @@ module Bitcoin2Graphdb
       end
     end
 
+    def search_invalid_oa_tx
+      puts "start get_invalid_oa_tx"
+      Graphdb::Model::AssetId.all.each{|asset_id|
+        asset_id.issuance_txs.each{|issuance_tx| asset_outputs(issuance_tx.txid)}
+      }
+      puts "get_invalid_oa_tx end."
+    end
+
     private
     def current_block_height
       return @block_height if @block_height
@@ -129,5 +139,16 @@ module Bitcoin2Graphdb
       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?
+      tx.outputs.each do |o|
+        unless o.asset_id.nil?
+          puts "This tx is not oa. txid = #{txid}" if not_oa_tx
+          asset_outputs(o.out_point.transaction.txid) unless o.out_point.nil?
+        end
+      end
+    end
+
   end
 end

data/lib/bitcoin2graphdb/tasks/migration.rake

@@ -40,6 +40,11 @@ namespace :b2g do
     end
   end
 
+  desc 'Search invalid oa tx.(invalid tx exist only openassets-ruby bug.)'
+  task :search_invalid_oa_tx, [:config_path] do |task, args|
+    get_migration(args.config_path).search_invalid_oa_tx
+  end
+
   private
   def get_migration(config_path)
     config = YAML.load(File.read(config_path)).deep_symbolize_keys[:bitcoin2graphdb]

data/lib/bitcoin2graphdb/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin2Graphdb
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/graphdb/model/address.rb

@@ -1,9 +1,9 @@
 module Graphdb
   module Model
     class Address < ActiveNodeBase
-      property :address, index: :exact, constraint: :unique
+      property :address, index: :exact
 
-      has_many :in, :outputs, origin: :addresses, model_class: TxOut
+      has_many :in, :outputs, origin: :addresses, model_class: 'Graphdb::Model::TxOut'
 
       validates :address, presence: true
 

data/lib/graphdb/model/block.rb

@@ -2,7 +2,7 @@ module Graphdb
   module Model
     class Block < ActiveNodeBase
 
-      property :block_hash, index: :exact, constraint: :unique
+      property :block_hash, index: :exact
       property :size, type: Integer
       property :height, type: Integer
       property :version
@@ -18,8 +18,8 @@ module Graphdb
       property :created_at
       property :updated_at
 
-      has_many :in, :transactions, origin: :block, model_class: Transaction, dependent: :destroy
-      has_one :out, :previous_block, type: :previous_block, model_class: Block
+      has_many :in, :transactions, origin: :block, model_class: 'Graphdb::Model::Transaction', dependent: :destroy
+      has_one :out, :previous_block, type: :previous_block, model_class: 'Graphdb::Model::Block'
 
       validates :block_hash, :presence => true
       validates :height, :presence => true

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

@@ -2,9 +2,9 @@ module Graphdb
   module Model
 
     class AssetId < ActiveNodeBase
-      property :asset_id, index: :exact, constraint: :unique
+      property :asset_id, index: :exact
 
-      has_many :in, :outputs, origin: :asset_id, model_class: TxOut
+      has_many :in, :outputs, origin: :asset_id, model_class: 'Graphdb::Model::TxOut'
 
       validates :asset_id, :presence => true
 

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

@@ -15,12 +15,7 @@ module Graphdb
 
             def create_from_txid(txid)
               tx = super(txid)
-              outputs = Bitcoin2Graphdb::Bitcoin.provider.oa_outputs(txid)
-              graph_outputs = tx.outputs.to_a
-              outputs.each{|o|
-                output = graph_outputs.find{|graph_out|graph_out.n == o['vout']}
-                output.apply_oa_attributes(o)
-              }
+              tx.apply_oa_outputs
               tx.save!
               tx
             end
@@ -35,6 +30,15 @@ module Graphdb
             false
           end
 
+          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)
+            }
+          end
+
         end
 
       end

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

@@ -12,7 +12,7 @@ module Graphdb
             base.class_eval do
               property :asset_quantity, type: Integer
               property :oa_output_type
-              has_one :out, :asset_id, type: :asset_id, model_class: AssetId
+              has_one :out, :asset_id, type: :asset_id, model_class: 'Graphdb::Model::AssetId'
             end
           end
 
@@ -23,7 +23,7 @@ module Graphdb
           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.asset_id = oa_out['asset_id'].nil? ? nil : AssetId.find_or_create(oa_out['asset_id'])
             self.oa_output_type = 'uncolored' if self.asset_id.nil? && self.oa_output_type != 'marker'
             save!
           end

data/lib/graphdb/model/transaction.rb

@@ -3,7 +3,7 @@ module Graphdb
     class Transaction < ActiveNodeBase
 
       property :hex
-      property :txid, index: :exact, constraint: :unique
+      property :txid, index: :exact
       property :version, type: Integer
       property :lock_time
       property :block_hash
@@ -12,8 +12,8 @@ module Graphdb
       property :confirmations, type: Integer
 
       has_one :out, :block, type: :block
-      has_many :in, :inputs, origin: :transaction, model_class: TxIn, dependent: :destroy
-      has_many :in, :outputs, origin: :transaction, model_class: TxOut, dependent: :destroy
+      has_many :in, :inputs, origin: :transaction, model_class: 'Graphdb::Model::TxIn', dependent: :destroy
+      has_many :in, :outputs, origin: :transaction, model_class: 'Graphdb::Model::TxOut', dependent: :destroy
 
       validates :hex, :presence => true
       validates :txid, :presence => true

data/lib/graphdb/model/tx_in.rb

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

data/lib/graphdb/model/tx_out.rb

@@ -9,9 +9,9 @@ module Graphdb
       property :output_type
       property :req_sigs, type: Integer
 
-      has_one :out, :transaction, type: :transaction, model_class: Transaction
-      has_many :out, :addresses, type: :address, model_class: Address
-      has_one :out, :out_point, type: :spent_input, model_class: TxIn
+      has_one :out, :transaction, type: :transaction, model_class: 'Graphdb::Model::Transaction'
+      has_many :out, :addresses, type: :address, model_class: 'Graphdb::Model::Address'
+      has_one :out, :out_point, type: :spent_input, model_class: 'Graphdb::Model::TxIn'
 
       validates :value, :presence => true
       validates :n, :presence => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement