cardano_wallet 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df0d8f6569ab3be773efe025fa14ec11e90fdfc9a51a08817182ec99de86eaec
-  data.tar.gz: 4ce00832c57f2afea0c2019d7772f8037b5fb4523e1f8f3be5aa3dfb4040a6d6
+  metadata.gz: 00a386b2276f8b8373cd9a89cebdba30a5f151c2b32cee0ae3d8915a6daee980
+  data.tar.gz: 10094b3fb16e9c9e71e61409a314b06d94dd140c01f79641e8bce9dafa21fccc
 SHA512:
-  metadata.gz: 97f5be475f2b18c6344e619fb33866a41d0449baf6801820aacc3123a0390195d4ed29a3d253b9b4e9004c6cd96246100a4b9df4a7ec54cb7e4ace3e37beeac8
-  data.tar.gz: e38d3564c8d28a01cc585ffbf3bf38d061f498301f26c1464aa9703bc927f18230af5bd3dbd27600a2b27b91a6dadc4059b6c91875a2dd2394951ded48af8cc2
+  metadata.gz: ff0b9ac1b5071acee4be8ad9830adbe082fb01587e4593fa868ed7dd47552609e04ed3a382a47abedba658340a4cad4e25506ad9f0db73e6b6f7f35fe23621a8
+  data.tar.gz: 19e1aad7916ec508822a48e1ac38996236874236c8d7849754fed3922444bae0396c955d62a4a06a11e4aafefbeb33b494035c5e9026aefa36a5885a7d3495ca

data/.github/workflows/nightly.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up cardano-wallet
-      run: NODE_CONFIG_PATH=`pwd`/spec/shelley-testnet docker-compose -f docker-compose-shelley.yml up --detach
+      run: NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml up --detach
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
@@ -25,10 +25,10 @@ jobs:
     - name: Wait until node is synced
       run: bundle exec rake wait_until_node_synced
     - name: Run all tests
-      run: bundle exec rspec
+      run: bundle exec rspec .
     env:
       CI: true
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NETWORK: testnet
       WALLET: dev-master-shelley
-      NODE: 1.14.2
+      NODE: 1.20.0

data/.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up cardano-wallet
-      run: NODE_CONFIG_PATH=`pwd`/spec/shelley-testnet docker-compose -f docker-compose-shelley.yml up --detach
+      run: NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml up --detach
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):
@@ -38,4 +38,4 @@ jobs:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NETWORK: testnet
       WALLET: dev-master-shelley
-      NODE: 1.14.2
+      NODE: 1.20.0

data/cardano_wallet.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   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'
+  spec.add_development_dependency 'codecov', '~> 0.2.8'
   spec.add_development_dependency 'simplecov'
 
 end

data/dev

@@ -1 +1 @@
-NETWORK=testnet WALLET=dev-master-byron NODE=master docker-compose $1
+NETWORK=testnet WALLET=dev-master-shelley NODE=1.19.1 NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml $1

data/docker-compose-shelley.yml

@@ -7,7 +7,7 @@ services:
       - node-db:/data
       - node-ipc:/ipc
       - ${NODE_CONFIG_PATH}:/config
-    command: run --socket-path /ipc/node.socket --config /config/shelley_testnet-config.json --topology /config/shelley_testnet-topology.json --database-path /data
+    command: run --socket-path /ipc/node.socket --config /config/${NETWORK}-config.json --topology /config/${NETWORK}-topology.json --database-path /data
     restart: on-failure
 
   cardano-wallet:
@@ -18,7 +18,7 @@ services:
       - ${NODE_CONFIG_PATH}:/config
     ports:
       - 8090:8090
-    command: serve --testnet /config/shelley_testnet-genesis.json --node-socket /ipc/node.socket --database /wallet-db --listen-address 0.0.0.0
+    command: serve --testnet /config/${NETWORK}-byron-genesis.json --node-socket /ipc/node.socket --database /wallet-db --listen-address 0.0.0.0
     restart: on-failure
 
 volumes:

data/lib/cardano_wallet.rb

@@ -6,7 +6,6 @@ require_relative "cardano_wallet/utils"
 require_relative "cardano_wallet/shelley"
 require_relative "cardano_wallet/byron"
 require_relative "cardano_wallet/misc"
-require_relative "cardano_wallet/proxy"
 
 module CardanoWallet
   def self.new(options = {})

data/lib/cardano_wallet/base.rb

@@ -13,7 +13,11 @@ module CardanoWallet
       opt[:url] ||= "#{opt[:protocol]}://#{opt[:host]}:#{opt[:port]}/v2"
       opt[:cacert] ||= ''
       opt[:pem] ||= ''
+      opt[:timeout] ||= -1
       self.class.base_uri opt[:url]
+      unless(opt[:timeout] == -1)
+        self.class.default_timeout(opt[:timeout].to_i)
+      end
 
       unless opt[:cacert].empty?
         ENV['SSL_CERT_FILE'] = opt[:cacert]

data/lib/cardano_wallet/byron.rb

@@ -22,6 +22,12 @@ module CardanoWallet
         Addresses.new @opt
       end
 
+      # API for CoinSelections
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Byron-Coin-Selections
+      def coin_selections
+        CoinSelections.new @opt
+      end
+
       # Get API for Byron transactions
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postByronTransactionFee
       def transactions
@@ -152,6 +158,36 @@ module CardanoWallet
         self.class.put("/byron-wallets/#{wid}/addresses/#{addr_id}")
       end
 
+      # Import addresses to Byron wallet.
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/importAddresses
+      # @param wid [String] wallet id
+      # @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' } )
+      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, {address1: 123, address2: 456})
+      def random(wid, payments)
+        payments_formatted = Utils.format_payments(payments)
+        self.class.post("/byron-wallets/#{wid}/coin-selections/random",
+                        :body => {:payments => payments_formatted}.to_json,
+                        :headers => { 'Content-Type' => 'application/json' })
+      end
     end
 
     # Byron transactions

data/lib/cardano_wallet/misc.rb

@@ -15,6 +15,16 @@ module CardanoWallet
       def network
         Network.new @opt
       end
+
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Utils
+      def utils
+        Utils.new @opt
+      end
+
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Proxy
+      def proxy
+        Proxy.new @opt
+      end
     end
 
     # API for Network
@@ -43,5 +53,34 @@ module CardanoWallet
       end
 
     end
+
+    # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Utils
+    class Utils < Base
+      def initialize opt
+        super
+      end
+
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/inspectAddress
+      def addresses(address_id)
+        self.class.get("/addresses/#{address_id}")
+      end
+
+    end
+
+    # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Proxy
+    class Proxy < Base
+      def initialize opt
+        super
+      end
+
+      # Submit a transaction that was created and signed outside of cardano-wallet.
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postExternalTransaction
+      # @param binary_blob [String] Signed transaction message binary blob.
+      def submit_external_transaction(binary_blob)
+        self.class.post("/proxy/transactions",
+                        :body => binary_blob,
+                        :headers => { 'Content-Type' => 'application/octet-stream' })
+      end
+    end
   end
 end

data/lib/cardano_wallet/shelley.rb

@@ -195,17 +195,21 @@ module CardanoWallet
       # @param wid [String] source wallet id
       # @param passphrase [String] source wallet's passphrase
       # @param payments [Hash] addres, amount pair
-      # @param q [Hash] query param (currently only withdrawRewards = true | false)
+      # @param withdrawal [String or Array] 'self' or mnemonic sentence
+      # @param metadata [Hash] special metadata JSON subset format (cf: https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postTransaction)
       #
       # @example
-      #   create(wid, passphrase, {addr1: 1000000}, q)
-      def create(wid, passphrase, payments, q = {})
+      #   create(wid, passphrase, {addr1: 1000000}, 'self', {"1": "abc"})
+      def create(wid, passphrase, payments, withdrawal = nil, metadata = nil)
         payments_formatted = Utils.format_payments(payments)
-        q.empty? ? query = '' : query = Utils.to_query(q)
-        self.class.post("/wallets/#{wid}/transactions#{query}",
-        :body => { :payments => payments_formatted,
-                   :passphrase => passphrase
-                 }.to_json,
+        payload = { :payments => payments_formatted,
+                    :passphrase => passphrase
+                  }
+        payload[:withdrawal] = withdrawal if withdrawal
+        payload[:metadata] = metadata if metadata
+
+        self.class.post("/wallets/#{wid}/transactions",
+        :body => payload.to_json,
         :headers => { 'Content-Type' => 'application/json' } )
       end
 
@@ -213,11 +217,16 @@ module CardanoWallet
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postTransactionFee
       #
       # @example
-      #   payment_fees(wid, {addr1: 1000000})
-      def payment_fees(wid, payments)
+      #   payment_fees(wid, {addr1: 1000000}, {"1": "abc"})
+      def payment_fees(wid, payments, withdrawal = nil, metadata = nil)
         payments_formatted = Utils.format_payments(payments)
+        payload = { :payments => payments_formatted }
+
+        payload[:withdrawal] = withdrawal if withdrawal
+        payload[:metadata] = metadata if metadata
+
         self.class.post("/wallets/#{wid}/payment-fees",
-        :body => { :payments => payments_formatted }.to_json,
+        :body => payload.to_json,
         :headers => { 'Content-Type' => 'application/json' } )
       end
 

data/lib/cardano_wallet/version.rb

@@ -1,3 +1,3 @@
 module CardanoWallet
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cardano_wallet
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Stachyra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -70,16 +70,16 @@ dependencies:
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,6 @@ files:
 - lib/cardano_wallet/base.rb
 - lib/cardano_wallet/byron.rb
 - lib/cardano_wallet/misc.rb
-- lib/cardano_wallet/proxy.rb
 - lib/cardano_wallet/shelley.rb
 - lib/cardano_wallet/utils.rb
 - lib/cardano_wallet/version.rb

data/lib/cardano_wallet/proxy.rb

@@ -1,26 +0,0 @@
-module CardanoWallet
-  module Proxy
-
-    # Call API for Proxy
-    # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Proxy
-    def self.new(opt)
-      Init.new opt
-    end
-
-    class Init < Base
-      def initialize opt
-        super
-      end
-
-      # Submit a transaction that was created and signed outside of cardano-wallet.
-      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postExternalTransaction
-      # @param binary_blob [String] Signed transaction message binary blob.
-      def submit_external_transaction(binary_blob)
-        self.class.post("/proxy/transactions",
-                        :body => binary_blob,
-                        :headers => { 'Content-Type' => 'application/octet-stream' })
-      end
-    end
-
-  end
-end