openassets-ruby 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bf5ca70ee3d56eb275492e20de8af986e6da15
-  data.tar.gz: 54c38aaafbfeb618ed5ad35510074b6adacea338
+  metadata.gz: 762cb76ac06beeb46aac132bcb5ac714edf67976
+  data.tar.gz: 421ce1356c464b70c927b37cf79297b9383329d8
 SHA512:
-  metadata.gz: 1a175cb0af22f388f5e372c2df4c532b065d011deae294692a41384e2ae09d1439f600d17e9841a796a531351dc9a4a46219fb4278df99231ce00aa527c51f92
-  data.tar.gz: 07ea55a4edd0bab117c3b4cfb2d4cb9242aa2cc1ff101dec7cf840e65264beab53c1acda1608a6a4de6430c26927dabd0c0d60eca73fe1680afc22f63a31de34
+  metadata.gz: f2d91da9ed7a58efe8eb8139a0e3779fccf6c5c721fd762f901cfe512abb82bdf6cf1558905836c4ee1a012b7833461beba9cab41afb54a35106cde5fccec2dc
+  data.tar.gz: 23df64ea454a114ca8f2bbd6d3bd851f716db29008c03166e108b940cdd74efecf32b2aa803756cf6a29adfca572d5e465bc55b9cebf1b7c0cc14883d1fd642a

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.0

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
+  - 2.5.0
   - 2.4.1
   - 2.4.0
   - 2.3.0
-  - 2.2.2
 
 bundler_args: --jobs=2
 

data/README.md

@@ -12,51 +12,81 @@ gem install openassets-ruby
 Initialize the connection information to the Bitcoin Core server.
 
 * **use mainnet**
-```ruby
-require 'openassets'
-
-api = OpenAssets::Api.new({
-    network:           'mainnet',
-    provider:         'bitcoind',
-    cache:            'cache.db',
-    dust_limit:              600,
-    default_fees:          10000,
-    min_confirmation:          1,
-    max_confirmation:    9999999,
-    rpc: {
-      user:                'xxx',
-      password:            'xxx',
-      schema:             'http',
-      port:                 8332,
-      host:          'localhost',
-      timeout:                60,
-      open_timeout:           60 }
-  })
-```
+
+  ```ruby
+  require 'openassets'
+
+  api = OpenAssets::Api.new({
+      network:           'mainnet',
+      provider:         'bitcoind',
+      cache:            'cache.db',
+      dust_limit:              600,
+      default_fees:          10000,
+      min_confirmation:          1,
+      max_confirmation:    9999999,
+      rpc: {
+        user:                'xxx',
+        password:            'xxx',
+        schema:             'http',
+        port:                 8332,
+        host:          'localhost',
+        timeout:                60,
+        open_timeout:           60 }
+    })
+  ```
 
 * **use testnet**
-Change `network` and `port` depending on your server setting.
-```ruby
-require 'openassets'
-
-api = OpenAssets::Api.new({
-    network:             'testnet',
-    provider:           'bitcoind',
-    cache:            'testnet.db',
-    dust_limit:                600,
-    default_fees:            10000,
-    min_confirmation:            1,
-    max_confirmation:      9999999,
-    rpc: {
-      user:                  'xxx',
-      password:              'xxx',
-      schema:               'http',
-      port:                  18332,
-      host:            'localhost',
-      timeout:                  60,
-      open_timeout:             60 }
-  })
-```
+
+  Change `network` and `port` depending on your server setting.
+
+  ```ruby
+  require 'openassets'
+
+  api = OpenAssets::Api.new({
+      network:             'testnet',
+      provider:           'bitcoind',
+      cache:            'testnet.db',
+      dust_limit:                600,
+      default_fees:            10000,
+      min_confirmation:            1,
+      max_confirmation:      9999999,
+      rpc: {
+        user:                  'xxx',
+        password:              'xxx',
+        schema:               'http',
+        port:                  18332,
+        host:            'localhost',
+        timeout:                  60,
+        open_timeout:             60 }
+    })
+  ```
+
+* **with [multi-wallet support](https://github.com/bitcoin/bitcoin/blob/0.15/doc/release-notes/release-notes-0.15.0.md#multi-wallet-support)**
+
+  From Bitcoin Core version 0.15 onwards, change `wallet` depending on wallet settings.
+
+  ```ruby
+  require 'openassets'
+
+  api = OpenAssets::Api.new({
+      network:             'testnet',
+      provider:           'bitcoind',
+      cache:            'testnet.db',
+      dust_limit:                600,
+      default_fees:            10000,
+      min_confirmation:            1,
+      max_confirmation:      9999999,
+      rpc: {
+        user:                  'xxx',
+        password:              'xxx',
+        schema:               'http',
+        port:                  18332,
+        host:            'localhost',
+        wallet:         'wallet.dat',
+        timeout:                  60,
+        open_timeout:             60 }
+    })
+  ```
 
 The configuration options are as follows:
 
@@ -64,13 +94,61 @@ The configuration options are as follows:
 |---|---|---|
 |**network**|The using network. "mainnet" or "testnet" or "regtest" or "litecoin" or "litecoin_testnet" |mainnet|
 |**provider**|The RPC server. "bitcoind" is the only option for now.|bitcoind|
-|**cache**|The path to the database file. Specify ':memory: to use in-memory database.|cache.db|
+|**cache**|The path to the database file. Specify `':memory:'` to use in-memory database.|cache.db|
 |**dust_limit**|The amount of Bitcoin, which is set to the each output of the Open Assets Protocol (issue or transfer).|600 (satoshi)|
-|**default_fees**|The default transaction fee in satoshi. Specify ':auto' to use auto fee settings. (used by issue_asset and send_asset, send_bitcoin )|10000 (satoshi)|
+|**default_fees**|The default transaction fee in satoshi. Specify `:auto` to use auto fee settings. (used by issue_asset and send_asset, send_bitcoin )|10000 (satoshi)|
 |**min_confirmation**|The minimum number of confirmations the transaction containing an output that used to get UTXO.|1|
 |**max_confirmation**|The maximum number of confirmations the transaction containing an output that used to get UTXO.|9999999|
 |**rpc**|The access information to the RPC server of Bitcoin Core.|N/A|
 
+### Using the API with multi-wallet support
+
+To use the Bitcoin Core multi-wallet support ([version 0.15 onwards](https://github.com/bitcoin/bitcoin/blob/0.15/doc/release-notes/release-notes-0.15.0.md#multi-wallet-support)), you should use multiple instances of API, for example:
+
+```ruby
+@apis = Hash.new
+@apis[1] = OpenAssets::Api.new({
+            network:             'testnet',
+            provider:           'bitcoind',
+            cache:            'testnet.db',
+            dust_limit:                600,
+            default_fees:            10000,
+            min_confirmation:            1,
+            max_confirmation:      9999999,
+            rpc: {
+              user:                  'xxx',
+              password:              'xxx',
+              schema:               'http',
+              port:                  18332,
+              host:            'localhost',
+              wallet:      'wallet001.dat',
+              timeout:                  60,
+              open_timeout:             60 }
+          })
+@apis[2] = OpenAssets::Api.new({
+            network:             'testnet',
+            provider:           'bitcoind',
+            cache:            'testnet.db',
+            dust_limit:                600,
+            default_fees:            10000,
+            min_confirmation:            1,
+            max_confirmation:      9999999,
+            rpc: {
+              user:                  'xxx',
+              password:              'xxx',
+              schema:               'http',
+              port:                  18332,
+              host:            'localhost',
+              wallet:      'wallet002.dat',
+              timeout:                  60,
+              open_timeout:             60 }
+          })
+# More wallets perhaps...
+# Then call API selectively
+@apis[1].provider.list_unspent
+@apis[2].provider.list_unspent
+```
+
 ## API
 
 Currently openassets-ruby support the following API.
@@ -183,10 +261,10 @@ Creates a transaction for issuing an asset.
   api.issue_asset(address, 150, 'u=https://goo.gl/bmVEuw', address, nil, 'broadcast')
   ```
 If specified ``output_qty``, the issue output is divided by the number of output_qty.
-Ex, amount = 125 and output_qty = 2, the marker output asset quantity is [62, 63] and issue TxOut is two.
+For example, amount = 125 and output_qty = 2, the marker output asset quantity is [62, 63] and issue TxOut is two.
 
 * **send_asset**
-Creates a transaction for sending an asset from the open asset address to another.
+  Creates a transaction for sending an asset from the open asset address to another.
   ```ruby
   # send asset
   # api.send_asset(<from open asset address>,
@@ -316,7 +394,8 @@ This API is to burn the asset by spending the all UTXO of specified asset as Bit
   asset_id = 'oGu4VXx2TU97d9LmPP8PMCkHckkcPqC5RY'
   tx = api.burn_asset(oa_address, asset_id)
   ```
-**Note:** Burned asset will not be able to again get.
+
+  **Note:** Burnt asset will be lost forever.
 
 ## Command line interface
 
@@ -328,10 +407,10 @@ Openassets-ruby comes with a `openassets` command line interface that allows eas
 
     Options:
     -c path to config JSON which is passed to OpenAssets::Api.new - see Configuration for details
-    -e load conifg from ENV variables (look at the exe/openassets file for details)
+    -e load config from ENV variables (look at the exe/openassets file for details)
 
     commands:
-    * console runs an IRB console and gives you an initialized Api instance to interact with OpenAssets
+    * console runs an IRB console and gives you an initialized API instance to interact with OpenAssets
     * any method on the API instance, helpful for get_balance, list_unspent
 
 

data/lib/openassets/api.rb

@@ -18,7 +18,8 @@ module OpenAssets
       @config = {:network => 'mainnet',
                  :provider => 'bitcoind', :cache => 'cache.db',
                  :dust_limit => 600, :default_fees => 10000, :min_confirmation => 1, :max_confirmation => 9999999,
-                 :rpc => { :host => 'localhost', :port => 8332 , :user => '', :password => '', :schema => 'https', :timeout => 60, :open_timeout => 60}}
+                 :rpc => {:host => 'localhost', :port => 8332 , :user => '', :password => '', :wallet => '',
+                          :schema => 'https', :timeout => 60, :open_timeout => 60}}
       if config
         @config.update(config)
       end
@@ -73,7 +74,7 @@ module OpenAssets
         }
         {
             'address' => btc_address,
-            'oa_address' => btc_address.nil? ? nil : address_to_oa_address(btc_address),
+            'oa_address' => (btc_address.nil? || btc_address.is_a?(Array)) ? nil : address_to_oa_address(btc_address),
             'value' => satoshi_to_coin(v.inject(0) { |sum, o|sum +  o.value}),
             'assets' => assets,
             'account' => v[0].account
@@ -218,6 +219,7 @@ 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)

data/lib/openassets/provider/bitcoin_core_provider.rb

@@ -95,6 +95,9 @@ module OpenAssets
         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
 

data/lib/openassets/util.rb

@@ -15,12 +15,16 @@ module OpenAssets
     # @param [String] btc_address The Bitcoin address.
     # @return [String] The Open Assets Address.
     def address_to_oa_address(btc_address)
-      btc_hex = decode_base58(btc_address)
-      btc_hex = '0' +btc_hex if btc_hex.size==47
-      address = btc_hex[0..-9] # bitcoin address without checksum
-      named_addr = OA_NAMESPACE.to_s(16) + address
-      oa_checksum = checksum(named_addr)
-      encode_base58(named_addr + oa_checksum)
+      begin
+        btc_hex = decode_base58(btc_address)
+        btc_hex = '0' +btc_hex if btc_hex.size==47
+        address = btc_hex[0..-9] # bitcoin address without checksum
+        named_addr = OA_NAMESPACE.to_s(16) + address
+        oa_checksum = checksum(named_addr)
+        encode_base58(named_addr + oa_checksum)
+      rescue ArgumentError
+        nil # bech32 format fails to decode. TODO define OA address for segwit
+      end
     end
 
     # convert open assets address to bitcoin address
@@ -95,11 +99,7 @@ module OpenAssets
     # @param [Bitcoin::Script] script The output script.
     # @return [String] The Bitcoin address. if the script dose not contains address, return nil.
     def script_to_address(script)
-      return script.get_pubkey_address    if script.is_pubkey?
-      return script.get_hash160_address   if script.is_hash160?
-      return script.get_multisig_addresses  if script.is_multisig?
-      return script.get_p2sh_address      if script.is_p2sh?
-      nil
+      script.is_multisig? ? script.get_multisig_addresses : script.get_addresses.first
     end
 
     # validate bitcoin address

data/lib/openassets/version.rb

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

data/openassets-ruby.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency "bitcoin-ruby", "~> 0.0.11"
+  spec.add_runtime_dependency "bitcoin-ruby", "~> 0.0.18"
   spec.add_runtime_dependency "ffi", "~>1.9.8"
-  spec.add_runtime_dependency "rest-client", "~>1.8.0"
+  spec.add_runtime_dependency "rest-client", "2.0"
   spec.add_runtime_dependency "httpclient"
   spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "leb128", '~> 1.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openassets-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: The implementation of the Open Assets Protocol for Ruby.