bitcoin2graphdb 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 702d79fd9fb47f7ffd16523a876f9d84462cebe9
-  data.tar.gz: c37d187e40612777ee4078aa4065619a58dc7a4a
+SHA256:
+  metadata.gz: 0ac28219e6acc4dd69b308b06455aaf8ff0ec94bf4c3877cc3e44cfcd674948f
+  data.tar.gz: 8defec9f49d8f193cb56a41f63ea124469fddb1f349e6b833595f735d5a1227a
 SHA512:
-  metadata.gz: 5e77036ba699a9147125077510d060c68b0bb33425e4998a7355e7dff81466e5ebda63e1ad08402eab4baf708d2f9d4f127344746ea9454ab7729545bc7268a8
-  data.tar.gz: 168b34282906e0fcc83bce76208f6640a33b34a0c6138f75d8f69614d6bbc82f417ff15ab769774ec3349136cc90095ebfff25eab7edf91028e1e2d4100e9f5f
+  metadata.gz: a66eb8c0226b4e3c4a55ebd5dfb3ff1d7221bab3aa6603119ae0ebe572ce50d028da4bc2f2e4817215a39c4ccbbc144d7a62a16eb8bbaa50ad725b10d387b25c
+  data.tar.gz: 1ca94b824c0a3f23458dd05bd01ef3d9e40a2a141dd530f0d51131a08896d7ea31193ecd1b9b48d5ac92e46ccbb9a69868061080990d84d13ec96f61a94618dc

data/.gitignore

@@ -11,6 +11,8 @@
 .idea
 config.yml
 cache.db
-db/neo4j
+db/neo4j/*
+!db/neo4j/migrate
+!db/neo4j/schema.yml
 bitcoin2graphdb.log
 bitcoin2graphdb.pid

data/.travis.yml

@@ -7,9 +7,15 @@ rvm:
 bundler_args: --jobs=2
 
 before_script:
-  - bundle exec rake neo4j:install[community-2.3.3,test]
+  - bundle exec rake neo4j:install[community-3.4.1,test]
   - bundle exec rake neo4j:config[test,7475]
   - bundle exec rake neo4j:start[test]
+  - sleep 20
+  - bundle exec rake neo4j:migrate
+
+env:
+  global:
+    - NEO4J_URL="http://localhost:7475"
 
 script:
   - bundle exec rake spec

data/README.md

@@ -109,7 +109,7 @@ Others are the same as normal rspec.
 ### install test database
 
 ```
-$ rake neo4j:install'[community-2.3.3,test]'
+$ rake neo4j:install'[community-3.4.1,test]'
 ```
 
 ### change port
@@ -124,6 +124,16 @@ $ rake neo4j:config'[test,7475]'
 $ rake neo4j:start'[test]'
 ```
 
+### migration
+```
+$ rake neo4j:migrate
+```
+
+#### specify neo4j url (optional)
+```
+$ rake neo4j:migrate NEO4J_URL=http://localhost:7475
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/haw-itn/bitcoin2graphdb.

data/bitcoin2graphdb.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "openassets-ruby", ">= 0.6.5"
   spec.add_runtime_dependency "daemon-spawn"
-  spec.add_runtime_dependency "neo4j", "~>7.1.0"
+  spec.add_runtime_dependency "neo4j", "~>9.4.0"
+  spec.add_runtime_dependency "neo4j-rake_tasks"
   spec.add_runtime_dependency "activesupport", ">= 4.0.2"
   spec.add_runtime_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "octorelease"
 
 end

data/db/neo4j/migrate/20190306081251_force_create_graphdb_model_active_node_base_uuid_constraint.rb

@@ -0,0 +1,9 @@
+class ForceCreateGraphdbModelActiveNodeBaseUuidConstraint < Neo4j::Migrations::Base
+  def up
+    add_constraint :"Graphdb::Model::ActiveNodeBase", :uuid, force: true
+  end
+
+  def down
+    drop_constraint :"Graphdb::Model::ActiveNodeBase", :uuid
+  end
+end

data/db/neo4j/migrate/20190306081322_force_create_graphdb_model_address_address_index.rb

@@ -0,0 +1,9 @@
+class ForceCreateGraphdbModelAddressAddressIndex < Neo4j::Migrations::Base
+  def up
+    add_index :"Graphdb::Model::Address", :address, force: true
+  end
+
+  def down
+    drop_index :"Graphdb::Model::Address", :address
+  end
+end

data/db/neo4j/migrate/20190306081338_force_create_graphdb_model_block_block_hash_index.rb

@@ -0,0 +1,9 @@
+class ForceCreateGraphdbModelBlockBlockHashIndex < Neo4j::Migrations::Base
+  def up
+    add_index :"Graphdb::Model::Block", :block_hash, force: true
+  end
+
+  def down
+    drop_index :"Graphdb::Model::Block", :block_hash
+  end
+end

data/db/neo4j/migrate/20190306081351_force_create_graphdb_model_asset_id_asset_id_index.rb

@@ -0,0 +1,9 @@
+class ForceCreateGraphdbModelAssetIdAssetIdIndex < Neo4j::Migrations::Base
+  def up
+    add_index :"Graphdb::Model::AssetId", :asset_id, force: true
+  end
+
+  def down
+    drop_index :"Graphdb::Model::AssetId", :asset_id
+  end
+end

data/db/neo4j/migrate/20190306081404_force_create_graphdb_model_transaction_txid_index.rb

@@ -0,0 +1,9 @@
+class ForceCreateGraphdbModelTransactionTxidIndex < Neo4j::Migrations::Base
+  def up
+    add_index :"Graphdb::Model::Transaction", :txid, force: true
+  end
+
+  def down
+    drop_index :"Graphdb::Model::Transaction", :txid
+  end
+end

data/db/neo4j/schema.yml

@@ -0,0 +1,29 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of ActiveNode to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.yml definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using neo4j:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+---
+:constraints:
+- CONSTRAINT ON ( `graphdb::model::activenodebase`:`Graphdb::Model::ActiveNodeBase`
+  ) ASSERT `graphdb::model::activenodebase`.uuid IS UNIQUE
+- CONSTRAINT ON ( `neo4j::migrations::schemamigration`:`Neo4j::Migrations::SchemaMigration`
+  ) ASSERT `neo4j::migrations::schemamigration`.migration_id IS UNIQUE
+:indexes:
+- INDEX ON :Graphdb::Model::Address(address)
+- INDEX ON :Graphdb::Model::AssetId(asset_id)
+- INDEX ON :Graphdb::Model::Block(block_hash)
+- INDEX ON :Graphdb::Model::Transaction(txid)
+:versions:
+- '20190306081251'
+- '20190306081322'
+- '20190306081338'
+- '20190306081351'
+- '20190306081404'

data/lib/base.rb

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

data/lib/bitcoin2graphdb/migration.rb

@@ -11,7 +11,8 @@ module Bitcoin2Graphdb
       end
       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)
+      neo4j_adaptor = Neo4j::Core::CypherSession::Adaptors::HTTP.new(config[:neo4j][:server], neo4j_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
 
       Graphdb::Model.constants.each {|const_name| Graphdb::Model.const_get(const_name)}
@@ -25,7 +26,7 @@ module Bitcoin2Graphdb
 
     def run_with_height(block_height)
       puts "start migration for block height = #{block_height}. #{Time.now}"
-      Neo4j::Transaction.run do |tx|
+      Neo4j::ActiveBase.run_transaction do |tx|
         begin
           Graphdb::Model::Block.create_from_block_height(block_height)
           @block_height = block_height
@@ -43,7 +44,7 @@ module Bitcoin2Graphdb
     end
 
     def repair_assign_txs(block_height)
-      Neo4j::Transaction.run do |tx|
+      Neo4j::ActiveBase.run_transaction do |tx|
         begin
           block = Graphdb::Model::Block.with_height(block_height).first
           if block
@@ -66,7 +67,7 @@ module Bitcoin2Graphdb
     end
 
     def remove_block(block_height)
-      Neo4j::Transaction.run do |tx|
+      Neo4j::ActiveBase.run_transaction do |tx|
         begin
           block = Graphdb::Model::Block.with_height(block_height).first
           if block.nil?
@@ -83,7 +84,7 @@ module Bitcoin2Graphdb
     end
 
     def import_tx(txid)
-      Neo4j::Transaction.run do |tx|
+      Neo4j::ActiveBase.run_transaction do |tx|
         begin
           tx = Graphdb::Model::Transaction.with_txid(txid).first
           if tx.nil?
@@ -100,7 +101,7 @@ module Bitcoin2Graphdb
     end
 
     def remove_tx(txid)
-      Neo4j::Transaction.run do |tx|
+      Neo4j::ActiveBase.run_transaction do |tx|
         begin
           tx = Graphdb::Model::Transaction.with_txid(txid).first
           if tx.nil?

data/lib/bitcoin2graphdb/version.rb

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

data/lib/graphdb/model/address.rb

@@ -1,7 +1,7 @@
 module Graphdb
   module Model
     class Address < ActiveNodeBase
-      property :address, index: :exact
+      property :address
 
       has_many :in, :outputs, origin: :addresses, model_class: 'Graphdb::Model::TxOut'
 

data/lib/graphdb/model/block.rb

@@ -2,7 +2,7 @@ module Graphdb
   module Model
     class Block < ActiveNodeBase
 
-      property :block_hash, index: :exact
+      property :block_hash
       property :size, type: Integer
       property :height, type: Integer
       property :version

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

@@ -2,7 +2,7 @@ module Graphdb
   module Model
 
     class AssetId < ActiveNodeBase
-      property :asset_id, index: :exact
+      property :asset_id
 
       has_many :in, :outputs, origin: :asset_id, model_class: 'Graphdb::Model::TxOut'
 

data/lib/graphdb/model/transaction.rb

@@ -3,7 +3,7 @@ module Graphdb
     class Transaction < ActiveNodeBase
 
       property :hex
-      property :txid, index: :exact
+      property :txid
       property :version, type: Integer
       property :lock_time
       property :block_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin2graphdb
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openassets-ruby
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 9.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 9.4.0
+- !ruby/object:Gem::Dependency
+  name: neo4j-rake_tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: octorelease
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,12 @@ files:
 - bin/console
 - bin/setup
 - bitcoin2graphdb.gemspec
+- db/neo4j/migrate/20190306081251_force_create_graphdb_model_active_node_base_uuid_constraint.rb
+- db/neo4j/migrate/20190306081322_force_create_graphdb_model_address_address_index.rb
+- db/neo4j/migrate/20190306081338_force_create_graphdb_model_block_block_hash_index.rb
+- db/neo4j/migrate/20190306081351_force_create_graphdb_model_asset_id_asset_id_index.rb
+- db/neo4j/migrate/20190306081404_force_create_graphdb_model_transaction_txid_index.rb
+- db/neo4j/schema.yml
 - exe/bitcoin2graphdb
 - lib/base.rb
 - lib/bitcoin2graphdb.rb
@@ -215,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: A tool for import Bitcoin blockchain data into neo4j database.