cardano_wallet 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9ad05abba294de18063a3e1e381ce3e06e95644f4209526eba555f9a2504dae
-  data.tar.gz: 24ee6eeb1fd928c07df71c9e2875fae4b150c6ac564ecfd1775001f1d712468b
+  metadata.gz: d0de7182a62723fefbe32712a08ac13765fe4507ac90969d3b752aff67fb05af
+  data.tar.gz: e6346e28024ce715b14ab9964634f4dc5bf80f7d63526bae0a6c4bc4d2bce22f
 SHA512:
-  metadata.gz: a94ebe1b3dc75ed9da0c3a7da543e607c3228baa1f9f127f09cd8d3f50e37f54dca7c2c6e84176f8ae4f0c8e0933e5c38b6dc536efddc98b5a2b34e5db7c4adf
-  data.tar.gz: '042836808eb65faf1a67f5508dd7ea12fd4b82c61cd6e7d9da8f4cb728fd45e6d9bf96ef1ea1afeedba8fdb56d9e53ff16a49dd08987edf678bd64aeb657708c'
+  metadata.gz: d2e7311a7a4ef549aae1f9fb571f1ccc7e84800b9ffe10b80f08b23586a3e2cadd73aefb3215ad1bef28e5f8f09198323fafb01a4d0f3053770dd27d087f1281
+  data.tar.gz: 3e4df4399289e3772061e4e8e68cae38a58308cbfb837b940af4736e36b1052884791cc641811a3b987307f75075e8df306bd0778683e83acf1479edd760a381

data/.github/workflows/nightly.yml

@@ -3,6 +3,16 @@ name: Nightly
 on:
   schedule:
   - cron:  "0 23 * * *"
+  workflow_dispatch:
+    inputs:
+      nodeTag:
+        description: 'Node tag (docker)'
+        required: true
+        default: '1.24.2'
+      walletTag:
+        description: 'Wallet tag (docker)'
+        required: true
+        default: 'dev-master-shelley'
 
 jobs:
   test:
@@ -11,19 +21,54 @@ 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: Cache node db
+      id: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/node-db-nightly-docker
+        key: ${{ runner.os }}-node-db-nightly-docker-tests-${{ hashFiles('**/protocolMagicId') }}
+
+    - name: Set up cardano-wallet and cardano-node MANUAL
+      if: ${{ github.event.inputs.walletTag != '' && github.event.inputs.nodeTag != ''}}
+      env:
+        WALLET: ${{ github.event.inputs.walletTag }}
+        NODE: ${{ github.event.inputs.nodeTag }}
+      run: |
+        echo "Wallet: $WALLET"
+        echo "Node: $NODE"
+        NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml up --detach
+        docker run --rm inputoutput/cardano-wallet:$WALLET version
+        docker run --rm inputoutput/cardano-node:$NODE version
+        ls ~/node-db-nightly-docker
+
+    - name: Set up cardano-wallet and cardano-node NIGHTLY
+      if: ${{ github.event.inputs.walletTag == '' && github.event.inputs.nodeTag == ''}}
+      run: |
+        echo "Wallet: $WALLET"
+        echo "Node: $NODE"
+        NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml up --detach
+        docker run --rm inputoutput/cardano-wallet:$WALLET version
+        docker run --rm inputoutput/cardano-node:$NODE version
+        ls ~/node-db-nightly-docker
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
+
     - name: Install dependencies
       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: Stop docker-compose
+      run: NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml down
     env:
       CI: true
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NETWORK: testnet
       WALLET: dev-master-shelley
-      NODE: 1.21.1
+      NODE: 1.25.1

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,37 @@ 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: Cache node db
+      id: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/node-db-nightly-docker
+        key: ${{ runner.os }}-node-db-tests-docker-${{ hashFiles('**/protocolMagicId') }}
+
+    - name: Set up cardano-wallet and cardano-node
+      run: |
+        echo "Wallet: $WALLET"
+        echo "Node: $NODE"
+        NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml up --detach
+        docker run --rm inputoutput/cardano-wallet:$WALLET version
+        docker run --rm inputoutput/cardano-node:$NODE version
+        ls ~/node-db-nightly-docker
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
+
     - name: Install dependencies
       run: bundle install
+
     - name: Run all tests except nighlty
-      run: bundle exec rspec . -t ~nightly
+      run: rspec . -t ~nightly
+
+    - name: Stop docker-compose
+      run: NODE_CONFIG_PATH=`pwd`/spec/testnet docker-compose -f docker-compose-shelley.yml down
     env:
       CI: true
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       NETWORK: testnet
       WALLET: dev-master-shelley
-      NODE: 1.21.1
+      NODE: 1.25.1

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', '~> 0.2.8'
+  spec.add_development_dependency 'codecov', '0.2.8'
   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

@@ -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/byron.rb

@@ -39,6 +39,29 @@ 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
+
+    class Assets < Base
+      def initialize opt
+        super
+      end
+
+      # @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
@@ -221,8 +244,14 @@ 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)
+        if payments.any?{|p| p.has_key?("address".to_sym) || p.has_key?("address")}
+          payments_formatted = payments
+        else
+          payments_formatted = Utils.format_payments(payments)
+        end
         self.class.post("/byron-wallets/#{wid}/transactions",
         :body => { :payments => payments_formatted,
                    :passphrase => passphrase
@@ -235,8 +264,13 @@ 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)
+        if payments.any?{|p| p.has_key?("address".to_sym) || p.has_key?("address")}
+          payments_formatted = payments
+        else
+          payments_formatted = Utils.format_payments(payments)
+        end
         self.class.post("/byron-wallets/#{wid}/payment-fees",
         :body => { :payments => payments_formatted }.to_json,
         :headers => { 'Content-Type' => 'application/json' } )

data/lib/cardano_wallet/shelley.rb

@@ -54,6 +54,29 @@ module CardanoWallet
         Keys.new @opt
       end
 
+      # API for Assets
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#tag/Assets
+      def assets
+        Assets.new @opt
+      end
+
+    end
+
+    class Assets < Base
+      def initialize opt
+        super
+      end
+
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/listAssets
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/getAsset
+      # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/getAssetDefault
+      def get(wid, policy_id = nil, asset_name = nil)
+        ep = "/wallets/#{wid}/assets"
+        ep += "/#{policy_id}" if policy_id
+        ep += "/#{asset_name}" if asset_name
+        self.class.get(ep)
+      end
+
     end
 
     class Keys < Base
@@ -77,6 +100,15 @@ module CardanoWallet
         self.class.get("/wallets/#{wid}/keys/#{role}/#{index}")
       end
 
+      # @see https://input-output-hk.github.io/cardano-wallet/api/#operation/postAccountKey
+      def create_acc_public_key(wid, index, pass, extended)
+        payload = { passphrase: pass, extended: extended }
+        self.class.post("/wallets/#{wid}/keys/#{index}",
+                        :body => payload.to_json,
+                        :headers => { 'Content-Type' => 'application/json' }
+                        )
+      end
+
     end
 
     # API for Wallets
@@ -236,15 +268,20 @@ module CardanoWallet
       # @see https://input-output-hk.github.io/cardano-wallet/api/edge/#operation/postTransaction
       # @param wid [String] source wallet id
       # @param passphrase [String] source wallet's passphrase
-      # @param payments [Array of Hashes] addres, amount pair
+      # @param payments [Array of Hashes] address / amount list or full payments payload with assets
       # @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)
       # @param ttl [Int] transaction's time-to-live in seconds
       #
       # @example
       #   create(wid, passphrase, [{addr1: 1000000}, {addr2: 1000000}], 'self', {"1": "abc"}, ttl = 10)
+      #   create(wid, passphrase, [{ "address": "addr1..", "amount": { "quantity": 42000000, "unit": "lovelace" }, "assets": [{"policy_id": "pid", "asset_name": "name", "quantity": 0 } ] } ], 'self', {"1": "abc"}, ttl = 10)
       def create(wid, passphrase, payments, withdrawal = nil, metadata = nil, ttl = nil)
-        payments_formatted = Utils.format_payments(payments)
+        if payments.any?{|p| p.has_key?("address".to_sym) || p.has_key?("address")}
+          payments_formatted = payments
+        else
+          payments_formatted = Utils.format_payments(payments)
+        end
         payload = { :payments => payments_formatted,
                     :passphrase => passphrase
                   }
@@ -262,8 +299,14 @@ module CardanoWallet
       #
       # @example
       #   payment_fees(wid, [{addr1: 1000000}, {addr2: 1000000}], {"1": "abc"}, ttl = 10)
+      #   payment_fees(wid, [{ "address": "addr1..", "amount": { "quantity": 42000000, "unit": "lovelace" }, "assets": [{"policy_id": "pid", "asset_name": "name", "quantity": 0 } ] } ], {"1": "abc"}, ttl = 10)
       def payment_fees(wid, payments, withdrawal = nil, metadata = nil, ttl = nil)
-        payments_formatted = Utils.format_payments(payments)
+        if payments.any?{|p| p.has_key?("address".to_sym) || p.has_key?("address")}
+          payments_formatted = payments
+        else
+          payments_formatted = Utils.format_payments(payments)
+        end
+
         payload = { :payments => payments_formatted }
 
         payload[:withdrawal] = withdrawal if withdrawal

data/lib/cardano_wallet/version.rb

@@ -1,3 +1,3 @@
 module CardanoWallet
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cardano_wallet
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Piotr Stachyra
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -70,14 +70,14 @@ dependencies:
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.8
 - !ruby/object:Gem::Dependency
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper over cardano-wallet.