From 640bb2827c9fbe18ed810f83683bfa1ff0f7a9e2 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Thu, 14 Sep 2023 10:48:02 +0000 Subject: [PATCH] chore(release): [ci skip] bump quickstart image to sha256@f38bfca8c99524efe09c06d4a667be0af10ed7ece8c8702b503bf8d6bf30afe2 --- .../dev/apollo-federation/supergraph.graphql | 18 +++--------------- quickstart/docker-compose.tmpl.yml | 4 ++-- quickstart/docker-compose.yml | 6 +++--- .../dev/apollo-federation/supergraph.graphql | 18 +++--------------- quickstart/graphql/public/schema.graphql | 17 +++-------------- quickstart/vendir.lock.yml | 18 +++++++++--------- quickstart/vendir.yml | 6 +++--- quickstart/vendir/values.yml | 2 +- 8 files changed, 27 insertions(+), 62 deletions(-) diff --git a/quickstart/dev/apollo-federation/supergraph.graphql b/quickstart/dev/apollo-federation/supergraph.graphql index 185834839e..e0fe1a6a2e 100644 --- a/quickstart/dev/apollo-federation/supergraph.graphql +++ b/quickstart/dev/apollo-federation/supergraph.graphql @@ -978,7 +978,6 @@ input OnChainPaymentSendAllInput address: OnChainAddress! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -989,7 +988,6 @@ input OnChainPaymentSendInput amount: SatAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -997,7 +995,6 @@ type OnChainTxFee @join__type(graph: PUBLIC) { amount: SatAmount! - targetConfirmations: TargetConfirmations! @deprecated(reason: "Ignored - will be removed") } scalar OnChainTxHash @@ -1021,7 +1018,6 @@ input OnChainUsdPaymentSendAsBtcDenominatedInput amount: SatAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -1032,7 +1028,6 @@ input OnChainUsdPaymentSendInput amount: CentAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -1040,7 +1035,6 @@ type OnChainUsdTxFee @join__type(graph: PUBLIC) { amount: CentAmount! - targetConfirmations: TargetConfirmations! @deprecated(reason: "Ignored - will be removed") } type OneDayAccountLimit implements AccountLimit @@ -1232,9 +1226,9 @@ type Query lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! me: User mobileVersions: [MobileVersions] - onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainTxFee! - onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainUsdTxFee! - onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainUsdTxFee! + onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainTxFee! + onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainUsdTxFee! + onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainUsdTxFee! quizQuestions: [QuizQuestion] @deprecated(reason: "TODO: remove. we don't need a non authenticated version of this query. the users can only do the query while authenticated") """Returns 1 Sat and 1 Usd Cent price for the given currency""" @@ -1380,12 +1374,6 @@ type SuccessPayload success: Boolean } -""" -(Positive) Number of blocks in which the transaction is expected to be confirmed -""" -scalar TargetConfirmations - @join__type(graph: PUBLIC) - """ Timestamp field, serialized as Unix time (the number of seconds since the Unix epoch) """ diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml index c404cf4c1f..2a67cac576 100644 --- a/quickstart/docker-compose.tmpl.yml +++ b/quickstart/docker-compose.tmpl.yml @@ -1,7 +1,7 @@ #@ load("@ytt:data", "data") -#@ galoy_image_digest = "sha256@ecad22fd1c8aeff1b923417030bc2a7ff8465999f6e4df6268f310a31d33d99b" -#@ mongodb_migrate_image_digest = "sha256@6c3057464d055409a2f7038c44e9b763c06cc66635cc55d459be0c5cdcd4616d" +#@ galoy_image_digest = "sha256@f38bfca8c99524efe09c06d4a667be0af10ed7ece8c8702b503bf8d6bf30afe2" +#@ mongodb_migrate_image_digest = "sha256@538df30b195c7b89e54c42f3a892257d00962e22314e604b56b2f3041874a2d7" version: #@ data.values.version services: diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 58de1745a1..07232d9b41 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -64,7 +64,7 @@ services: - POSTGRES_PASSWORD=secret - POSTGRES_DB=default galoy: - image: us.gcr.io/galoy-org/galoy-app@sha256:ecad22fd1c8aeff1b923417030bc2a7ff8465999f6e4df6268f310a31d33d99b + image: us.gcr.io/galoy-org/galoy-app@sha256:f38bfca8c99524efe09c06d4a667be0af10ed7ece8c8702b503bf8d6bf30afe2 command: - -r - /app/lib/services/tracing.js @@ -86,7 +86,7 @@ services: aliases: - bats-tests trigger: - image: us.gcr.io/galoy-org/galoy-app@sha256:ecad22fd1c8aeff1b923417030bc2a7ff8465999f6e4df6268f310a31d33d99b + image: us.gcr.io/galoy-org/galoy-app@sha256:f38bfca8c99524efe09c06d4a667be0af10ed7ece8c8702b503bf8d6bf30afe2 command: - -r - /app/lib/services/tracing.js @@ -111,7 +111,7 @@ services: - MONGO_INITDB_DATABASE=galoy - MONGODB_ADVERTISED_HOSTNAME=127.0.0.1 mongodb-migrate: - image: us.gcr.io/galoy-org/galoy-app-migrate@sha256:6c3057464d055409a2f7038c44e9b763c06cc66635cc55d459be0c5cdcd4616d + image: us.gcr.io/galoy-org/galoy-app-migrate@sha256:538df30b195c7b89e54c42f3a892257d00962e22314e604b56b2f3041874a2d7 depends_on: - mongodb environment: diff --git a/quickstart/galoy/dev/apollo-federation/supergraph.graphql b/quickstart/galoy/dev/apollo-federation/supergraph.graphql index 185834839e..e0fe1a6a2e 100644 --- a/quickstart/galoy/dev/apollo-federation/supergraph.graphql +++ b/quickstart/galoy/dev/apollo-federation/supergraph.graphql @@ -978,7 +978,6 @@ input OnChainPaymentSendAllInput address: OnChainAddress! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -989,7 +988,6 @@ input OnChainPaymentSendInput amount: SatAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -997,7 +995,6 @@ type OnChainTxFee @join__type(graph: PUBLIC) { amount: SatAmount! - targetConfirmations: TargetConfirmations! @deprecated(reason: "Ignored - will be removed") } scalar OnChainTxHash @@ -1021,7 +1018,6 @@ input OnChainUsdPaymentSendAsBtcDenominatedInput amount: SatAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -1032,7 +1028,6 @@ input OnChainUsdPaymentSendInput amount: CentAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -1040,7 +1035,6 @@ type OnChainUsdTxFee @join__type(graph: PUBLIC) { amount: CentAmount! - targetConfirmations: TargetConfirmations! @deprecated(reason: "Ignored - will be removed") } type OneDayAccountLimit implements AccountLimit @@ -1232,9 +1226,9 @@ type Query lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! me: User mobileVersions: [MobileVersions] - onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainTxFee! - onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainUsdTxFee! - onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainUsdTxFee! + onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainTxFee! + onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainUsdTxFee! + onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainUsdTxFee! quizQuestions: [QuizQuestion] @deprecated(reason: "TODO: remove. we don't need a non authenticated version of this query. the users can only do the query while authenticated") """Returns 1 Sat and 1 Usd Cent price for the given currency""" @@ -1380,12 +1374,6 @@ type SuccessPayload success: Boolean } -""" -(Positive) Number of blocks in which the transaction is expected to be confirmed -""" -scalar TargetConfirmations - @join__type(graph: PUBLIC) - """ Timestamp field, serialized as Unix time (the number of seconds since the Unix epoch) """ diff --git a/quickstart/graphql/public/schema.graphql b/quickstart/graphql/public/schema.graphql index d343f462cb..272f38c18a 100644 --- a/quickstart/graphql/public/schema.graphql +++ b/quickstart/graphql/public/schema.graphql @@ -769,7 +769,6 @@ input OnChainPaymentSendAllInput { address: OnChainAddress! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -778,13 +777,11 @@ input OnChainPaymentSendInput { amount: SatAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } type OnChainTxFee { amount: SatAmount! - targetConfirmations: TargetConfirmations! @deprecated(reason: "Ignored - will be removed") } scalar OnChainTxHash @@ -803,7 +800,6 @@ input OnChainUsdPaymentSendAsBtcDenominatedInput { amount: SatAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } @@ -812,13 +808,11 @@ input OnChainUsdPaymentSendInput { amount: CentAmount! memo: Memo speed: PayoutSpeed = FAST - targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced") walletId: WalletId! } type OnChainUsdTxFee { amount: CentAmount! - targetConfirmations: TargetConfirmations! @deprecated(reason: "Ignored - will be removed") } type OneDayAccountLimit implements AccountLimit { @@ -969,9 +963,9 @@ type Query { lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! me: User mobileVersions: [MobileVersions] - onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainTxFee! - onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainUsdTxFee! - onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, targetConfirmations: TargetConfirmations = 0 @deprecated(reason: "Ignored - will be replaced"), walletId: WalletId!): OnChainUsdTxFee! + onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainTxFee! + onChainUsdTxFee(address: OnChainAddress!, amount: CentAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainUsdTxFee! + onChainUsdTxFeeAsBtcDenominated(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed = FAST, walletId: WalletId!): OnChainUsdTxFee! quizQuestions: [QuizQuestion] @deprecated(reason: "TODO: remove. we don't need a non authenticated version of this query. the users can only do the query while authenticated") """Returns 1 Sat and 1 Usd Cent price for the given currency""" @@ -1081,11 +1075,6 @@ type SuccessPayload { success: Boolean } -""" -(Positive) Number of blocks in which the transaction is expected to be confirmed -""" -scalar TargetConfirmations - """ Timestamp field, serialized as Unix time (the number of seconds since the Unix epoch) """ diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml index 7e015262c1..b83491cff3 100644 --- a/quickstart/vendir.lock.yml +++ b/quickstart/vendir.lock.yml @@ -2,26 +2,26 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'fix: cron usd invoices processing (#3209)...' - sha: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 + commitTitle: 'chore: more graphql layer clean up (#3211)...' + sha: d050af8048a6de674c647037f84eb60e6b9b7e5d tags: - - 0.13.66-1-ga9f0a26ba + - 0.13.67-1-gd050af804 path: ./ path: dev - contents: - git: - commitTitle: 'fix: cron usd invoices processing (#3209)...' - sha: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 + commitTitle: 'chore: more graphql layer clean up (#3211)...' + sha: d050af8048a6de674c647037f84eb60e6b9b7e5d tags: - - 0.13.66-1-ga9f0a26ba + - 0.13.67-1-gd050af804 path: ./ path: ./galoy - contents: - git: - commitTitle: 'fix: cron usd invoices processing (#3209)...' - sha: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 + commitTitle: 'chore: more graphql layer clean up (#3211)...' + sha: d050af8048a6de674c647037f84eb60e6b9b7e5d tags: - - 0.13.66-1-ga9f0a26ba + - 0.13.67-1-gd050af804 path: ./ path: ./graphql kind: LockConfig diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml index e7562656ee..ef72487abe 100644 --- a/quickstart/vendir.yml +++ b/quickstart/vendir.yml @@ -6,7 +6,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 + ref: d050af8048a6de674c647037f84eb60e6b9b7e5d includePaths: - dev/**/* excludePaths: @@ -18,7 +18,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 + ref: d050af8048a6de674c647037f84eb60e6b9b7e5d includePaths: - dev/**/* - test/bats/bitcoind_signer_descriptors.json @@ -34,7 +34,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 + ref: d050af8048a6de674c647037f84eb60e6b9b7e5d includePaths: - src/graphql/public/schema.graphql - src/graphql/admin/schema.graphql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index 7702592a09..ae102f2e10 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,3 @@ #@data/values --- -galoy_git_ref: a9f0a26ba4194b7546ea20f43747baf1cfc8bf86 +galoy_git_ref: d050af8048a6de674c647037f84eb60e6b9b7e5d