waves_ruby_client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94d6f75de8e5fd42cff86ee2396ac8d987e69941cae2e78a88b4a538e0411421
-  data.tar.gz: 4f7737dfaee0b6de98756a29ad661ca3483ab4af3b8868d5642c6de63be2b33c
+  metadata.gz: 6a8818fe71f32d1807dd626e6c9e1213230777ed8e0c83a93a644258daa346d6
+  data.tar.gz: ba34f2b0c97fa99fe9aaad4d563adc82921f94f530def58e553c607afded3077
 SHA512:
-  metadata.gz: 8c886f5a716e98ae922c58e3e3c287183180ca280997f345c98124dbc4787ac30079889b65b66480e178c7dfa33881a06e4100f73989e0f998053d85771ddcf7
-  data.tar.gz: 88c905bb7c8a11686281fceaca83c3f8a0bdbad7f1e4d924bb0c02e529fca9ca0ea7ac46839382a6a38bd156439a9df91fbeedef03f9c43f59fe0268859bd113
+  metadata.gz: d30e3e7b8d0df556594e092c19f6bbeb1524eab0286be25ce380db8a99da94c4f67e35c99f03128743531450bdba25b53cebc236efc219403f0c7b76c1185123
+  data.tar.gz: 3f9cd8a85eadcc7804f071b075ff17cf8d78e809a656aa14bf898980fa05ec2d0f7d1403a1ba1a5a705e5abe9358f8aa173761d7ac3b5bcca4127b0835f03463

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waves_ruby_client (0.1.4)
+    waves_ruby_client (0.1.5)
       activemodel
       activesupport
       httparty
@@ -9,26 +9,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    ffi (1.9.25)
-    formatador (0.2.5)
-    guard (2.14.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -36,63 +36,60 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    httparty (0.17.1)
+    httparty (0.19.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.7.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.1)
-    mime-types (3.3)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    minitest (5.13.0)
+    mime-types-data (3.2021.0901)
+    minitest (5.14.4)
     multi_xml (0.6.0)
     nenv (0.3.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.12.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby_dep (1.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     shellany (0.0.1)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-20
 
 DEPENDENCIES
-  bundler (~> 1.14)
+  bundler (~> 2.2)
   guard-rspec
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   waves_ruby_client!
 
 BUNDLED WITH
-   1.17.2
+   2.2.22

data/README.md

@@ -26,17 +26,23 @@ Or install it yourself as:
 
 The gem requires the following environment variables
 
-* WAVES_PUBLIC_KEY: your waves public key
-* WAVES_PRIVATE_KEY: your waves private key, necessary for signing requests
-* WAVES_ADDRESS: your waves address
+- WAVES_PUBLIC_KEY: your waves public key
+- WAVES_PRIVATE_KEY: your waves private key, necessary for signing requests
+- WAVES_ADDRESS: your waves address
 
+Optionally you can override:
 
-Optionally you can override the waves API URL (https://nodes.wavesnodes.com) and
-the matcher public key (7kPFrHDiGw1rCm7LPszuECwWYL3dMf6iMifLRDJQZMzy) by setting the following environement variables:
+- the API URLs for the node (https://nodes.wavesnodes.com),
+- the matcher (https://matcher.waves.exchange),
+- matcher address (3PEjHv3JGjcWNpYEEkif2w8NXV4kbhnoGgu)
+- and the matcher public key (9cpfKN9suPNvfeUNphzxXMjcnn974eme8ZhWUjaktzU5)
 
-* WAVES_API_URL
-* WAVES_MATCHER_PUBLIC_KEY
+by setting the following environement variables:
 
+- WAVES_NODE_URL
+- WAVES_MATCHER_URL
+- WAVES_MATCHER_ADDRESS
+- WAVES_MATCHER_PUBLIC_KEY
 
 ### Order book
 
@@ -55,16 +61,17 @@ book.asks
 
 An Order object has the following attributes:
 
-* id
-* price
-* amount
-* timestamp
-* type (sell|buy)
-* status (Accepted|PartiallyFilled|Filled|NotFound|Cancelled)
+- id
+- price
+- amount
+- timestamp
+- type (sell|buy)
+- status (Accepted|PartiallyFilled|Filled|NotFound|Cancelled)
 
 #### Get user orders
 
 All orders:
+
 ```ruby
 WavesRubyClient::Order.all
 ```
@@ -78,7 +85,7 @@ WavesRubyClient::Order.active
 #### Place/Cancel/Delete limit order
 
 ```ruby
-order = WavesRubyClient::Order.new(price: 0.0008, amount: 10)
+order = WavesRubyClient::Order.new(price: 0.0008, amount: 10, type: :buy)
 order.place # raises exception if not successful
 order.cancel
 order.delete
@@ -87,7 +94,7 @@ order.delete
 #### Order status
 
 ```ruby
-order = WavesRubyClient::Order.new(price: 0.0008, amount: 10)
+order = WavesRubyClient::Order.new(price: 0.0008, amount: 10, type: :buy)
 order.place
 order.refresh_status
 order.status
@@ -112,8 +119,11 @@ sleep(10) while WavesRubyClient::Transaction.my_unconfirmed_exchanges.any?
 Lists user's balances for waves and bitcoins.
 
 ```ruby
-WavesRubyClient::Wallet.balance
-=> { waves: 5002.3, btc: 1200.3 }
+WavesRubyClient::Wallet.balance_btc
+=> 1200.3
+
+WavesRubyClient::Wallet.balance_waves
+=> 500.2
 ```
 
 ### DataFeed
@@ -147,6 +157,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 Bug reports and pull requests are welcome on GitHub at https://github.com/phigrofi/waves_ruby_client.
 This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
+
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/waves_ruby_client/api.rb

@@ -7,17 +7,22 @@ module WavesRubyClient
 
     def call_matcher(path, method = :get, args = {})
       WavesRubyClient.try_many_times do
-        call('/matcher' + path, method, args)
+        call("/matcher#{path}", method, args)
       end
     end
 
+    def call_node(path)
+      response = HTTParty.get(WavesRubyClient::NODE_URL + path)
+      JSON.parse(response.body)
+    end
+
     def call_data_feed(path)
       response = HTTParty.get(WavesRubyClient::DATA_FEED_URL + path)
       JSON.parse(response.body)
     end
 
     def call(path, method = :get, args = {})
-      response = HTTParty.send(method, WavesRubyClient::API_URL + path, args)
+      response = HTTParty.send(method, WavesRubyClient::MATCHER_URL + path, args)
       JSON.parse(response.body)
     end
   end

data/lib/waves_ruby_client/data_feed.rb

@@ -7,13 +7,19 @@ module WavesRubyClient
 
     # get history from data feed
     def self.trade_history(count = 10)
-      WavesRubyClient::Api.instance.call_data_feed("/transactions/exchange?amountAsset=WAVES&limit=#{count}")['data'].map do |entry|
-        order = entry['data']
+      params = [
+        '/trades',
+        WavesRubyClient::AMOUNT_ASSET.url_id,
+        WavesRubyClient::PRICE_ASSET.url_id,
+        count
+      ]
+
+      WavesRubyClient::Api.instance.call_data_feed(params.join('/')).map do |entry|
         WavesRubyClient::Order.new(
-          id: order['id'],
-          price: order['price'].to_f,
-          timestamp: Time.parse(order['timestamp']),
-          amount: order['amount'].to_f
+          id: entry['id'],
+          price: entry['price'].to_f,
+          timestamp: Time.at(entry['timestamp'] / 1000),
+          amount: entry['amount'].to_f
         )
       end
     end

data/lib/waves_ruby_client/order_book.rb

@@ -17,7 +17,7 @@ module WavesRubyClient
 
     def refresh
       order_book = WavesRubyClient::Api.instance.call_matcher(
-        "/orderbook/#{asset1.url_id}/#{asset2.url_id}"
+        "/orderbook/#{asset1.url_id}/#{asset2.url_id}#getOrderBook"
       )
       self.asks = order_book['asks'].map { |order| scale(order) }
       self.bids = order_book['bids'].map { |order| scale(order) }

data/lib/waves_ruby_client/order_data/place.rb

@@ -13,7 +13,7 @@ module WavesRubyClient
       end
 
       def data_with_signature
-        data.merge(signature: signature)
+        data.merge(proofs: [signature])
       end
 
       private

data/lib/waves_ruby_client/transaction.rb

@@ -4,13 +4,14 @@ module WavesRubyClient
   # Access unconfirmed transactions
   class Transaction
     def self.unconfirmed
-      WavesRubyClient::Api.instance.call('/transactions/unconfirmed')
+      WavesRubyClient::Api.instance.call_node('/transactions/unconfirmed')
     end
 
     # own unconfirmed exchange transactions
     def self.my_unconfirmed_exchanges
       unconfirmed.select do |transaction|
         next unless transaction['type'] == 7
+
         transaction['order1']['senderPublicKey'] == WavesRubyClient::WAVES_PUBLIC_KEY ||
           transaction['order2']['senderPublicKey'] == WavesRubyClient::WAVES_PUBLIC_KEY
       end

data/lib/waves_ruby_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WavesRubyClient
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/waves_ruby_client/wallet.rb

@@ -3,14 +3,20 @@
 module WavesRubyClient
   # get waves and btc balance
   class Wallet
-    def self.balance
+    def self.balance_btc
       WavesRubyClient.try_many_times do
-        url = ['/orderbook', WavesRubyClient::AMOUNT_ASSET.url_id,
-               WavesRubyClient::PRICE_ASSET.url_id, 'tradableBalance',
-               WavesRubyClient::WAVES_ADDRESS].join('/')
-        res = WavesRubyClient::Api.instance.call_matcher(url)
-        { waves: res['WAVES'].to_f / WavesRubyClient::NUMBER_MULTIPLIKATOR,
-          btc: res[WavesRubyClient::Asset.btc.url_id].to_f / WavesRubyClient::NUMBER_MULTIPLIKATOR }
+        url = ['/assets/balance', WavesRubyClient::WAVES_ADDRESS,
+               WavesRubyClient::PRICE_ASSET.url_id].join('/')
+        res = WavesRubyClient::Api.instance.call_node(url)
+        res['balance'].to_f / WavesRubyClient::NUMBER_MULTIPLIKATOR
+      end
+    end
+
+    def self.balance_waves
+      WavesRubyClient.try_many_times do
+        url = ['/addresses/balance', WavesRubyClient::WAVES_ADDRESS].join('/')
+        res = WavesRubyClient::Api.instance.call_node(url)
+        res['balance'].to_f / WavesRubyClient::NUMBER_MULTIPLIKATOR
       end
     end
   end

data/lib/waves_ruby_client.rb

@@ -30,10 +30,12 @@ module WavesRubyClient
   WAVES_PUBLIC_KEY = ENV['WAVES_PUBLIC_KEY']
   WAVES_PRIVATE_KEY = ENV['WAVES_PRIVATE_KEY']
   WAVES_ADDRESS = ENV['WAVES_ADDRESS']
-  API_URL = ENV['WAVES_API_URL'] || 'https://matcher.wavesplatform.com'
-  MATCHER_PUBLIC_KEY = ENV['WAVES_MATCHER_PUBLIC_KEY'] ||
-                       '7kPFrHDiGw1rCm7LPszuECwWYL3dMf6iMifLRDJQZMzy'
-  DATA_FEED_URL = 'https://api.wavesplatform.com/v0'
+
+  DATA_FEED_URL = 'https://marketdata.wavesplatform.com/api'
+  NODE_URL = ENV['WAVES_NODE_URL'] || 'https://nodes.wavesnodes.com'
+  MATCHER_URL = ENV['WAVES_MATCHER_URL'] || 'https://matcher.waves.exchange'
+  MATCHER_ADDRESS = ENV['WAVES_MATCHER_ADDRESS'] || '3PEjHv3JGjcWNpYEEkif2w8NXV4kbhnoGgu'
+  MATCHER_PUBLIC_KEY = ENV['WAVES_MATCHER_PUBLIC_KEY'] || '9cpfKN9suPNvfeUNphzxXMjcnn974eme8ZhWUjaktzU5'
 
   BTC_ASSET_ID = '8LQW8f7P5d5PZM7GtZEBgaqRPGSzS3DfPuiXrURJ4AJS'
   WAVES_ASSET_ID = 'WAVES'
@@ -51,7 +53,7 @@ module WavesRubyClient
     tries ||= times
     yield
   rescue StandardError => e
-    sleep(5)
+    sleep(1)
     retry unless (tries -= 1).zero?
     raise e
   end

data/waves_ruby_client.gemspec

@@ -1,7 +1,6 @@
-
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'waves_ruby_client/version'
 
@@ -23,12 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty'
   spec.add_dependency 'activemodel'
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'httparty'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: waves_ruby_client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Philipp Großelfinger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Access Waves Platform API with ruby
 email:
 - philipp.grosselfinger@gmail.com
@@ -119,6 +119,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".semaphore/semaphore.yml"
+- ".tool-versions"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -151,7 +152,7 @@ homepage: https://github.com/phigrofi/waves_ruby_client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Ruby Client for Waves Platform API
 test_files: []