diff --git a/quickstart/dev/apollo-federation/supergraph.graphql b/quickstart/dev/apollo-federation/supergraph.graphql index 19de7dd690..bcb5800a00 100644 --- a/quickstart/dev/apollo-federation/supergraph.graphql +++ b/quickstart/dev/apollo-federation/supergraph.graphql @@ -723,6 +723,19 @@ enum link__Purpose { EXECUTION } +input LnAddressPaymentSendInput + @join__type(graph: PUBLIC) +{ + """Amount in satoshis.""" + amount: SatAmount! + + """Lightning address to send to.""" + lnAddress: String! + + """Wallet ID to send bitcoin from.""" + walletId: WalletId! +} + type LnInvoice implements Invoice @join__implements(graph: PUBLIC, interface: "Invoice") @join__type(graph: PUBLIC) @@ -929,6 +942,19 @@ type LnUpdate walletId: WalletId! @deprecated(reason: "Deprecated in favor of transaction") } +input LnurlPaymentSendInput + @join__type(graph: PUBLIC) +{ + """Amount in satoshis.""" + amount: SatAmount! + + """Lnurl string to send to.""" + lnurl: String! + + """Wallet ID to send bitcoin from.""" + walletId: WalletId! +} + input LnUsdInvoiceBtcDenominatedCreateOnBehalfOfRecipientInput @join__type(graph: PUBLIC) { @@ -1054,6 +1080,9 @@ type Mutation """ intraLedgerUsdPaymentSend(input: IntraLedgerUsdPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) + """Sends a payment to a lightning address.""" + lnAddressPaymentSend(input: LnAddressPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) + """ Returns a lightning invoice for an associated wallet. When invoice is paid the value will be credited to a BTC wallet. @@ -1130,13 +1159,17 @@ type Mutation """ lnUsdInvoiceCreateOnBehalfOfRecipient(input: LnUsdInvoiceCreateOnBehalfOfRecipientInput!): LnInvoicePayload! @join__field(graph: PUBLIC) lnUsdInvoiceFeeProbe(input: LnUsdInvoiceFeeProbeInput!): SatAmountPayload! @join__field(graph: PUBLIC) + + """Sends a payment to a lightning address.""" + lnurlPaymentSend(input: LnurlPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainAddressCreate(input: OnChainAddressCreateInput!): OnChainAddressPayload! @join__field(graph: PUBLIC) onChainAddressCurrent(input: OnChainAddressCurrentInput!): OnChainAddressPayload! @join__field(graph: PUBLIC) onChainPaymentSend(input: OnChainPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainPaymentSendAll(input: OnChainPaymentSendAllInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainUsdPaymentSend(input: OnChainUsdPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainUsdPaymentSendAsBtcDenominated(input: OnChainUsdPaymentSendAsBtcDenominatedInput!): PaymentSendPayload! @join__field(graph: PUBLIC) - quizCompleted(input: QuizCompletedInput!): QuizCompletedPayload! @join__field(graph: PUBLIC) + quizClaim(input: QuizClaimInput!): QuizClaimPayload! @join__field(graph: PUBLIC) + quizCompleted(input: QuizCompletedInput!): QuizCompletedPayload! @join__field(graph: PUBLIC) @deprecated(reason: "Use quizClaim instead") userContactUpdateAlias(input: UserContactUpdateAliasInput!): UserContactUpdateAliasPayload! @join__field(graph: PUBLIC) @deprecated(reason: "will be moved to AccountContact") userEmailDelete: UserEmailDeletePayload! @join__field(graph: PUBLIC) userEmailRegistrationInitiate(input: UserEmailRegistrationInitiateInput!): UserEmailRegistrationInitiatePayload! @join__field(graph: PUBLIC) @@ -1490,6 +1523,20 @@ type Quiz amount: SatAmount! completed: Boolean! id: ID! + notBefore: Timestamp +} + +input QuizClaimInput + @join__type(graph: PUBLIC) +{ + id: ID! +} + +type QuizClaimPayload + @join__type(graph: PUBLIC) +{ + errors: [Error!]! + quizzes: [Quiz!]! } input QuizCompletedInput diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml index c0a1c9e569..6150b26ba8 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@d32b322bc300b59d6317d3d64b63d1fff477bd94ff66bf3516d9aa27ea4c6580" -#@ galoy_trigger_image_digest = "sha256@2e92f23a649b48bba6822d4fdec33fbf80974dfe9323822ed698dd70f88f9fee" -#@ mongodb_migrate_image_digest = "sha256@1733dd78e5e2dbbe7400f9d40fb3b78f33e848a44a91ea1065387d8a0e94fa23" +#@ galoy_api_image_digest = "sha256@6fab2712266c8a81aeb93086ae897f112580a47c8b30a25fd088b1addce7870c" +#@ galoy_trigger_image_digest = "sha256@f7e4b8b12023280214558fd23f4c8449687a057fb61a9e52442db2d24e56558a" +#@ mongodb_migrate_image_digest = "sha256@06e4fe22889c22589498d49996d40b614590856870b5538b46ebdbefbc2677cc" version: #@ data.values.version services: diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml index 381241591f..fe78a69e76 100644 --- a/quickstart/docker-compose.yml +++ b/quickstart/docker-compose.yml @@ -97,7 +97,7 @@ services: ports: - 5434:5432 galoy: - image: us.gcr.io/galoy-org/galoy-api@sha256:d32b322bc300b59d6317d3d64b63d1fff477bd94ff66bf3516d9aa27ea4c6580 + image: us.gcr.io/galoy-org/galoy-api@sha256:6fab2712266c8a81aeb93086ae897f112580a47c8b30a25fd088b1addce7870c env_file: ${HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}/.env.galoy depends_on: - trigger @@ -115,7 +115,7 @@ services: aliases: - bats-tests trigger: - image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:2e92f23a649b48bba6822d4fdec33fbf80974dfe9323822ed698dd70f88f9fee + image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:f7e4b8b12023280214558fd23f4c8449687a057fb61a9e52442db2d24e56558a env_file: ${HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}/.env.galoy depends_on: - lnd1 @@ -136,7 +136,7 @@ services: - MONGODB_ADVERTISED_HOSTNAME=127.0.0.1 - MONGO_INITDB_DATABASE=galoy mongodb-migrate: - image: us.gcr.io/galoy-org/galoy-app-migrate@sha256:1733dd78e5e2dbbe7400f9d40fb3b78f33e848a44a91ea1065387d8a0e94fa23 + image: us.gcr.io/galoy-org/galoy-app-migrate@sha256:06e4fe22889c22589498d49996d40b614590856870b5538b46ebdbefbc2677cc depends_on: - mongodb environment: diff --git a/quickstart/galoy/dev/apollo-federation/supergraph.graphql b/quickstart/galoy/dev/apollo-federation/supergraph.graphql index 19de7dd690..bcb5800a00 100644 --- a/quickstart/galoy/dev/apollo-federation/supergraph.graphql +++ b/quickstart/galoy/dev/apollo-federation/supergraph.graphql @@ -723,6 +723,19 @@ enum link__Purpose { EXECUTION } +input LnAddressPaymentSendInput + @join__type(graph: PUBLIC) +{ + """Amount in satoshis.""" + amount: SatAmount! + + """Lightning address to send to.""" + lnAddress: String! + + """Wallet ID to send bitcoin from.""" + walletId: WalletId! +} + type LnInvoice implements Invoice @join__implements(graph: PUBLIC, interface: "Invoice") @join__type(graph: PUBLIC) @@ -929,6 +942,19 @@ type LnUpdate walletId: WalletId! @deprecated(reason: "Deprecated in favor of transaction") } +input LnurlPaymentSendInput + @join__type(graph: PUBLIC) +{ + """Amount in satoshis.""" + amount: SatAmount! + + """Lnurl string to send to.""" + lnurl: String! + + """Wallet ID to send bitcoin from.""" + walletId: WalletId! +} + input LnUsdInvoiceBtcDenominatedCreateOnBehalfOfRecipientInput @join__type(graph: PUBLIC) { @@ -1054,6 +1080,9 @@ type Mutation """ intraLedgerUsdPaymentSend(input: IntraLedgerUsdPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) + """Sends a payment to a lightning address.""" + lnAddressPaymentSend(input: LnAddressPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) + """ Returns a lightning invoice for an associated wallet. When invoice is paid the value will be credited to a BTC wallet. @@ -1130,13 +1159,17 @@ type Mutation """ lnUsdInvoiceCreateOnBehalfOfRecipient(input: LnUsdInvoiceCreateOnBehalfOfRecipientInput!): LnInvoicePayload! @join__field(graph: PUBLIC) lnUsdInvoiceFeeProbe(input: LnUsdInvoiceFeeProbeInput!): SatAmountPayload! @join__field(graph: PUBLIC) + + """Sends a payment to a lightning address.""" + lnurlPaymentSend(input: LnurlPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainAddressCreate(input: OnChainAddressCreateInput!): OnChainAddressPayload! @join__field(graph: PUBLIC) onChainAddressCurrent(input: OnChainAddressCurrentInput!): OnChainAddressPayload! @join__field(graph: PUBLIC) onChainPaymentSend(input: OnChainPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainPaymentSendAll(input: OnChainPaymentSendAllInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainUsdPaymentSend(input: OnChainUsdPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC) onChainUsdPaymentSendAsBtcDenominated(input: OnChainUsdPaymentSendAsBtcDenominatedInput!): PaymentSendPayload! @join__field(graph: PUBLIC) - quizCompleted(input: QuizCompletedInput!): QuizCompletedPayload! @join__field(graph: PUBLIC) + quizClaim(input: QuizClaimInput!): QuizClaimPayload! @join__field(graph: PUBLIC) + quizCompleted(input: QuizCompletedInput!): QuizCompletedPayload! @join__field(graph: PUBLIC) @deprecated(reason: "Use quizClaim instead") userContactUpdateAlias(input: UserContactUpdateAliasInput!): UserContactUpdateAliasPayload! @join__field(graph: PUBLIC) @deprecated(reason: "will be moved to AccountContact") userEmailDelete: UserEmailDeletePayload! @join__field(graph: PUBLIC) userEmailRegistrationInitiate(input: UserEmailRegistrationInitiateInput!): UserEmailRegistrationInitiatePayload! @join__field(graph: PUBLIC) @@ -1490,6 +1523,20 @@ type Quiz amount: SatAmount! completed: Boolean! id: ID! + notBefore: Timestamp +} + +input QuizClaimInput + @join__type(graph: PUBLIC) +{ + id: ID! +} + +type QuizClaimPayload + @join__type(graph: PUBLIC) +{ + errors: [Error!]! + quizzes: [Quiz!]! } input QuizCompletedInput diff --git a/quickstart/graphql/public/schema.graphql b/quickstart/graphql/public/schema.graphql index 5b750ef2b4..1f1c4b5723 100644 --- a/quickstart/graphql/public/schema.graphql +++ b/quickstart/graphql/public/schema.graphql @@ -904,7 +904,8 @@ type Mutation { onChainPaymentSendAll(input: OnChainPaymentSendAllInput!): PaymentSendPayload! onChainUsdPaymentSend(input: OnChainUsdPaymentSendInput!): PaymentSendPayload! onChainUsdPaymentSendAsBtcDenominated(input: OnChainUsdPaymentSendAsBtcDenominatedInput!): PaymentSendPayload! - quizCompleted(input: QuizCompletedInput!): QuizCompletedPayload! + quizClaim(input: QuizClaimInput!): QuizClaimPayload! + quizCompleted(input: QuizCompletedInput!): QuizCompletedPayload! @deprecated(reason: "Use quizClaim instead") userContactUpdateAlias(input: UserContactUpdateAliasInput!): UserContactUpdateAliasPayload! @deprecated(reason: "will be moved to AccountContact") userEmailDelete: UserEmailDeletePayload! userEmailRegistrationInitiate(input: UserEmailRegistrationInitiateInput!): UserEmailRegistrationInitiatePayload! @@ -1181,6 +1182,16 @@ type Quiz { amount: SatAmount! completed: Boolean! id: ID! + notBefore: Timestamp +} + +input QuizClaimInput { + id: ID! +} + +type QuizClaimPayload { + errors: [Error!]! + quizzes: [Quiz!]! } input QuizCompletedInput { diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml index 007a6cfbfa..0ffe845e7c 100644 --- a/quickstart/vendir.lock.yml +++ b/quickstart/vendir.lock.yml @@ -2,26 +2,26 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'chore: update some galoy.yaml values (#3754)...' - sha: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 + commitTitle: 'feat: introduce time based quizzes (#3743)...' + sha: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e tags: - - 0.19.7-2-gf02263e79 + - 0.19.7-4-g736c51b40 path: ./ path: dev - contents: - git: - commitTitle: 'chore: update some galoy.yaml values (#3754)...' - sha: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 + commitTitle: 'feat: introduce time based quizzes (#3743)...' + sha: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e tags: - - 0.19.7-2-gf02263e79 + - 0.19.7-4-g736c51b40 path: ./ path: ./galoy - contents: - git: - commitTitle: 'chore: update some galoy.yaml values (#3754)...' - sha: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 + commitTitle: 'feat: introduce time based quizzes (#3743)...' + sha: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e tags: - - 0.19.7-2-gf02263e79 + - 0.19.7-4-g736c51b40 path: ./ path: ./graphql kind: LockConfig diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml index 5bb73c4692..c1c234deea 100644 --- a/quickstart/vendir.yml +++ b/quickstart/vendir.yml @@ -6,7 +6,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 + ref: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e includePaths: - core/api/dev/**/* excludePaths: @@ -18,7 +18,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 + ref: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e includePaths: - core/api/dev/**/* - core/api/test/bats/bitcoind_signer_descriptors.json @@ -36,7 +36,7 @@ directories: - path: ./ git: url: https://github.com/GaloyMoney/galoy.git - ref: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 + ref: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e includePaths: - core/api/src/graphql/public/schema.graphql - core/api/src/graphql/admin/schema.graphql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index 378c503795..a6990de1b7 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,3 @@ #@data/values --- -galoy_git_ref: f02263e79f119602d6e63a8d9c2ca8914e3a8c08 +galoy_git_ref: 736c51b4048ba54d107a07a2070bd5e0b7e31b0e