From 8531bfb41ed978aaa7d165c0dcd4eca618791889 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Wed, 14 Feb 2024 22:21:06 +0000 Subject: [PATCH] chore(release): [ci skip] bump quickstart image to sha256@2fdcbbacf6eb77bb4f01c85318caecfd48d89ea2730b565235f32f3ff47a7aaf --- .../apollo-federation/supergraph.graphql | 30 +++++++++++++++++-- quickstart/docker-compose.tmpl.yml | 8 ++--- quickstart/docker-compose.yml | 8 ++--- .../ln-invoice-payment-status-by-hash-sub.gql | 10 +++++++ .../gql/ln-invoice-payment-status-by-hash.gql | 7 +++++ ...-invoice-payment-status-by-request-sub.gql | 10 +++++++ .../ln-invoice-payment-status-by-request.gql | 7 +++++ .../gql/ln-invoice-payment-status-sub.gql | 8 ----- .../graphql/gql/ln-invoice-payment-status.gql | 5 ---- .../graphql/schemas/public/schema.graphql | 24 +++++++++++++-- quickstart/vendir.lock.yml | 18 +++++------ quickstart/vendir.yml | 6 ++-- quickstart/vendir/values.yml | 2 +- 13 files changed, 105 insertions(+), 38 deletions(-) create mode 100644 quickstart/graphql/gql/ln-invoice-payment-status-by-hash-sub.gql create mode 100644 quickstart/graphql/gql/ln-invoice-payment-status-by-hash.gql create mode 100644 quickstart/graphql/gql/ln-invoice-payment-status-by-request-sub.gql create mode 100644 quickstart/graphql/gql/ln-invoice-payment-status-by-request.gql delete mode 100644 quickstart/graphql/gql/ln-invoice-payment-status-sub.gql delete mode 100644 quickstart/graphql/gql/ln-invoice-payment-status.gql diff --git a/quickstart/dev/config/apollo-federation/supergraph.graphql b/quickstart/dev/config/apollo-federation/supergraph.graphql index 0560477573..e5ad5e75ad 100644 --- a/quickstart/dev/config/apollo-federation/supergraph.graphql +++ b/quickstart/dev/config/apollo-federation/supergraph.graphql @@ -811,6 +811,26 @@ input LnInvoicePaymentInput walletId: WalletId! } +type LnInvoicePaymentStatus + @join__type(graph: PUBLIC) +{ + paymentHash: PaymentHash + paymentRequest: LnPaymentRequest + status: InvoicePaymentStatus +} + +input LnInvoicePaymentStatusByHashInput + @join__type(graph: PUBLIC) +{ + paymentHash: PaymentHash! +} + +input LnInvoicePaymentStatusByRequestInput + @join__type(graph: PUBLIC) +{ + paymentRequest: LnPaymentRequest! +} + input LnInvoicePaymentStatusInput @join__type(graph: PUBLIC) { @@ -821,6 +841,8 @@ type LnInvoicePaymentStatusPayload @join__type(graph: PUBLIC) { errors: [Error!]! + paymentHash: PaymentHash + paymentRequest: LnPaymentRequest status: InvoicePaymentStatus } @@ -1545,7 +1567,9 @@ type Query businessMapMarkers: [MapMarker!]! @join__field(graph: PUBLIC) currencyList: [Currency!]! @join__field(graph: PUBLIC) globals: Globals @join__field(graph: PUBLIC) - lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! @join__field(graph: PUBLIC) + lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! @join__field(graph: PUBLIC) @deprecated(reason: "Deprecated in favor of lnInvoicePaymentStatusByRequest") + lnInvoicePaymentStatusByHash(input: LnInvoicePaymentStatusByHashInput!): LnInvoicePaymentStatus! @join__field(graph: PUBLIC) + lnInvoicePaymentStatusByRequest(input: LnInvoicePaymentStatusByRequestInput!): LnInvoicePaymentStatus! @join__field(graph: PUBLIC) me: User @join__field(graph: PUBLIC) mobileVersions: [MobileVersions] @join__field(graph: PUBLIC) onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed! = FAST, walletId: WalletId!): OnChainTxFee! @join__field(graph: PUBLIC) @@ -1688,7 +1712,9 @@ scalar SignedDisplayMajorAmount type Subscription @join__type(graph: PUBLIC) { - lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! + lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! @deprecated(reason: "Deprecated in favor of lnInvoicePaymentStatusByRequest") + lnInvoicePaymentStatusByHash(input: LnInvoicePaymentStatusByHashInput!): LnInvoicePaymentStatusPayload! + lnInvoicePaymentStatusByRequest(input: LnInvoicePaymentStatusByRequestInput!): LnInvoicePaymentStatusPayload! myUpdates: MyUpdatesPayload! price(input: PriceInput!): PricePayload! diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml index 8515d3fcdd..a3db421c20 100644 --- a/quickstart/docker-compose.tmpl.yml +++ b/quickstart/docker-compose.tmpl.yml @@ -1,9 +1,9 @@ #@ load("@ytt:data", "data") -#@ galoy_api_image_digest = "sha256@7372b1160a39c9415fdd93fe21e24c311fb497a5e1a767384f5283b044006f01" -#@ galoy_trigger_image_digest = "sha256@073e91304825d3ead01588f2cdd6e16e5db987a7bd43c8a2e7564dd6d06d0dc8" -#@ mongodb_migrate_image_digest = "sha256@4923fe36c8c2c5cc624a1fae2b53ab2c17a42dfdf152f0edba324d3d92845405" -#@ galoy_notifications_image_digest = "sha256@6ba0bedcd7534178bb91e291bdb26fc079c1ecbbccb59f1ddb2d70fae4c07b1b" +#@ galoy_api_image_digest = "sha256@2fdcbbacf6eb77bb4f01c85318caecfd48d89ea2730b565235f32f3ff47a7aaf" +#@ galoy_trigger_image_digest = "sha256@855828da098769c75a6560b184e833b1e533f7ed634e660edbd328ae102a5a17" +#@ mongodb_migrate_image_digest = "sha256@31ad0fdab3105589364f8525e91aa88e8a8eb3f33fce844606bbdc7bdb47ee8d" +#@ galoy_notifications_image_digest = "sha256@edad807ad3a4691bbcba71a7f1ff3f30f1c7af32f598fc4ab386df9c58638453" #@ core_env = [ #@ "HELMREVISION=dev", diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 44e6828711..f12a01f7f6 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:7372b1160a39c9415fdd93fe21e24c311fb497a5e1a767384f5283b044006f01 + image: us.gcr.io/galoy-org/galoy-api@sha256:2fdcbbacf6eb77bb4f01c85318caecfd48d89ea2730b565235f32f3ff47a7aaf environment: - HELMREVISION=dev - NETWORK=regtest @@ -161,7 +161,7 @@ services: aliases: - bats-tests trigger: - image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:073e91304825d3ead01588f2cdd6e16e5db987a7bd43c8a2e7564dd6d06d0dc8 + image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:855828da098769c75a6560b184e833b1e533f7ed634e660edbd328ae102a5a17 environment: - HELMREVISION=dev - NETWORK=regtest @@ -213,7 +213,7 @@ services: - bria - mongodb notifications: - image: us.gcr.io/galoy-org/galoy-notifications@sha256:6ba0bedcd7534178bb91e291bdb26fc079c1ecbbccb59f1ddb2d70fae4c07b1b + image: us.gcr.io/galoy-org/galoy-notifications@sha256:edad807ad3a4691bbcba71a7f1ff3f30f1c7af32f598fc4ab386df9c58638453 environment: - PG_CON=postgres://user:password@notifications-pg:5432/pg - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-agent:4318 @@ -248,7 +248,7 @@ services: environment: - MONGO_INITDB_DATABASE=galoy mongodb-migrate: - image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:4923fe36c8c2c5cc624a1fae2b53ab2c17a42dfdf152f0edba324d3d92845405 + image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:31ad0fdab3105589364f8525e91aa88e8a8eb3f33fce844606bbdc7bdb47ee8d depends_on: - mongodb environment: diff --git a/quickstart/graphql/gql/ln-invoice-payment-status-by-hash-sub.gql b/quickstart/graphql/gql/ln-invoice-payment-status-by-hash-sub.gql new file mode 100644 index 0000000000..5393eebf3f --- /dev/null +++ b/quickstart/graphql/gql/ln-invoice-payment-status-by-hash-sub.gql @@ -0,0 +1,10 @@ +subscription lnInvoicePaymentStatusByHashSubscription($input: LnInvoicePaymentStatusByHashInput!) { + lnInvoicePaymentStatusByHash(input: $input) { + errors { + message + } + status + paymentHash + paymentRequest + } +} diff --git a/quickstart/graphql/gql/ln-invoice-payment-status-by-hash.gql b/quickstart/graphql/gql/ln-invoice-payment-status-by-hash.gql new file mode 100644 index 0000000000..2de705e071 --- /dev/null +++ b/quickstart/graphql/gql/ln-invoice-payment-status-by-hash.gql @@ -0,0 +1,7 @@ +query LnInvoicePaymentStatusByHashQuery($input: LnInvoicePaymentStatusByHashInput!) { + lnInvoicePaymentStatusByHash(input: $input) { + status + paymentHash + paymentRequest + } +} diff --git a/quickstart/graphql/gql/ln-invoice-payment-status-by-request-sub.gql b/quickstart/graphql/gql/ln-invoice-payment-status-by-request-sub.gql new file mode 100644 index 0000000000..ff0b219d4e --- /dev/null +++ b/quickstart/graphql/gql/ln-invoice-payment-status-by-request-sub.gql @@ -0,0 +1,10 @@ +subscription lnInvoicePaymentStatusByRequestSubscription($input: LnInvoicePaymentStatusByRequestInput!) { + lnInvoicePaymentStatusByRequest(input: $input) { + errors { + message + } + status + paymentHash + paymentRequest + } +} diff --git a/quickstart/graphql/gql/ln-invoice-payment-status-by-request.gql b/quickstart/graphql/gql/ln-invoice-payment-status-by-request.gql new file mode 100644 index 0000000000..8d0245512e --- /dev/null +++ b/quickstart/graphql/gql/ln-invoice-payment-status-by-request.gql @@ -0,0 +1,7 @@ +query LnInvoicePaymentStatusByRequestQuery($input: LnInvoicePaymentStatusByRequestInput!) { + lnInvoicePaymentStatusByRequest(input: $input) { + status + paymentHash + paymentRequest + } +} diff --git a/quickstart/graphql/gql/ln-invoice-payment-status-sub.gql b/quickstart/graphql/gql/ln-invoice-payment-status-sub.gql deleted file mode 100644 index 6e26bd0732..0000000000 --- a/quickstart/graphql/gql/ln-invoice-payment-status-sub.gql +++ /dev/null @@ -1,8 +0,0 @@ -subscription lnInvoicePaymentStatusSubscription($input: LnInvoicePaymentStatusInput!) { - lnInvoicePaymentStatus(input: $input) { - errors { - message - } - status - } -} diff --git a/quickstart/graphql/gql/ln-invoice-payment-status.gql b/quickstart/graphql/gql/ln-invoice-payment-status.gql deleted file mode 100644 index af9e729f35..0000000000 --- a/quickstart/graphql/gql/ln-invoice-payment-status.gql +++ /dev/null @@ -1,5 +0,0 @@ -query LnInvoicePaymentStatusQuery($input: LnInvoicePaymentStatusInput!) { - lnInvoicePaymentStatus(input: $input) { - status - } -} diff --git a/quickstart/graphql/schemas/public/schema.graphql b/quickstart/graphql/schemas/public/schema.graphql index 5bdfa82c2f..a90bf0d5f2 100644 --- a/quickstart/graphql/schemas/public/schema.graphql +++ b/quickstart/graphql/schemas/public/schema.graphql @@ -595,12 +595,28 @@ input LnInvoicePaymentInput { walletId: WalletId! } +type LnInvoicePaymentStatus { + paymentHash: PaymentHash + paymentRequest: LnPaymentRequest + status: InvoicePaymentStatus +} + +input LnInvoicePaymentStatusByHashInput { + paymentHash: PaymentHash! +} + +input LnInvoicePaymentStatusByRequestInput { + paymentRequest: LnPaymentRequest! +} + input LnInvoicePaymentStatusInput { paymentRequest: LnPaymentRequest! } type LnInvoicePaymentStatusPayload { errors: [Error!]! + paymentHash: PaymentHash + paymentRequest: LnPaymentRequest status: InvoicePaymentStatus } @@ -1193,7 +1209,9 @@ type Query { businessMapMarkers: [MapMarker!]! currencyList: [Currency!]! globals: Globals - lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! + lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! @deprecated(reason: "Deprecated in favor of lnInvoicePaymentStatusByRequest") + lnInvoicePaymentStatusByHash(input: LnInvoicePaymentStatusByHashInput!): LnInvoicePaymentStatus! + lnInvoicePaymentStatusByRequest(input: LnInvoicePaymentStatusByRequestInput!): LnInvoicePaymentStatus! me: User mobileVersions: [MobileVersions] onChainTxFee(address: OnChainAddress!, amount: SatAmount!, speed: PayoutSpeed! = FAST, walletId: WalletId!): OnChainTxFee! @@ -1300,7 +1318,9 @@ A string amount (of a currency) that can be negative (e.g. in a transaction) scalar SignedDisplayMajorAmount type Subscription { - lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! + lnInvoicePaymentStatus(input: LnInvoicePaymentStatusInput!): LnInvoicePaymentStatusPayload! @deprecated(reason: "Deprecated in favor of lnInvoicePaymentStatusByRequest") + lnInvoicePaymentStatusByHash(input: LnInvoicePaymentStatusByHashInput!): LnInvoicePaymentStatusPayload! + lnInvoicePaymentStatusByRequest(input: LnInvoicePaymentStatusByRequestInput!): LnInvoicePaymentStatusPayload! myUpdates: MyUpdatesPayload! price(input: PriceInput!): PricePayload! diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml index 52b76266d2..de644a4758 100644 --- a/quickstart/vendir.lock.yml +++ b/quickstart/vendir.lock.yml @@ -2,24 +2,24 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'fix(core): bad linting (#3998)' - sha: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 + commitTitle: 'feat(core): add payment status by hash query/subscription (#3899)...' + sha: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64 tags: - - 0.20.58-6-g36f585fac + - 0.20.59-2-gf316a1bed path: ./ path: dev - contents: - git: - commitTitle: 'fix(core): bad linting (#3998)' - sha: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 + commitTitle: 'feat(core): add payment status by hash query/subscription (#3899)...' + sha: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64 tags: - - 0.20.58-6-g36f585fac + - 0.20.59-2-gf316a1bed path: schemas/ - git: - commitTitle: 'fix(core): bad linting (#3998)' - sha: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 + commitTitle: 'feat(core): add payment status by hash query/subscription (#3899)...' + sha: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64 tags: - - 0.20.58-6-g36f585fac + - 0.20.60 path: gql/ path: ./graphql kind: LockConfig diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml index 83d4b3093e..8b4cfe4f60 100644 --- a/quickstart/vendir.yml +++ b/quickstart/vendir.yml @@ -6,7 +6,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 + ref: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64 includePaths: - dev/**/* excludePaths: @@ -18,7 +18,7 @@ directories: - path: schemas/ git: url: https://github.com/GaloyMoney/galoy.git - ref: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 + ref: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64 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: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 + ref: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64 includePaths: - bats/gql/**/* newRootPath: bats/gql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index 030ad02d32..fa96a30dea 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,3 @@ #@data/values --- -galoy_git_ref: 36f585fac2e3f6c3b43f48437c1e4aab2c94bd37 +galoy_git_ref: f316a1bedb7a2122aeddac495bc7ae6a96ee8b64