2 6 stable bitzlato

Gemfile

@@ -33,7 +33,11 @@ gem 'faraday_middleware', '~> 0.13.1'
 gem 'faye', '~> 1.4'
 gem 'eventmachine', '~> 1.2'
 gem 'em-synchrony', '~> 1.0'
-gem 'jwt', '~> 2.2.0'
+
+# We use 2.3.0.dev for bitzlato client
+# Fill free to update to rubygem version when it will be released
+gem 'jwt', github: 'jwt/ruby-jwt'
+
 gem 'email_validator', '~> 1.6.0'
 gem 'validate_url', '~> 1.0.4'
 gem 'god', '~> 0.13.7', require: false
@@ -72,6 +76,10 @@ group :development do
   gem 'annotate',   '~> 3.1.0'
   gem 'ruby-prof',  '~> 0.17.0', require: false
   gem 'listen',     '>= 3.0.5', '< 3.2'
+
+  gem 'rspec'
+  gem 'guard'
+  gem 'guard-rspec', github: 'caspark/guard-rspec' # Use from github to remove rspec < 4.0 dependencies
 end
 
 group :test do

Gemfile.lock

@@ -6,6 +6,30 @@ GIT
       rails (>= 4.1)
       vault (~> 0.14)
 
+GIT
+  remote: https://github.com/caspark/guard-rspec
+  revision: 407ef8c62f3abad575bb66d53c02ba062a5ee8af
+  specs:
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+
+GIT
+  remote: https://github.com/finfex/bitzlato
+  revision: 53b9c814a0be82f7d39c36abc4b9f37770bff405
+  branch: main
+  specs:
+    bitzlato (0.1.8)
+      faraday (>= 0.17)
+      json (~> 2.0)
+      jwt (~> 2.3.0.dev)
+
+GIT
+  remote: https://github.com/jwt/ruby-jwt
+  revision: 2cea14fdae439773fafc59640178e5cf7a0af8a4
+  specs:
+    jwt (2.3.0.dev)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -166,6 +190,7 @@ GEM
     ffi (1.15.0)
     figaro (1.1.1)
       thor (~> 0.14)
+    formatador (0.2.5)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     god (0.13.7)
@@ -191,6 +216,16 @@ GEM
       rack
     grape_on_rails_routes (0.3.2)
       rails (>= 3.1.1)
+    guard (2.16.2)
+      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)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
     hashdiff (1.0.1)
     hashie (3.6.0)
     hiredis (0.6.3)
@@ -208,7 +243,7 @@ GEM
       faraday_middleware (~> 0.13.1)
       faye (~> 1.2)
       peatio (>= 2.4.2)
-    jwt (2.2.2)
+    json (2.5.1)
     jwt-multisig (1.0.5)
       activesupport (>= 4.0)
       jwt (~> 2.2)
@@ -234,6 +269,7 @@ GEM
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    lumberjack (1.2.8)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
@@ -256,12 +292,16 @@ GEM
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
     mysql2 (0.5.3)
+    nenv (0.3.0)
     net-http-persistent (3.0.1)
       connection_pool (~> 2.2)
     nio4r (2.5.7)
     nokogiri (1.11.2)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -382,6 +422,10 @@ GEM
     reline (0.2.4)
       io-console (~> 0.5)
     rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
     rspec-core (3.9.0)
       rspec-support (~> 3.9.0)
     rspec-expectations (3.9.0)
@@ -424,6 +468,7 @@ GEM
       parser
     sentry-raven (2.9.0)
       faraday (>= 0.7.6, < 1.0)
+    shellany (0.0.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -465,6 +510,7 @@ DEPENDENCIES
   annotate (~> 3.1.0)
   arel-is-blank (~> 1.0.0)
   better-faraday (~> 1.0.5)
+  bitzlato!
   bootsnap (>= 1.1.0)
   bullet (~> 5.9)
   bump (~> 0.7)
@@ -493,12 +539,14 @@ DEPENDENCIES
   grape-swagger-ui (~> 2.2.8)
   grape_logging (~> 1.8.0)
   grape_on_rails_routes (~> 0.3.2)
+  guard
+  guard-rspec!
   hashie (~> 3.6.0)
   hiredis (~> 0.6.0)
   influxdb (~> 0.7.0)
   irb
   irix (~> 2.6.0)
-  jwt (~> 2.2.0)
+  jwt!
   jwt-multisig (~> 1.0.0)
   jwt-rack (~> 0.1.0)
   kaminari (~> 1.2.1)
@@ -524,6 +572,7 @@ DEPENDENCIES
   ransack (~> 2.3.2)
   rbtree (~> 0.4.2)
   redis (~> 4.1.2)
+  rspec
   rspec-rails (~> 3.8, >= 3.8.2)
   rspec-retry (~> 0.6)
   rubocop-rspec (~> 1.32)
@@ -542,4 +591,4 @@ RUBY VERSION
    ruby 2.6.6p146
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

Gemfile.plugin

@@ -9,3 +9,4 @@ gem 'peatio-bitcoincash', '~> 2.6.1'
 gem 'peatio-ripple', '~> 2.6.1'
 gem 'peatio-bitgo', '~> 2.6.6'
 gem 'peatio-electrum', '~> 2.6.2'
+gem 'bitzlato', github: 'finfex/bitzlato', branch: 'main'

Guardfile

@@ -0,0 +1,75 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+#
+notification :tmux, display_message: true if ENV.has_key?('TMUX')
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+
+  # Rake tasks
+  dsl.watch_spec_files_for(dsl.rake.rake_files)
+end

README.md

@@ -228,4 +228,3 @@ Peatio is released under the terms of the [MIT license](http://peatio.mit-licens
 
 [Peatio](http://en.wikipedia.org/wiki/Pixiu) (Chinese: 貔貅) is a Chinese mythical hybrid creature
 considered to be a very powerful protector to practitioners of Feng Shui.
-

VERSION

@@ -1 +1 @@
-2.6.0
+2.7.0

app/api/v2/account/deposits.rb

@@ -10,6 +10,39 @@ class Deposits < Grape::API
 
         before { deposits_must_be_permitted! }
 
+
+        desc 'Create deposit intention',
+          success: API::V2::Entities::Deposit
+        params do
+          requires :currency,
+                   type: String,
+                   values: { value: -> { Currency.visible.codes(bothcase: true) }, message: 'account.currency.doesnt_exist' },
+                   desc: 'Currency code'
+          requires :amount,
+                   type: BigDecimal,
+                   desc: 'The deposit amount.'
+        end
+
+        post '/deposits/intention' do
+          currency = Currency.find(params[:currency])
+
+          unless currency.deposit_enabled?
+            error!({ errors: ['management.currency.deposit_disabled'] }, 422)
+          end
+
+          wallet = Wallet.deposit_wallet(currency.id)
+
+          unless wallet.present?
+            error!({ errors: ['account.wallet.not_found'] }, 422)
+          end
+
+          deposit = WalletService
+            .new(wallet)
+            .create_deposit_intention!(current_user, currency, params[:amount])
+
+          present deposit, with: API::V2::Entities::Deposit
+        end
+
         desc 'Get your deposits history.',
           is_array: true,
           success: API::V2::Entities::Deposit

app/api/v2/account/withdraws.rb

@@ -91,8 +91,6 @@ class Withdraws < Grape::API
         post '/withdraws' do
           user_authorize! :create, ::Withdraw
 
-          withdraw_api_must_be_enabled!
-
           beneficiary = current_user
                           .beneficiaries
                           .available_to_member

app/api/v2/entities/account.rb

@@ -34,7 +34,7 @@ class Account < Base
 
         expose(
           :deposit_address,
-          if: ->(account, _options) { account.currency.coin? },
+          if: ->(account, _options) { account.currency.coin? && !Wallet.deposit_wallet(account.currency_id)&.settings&.fetch('enable_intention', false) },
           using: API::V2::Entities::PaymentAddress,
           documentation: {
             desc: 'User deposit address',
@@ -44,6 +44,17 @@ class Account < Base
           wallet = Wallet.deposit_wallet(account.currency_id)
           ::PaymentAddress.find_by(wallet: wallet, member: options[:current_user], remote: false)
         end
+
+        expose(
+          :enable_intention,
+          if: ->(account, _options) { Wallet.deposit_wallet(account.currency_id)&.settings&.fetch('enable_intention', false) },
+          documentation: {
+            desc: 'Show intention form instead of payment address generation',
+            type: JSON
+          }
+        ) do |account, options|
+          true
+        end
       end
     end
   end

app/api/v2/entities/deposit.rb

@@ -73,6 +73,20 @@ class Deposit < Base
           }
         )
 
+        expose(
+          :transfer_links,
+          documentation: {
+            type: JSON,
+            desc: 'Links to p2p page to make deposit transfer',
+            example: -> {
+              [
+                { title: 'telegram', url: 'https://t.me/BTC_STAGE_BOT?start=b_0f8c3db61f223ea9df072fd37e0b6315' },
+                { title: 'web', url: 'https://s-www.lgk.one/p2p/?start=b_0f8c3db61f223ea9df072fd37e0b6315' }
+              ]
+            }
+          },
+          if: ->(deposit) { deposit.transfer_links.present? }
+        )
 
         expose(
           :created_at,

app/api/v2/entities/withdraw.rb

@@ -117,6 +117,23 @@ class Withdraw < Base
             desc: 'The datetime when withdraw was completed'
           }
         )
+
+        expose(
+          :transfer_links,
+          if: ->(withdraw) { withdraw.metadata.has_key? 'links' },
+          documentation: {
+            type: JSON,
+            desc: 'Links to confirm withdraw on external resource',
+            example: -> {
+              [
+                { title: 'telegram', url: 'https://t.me/BTC_STAGE_BOT?start=b_0f8c3db61f223ea9df072fd37e0b6315' },
+                { title: 'web', url: 'https://s-www.lgk.one/p2p/?start=b_0f8c3db61f223ea9df072fd37e0b6315' }
+              ]
+            }
+          }
+        ) do |withdraw|
+          withdraw.metadata['links']
+        end
       end
     end
   end

app/api/v2/helpers.rb

@@ -66,12 +66,6 @@ def trading_must_be_permitted!
         end
       end
 
-      def withdraw_api_must_be_enabled!
-        if ENV.false?('ENABLE_ACCOUNT_WITHDRAWAL_API')
-          error!({ errors: ['account.withdraw.disabled_api'] }, 422)
-        end
-      end
-
       def current_user
         # jwt.payload provided by rack-jwt
         if request.env.key?('jwt.payload')