Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/flash/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: flash
description: A Helm chart for the Flash application backend
type: application
version: 3.2.4
appVersion: 0.7.45
appVersion: 0.7.49
dependencies:
- name: redis
repository: https://charts.bitnami.com/bitnami
Expand Down
60 changes: 48 additions & 12 deletions charts/flash/apollo-router/supergraph.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,20 @@ type Bank
type BankAccount
@join__type(graph: PUBLIC)
{
accountName: String!
accountNumber: String!
accountType: String!
bankBranch: String!
bankName: String!

"""Name of the bank institution"""
bank: String!
branchCode: String!

"""Account currency (e.g. JMD, USD)"""
currency: String!

"""ERPNext bank account identifier"""
id: ID!
isDefault: Boolean!
}

input BankAccountInput
Expand All @@ -234,8 +243,9 @@ type BTCWallet implements Wallet
accountId: ID!

"""A balance stored in BTC."""
balance: FractionalCentAmount!
balance: FractionalCentAmount
id: ID!
isExternal: Boolean!
lnurlp: Lnurl

"""An unconfirmed incoming onchain balance."""
Expand Down Expand Up @@ -349,22 +359,26 @@ type CashoutOffer
@join__type(graph: PUBLIC)
{
"""The rate used when withdrawing to a JMD bank account"""
exchangeRate: JMDCents!
exchangeRate: JMDCents

"""The time at which this offer is no longer accepted by Flash"""
expiresAt: Timestamp!

"""The amount that Flash is charging for it's services"""
"""The amount that Flash is charging for its services"""
flashFee: USDCents!

"""ID of the offer"""
offerId: ID!

"""The amount Flash owes to the user denominated in JMD as cents"""
receiveJmd: JMDCents!
"""
The amount Flash owes to the user denominated in JMD cents (null for USD payouts)
"""
receiveJmd: JMDCents

"""The amount Flash owes to the user denominated in USD as cents"""
receiveUsd: USDCents!
"""
The amount Flash owes to the user denominated in USD cents (null for JMD payouts)
"""
receiveUsd: USDCents

"""The amount the user is sending to flash"""
send: USDCents!
Expand Down Expand Up @@ -620,7 +634,7 @@ type InitiatedCashoutResponse
@join__type(graph: PUBLIC)
{
errors: [Error!]!
journalId: ID
id: ID
}

union InitiationVia
Expand Down Expand Up @@ -1165,6 +1179,7 @@ type Mutation
The user can review this offer and then execute the withdrawal by calling the initiateCashout mutation.
"""
requestCashout(input: RequestCashoutInput!): RequestCashoutResponse!
updateExternalWallet(input: UpdateExternalWalletInput!): UpdateExternalWalletPayload!
userContactUpdateAlias(input: UserContactUpdateAliasInput!): UserContactUpdateAliasPayload! @deprecated(reason: "will be moved to AccountContact")
userEmailDelete: UserEmailDeletePayload!
userEmailRegistrationInitiate(input: UserEmailRegistrationInitiateInput!): UserEmailRegistrationInitiatePayload!
Expand Down Expand Up @@ -1588,6 +1603,9 @@ input RequestCashoutInput
"""Amount in USD cents."""
amount: USDCents!

"""ERPNext bank account identifier to receive the cashout."""
bankAccountId: ID!

"""ID for a USD wallet belonging to the current user."""
walletId: WalletId!
}
Expand Down Expand Up @@ -1856,6 +1874,19 @@ enum TxStatus
SUCCESS @join__enumValue(graph: PUBLIC)
}

input UpdateExternalWalletInput
@join__type(graph: PUBLIC)
{
lnurlp: Lnurl!
}

type UpdateExternalWalletPayload
@join__type(graph: PUBLIC)
{
errors: [Error!]!
walletId: WalletId
}

type UpgradePayload
@join__type(graph: PUBLIC)
{
Expand All @@ -1876,8 +1907,9 @@ type UsdWallet implements Wallet
@join__type(graph: PUBLIC)
{
accountId: ID!
balance: FractionalCentAmount!
balance: FractionalCentAmount
id: ID!
isExternal: Boolean!
lnurlp: Lnurl

"""An unconfirmed incoming onchain balance."""
Expand Down Expand Up @@ -1917,6 +1949,9 @@ type UsdWallet implements Wallet
type User
@join__type(graph: PUBLIC)
{
"""Bank accounts available for cashout"""
bankAccounts: [BankAccount!]!

"""
Get single contact details.
Can include the transactions associated with the contact.
Expand Down Expand Up @@ -2205,8 +2240,9 @@ interface Wallet
@join__type(graph: PUBLIC)
{
accountId: ID!
balance: FractionalCentAmount!
balance: FractionalCentAmount
id: ID!
isExternal: Boolean!
lnurlp: Lnurl
pendingIncomingBalance: SignedAmount!

Expand Down
10 changes: 5 additions & 5 deletions charts/flash/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ galoy:
repository: lnflash/flash-app
imagePullPolicy: Always
# digests managed by flash-app pipeline in concourse
digest: sha256:d28ba49761265d51f194e46878196be4b6a84194f83fdd51b6c86e2c66d68673
git_ref: "e9452c3"
digest: sha256:e9529b64f311cac8cc6b6d0bd8a25850a96bd352852aea2f8e2e5944b9845fcf
git_ref: "64edf74"
websocket:
repository: docker.io/lnflash/galoy-app-websocket
# digests managed by flash-app pipeline in concourse
digest: "sha256:497a91d736d56e1e27a962aa7cd722077da8d21791a18ee0b108ff75d3cb48b8"
digest: "sha256:b9d5f21d8f08fe91e55e11b6418f4a661b0980e5e9d596e1445cd113b5187c53"
mongodbMigrate:
repository: docker.io/lnflash/galoy-app-migrate
# digests managed by flash-app pipeline in concourse
digest: "sha256:b66414307d90369280168ad26336e073ce3485b79b3e8cdd8e09377511eaae88"
digest: "sha256:5e1989ec7e10f2a97c4b19c756e7029f443f54f7be37e5d1fbb0d3ef29b4bcca"
mongoBackup:
repository: us.gcr.io/galoy-org/mongo-backup
# Currently using Galoy's images. To make changes, see /images & /ci in this repo
Expand Down Expand Up @@ -841,7 +841,7 @@ kratos:
body:
plaintext: base64://SGksCgpDb25maXJtIGFjY2VzcyB0byB5b3VyIEZsYXNoIGFjY291bnQgdXNpbmcgdGhlIGZvbGxvd2luZyBjb2RlOgoKe3sgLlJlY292ZXJ5Q29kZSB9fQoKVGhpcyBjb2RlIHdpbGwgb25seSBiZSB1c2VkIG9uY2UuIERvIG5vdCBzaGFyZSBpdCB3aXRoIGFueW9uZS4gCg==
html: base64://PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KCjxoZWFkPgogICAgPG1ldGEgY2hhcnNldD0iVVRGLTgiPgogICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xLjAiPgogICAgPHN0eWxlPgogICAgICAgIGJvZHkgewogICAgICAgICAgICBmb250LWZhbWlseTogQXJpYWwsIHNhbnMtc2VyaWY7CiAgICAgICAgICAgIG1hcmdpbjogMDsKICAgICAgICAgICAgcGFkZGluZzogMDsKICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2Y0ZjRmNDsKICAgICAgICAgICAgY29sb3I6ICMzMzM7CiAgICAgICAgfQoKICAgICAgICAuY29udGFpbmVyIHsKICAgICAgICAgICAgbWF4LXdpZHRoOiA2MDBweDsKICAgICAgICAgICAgbWFyZ2luOiAwIGF1dG87CiAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6ICNmZmZmZmY7CiAgICAgICAgICAgIGJvcmRlci1yYWRpdXM6IDhweDsKICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICAgICAgICAgYm94LXNoYWRvdzogMCAwIDEwcHggcmdiYSgwLCAwLCAwLCAwLjEpOwogICAgICAgIH0KCiAgICAgICAgLmhlYWRlciB7CiAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6ICMwMDdiZmY7CiAgICAgICAgICAgIGNvbG9yOiAjZmZmZmZmOwogICAgICAgICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAgICAgICAgICAgIHBhZGRpbmc6IDIwcHg7CiAgICAgICAgfQoKICAgICAgICAuaGVhZGVyIGgxIHsKICAgICAgICAgICAgbWFyZ2luOiAwOwogICAgICAgICAgICBmb250LXNpemU6IDI0cHg7CiAgICAgICAgfQoKICAgICAgICAuaGVhZGVyIGltZyB7CiAgICAgICAgICAgIG1heC13aWR0aDogMTAwcHg7CiAgICAgICAgICAgIG1hcmdpbi10b3A6IDEwcHg7CiAgICAgICAgfQoKICAgICAgICAuY29udGVudCB7CiAgICAgICAgICAgIHBhZGRpbmc6IDIwcHg7CiAgICAgICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICAgICB9CgogICAgICAgIC5jb250ZW50IGgyIHsKICAgICAgICAgICAgZm9udC1zaXplOiAyMHB4OwogICAgICAgICAgICBtYXJnaW46IDIwcHggMDsKICAgICAgICB9CgogICAgICAgIC5jb250ZW50IHAgewogICAgICAgICAgICBmb250LXNpemU6IDE2cHg7CiAgICAgICAgICAgIG1hcmdpbjogMTBweCAwOwogICAgICAgIH0KCiAgICAgICAgLmNvZGUgewogICAgICAgICAgICBmb250LXNpemU6IDI0cHg7CiAgICAgICAgICAgIGZvbnQtd2VpZ2h0OiBib2xkOwogICAgICAgICAgICBjb2xvcjogIzAwN2JmZjsKICAgICAgICAgICAgbWFyZ2luOiAyMHB4IDA7CiAgICAgICAgfQoKICAgICAgICAuZm9vdGVyIHsKICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2Y0ZjRmNDsKICAgICAgICAgICAgY29sb3I6ICM3Nzc7CiAgICAgICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICAgICAgICAgcGFkZGluZzogMTBweDsKICAgICAgICAgICAgZm9udC1zaXplOiAxMnB4OwogICAgICAgIH0KICAgIDwvc3R5bGU+CjwvaGVhZD4KCjxib2R5PgogICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KICAgICAgICA8ZGl2IGNsYXNzPSJoZWFkZXIiPgogICAgICAgICAgICA8aDE+V2VsY29tZSB0byBGbGFzaDwvaDE+CiAgICAgICAgICAgIDxpbWcgc3JjPSJodHRwczovL2dldGZsYXNoLmlvL2Fzc2V0cy9pbWcvbG9nby13aGl0ZS5wbmciIGFsdD0iV2VsY29tZSBJbWFnZSI+CiAgICAgICAgPC9kaXY+CiAgICAgICAgPGRpdiBjbGFzcz0iY29udGVudCI+CiAgICAgICAgICAgIDxoMj5Db25maXJtIFlvdXIgQWNjZXNzPC9oMj4KICAgICAgICAgICAgPHA+SGksPC9wPgogICAgICAgICAgICA8cD5Db25maXJtIGFjY2VzcyB0byB5b3VyIEZsYXNoIGFjY291bnQgdXNpbmcgdGhlIGZvbGxvd2luZyBjb2RlOjwvcD4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iY29kZSI+e3sgLlJlY292ZXJ5Q29kZSB9fTwvZGl2PgogICAgICAgICAgICA8cD5UaGlzIGNvZGUgd2lsbCBvbmx5IGJlIHVzZWQgb25jZS4gRG8gbm90IHNoYXJlIGl0IHdpdGggYW55b25lLjwvcD4KICAgICAgICA8L2Rpdj4KICAgICAgICA8ZGl2IGNsYXNzPSJmb290ZXIiPgogICAgICAgICAgICA8cD4mY29weTsgMjAyNCBGbGFzaC4gQWxsIHJpZ2h0cyByZXNlcnZlZC48L3A+CiAgICAgICAgPC9kaXY+CiAgICA8L2Rpdj4KPC9ib2R5PgoKPC9odG1sPgo=
tracing:
tracing:
service_name: "kratos"
provider: otel
providers:
Expand Down
Loading