[B2B-7901] update clients

README.md

@@ -204,6 +204,19 @@ params = Cryptopay::CoinWithdrawalParams.new(
   force_commit: true
 )
 
+result = client.coin_withdrawals.create(params)
+p result # => <CoinWithdrawalResult data=...>
+# New amounts example
+params = Cryptopay::CoinWithdrawalParams.new(
+  address: '2Mz3bcjSVHG8uQJpNjmCxp24VdTjwaqmFcJ',
+  amount: '100.0',
+  amount_currency: 'EUR',
+  received_currency: 'BTC',
+  amount_includes_processing_fee: true,
+  amount_includes_network_fee: true,
+  force_commit: true
+)
+
 result = client.coin_withdrawals.create(params)
 p result # => <CoinWithdrawalResult data=...>
 ```
@@ -402,9 +415,8 @@ p result # => <InvoiceRecalculationResult data=...>
 
 ```ruby
 invoice_id = '7e274430-e20f-4321-8748-20824287ae44'
-invoice_refund_params = Cryptopay::InvoiceRefundParams.new(address: '0xf3532c1fd002665ec54d46a50787e0c69c76cd44')
 
-result = client.invoices.create_refund(invoice_id, invoice_refund_params)
+result = client.invoices.create_refund(invoice_id)
 p result # => <InvoiceRefundResult data=...>
 ```
 

lib/cryptopay/api/coin_withdrawals.rb

@@ -26,7 +26,7 @@ def commit(coin_withdrawal_id, _opts = {})
     end
 
     # Create a withdrawal
-    # To create a withdrawal you need to use either `charged_amount`, `charged_amount_to_send` or `received_amount` parameters in your request body.
+    # To create a withdrawal you must provide either the legacy amount fields (`charged_amount`, `charged_amount_to_send`, `received_amount`) or the new amount fields (`amount`, `amount_currency`, `amount_includes_processing_fee`, `amount_includes_network_fee`). Mixing legacy and new amount fields in one request is not allowed.
     # @param coin_withdrawal_params [CoinWithdrawalParams]
     # @param [Hash] opts the optional parameters
     # @return [CoinWithdrawalResult]

lib/cryptopay/api/invoices.rb

@@ -65,19 +65,19 @@ def create_recalculation(invoice_id, invoice_recalculation_params, _opts = {})
     end
 
     # Create invoice refund
-    # This endpoint allows you to create invoice refunds.
+    # This endpoint allows you to create invoice refunds to your cryptocurrency account.
     # @param invoice_id [String] Invoice ID
-    # @param invoice_refund_params [InvoiceRefundParams]
     # @param [Hash] opts the optional parameters
+    # @option opts [Object] :body
     # @return [InvoiceRefundResult]
-    def create_refund(invoice_id, invoice_refund_params, _opts = {})
+    def create_refund(invoice_id, opts = {})
       path = '/api/invoices/{invoice_id}/refunds'
       path = path.sub('{invoice_id}', CGI.escape(invoice_id.to_s))
 
       req = Request.new(
         method: :post,
         path: path,
-        body_params: invoice_refund_params
+        body_params: opts[:body] || {}
       )
 
       connection.call(req, return_type: InvoiceRefundResult)

lib/cryptopay/models/beneficiary.rb

@@ -40,7 +40,7 @@ def type
       @attributes[:type]
     end
 
-    # The registered name of the company for a `legal_person` or the full name for a `natural_person`.
+    # The registered name of the company for a `legal_person` or the full name for a `natural_person`. Note that only following symbols will be stored, regardless of the input value: letters of any language, digits `0-9`, symbols `&` `!` `,` `.` `-` and single spaces. Symbols `\\`, `/`, newlines and tabs will be replaced with spaces. Everything else will be removed, including double spaces and spaces in the end.
     def name
       @attributes[:name]
     end
@@ -66,11 +66,6 @@ def invalid_properties
         properties.push('invalid value for "name", the character length must be smaller than or equal to 100.')
       end
 
-      pattern = Regexp.new(/^[a-zA-Z0-9\s-]+$/)
-      properties.push("invalid value for \"name\", must conform to the pattern #{pattern}.") if name !~ pattern
-
-      properties.push('invalid value for "address", address cannot be nil.') if address.nil?
-
       address&.invalid_properties&.each do |prop|
         properties.push("invalid value for \"address\": #{prop}")
       end

lib/cryptopay/models/beneficiary_address.rb

@@ -69,9 +69,7 @@ def post_code
     def invalid_properties
       properties = []
 
-      properties.push('invalid value for "country", country cannot be nil.') if country.nil?
-
-      if country.to_s.length > 2
+      if !country.nil? && country.to_s.length > 2
         properties.push('invalid value for "country", the character length must be smaller than or equal to 2.')
       end
 

lib/cryptopay/models/coin_withdrawal_params.rb

@@ -20,7 +20,11 @@ class CoinWithdrawalParams
         'network_fee_level': :network_fee_level,
         'force_commit': :force_commit,
         'travel_rule_compliant': :travel_rule_compliant,
-        'beneficiary': :beneficiary
+        'beneficiary': :beneficiary,
+        'amount': :amount,
+        'amount_currency': :amount_currency,
+        'amount_includes_processing_fee': :amount_includes_processing_fee,
+        'amount_includes_network_fee': :amount_includes_network_fee
       },
       types: {
         'address': :String,
@@ -35,7 +39,11 @@ class CoinWithdrawalParams
         'network_fee_level': :NetworkFeeLevel,
         'force_commit': :Boolean,
         'travel_rule_compliant': :Boolean,
-        'beneficiary': :Beneficiary
+        'beneficiary': :Beneficiary,
+        'amount': :Decimal,
+        'amount_currency': :String,
+        'amount_includes_processing_fee': :Boolean,
+        'amount_includes_network_fee': :Boolean
       },
       nullables: %i[
         charged_amount
@@ -122,6 +130,26 @@ def beneficiary
       @attributes[:beneficiary]
     end
 
+    # Transaction amount for new calculation
+    def amount
+      @attributes[:amount]
+    end
+
+    # An currency of the transaction amount
+    def amount_currency
+      @attributes[:amount_currency]
+    end
+
+    # Whether the amount includes processing fee
+    def amount_includes_processing_fee
+      @attributes[:amount_includes_processing_fee]
+    end
+
+    # Whether the amount includes network fee
+    def amount_includes_network_fee
+      @attributes[:amount_includes_network_fee]
+    end
+
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def invalid_properties

lib/cryptopay/require.rb

@@ -56,7 +56,6 @@
 require 'cryptopay/models/invoice_recalculation_result'
 require 'cryptopay/models/invoice_refund'
 require 'cryptopay/models/invoice_refund_list_result'
-require 'cryptopay/models/invoice_refund_params'
 require 'cryptopay/models/invoice_refund_result'
 require 'cryptopay/models/invoice_result'
 require 'cryptopay/models/invoice_status'

lib/cryptopay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptopay
-  VERSION = '2.2.0'
+  VERSION = '3.0.0'
 end

spec/cryptopay/api/coin_withdrawals_spec.rb

@@ -39,6 +39,19 @@
         force_commit: true
       )
 
+      result = client.coin_withdrawals.create(params)
+      p result # => <CoinWithdrawalResult data=...>
+      # New amounts example
+      params = Cryptopay::CoinWithdrawalParams.new(
+        address: '2Mz3bcjSVHG8uQJpNjmCxp24VdTjwaqmFcJ',
+        amount: '100.0',
+        amount_currency: 'EUR',
+        received_currency: 'BTC',
+        amount_includes_processing_fee: true,
+        amount_includes_network_fee: true,
+        force_commit: true
+      )
+
       result = client.coin_withdrawals.create(params)
       p result # => <CoinWithdrawalResult data=...>
 

spec/cryptopay/api/invoices_spec.rb

@@ -56,9 +56,8 @@
   describe '#create_refund' do
     it 'returns InvoiceRefundResult', :aggregate_failures, vcr: 'api/invoices/create_refund' do
       invoice_id = '7e274430-e20f-4321-8748-20824287ae44'
-      invoice_refund_params = Cryptopay::InvoiceRefundParams.new(address: '0xf3532c1fd002665ec54d46a50787e0c69c76cd44')
 
-      result = client.invoices.create_refund(invoice_id, invoice_refund_params)
+      result = client.invoices.create_refund(invoice_id)
       p result # => <InvoiceRefundResult data=...>
 
       expect(result).to be_a(Cryptopay::InvoiceRefundResult)