openassets-ruby 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 762cb76ac06beeb46aac132bcb5ac714edf67976
-  data.tar.gz: 421ce1356c464b70c927b37cf79297b9383329d8
+SHA256:
+  metadata.gz: 1cd6a9bb5787981c5b6fa09927547fa27d480122398a728f29b26d5cc3dc38ef
+  data.tar.gz: fa92fb3ab5bd0a9616959b57e181c5de92f4b48c4845ded4dd0345ddb5c1bae7
 SHA512:
-  metadata.gz: f2d91da9ed7a58efe8eb8139a0e3779fccf6c5c721fd762f901cfe512abb82bdf6cf1558905836c4ee1a012b7833461beba9cab41afb54a35106cde5fccec2dc
-  data.tar.gz: 23df64ea454a114ca8f2bbd6d3bd851f716db29008c03166e108b940cdd74efecf32b2aa803756cf6a29adfca572d5e465bc55b9cebf1b7c0cc14883d1fd642a
+  metadata.gz: d8b73b6586b9254b832df6dc413345a72cdf8e41aa25e366464e5c2a5605303302b6ae8efdd9c42d9a5a967d1d6999cb8900f318b687b7f2ee9ef51309ef48fc
+  data.tar.gz: d1f16659ad557210e360f37f3a439521ed77d8fa5cdf2ad94c9f7f477b886dc694a60207b3e5e5982e39aea9ad1f1f6ebb5b72d4f42cbbbc46e750e729a3c689

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.3

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.5.0
-  - 2.4.1
-  - 2.4.0
+  - 2.6.3
+  - 2.5.5
+  - 2.4.5
   - 2.3.0
 
 bundler_args: --jobs=2

data/README.md

@@ -1,9 +1,9 @@
-# openassets-ruby [![Build Status](https://travis-ci.org/haw-itn/openassets-ruby.svg?branch=master)](https://travis-ci.org/haw-itn/openassets-ruby) [![Gem Version](https://badge.fury.io/rb/openassets-ruby.svg)](https://badge.fury.io/rb/openassets-ruby) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
+# openassets-ruby [![Build Status](https://travis-ci.org/haw/openassets-ruby.svg?branch=master)](https://travis-ci.org/haw/openassets-ruby) [![Gem Version](https://badge.fury.io/rb/openassets-ruby.svg)](https://badge.fury.io/rb/openassets-ruby) [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
 The implementation of the [Open Assets Protocol](https://github.com/OpenAssets/open-assets-protocol) for Ruby.
 
 ## Install
 
-```ruby
+```rubyThe implementation of the bitcoin protocol for ruby.
 gem install openassets-ruby
 ```
 

data/lib/openassets/api.rb

@@ -219,7 +219,6 @@ module OpenAssets
         cached = output_cache.get(txid, output_index)
         return cached unless cached.nil?
       end
-      puts "#{txid}:[#{output_index}]"
       decode_tx = load_cached_tx(txid)
       tx = Bitcoin::Protocol::Tx.new(decode_tx.htb)
       colored_outputs = get_color_outputs_from_tx(tx)
@@ -228,7 +227,7 @@ module OpenAssets
     end
 
     def get_color_outputs_from_tx(tx)
-      unless tx.is_coinbase?
+      unless tx.coinbase?
         tx.outputs.each_with_index { |out, i|
           marker_output_payload = OpenAssets::Protocol::MarkerOutput.parse_script(out.pk_script)
           unless marker_output_payload.nil?

data/lib/openassets/provider/bitcoin_core_provider.rb

@@ -50,7 +50,7 @@ module OpenAssets
       # @param [String] tx The serialized format transaction.
       # @return [Bitcoin::Protocol::Tx] The signed transaction.
       def sign_transaction(tx)
-        signed_tx = signrawtransaction(tx)
+        signed_tx = respond_to?(:signrawtransactionwithwallet) ? signrawtransactionwithwallet(tx) : signrawtransaction(tx)
         raise OpenAssets::Error, 'Could not sign the transaction.' unless signed_tx['complete']
         Bitcoin::Protocol::Tx.new(signed_tx['hex'].htb)
       end
@@ -68,7 +68,6 @@ module OpenAssets
         importaddress(address)
       end
 
-      private
       # Convert decode tx string to Bitcion::Protocol::Tx
       def decode_tx_to_btc_tx(tx)
         hash = {
@@ -90,22 +89,11 @@ module OpenAssets
         Bitcoin::Protocol::Tx.from_hash(hash)
       end
 
-      private
-      def server_url
-        url = "#{@config[:schema]}://"
-        url.concat "#{@config[:user]}:#{@config[:password]}@"
-        url.concat "#{@config[:host]}:#{@config[:port]}"
-        if !@config[:wallet].nil? && !@config[:wallet].empty?
-          url.concat "/wallet/#{@config[:wallet]}"
-        end
-        url
-      end
-
       def request(command, *params)
         data = {
-          :method => command,
-          :params => params,
-          :id => 'jsonrpc'
+            :method => command,
+            :params => params,
+            :id => 'jsonrpc'
         }
         post(server_url, @config[:timeout], @config[:open_timeout], data.to_json, content_type: :json) do |respdata, request, result|
           raise ApiError, result.message if !result.kind_of?(Net::HTTPSuccess) && respdata.empty?
@@ -115,9 +103,22 @@ module OpenAssets
         end
       end
 
+      private
+
+      def server_url
+        url = "#{@config[:schema]}://"
+        url.concat "#{@config[:user]}:#{@config[:password]}@"
+        url.concat "#{@config[:host]}:#{@config[:port]}"
+        if !@config[:wallet].nil? && !@config[:wallet].empty?
+          url.concat "/wallet/#{@config[:wallet]}"
+        end
+        url
+      end
+
       def post(url, timeout, open_timeout, payload, headers={}, &block)
         RestClient::Request.execute(:method => :post, :url => url, :timeout => timeout, :open_timeout => open_timeout, :payload => payload, :headers => headers, &block)
       end
+
     end
   end
 end

data/lib/openassets/version.rb

@@ -1,3 +1,3 @@
 module OpenAssets
-  VERSION = '0.6.7'
+  VERSION = '0.7.0'
 end

data/openassets-ruby.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "bitcoin-ruby", "~> 0.0.18"
   spec.add_runtime_dependency "ffi", "~>1.9.8"
-  spec.add_runtime_dependency "rest-client", "2.0"
+  spec.add_runtime_dependency "rest-client", "2.0.2"
   spec.add_runtime_dependency "httpclient"
   spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "leb128", '~> 1.0.0'
-  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "timecop"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -238,8 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The implementation of the Open Assets Protocol for Ruby.