From e92624346075d33c772a58a3a5e59ceb856ba7c5 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Fri, 22 Mar 2024 10:00:29 +0000 Subject: [PATCH] chore(release): [ci skip] bump quickstart image to sha256@6891b65dcae9ab479b696a33921a230bdf46f336b23b0a24cac5fb5e4a35b0c1 --- .../apollo-federation/supergraph.graphql | 7 ++++-- quickstart/docker-compose.tmpl.yml | 6 ++--- quickstart/docker-compose.yml | 6 ++--- quickstart/graphql/gql/my-updates-sub.gql | 7 ++++++ .../graphql/gql/real-time-price-sub.gql | 7 ++++++ quickstart/graphql/gql/real-time-price.gql | 22 +++++++++++++++++ .../graphql/schemas/public/schema.graphql | 7 ++++-- quickstart/vendir.lock.yml | 24 +++++++++---------- quickstart/vendir.yml | 6 ++--- quickstart/vendir/values.yml | 2 +- 10 files changed, 68 insertions(+), 26 deletions(-) create mode 100644 quickstart/graphql/gql/real-time-price.gql diff --git a/quickstart/dev/config/apollo-federation/supergraph.graphql b/quickstart/dev/config/apollo-federation/supergraph.graphql index cfc339bc7e..29cac44ffb 100644 --- a/quickstart/dev/config/apollo-federation/supergraph.graphql +++ b/quickstart/dev/config/apollo-federation/supergraph.graphql @@ -1598,7 +1598,9 @@ type Query onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed! = FAST, walletId: WalletId!): OnChainUsdTxFee! @join__field(graph: PUBLIC) onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed! = FAST, walletId: WalletId!): OnChainUsdTxFee! @join__field(graph: PUBLIC) - """Returns 1 Sat and 1 Usd Cent price for the given currency""" + """ + Returns 1 Sat and 1 Usd Cent price for the given currency in minor unit + """ realtimePrice(currency: DisplayCurrency = "USD"): RealtimePrice! @join__field(graph: PUBLIC) userDefaultWalletId(username: Username!): WalletId! @join__field(graph: PUBLIC) @deprecated(reason: "will be migrated to AccountDefaultWalletId") usernameAvailable(username: Username!): Boolean @join__field(graph: PUBLIC) @@ -1631,7 +1633,8 @@ type RealtimePrice @join__type(graph: PUBLIC) { btcSatPrice: PriceOfOneSatInMinorUnit! - denominatorCurrency: DisplayCurrency! + denominatorCurrency: DisplayCurrency! @deprecated(reason: "Deprecated in favor of denominatorCurrencyDetails") + denominatorCurrencyDetails: Currency! id: ID! """ diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml index bdba5c31a4..4ac7cf0df5 100644 --- a/quickstart/docker-compose.tmpl.yml +++ b/quickstart/docker-compose.tmpl.yml @@ -1,8 +1,8 @@ #@ load("@ytt:data", "data") -#@ galoy_api_image_digest = "sha256@f9e01805537dd11c7f0184414f67260c5e210bf621ec9adff2f488e034857a27" -#@ galoy_trigger_image_digest = "sha256@5d4ebed6e9521cc267563d118aed5ab2103cf28d2fa9c2649d68af0a33e0be9b" -#@ mongodb_migrate_image_digest = "sha256@2b5d57b30a708b2de677b5e353c59c19ea9865daec38a2a5ba2b6c94a022a0f2" +#@ galoy_api_image_digest = "sha256@6891b65dcae9ab479b696a33921a230bdf46f336b23b0a24cac5fb5e4a35b0c1" +#@ galoy_trigger_image_digest = "sha256@dfe1dbe3709a1ffc8aea4dbd11adae2e0fad36e0a165b105bad80c5f4ffb3d26" +#@ mongodb_migrate_image_digest = "sha256@987866fa9e8db5399b816978be1db9f8bd2fa41b80b957c2c1bbcbde7e2922b7" #@ galoy_notifications_image_digest = "sha256@21fb3caae150b425142439d6f0c0b8d7c84d63377649c2831cfad3519e4b976b" #@ core_env = [ diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index f7474f965d..4c3fe19840 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -98,7 +98,7 @@ services: - POSTGRES_PASSWORD=secret - POSTGRES_DB=hydra galoy: - image: us.gcr.io/galoy-org/galoy-api@sha256:f9e01805537dd11c7f0184414f67260c5e210bf621ec9adff2f488e034857a27 + image: us.gcr.io/galoy-org/galoy-api@sha256:6891b65dcae9ab479b696a33921a230bdf46f336b23b0a24cac5fb5e4a35b0c1 environment: - HELMREVISION=dev - NETWORK=regtest @@ -161,7 +161,7 @@ services: aliases: - bats-tests trigger: - image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:5d4ebed6e9521cc267563d118aed5ab2103cf28d2fa9c2649d68af0a33e0be9b + image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:dfe1dbe3709a1ffc8aea4dbd11adae2e0fad36e0a165b105bad80c5f4ffb3d26 environment: - HELMREVISION=dev - NETWORK=regtest @@ -254,7 +254,7 @@ services: environment: - MONGO_INITDB_DATABASE=galoy mongodb-migrate: - image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:2b5d57b30a708b2de677b5e353c59c19ea9865daec38a2a5ba2b6c94a022a0f2 + image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:987866fa9e8db5399b816978be1db9f8bd2fa41b80b957c2c1bbcbde7e2922b7 depends_on: - mongodb environment: diff --git a/quickstart/graphql/gql/my-updates-sub.gql b/quickstart/graphql/gql/my-updates-sub.gql index 94297df873..867736cb86 100644 --- a/quickstart/graphql/gql/my-updates-sub.gql +++ b/quickstart/graphql/gql/my-updates-sub.gql @@ -25,6 +25,13 @@ subscription myUpdates { ... on RealtimePrice { id timestamp + denominatorCurrencyDetails { + flag + fractionDigits + id + name + symbol + } denominatorCurrency btcSatPrice { base diff --git a/quickstart/graphql/gql/real-time-price-sub.gql b/quickstart/graphql/gql/real-time-price-sub.gql index 00c13d1b29..e952874cc5 100644 --- a/quickstart/graphql/gql/real-time-price-sub.gql +++ b/quickstart/graphql/gql/real-time-price-sub.gql @@ -6,6 +6,13 @@ subscription realtimePrice($currency: DisplayCurrency!) { realtimePrice { id timestamp + denominatorCurrencyDetails { + flag + fractionDigits + id + name + symbol + } denominatorCurrency btcSatPrice { base diff --git a/quickstart/graphql/gql/real-time-price.gql b/quickstart/graphql/gql/real-time-price.gql new file mode 100644 index 0000000000..6b7e73aa23 --- /dev/null +++ b/quickstart/graphql/gql/real-time-price.gql @@ -0,0 +1,22 @@ +query RealtimePrice($currency: DisplayCurrency) { + realtimePrice(currency: $currency) { + btcSatPrice { + base + offset + } + denominatorCurrencyDetails { + flag + fractionDigits + id + name + symbol + } + denominatorCurrency + id + timestamp + usdCentPrice { + base + offset + } + } +} diff --git a/quickstart/graphql/schemas/public/schema.graphql b/quickstart/graphql/schemas/public/schema.graphql index 441c959c61..8a0da12783 100644 --- a/quickstart/graphql/schemas/public/schema.graphql +++ b/quickstart/graphql/schemas/public/schema.graphql @@ -1235,7 +1235,9 @@ type Query { onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed! = FAST, walletId: WalletId!): OnChainUsdTxFee! onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed! = FAST, walletId: WalletId!): OnChainUsdTxFee! - """Returns 1 Sat and 1 Usd Cent price for the given currency""" + """ + Returns 1 Sat and 1 Usd Cent price for the given currency in minor unit + """ realtimePrice(currency: DisplayCurrency = "USD"): RealtimePrice! userDefaultWalletId(username: Username!): WalletId! @deprecated(reason: "will be migrated to AccountDefaultWalletId") usernameAvailable(username: Username!): Boolean @@ -1260,7 +1262,8 @@ type QuizClaimPayload { type RealtimePrice { btcSatPrice: PriceOfOneSatInMinorUnit! - denominatorCurrency: DisplayCurrency! + denominatorCurrency: DisplayCurrency! @deprecated(reason: "Deprecated in favor of denominatorCurrencyDetails") + denominatorCurrencyDetails: Currency! id: ID! """ diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml index 8303336d91..a540352d97 100644 --- a/quickstart/vendir.lock.yml +++ b/quickstart/vendir.lock.yml @@ -2,27 +2,27 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'refactor(core): move intraledger send locked steps into function - (#4181)...' - sha: d087845ddbb5044c0eede2691c47ccd0b912157b + commitTitle: 'refactor(core): add price currency to real time price query/subscriptions + (#4212)...' + sha: d02c36bd2199d657680875478210faa2a80064a4 tags: - - 0.20.128-2-gd087845dd + - 0.20.129-1-gd02c36bd2 path: ./ path: dev - contents: - git: - commitTitle: 'refactor(core): move intraledger send locked steps into function - (#4181)...' - sha: d087845ddbb5044c0eede2691c47ccd0b912157b + commitTitle: 'refactor(core): add price currency to real time price query/subscriptions + (#4212)...' + sha: d02c36bd2199d657680875478210faa2a80064a4 tags: - - 0.20.128-2-gd087845dd + - 0.20.129-1-gd02c36bd2 path: schemas/ - git: - commitTitle: 'refactor(core): move intraledger send locked steps into function - (#4181)...' - sha: d087845ddbb5044c0eede2691c47ccd0b912157b + commitTitle: 'refactor(core): add price currency to real time price query/subscriptions + (#4212)...' + sha: d02c36bd2199d657680875478210faa2a80064a4 tags: - - 0.20.128-2-gd087845dd + - 0.20.129-1-gd02c36bd2 path: gql/ path: ./graphql kind: LockConfig diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml index 7d7195342b..aeca313673 100644 --- a/quickstart/vendir.yml +++ b/quickstart/vendir.yml @@ -6,7 +6,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: d087845ddbb5044c0eede2691c47ccd0b912157b + ref: d02c36bd2199d657680875478210faa2a80064a4 includePaths: - dev/**/* excludePaths: @@ -18,7 +18,7 @@ directories: - path: schemas/ git: url: https://github.com/GaloyMoney/galoy.git - ref: d087845ddbb5044c0eede2691c47ccd0b912157b + ref: d02c36bd2199d657680875478210faa2a80064a4 includePaths: - core/api/src/graphql/public/schema.graphql - core/api/src/graphql/admin/schema.graphql @@ -26,7 +26,7 @@ directories: - path: gql/ git: url: https://github.com/GaloyMoney/galoy.git - ref: d087845ddbb5044c0eede2691c47ccd0b912157b + ref: d02c36bd2199d657680875478210faa2a80064a4 includePaths: - bats/gql/**/* newRootPath: bats/gql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index 7ac6ea4994..5b6476642e 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,3 @@ #@data/values --- -galoy_git_ref: d087845ddbb5044c0eede2691c47ccd0b912157b +galoy_git_ref: d02c36bd2199d657680875478210faa2a80064a4