Add missing APIs for multi-asset #2489

rvl · 2021-02-04T08:36:58Z

Issue Number

ADP-698

Overview

Adds assets to the responses of the coin selections endpoints.
Adds assets to the /byron-wallets endpoints.

Comments

KtorZ · 2021-02-04T09:28:33Z

@rvl shall we also tackle this quick one at the same time: #2476 (comment)

rvl · 2021-02-04T09:31:43Z

Yes, coming up...

KtorZ · 2021-02-04T09:41:37Z

lib/core/src/Cardano/Wallet/Primitive/Types/TokenMap.hs

@@ -213,6 +215,8 @@ instance PartialOrd TokenMap where
        (getAssets m1 `Set.union` getAssets m2)

 instance NFData TokenMap
+instance Hashable TokenMap where
+    hashWithSalt = hashUsing (Map.toList . unTokenMap)


Can't GeneralizedNewtypeDeriving or DerivingVia handle that just fine 🤔 ?

It didn't seem to work - I think perhaps Map didn't have a Hashable instance.

KtorZ · 2021-02-04T09:42:12Z

specifications/api/swagger.yaml

@@ -996,6 +996,7 @@ x-transactionResolvedInputs: &transactionResolvedInputs
    properties:
      address: *addressId
      amount: *amount
+      assets: *walletAssets


KtorZ

👌

KtorZ · 2021-02-04T11:56:44Z

lib/core/src/Cardano/Wallet/Api.hs

+    :> Capture "walletId" (ApiT WalletId)
+    :> "assets"
+    :> Capture "policyId" (ApiT TokenPolicyId)
+    :> Get '[JSON] ApiAsset


rvl · 2021-02-04T12:22:20Z

bors r+

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments Co-authored-by: Rodney Lorrimar <[email protected]>

iohk-bors · 2021-02-04T12:58:44Z

Build failed:

buildkite/cardano-wallet

== Section test:integration ==
--
  | Redundant build-depends entry
  | * unordered-containers

#expected

piotr-iohk · 2021-02-04T13:00:24Z

As far as I see assets are now present on inputs and outputs on the coin selection response, but they are not on change. Should there be on change too @rvl?

Exemplary response:

{
  "inputs": [
    {
      "amount": {
        "quantity": 353684111,
        "unit": "lovelace"
      },
      "address": "addr_test1qzvw02vau2jf8vmwav657w5j9grstsx3sp4cgnqh9agnz48l0dw5r75vk42mv3ykq8vyjeaanvpytg79xqzymqy5acmqy0h2p9",
      "id": "b2c4b2725a1cbe6a46b843368f525b87d3a4e1388834a18b39f2d0db7d5c069e",
      "derivation_path": [
        "1852H",
        "1815H",
        "0H",
        "1",
        "287"
      ],
      "assets": [
        {
          "asset_name": "6861707079636f696e",
          "quantity": 4000,
          "policy_id": "789ef8ae89617f34c07f7f6a12e4d65146f958c0bc15a97b4ff169f1"
        },
        {
          "asset_name": "7375706572636f696e",
          "quantity": 4000,
          "policy_id": "789ef8ae89617f34c07f7f6a12e4d65146f958c0bc15a97b4ff169f1"
        }
      ],
      "index": 3
    }
  ],
  "deposits": [],
  "change": [
    {
      "amount": {
        "quantity": 351505014,
        "unit": "lovelace"
      },
      "address": "addr_test1qqes885m0524cgxk84awhlhp38qf9q2p9c6t99zs0smdy3ll0dw5r75vk42mv3ykq8vyjeaanvpytg79xqzymqy5acmqx4x7rl",
      "derivation_path": [
        "1852H",
        "1815H",
        "0H",
        "1",
        "288"
      ]
    }
  ],
  "outputs": [
    {
      "amount": {
        "quantity": 2000000,
        "unit": "lovelace"
      },
      "address": "37btjrVyb4KF6KtvXYUxDHqjAwfKAuDzP71UEuG6vh87rjstvB8o1Muu6KaeGAF8xZro63Zc5VAYNnQtcci4vT8jhLuNtwku9x1YgS18LHFAhxxTi8",
      "assets": [
        {
          "asset_name": "6861707079636f696e",
          "quantity": 1000,
          "policy_id": "789ef8ae89617f34c07f7f6a12e4d65146f958c0bc15a97b4ff169f1"
        },
        {
          "asset_name": "7375706572636f696e",
          "quantity": 1000,
          "policy_id": "789ef8ae89617f34c07f7f6a12e4d65146f958c0bc15a97b4ff169f1"
        }
      ]
    }
  ]
}

rvl · 2021-02-04T15:10:42Z

Ah yes ... fixed now. I think that's the last one.

ApiTransaction doesn't have an assets field corresponding to the amount field, but that's a known limitation (ADP-683).

rvl · 2021-02-05T04:40:32Z

bors r+

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments Co-authored-by: Rodney Lorrimar <[email protected]>

rvl · 2021-02-05T06:28:08Z

bors retry

iohk-bors · 2021-02-05T06:28:10Z

Already running a review

rvl · 2021-02-05T06:31:06Z

bors r-

iohk-bors · 2021-02-05T06:31:08Z

Canceled.

(The integration tests were failing on macOS - really slowly.)

rvl · 2021-02-05T06:31:13Z

bors r+

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments Co-authored-by: Rodney Lorrimar <[email protected]>

iohk-bors · 2021-02-05T07:20:58Z

Build failed:

ci/hydra-build:required

     TRACE /wallets/0000000000000000000000000000000000000000/statistics/utxos
     OPTIONS /wallets/0000000000000000000000000000000000000000/statistics/utxos
     PUT /wallets/0000000000000000000000000000000000000000/transactions
     PATCH /wallets/0000000000000000000000000000000000000000/transactions
     DELETE /wallets/0000000000000000000000000000000000000000/transactions
building of '/nix/store/pvlwybm8741ir5lzpqb4vwfij4b7mx76-cardano-wallet-core-test-unit-2021.1.28-check' timed out after 900 seconds of silence

#2472

So that a set of token bundles can be compared.

rvl · 2021-02-05T11:37:57Z

bors r+

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments 2492: API: get and list only assets associated with the wallet r=rvl a=rvl ### Issue Number ADP-603 / ADP-604 ### Overview - The list assets endpoint now returns all assets of the wallet, not just available assets. - The get asset endpoint checks that the asset id really is associated with the wallet. 2493: Let tests and cluster run in pre-mary eras again r=rvl a=rvl ### Issue Number ADP-695 ### Overview Conditionally fund the assets faucet based on era. Co-authored-by: Rodney Lorrimar <[email protected]>

iohk-bors · 2021-02-05T12:12:37Z

Build failed (retrying...):

buildkite/cardano-wallet

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments Co-authored-by: Rodney Lorrimar <[email protected]>

iohk-bors · 2021-02-05T13:33:25Z

Build failed:

buildkite/cardano-wallet

src/Test/Integration/Scenario/API/Shelley/Addresses.hs:96:5:
--
  | 1) API Specifications, SHELLEY_ADDRESSES, BYRON_ADDRESS_LIST - Byron wallet on Shelley ep
  | uncaught exception: ProcessHasExited
  | ProcessHasExited "cluster didn't start correctly: [Left user error (Waited too long for: pool registration),Left user error (Waited too long for: pool registration),Left user error (Waited too long for: pool registration),Left user error (Waited too long for: pool registration)]" (ExitFailure 1)
  |  
  | To rerun use: --match "/API Specifications/SHELLEY_ADDRESSES/BYRON_ADDRESS_LIST - Byron wallet on Shelley ep/"
  |  
  | 2) afterAll-hook
  | uncaught exception: ResultStatus
  | Pending Nothing (Just "exception in beforeAll-hook (see previous failure)")
  |  
  | To rerun use: --match "/afterAll-hook/"
  |

rvl · 2021-02-06T02:56:56Z

bors r+

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments 2492: API: get and list only assets associated with the wallet r=rvl a=rvl ### Issue Number ADP-603 / ADP-604 ### Overview - The list assets endpoint now returns all assets of the wallet, not just available assets. - The get asset endpoint checks that the asset id really is associated with the wallet. 2493: Let tests and cluster run in pre-mary eras again r=rvl a=rvl ### Issue Number ADP-695 ### Overview Conditionally fund the assets faucet based on era. Co-authored-by: Rodney Lorrimar <[email protected]>

iohk-bors · 2021-02-06T04:59:44Z

Build failed (retrying...):

ci/hydra-build:required

#2467

2489: Add missing APIs for multi-asset r=rvl a=rvl ## Issue Number ADP-698 ## Overview - Adds assets to the responses of the coin selections endpoints. - Adds assets to the `/byron-wallets` endpoints. ## Comments Co-authored-by: Rodney Lorrimar <[email protected]>

iohk-bors · 2021-02-06T06:27:09Z

Build failed:

ci/hydra-build:required

#2472

     PUT /wallets/0000000000000000000000000000000000000000/statistics/utxos
     POST /wallets/0000000000000000000000000000000000000000/statistics/utxos
     PATCH /wallets/0000000000000000000000000000000000000000/statistics/utxos
     DELETE /wallets/0000000000000000000000000000000000000000/statistics/utxos
     CONNECT /wallets/0000000000000000000000000000000000000000/statistics/utxos
     TRACE /wallets/0000000000000000000000000000000000000000/statistics/utxos
     OPTIONS /wallets/0000000000000000000000000000000000000000/statistics/utxos
     PUT /wallets/0000000000000000000000000000000000000000/transactions
     PATCH /wallets/0000000000000000000000000000000000000000/transactions
     DELETE /wallets/0000000000000000000000000000000000000000/transactions
building of '/nix/store/5qpdb8ap9d1hf1x4y8nkhwfnd73x0apc-cardano-wallet-core-test-unit-2021.1.28-check' timed out after 900 seconds of silence

KtorZ · 2021-02-08T08:51:13Z

bors retry

iohk-bors · 2021-02-08T09:53:26Z

Build succeeded:

rvl self-assigned this Feb 4, 2021

rvl force-pushed the rvl/adp-698/ma-missing-apis branch from d870ffc to 0ff5654 Compare February 4, 2021 08:41

KtorZ reviewed Feb 4, 2021

View reviewed changes

KtorZ approved these changes Feb 4, 2021

View reviewed changes

KtorZ reviewed Feb 4, 2021

View reviewed changes

rvl force-pushed the rvl/adp-698/ma-missing-apis branch from 98a29bc to 1839acd Compare February 4, 2021 12:14

rvl requested a review from piotr-iohk February 4, 2021 12:19

rvl force-pushed the rvl/adp-698/ma-missing-apis branch from 64b0955 to 46f3009 Compare February 4, 2021 15:10

rvl added 5 commits February 5, 2021 19:33

swagger.yaml: Add assets to transaction inputs for coin selection

22eaf1a

API: Add assets to coin selection endpoints

20f3f6c

Add instance TokenBundle Hashable

4189935

So that a set of token bundles can be compared.

Update coin selection integration tests for new assets field

f2b6a93

Regenerate nix

f89f67d

rvl added 5 commits February 5, 2021 19:35

swagger.yaml: Add list/get assets endpoints to byron-wallets

2dda170

API: Add ByronAssets handlers

ca799c6

swagger: add assets to coin selection change

40e81f6

API: add assets to coin selection change

72d4be6

Regenerate API golden tests JSON

b458c8c

rvl force-pushed the rvl/adp-698/ma-missing-apis branch from 46f3009 to b458c8c Compare February 5, 2021 11:35

iohk-bors bot merged commit b301e3a into master Feb 8, 2021

iohk-bors bot deleted the rvl/adp-698/ma-missing-apis branch February 8, 2021 09:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add missing APIs for multi-asset #2489

Add missing APIs for multi-asset #2489

rvl commented Feb 4, 2021 •

edited

Loading

KtorZ commented Feb 4, 2021

rvl commented Feb 4, 2021

KtorZ Feb 4, 2021

rvl Feb 4, 2021

KtorZ Feb 4, 2021

KtorZ left a comment

KtorZ Feb 4, 2021

rvl commented Feb 4, 2021

iohk-bors bot commented Feb 4, 2021 •

edited by Anviking

Loading

piotr-iohk commented Feb 4, 2021 •

edited

Loading

rvl commented Feb 4, 2021

rvl commented Feb 5, 2021

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021 •

edited by rvl

Loading

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021 •

edited by Anviking

Loading

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021 •

edited by Anviking

Loading

rvl commented Feb 6, 2021

iohk-bors bot commented Feb 6, 2021 •

edited by KtorZ

Loading

iohk-bors bot commented Feb 6, 2021 •

edited by Anviking

Loading

KtorZ commented Feb 8, 2021

iohk-bors bot commented Feb 8, 2021

Add missing APIs for multi-asset #2489

Add missing APIs for multi-asset #2489

Conversation

rvl commented Feb 4, 2021 • edited Loading

Issue Number

Overview

Comments

KtorZ commented Feb 4, 2021

rvl commented Feb 4, 2021

KtorZ Feb 4, 2021

Choose a reason for hiding this comment

rvl Feb 4, 2021

Choose a reason for hiding this comment

KtorZ Feb 4, 2021

Choose a reason for hiding this comment

KtorZ left a comment

Choose a reason for hiding this comment

KtorZ Feb 4, 2021

Choose a reason for hiding this comment

rvl commented Feb 4, 2021

iohk-bors bot commented Feb 4, 2021 • edited by Anviking Loading

piotr-iohk commented Feb 4, 2021 • edited Loading

rvl commented Feb 4, 2021

rvl commented Feb 5, 2021

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021 • edited by rvl Loading

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021 • edited by Anviking Loading

rvl commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021

iohk-bors bot commented Feb 5, 2021 • edited by Anviking Loading

rvl commented Feb 6, 2021

iohk-bors bot commented Feb 6, 2021 • edited by KtorZ Loading

iohk-bors bot commented Feb 6, 2021 • edited by Anviking Loading

KtorZ commented Feb 8, 2021

iohk-bors bot commented Feb 8, 2021

rvl commented Feb 4, 2021 •

edited

Loading

iohk-bors bot commented Feb 4, 2021 •

edited by Anviking

Loading

piotr-iohk commented Feb 4, 2021 •

edited

Loading

iohk-bors bot commented Feb 5, 2021 •

edited by rvl

Loading

iohk-bors bot commented Feb 5, 2021 •

edited by Anviking

Loading

iohk-bors bot commented Feb 5, 2021 •

edited by Anviking

Loading

iohk-bors bot commented Feb 6, 2021 •

edited by KtorZ

Loading

iohk-bors bot commented Feb 6, 2021 •

edited by Anviking

Loading