cardano_wallet 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e71c5cdb72ca953d4289d8d343e1e769c0cd0cb24f6bc51c8487fd189c7dff2
-  data.tar.gz: 4c4712df87921f80adf52b49db9cb8752f397b9fef31c3dd10fe895e18caa29b
+  metadata.gz: ebc7d4ddc02947d49ab653cfc6e1a86a09ff4e8cf7efb33921a1418a855dc68a
+  data.tar.gz: 187877c6fe0fa07d231676f2140a93e30bf2934e325fa9761df63e72a3c85476
 SHA512:
-  metadata.gz: 515592573f6cdff23f85e26b32430f2913192d04d841dd23f1e1b4c2b5a11c698861f6b5c2039052ce0f6327f82c7c523cf907feb67f8a1a5b3195c1fa27b73c
-  data.tar.gz: 3e8f0e8a30a9eda51a229c202d08adf6d91f7a67a58dbb933f1c50df83182e9b4eb448352ff9e4d5790913ecfe297f753831496807636c5ebac75cd8d065dc45
+  metadata.gz: f4956699eb0dc284137b84f7aa53bc38f2fd6b7bed5e0f7793d6c4ec30b692f3f45160db173c175a2421cc889bb2d1d5861c7c5431dd1f924f38fb3d2e7245a2
+  data.tar.gz: d0d63600ec42d8b59fb4f6f5bdf29e88c5e7aa42209b854d5a3da3cea84994f93dd3df5165ae46dd89ec1581137e7f6dfec779fb8d5b1e5fb1b114be548055c5

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):
@@ -24,11 +24,11 @@ jobs:
       run: bundle install
     - name: Wait until node is synced
       run: bundle exec rake wait_until_node_synced
-    - name: Run all tests
-      run: bundle exec rspec
+    - name: Run all tests (temporarily without nightly)
+      run: bundle exec rspec . -t ~nightly
     env:
       CI: true
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NETWORK: testnet
       WALLET: dev-master-shelley
-      NODE: master
+      NODE: 1.18.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: master
+      NODE: 1.18.0

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/shelley.rb

@@ -195,17 +195,26 @@ 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 [Strin or Array] 'self' or mnemonic sentence
       #
       # @example
-      #   create(wid, passphrase, {addr1: 1000000}, q)
-      def create(wid, passphrase, payments, q = {})
+      #   create(wid, passphrase, {addr1: 1000000}, 'self')
+      def create(wid, passphrase, payments, withdrawal = 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,
+
+        if withdrawal
+          payload = { :payments => payments_formatted,
+                      :passphrase => passphrase,
+                      :withdrawal => withdrawal,
+                    }
+        else
+          payload = { :payments => payments_formatted,
+                      :passphrase => passphrase
+                    }
+        end
+
+        self.class.post("/wallets/#{wid}/transactions",
+        :body => payload.to_json,
         :headers => { 'Content-Type' => 'application/json' } )
       end
 
@@ -214,11 +223,19 @@ module CardanoWallet
       #
       # @example
       #   payment_fees(wid, {addr1: 1000000})
-      def payment_fees(wid, payments, q = {})
+      def payment_fees(wid, payments, withdrawal = nil)
         payments_formatted = Utils.format_payments(payments)
-        q.empty? ? query = '' : query = Utils.to_query(q)
-        self.class.post("/wallets/#{wid}/payment-fees#{query}",
-        :body => { :payments => payments_formatted }.to_json,
+
+        if withdrawal
+          payload = { :payments => payments_formatted,
+                      :withdrawal => withdrawal
+                    }
+        else
+          payload = { :payments => payments_formatted }
+        end
+
+        self.class.post("/wallets/#{wid}/payment-fees",
+        :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.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cardano_wallet
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Piotr Stachyra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty