cardano_wallet 0.2.8 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b83fd4fa4d1a41132d0afb2563a30fe64ff86b69356b45266fe0d044cfe4d0fc
-  data.tar.gz: 5191ea71cb925c5f6241facb477c65fba766d84cf0977716dcd0ad0d05926564
+  metadata.gz: 3e96ef68a97833180203b09137217a2e3667800f2eb13b2131505f93879a3c5e
+  data.tar.gz: 2312bc7afae1647800d0e25e422cf811ee3c94d2d4d97ce45e9662f6dd4d8ccc
 SHA512:
-  metadata.gz: 3671b155b8d5d9ac44df4ed1be0370d266a2b034ae26e15385f3634306c648ba1bacdbe7bda7a4f4fdb93193ed1fe3e4a7cd999cef0b672f8cf049cf4d5e9bf3
-  data.tar.gz: 3ed411e07eb090749898e5a0080fde5e039e2de7c386248d8accdfd12526110fd68e7795b07be7be424f5497446d7ed08d3d3262c5f1eff975e0dfd8c54ca850
+  metadata.gz: 60059be2b38590b8819879ae4c7433478289048db9d4b9a258520c74d8bb0d62e7b05693a1575d6c4bfed18e5b8385425960d2ee0f8bd7bdd3526d8b541c74da
+  data.tar.gz: 22ae9e0ed677b5591c5e6ff1c9a27fc406eb0c7d7df18d73924bb8081d51614c2e9ee4b50f91379de6cffc4a4baf4e8e11b47352235488ea1c278ac70977dcaf

data/.github/workflows/tests.yml

@@ -1,10 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
 name: Tests
 
 on:
@@ -12,6 +5,7 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   test:
@@ -20,17 +14,36 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up cardano-wallet
-      run: NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml up --detach
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
+
     - name: Install dependencies
       run: bundle install
+
+    - name: Run rubocop
+      run: rubocop
+
+    - name: Get recent configs
+      run: bundle exec rake get_latest_configs[testnet]
+
+    - name: Set up cardano-wallet and cardano-node
+      run: |
+        echo "Wallet: $WALLET"
+        echo "Node: $NODE"
+        NODE_CONFIG_PATH=`pwd`/configs docker-compose up --detach
+        docker run --rm inputoutput/cardano-wallet:$WALLET version
+        docker run --rm inputoutput/cardano-node:$NODE version
+        ls ~/node-db-nightly-docker
+
     - name: Run all tests except nighlty
-      run: bundle exec rspec . -t ~nightly
+      run: rake spec
+
+    - name: Stop docker-compose
+      run: NODE_CONFIG_PATH=`pwd`/configs docker-compose down
     env:
       CI: true
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NETWORK: testnet
       WALLET: dev-master-shelley
-      NODE: 1.21.1
+      NODE: 1.25.1

data/.gitignore

@@ -6,6 +6,10 @@
 /pkg/
 /spec/reports/
 /tmp/
+/configs/
+/node_db/
+/wallet_db/
+/binaries/
 
 Gemfile.lock
 

data/.rubocop.yml

@@ -0,0 +1,24 @@
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Max: 10

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cardano_wallet.gemspec
 gemspec

data/README.md

@@ -1,4 +1,5 @@
 
+
 <a href="https://badge.fury.io/rb/cardano_wallet">
   <img src="https://badge.fury.io/rb/cardano_wallet.svg" alt="Gem Version">
 </a>
@@ -11,27 +12,26 @@
 <a href="https://github.com/piotr-iohk/cardano-wallet-rb/actions?query=workflow%3ATests">
   <img src="https://github.com/piotr-iohk/cardano-wallet-rb/workflows/Tests/badge.svg" />
 </a>
-<a href="https://github.com/piotr-iohk/cardano-wallet-rb/actions?query=workflow%3ANightly">
-  <img src="https://github.com/piotr-iohk/cardano-wallet-rb/workflows/Nightly/badge.svg" />
-</a>
+
 
 # cardano-wallet-rb
 
 Ruby wrapper over [cardano-wallet's](https://github.com/input-output-hk/cardano-wallet) REST [API](https://input-output-hk.github.io/cardano-wallet/api/edge/).
 
+## E2E tests
+
+Cardano-wallet-rb is used for e2e testing of [cardano-wallet](https://github.com/input-output-hk/cardano-wallet/test/e2e) against public testnet.
+
+
 ## Installation
 
-Add this line to your application's Gemfile:
+In Gemfile:
 
 ```ruby
 gem 'cardano_wallet'
 ```
 
-And then execute:
-
-    $ bundle install
-
-Or install it yourself as:
+Or:
 
     $ gem install cardano_wallet
 
@@ -43,22 +43,6 @@ For `cardano-wallet` REST Api see: https://input-output-hk.github.io/cardano-wal
 
 ## Usage
 
-### Initialize
-
-```ruby
-# default options
-CW = CardanoWallet.new
-
-# custom options
-CW1 = CardanoWallet.new({port: 8091})
-CW2 = CardanoWallet.new({port: 443,
-                        protocol: "https",
-                        cacert: "/root/ca.cert",
-                        pem: "/root/client.pem"})
-CW3 = CardanoWallet.new({url: "http://localhost:8090/v2"})
-```
-
-### Exercise
 ```ruby
 CW = CardanoWallet.new
 

data/Rakefile

@@ -1,16 +1,36 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'httparty'
+require_relative 'lib/cardano_wallet'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
-require_relative "lib/cardano_wallet"
-task :wait_until_node_synced do
-  desc "Wait for node to be synced"
-  network = CardanoWallet.new.misc.network
-  while network.information["sync_progress"]["status"] == "syncing" do
-    puts "Syncing... #{network.information["sync_progress"]["progress"]["quantity"]}%"
-    sleep 15
+def wget(url, file = nil)
+  file ||= File.basename(url)
+  resp = HTTParty.get(url)
+  File.open(file, 'wb') do |f|
+    f.write(resp.body)
   end
+  puts "#{url} -> #{resp.code}"
+end
+
+def mk_dir(path)
+  Dir.mkdir(path) unless File.exist?(path)
+end
+
+task :get_latest_configs, [:env] do |_, args|
+  puts "\n  >> Get latest configs for '#{args[:env]}'"
+
+  base_url = 'https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1'
+  env = args[:env]
+  path = File.join(Dir.pwd, 'configs')
+  mk_dir(path)
+  wget("#{base_url}/#{env}-config.json", "#{path}/#{env}-config.json")
+  wget("#{base_url}/#{env}-byron-genesis.json", "#{path}/#{env}-byron-genesis.json")
+  wget("#{base_url}/#{env}-shelley-genesis.json", "#{path}/#{env}-shelley-genesis.json")
+  wget("#{base_url}/#{env}-topology.json", "#{path}/#{env}-topology.json")
 end

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "cardano_wallet"
+require 'bundler/setup'
+require 'cardano_wallet'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "cardano_wallet"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/run_all_tests

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+NODE_DB=./node_db \
+WALLET_DB=./wallet_db \
+TOKEN_METADATA=http://metadata-server-mock.herokuapp.com/ \
+bundle exec rake run_on["testnet"]

data/cardano_wallet.gemspec

@@ -1,38 +1,40 @@
+# frozen_string_literal: true
+
 require_relative 'lib/cardano_wallet/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "cardano_wallet"
+  spec.name          = 'cardano_wallet'
   spec.version       = CardanoWallet::VERSION
-  spec.authors       = ["Piotr Stachyra"]
-  spec.email         = ["piotr.stachyra@gmail.com"]
+  spec.authors       = ['Piotr Stachyra']
+  spec.email         = ['piotr.stachyra@gmail.com']
 
-  spec.summary       = %q{Ruby wrapper over cardano-wallet.}
-  spec.description   = %q{Ruby wrapper over cardano-wallet.}
-  spec.homepage      = "https://github.com/piotr-iohk/cardano-wallet-rb"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.summary       = 'Ruby wrapper over cardano-wallet.'
+  spec.description   = 'Ruby wrapper over cardano-wallet.'
+  spec.homepage      = 'https://github.com/piotr-iohk/cardano-wallet-rb'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
-  spec.metadata["allowed_push_host"] = "https://rubygems.org/"
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.homepage
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = spec.homepage
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'httparty', '~> 0.18.0'
 
+  spec.add_development_dependency 'bip_mnemonic', '~> 0.0.4'
+  spec.add_development_dependency 'codecov', '0.2.8'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'bip_mnemonic', '~> 0.0.4'
-  spec.add_development_dependency 'codecov', '~> 0.2.8'
+  spec.add_development_dependency 'rubocop', '~> 1.11'
   spec.add_development_dependency 'simplecov'
-
 end

data/dev

@@ -2,7 +2,7 @@
 
 NETWORK=testnet \
 WALLET=dev-master-shelley \
-NODE=1.20.0 \
+NODE=1.24.2 \
 NODE_CONFIG_PATH=`pwd`/spec/testnet \
 docker-compose -f docker-compose-shelley.yml \
 $1 $2 $3 $4

data/{docker-compose-shelley.yml → docker-compose.yml}

@@ -4,7 +4,7 @@ services:
   cardano-node:
     image: inputoutput/cardano-node:${NODE}
     volumes:
-      - node-db:/data
+      - ~/node-db-nightly-docker:/data
       - node-ipc:/ipc
       - ${NODE_CONFIG_PATH}:/config
     command: run --socket-path /ipc/node.socket --config /config/${NETWORK}-config.json --topology /config/${NETWORK}-topology.json --database-path /data
@@ -22,6 +22,5 @@ services:
     restart: on-failure
 
 volumes:
-  node-db:
   wallet-shelley-db:
   node-ipc:

data/lib/cardano_wallet.rb

@@ -1,12 +1,17 @@
-require "httparty"
+# frozen_string_literal: true
 
-require_relative "cardano_wallet/version"
-require_relative "cardano_wallet/base"
-require_relative "cardano_wallet/utils"
-require_relative "cardano_wallet/shelley"
-require_relative "cardano_wallet/byron"
-require_relative "cardano_wallet/misc"
+require 'httparty'
 
+require_relative 'cardano_wallet/version'
+require_relative 'cardano_wallet/base'
+require_relative 'cardano_wallet/utils'
+require_relative 'cardano_wallet/shelley'
+require_relative 'cardano_wallet/byron'
+require_relative 'cardano_wallet/misc'
+require_relative 'cardano_wallet/shared'
+
+##
+# Main module
 module CardanoWallet
   def self.new(options = {})
     CardanoWallet::Base.new(options)

data/lib/cardano_wallet/base.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 module CardanoWallet
+  ##
+  # Base class for all APIs
   class Base
     include HTTParty
 
     attr_accessor :opt
 
     def initialize(opt = {})
-      raise ArgumentError, "argument should be Hash" unless opt.is_a?(Hash)
+      raise ArgumentError, 'argument should be Hash' unless opt.is_a?(Hash)
 
       opt[:protocol] ||= 'http'
       opt[:host] ||= 'localhost'
@@ -15,15 +19,13 @@ module CardanoWallet
       opt[:pem] ||= ''
       opt[:timeout] ||= -1
       self.class.base_uri opt[:url]
-      unless(opt[:timeout] == -1)
-        self.class.default_timeout(opt[:timeout].to_i)
-      end
+      self.class.default_timeout(opt[:timeout].to_i) unless opt[:timeout] == -1
 
       unless opt[:cacert].empty?
         ENV['SSL_CERT_FILE'] = opt[:cacert]
-        self.class.ssl_ca_file(File.read ENV['SSL_CERT_FILE'])
+        self.class.ssl_ca_file(File.read(ENV['SSL_CERT_FILE']))
       end
-      self.class.pem(File.read opt[:pem]) unless opt[:pem].empty?
+      self.class.pem(File.read(opt[:pem])) unless opt[:pem].empty?
 
       @opt = opt
     end
@@ -33,6 +35,11 @@ module CardanoWallet
       Shelley.new @opt
     end
 
+    # Init API for Shared wallets
+    def shared
+      Shared.new @opt
+    end
+
     # Init API for Byron
     def byron
       Byron.new @opt

data/lib/cardano_wallet/byron.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 module CardanoWallet
+  ##
+  # Byron APIs
   module Byron
-
     def self.new(opt)
       Init.new opt
     end
 
+    ##
+    # Init class for Byron APIs
     class Init < Base
-      def initialize opt
-        super
-      end
-
       # Get API for Byron wallets
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Wallets
       def wallets
@@ -39,19 +40,35 @@ module CardanoWallet
       def migrations
         Migrations.new @opt
       end
+
+      # API for Assets
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Assets
+      def assets
+        Assets.new @opt
+      end
+    end
+
+    ##
+    # Init for Byron assets APIs
+    class Assets < Base
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/listByronAssets
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/getByronAsset
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/getByronAssetDefault
+      def get(wid, policy_id = nil, asset_name = nil)
+        ep = "/byron-wallets/#{wid}/assets"
+        ep += "/#{policy_id}" if policy_id
+        ep += "/#{asset_name}" if asset_name
+        self.class.get(ep)
+      end
     end
 
     # Byron wallets
     # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Wallets
     class Wallets < Base
-      def initialize opt
-        super
-      end
-
       # List Byron wallets
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/listByronWallets
       def list
-        self.class.get("/byron-wallets")
+        self.class.get('/byron-wallets')
       end
 
       # Get Byron wallet details
@@ -67,14 +84,13 @@ module CardanoWallet
       #   create({style: "random",
       #           name: "Random Wallet from mnemonic_sentence",
       #           passphrase: "Secure Passphrase",
-      #           mnemonic_sentence: %w[arctic decade pink easy jar index base bright vast ocean hard pizza],
+      #           mnemonic_sentence: %w[arctic decade pizza ...],
       #          })
       def create(params)
         Utils.verify_param_is_hash!(params)
-        self.class.post( "/byron-wallets",
-                         :body => params.to_json,
-                         :headers => { 'Content-Type' => 'application/json' }
-                        )
+        self.class.post('/byron-wallets',
+                        body: params.to_json,
+                        headers: { 'Content-Type' => 'application/json' })
       end
 
       # Delete Byron wallet
@@ -91,9 +107,8 @@ module CardanoWallet
       def update_metadata(wid, params)
         Utils.verify_param_is_hash!(params)
         self.class.put("/byron-wallets/#{wid}",
-                       :body => params.to_json,
-                       :headers => { 'Content-Type' => 'application/json' }
-                      )
+                       body: params.to_json,
+                       headers: { 'Content-Type' => 'application/json' })
       end
 
       # See Byron wallet's utxo distribution
@@ -110,27 +125,22 @@ module CardanoWallet
       def update_passphrase(wid, params)
         Utils.verify_param_is_hash!(params)
         self.class.put("/byron-wallets/#{wid}/passphrase",
-                       :body => params.to_json,
-                       :headers => { 'Content-Type' => 'application/json' }
-                      )
+                       body: params.to_json,
+                       headers: { 'Content-Type' => 'application/json' })
       end
     end
 
     # Byron addresses
     # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Addresses
     class Addresses < Base
-      def initialize opt
-        super
-      end
-
       # List Byron addresses.
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/listByronAddresses
       #
       # @example
       #   list(wid, {state: "used"})
-      def list(wid, q = {})
-        q.empty? ? query = '' : query = Utils.to_query(q)
-        self.class.get("/byron-wallets/#{wid}/addresses#{query}")
+      def list(wid, query = {})
+        query_formatted = query.empty? ? '' : Utils.to_query(query)
+        self.class.get("/byron-wallets/#{wid}/addresses#{query_formatted}")
       end
 
       # Create address for Byron random wallet.
@@ -144,10 +154,9 @@ module CardanoWallet
       #   create(wid, {passphrase: "Secure Passphrase"})
       def create(wid, params)
         Utils.verify_param_is_hash!(params)
-        self.class.post( "/byron-wallets/#{wid}/addresses",
-                         :body => params.to_json,
-                         :headers => { 'Content-Type' => 'application/json' }
-                        )
+        self.class.post("/byron-wallets/#{wid}/addresses",
+                        body: params.to_json,
+                        headers: { 'Content-Type' => 'application/json' })
       end
 
       # Import address to Byron wallet.
@@ -164,39 +173,38 @@ module CardanoWallet
       # @param addresses [Array] array of addresses
       def bulk_import(wid, addresses)
         self.class.put("/byron-wallets/#{wid}/addresses",
-        :body => { :addresses => addresses
-                 }.to_json,
-        :headers => { 'Content-Type' => 'application/json' } )
+                       body: { addresses: addresses }.to_json,
+                       headers: { 'Content-Type' => 'application/json' })
       end
     end
 
     # API for CoinSelections
     # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Coin-Selections
     class CoinSelections < Base
-      def initialize opt
-        super
-      end
-
       # Show random coin selection for particular payment
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/byronSelectCoins
       #
       # @example
       #   random(wid, [{addr1: 1000000}, {addr2: 1000000}])
+      #   random(wid, [{ "address": "addr1..",
+      #                  "amount": { "quantity": 42000000, "unit": "lovelace" },
+      #                  "assets": [{"policy_id": "pid", "asset_name": "name", "quantity": 0 } ] } ])
       def random(wid, payments)
-        payments_formatted = Utils.format_payments(payments)
+        Utils.verify_param_is_array!(payments)
+        payments_formatted = if payments.any? { |p| p.key?(:address) || p.key?('address') }
+                               payments
+                             else
+                               Utils.format_payments(payments)
+                             end
         self.class.post("/byron-wallets/#{wid}/coin-selections/random",
-                        :body => {:payments => payments_formatted}.to_json,
-                        :headers => { 'Content-Type' => 'application/json' })
+                        body: { payments: payments_formatted }.to_json,
+                        headers: { 'Content-Type' => 'application/json' })
       end
     end
 
     # Byron transactions
     # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postByronTransactionFee
     class Transactions < Base
-      def initialize opt
-        super
-      end
-
       # Get tx by id
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/getByronTransaction
       def get(wid, tx_id)
@@ -208,9 +216,9 @@ module CardanoWallet
       #
       # @example
       #   list(wid, {start: "2012-09-25T10:15:00Z", order: "descending"})
-      def list(wid, q = {})
-        q.empty? ? query = '' : query = Utils.to_query(q)
-        self.class.get("/byron-wallets/#{wid}/transactions#{query}")
+      def list(wid, query = {})
+        query_formatted = query.empty? ? '' : Utils.to_query(query)
+        self.class.get("/byron-wallets/#{wid}/transactions#{query_formatted}")
       end
 
       # Create a transaction from the Byron wallet.
@@ -221,13 +229,21 @@ module CardanoWallet
       #
       # @example
       #   create(wid, passphrase, [{addr1: 1000000}, {addr2: 1000000}])
+      #   create(wid, passphrase, [{ "address": "addr1..",
+      #                              "amount": { "quantity": 42000000, "unit": "lovelace" },
+      #                              "assets": [{"policy_id": "pid", "asset_name": "name", "quantity": 0 } ] } ])
+
       def create(wid, passphrase, payments)
-        payments_formatted = Utils.format_payments(payments)
+        Utils.verify_param_is_array!(payments)
+        payments_formatted = if payments.any? { |p| p.key?(:address) || p.key?('address') }
+                               payments
+                             else
+                               Utils.format_payments(payments)
+                             end
         self.class.post("/byron-wallets/#{wid}/transactions",
-        :body => { :payments => payments_formatted,
-                   :passphrase => passphrase
-                 }.to_json,
-        :headers => { 'Content-Type' => 'application/json' } )
+                        body: { payments: payments_formatted,
+                                passphrase: passphrase }.to_json,
+                        headers: { 'Content-Type' => 'application/json' })
       end
 
       # Estimate fees for transaction
@@ -235,11 +251,19 @@ module CardanoWallet
       #
       # @example
       #   payment_fees(wid, [{addr1: 1000000}, {addr2: 1000000}])
+      #   payment_fees(wid, [{ "address": "addr1..",
+      #                        "amount": { "quantity": 42000000, "unit": "lovelace" },
+      #                        "assets": [{"policy_id": "pid", "asset_name": "name", "quantity": 0 } ] } ])
       def payment_fees(wid, payments)
-        payments_formatted = Utils.format_payments(payments)
+        Utils.verify_param_is_array!(payments)
+        payments_formatted = if payments.any? { |p| p.key?(:address) || p.key?('address') }
+                               payments
+                             else
+                               Utils.format_payments(payments)
+                             end
         self.class.post("/byron-wallets/#{wid}/payment-fees",
-        :body => { :payments => payments_formatted }.to_json,
-        :headers => { 'Content-Type' => 'application/json' } )
+                        body: { payments: payments_formatted }.to_json,
+                        headers: { 'Content-Type' => 'application/json' })
       end
 
       # Forget a transaction.
@@ -252,10 +276,6 @@ module CardanoWallet
     # Byron migrations
     # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Migrations
     class Migrations < Base
-      def initialize opt
-        super
-      end
-
       # Calculate migration cost
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/getByronWalletMigrationInfo
       def cost(wid)
@@ -269,12 +289,10 @@ module CardanoWallet
       # @param [Array] array of addresses
       def migrate(wid, passphrase, addresses)
         self.class.post("/byron-wallets/#{wid}/migrations",
-        :body => { :addresses => addresses,
-                   :passphrase => passphrase
-                 }.to_json,
-        :headers => { 'Content-Type' => 'application/json' } )
+                        body: { addresses: addresses,
+                                passphrase: passphrase }.to_json,
+                        headers: { 'Content-Type' => 'application/json' })
       end
-
     end
   end
 end