Skip to content

feat(wallet): add reusable program account selector #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
3esmit wants to merge 5 commits into from
Closed

feat(wallet): add reusable program account selector #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a633adc
feat(wallet): add reusable program account selector
3esmit Jul 30, 2026
d3fcbb6
feat(amm-ui): default holding selectors by balance
3esmit Jul 30, 2026
4adf5f6
fix(amm-ui): preserve swap account authorization
3esmit Aug 3, 2026
9233eff
test(wallet): assert encoded transaction bytes
3esmit Aug 3, 2026
3db69ce
fix(amm): avoid redundant output holding signatures
3esmit Aug 10, 2026
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
16 changes: 8 additions & 8 deletions apps/amm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,18 @@ Swap view stays disabled (no pool can be resolved).

### Token list config (required for the Swap token picker)

The Swap view's token picker is config-driven: it doesn't derive tokens from
chain state, it reads a flat JSON list from the `TOKENS_CONFIG` environment
variable (absolute path). Each entry needs, at minimum, the token's
`definitionId` and **your own** `holding` account address for that token (the
account the wallet will sign transfers from/to for that token):
The Swap view's token picker is config-driven: it doesn't derive token
definitions from chain state, it reads a flat JSON list from the
`TOKENS_CONFIG` environment variable (absolute path). Each entry needs, at
minimum, a `definitionId`. Source and destination TokenHoldings come from the
connected wallet:

```json
[
{
"symbol": "TKA",
"name": "Token A",
"definitionId": "9qbX…",
"holding": "4T69…",
"decimals": 18
}
]
Expand All @@ -208,8 +207,9 @@ cp apps/amm/amm-tokens.json.example apps/amm/amm-tokens.json # then replace th

If `TOKENS_CONFIG` is unset, unreadable, or not a valid JSON array, the token
picker stays empty (a `qWarning` naming the exact cause is logged to stderr; no
swap can be started). `definitionId`/`holding` may be given as base58 (as the
wallet/runbook display them) or hex — the app normalizes both to hex.
swap can be started). `definitionId` may be given as base58 (as the
wallet/runbook displays it) or hex. A legacy `holding` value is accepted but is
not used for transaction account selection.

Full command with both variables set (absolute paths, from the repo root):

Expand Down
126 changes: 118 additions & 8 deletions apps/amm/qml/components/liquidity/NewPositionForm.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,17 @@ AmmActionCard {
})
readonly property var tokens: root.newPositionContext && root.newPositionContext.tokens
? root.newPositionContext.tokens : []
readonly property var programAccounts: root.newPositionContext
&& root.newPositionContext.programAccounts
? root.newPositionContext.programAccounts : []
readonly property var feeTiers: root.newPositionContext && root.newPositionContext.feeTiers
? root.newPositionContext.feeTiers : []
readonly property var tokenA: root.tokenById(root.selectedTokenAId)
readonly property var tokenB: root.tokenById(root.selectedTokenBId)
readonly property string selectedHoldingAId: tokenAInput.selectedHoldingId
readonly property string selectedHoldingBId: tokenBInput.selectedHoldingId
readonly property var holdingA: tokenAInput.selectedHolding
readonly property var holdingB: tokenBInput.selectedHolding
readonly property int decimalsA: 0
readonly property int decimalsB: 0
readonly property bool displayIsCanonical: root.selectedTokenAId.length > 0
Expand Down Expand Up @@ -96,6 +103,9 @@ AmmActionCard {
&& !root.quoteStale
&& !root.submitting
&& !root.poolCreationPending
&& tokenAInput.holdingReady
&& tokenBInput.holdingReady
&& lpDestinationSelector.ready

signal quoteRequested(bool immediate, var quoteRequest)
signal confirmationRequested(var snapshot)
Expand Down Expand Up @@ -235,15 +245,18 @@ AmmActionCard {
theme: root.theme
text: root.amountA
label: qsTr("Token A amount")
balance: root.contextLoading ? "" : root.balanceText(root.tokenA, root.decimalsA)
balance: root.contextLoading ? "" : root.holdingBalanceText(
root.holdingA, root.decimalsA)
helperText: root.missingPool && !root.compact
? root.minimumAmountText("A") : ""
errorText: root.formErrorText()
invalid: root.fieldHasError("amountA")
|| root.fieldHasError("holdingAId")
readOnly: root.submitting || (!root.activePool && !root.missingPool)
showMaxButton: root.activePool
tokenData: root.tokenA.definitionId ? root.tokenA : null
tokens: root.tokens
programAccounts: root.programAccounts
selectedTokenId: root.selectedTokenAId
tokenInvalid: root.tokenHasError("A")
tokenSelectionEnabled: !root.contextLoading && !root.submitting
Expand All @@ -267,6 +280,10 @@ AmmActionCard {
onMaxClicked: root.useMaximum()
onTokenSelected: function(tokenId) { root.resolveToken("A", tokenId) }
onTokenEntered: function(value) { root.resolveToken("A", value) }
onHoldingSelectionChanged: function(holdingId) {
root.noteDraftChanged()
root.requestQuote(true)
}
}

AmmPairSeparator {
Expand All @@ -284,14 +301,17 @@ AmmActionCard {
theme: root.theme
text: root.amountB
label: qsTr("Token B amount")
balance: root.contextLoading ? "" : root.balanceText(root.tokenB, root.decimalsB)
balance: root.contextLoading ? "" : root.holdingBalanceText(
root.holdingB, root.decimalsB)
helperText: root.missingPool && !root.compact
? root.minimumAmountText("B") : ""
invalid: root.fieldHasError("amountB")
|| root.fieldHasError("holdingBId")
readOnly: root.submitting || (!root.activePool && !root.missingPool)
showMaxButton: root.activePool
tokenData: root.tokenB.definitionId ? root.tokenB : null
tokens: root.tokens
programAccounts: root.programAccounts
selectedTokenId: root.selectedTokenBId
tokenInvalid: root.tokenHasError("B")
tokenSelectionEnabled: !root.contextLoading && !root.submitting
Expand All @@ -315,6 +335,10 @@ AmmActionCard {
onMaxClicked: root.useMaximum()
onTokenSelected: function(tokenId) { root.resolveToken("B", tokenId) }
onTokenEntered: function(value) { root.resolveToken("B", value) }
onHoldingSelectionChanged: function(holdingId) {
root.noteDraftChanged()
root.requestQuote(true)
}
}
}

Expand Down Expand Up @@ -476,6 +500,44 @@ AmmActionCard {
}
}

ColumnLayout {
Layout.fillWidth: true
spacing: 6
visible: root.hasPair

Text {
text: qsTr("LP TokenHolding output")
color: root.theme.colors.textSecondary
font.pixelSize: 12
}

ProgramAccountSelector {
id: lpDestinationSelector

objectName: "lpTokenHoldingSelector"
Layout.fillWidth: true
sourceModel: root.programAccounts
accountType: "TokenHolding"
stateField: "definitionId"
stateValue: root.lpDefinitionIdHex()
selectionMode: ProgramAccountSelector.Output
createNewText: qsTr("Create new TokenHolding")
placeholderText: qsTr("Select LP destination")
criteriaPendingText: qsTr("Resolving LP token")
accessibleName: qsTr("LP TokenHolding destination")
backgroundColor: root.theme.colors.panelBg
hoverColor: root.theme.colors.panelHoverBg
textColor: root.theme.colors.textPrimary
secondaryTextColor: root.theme.colors.textSecondary
borderColor: root.theme.colors.borderStrong
focusColor: root.theme.colors.ctaBg
onSelectionChanged: function(accountId, createNew) {
root.noteDraftChanged()
root.requestQuote(true)
}
}
}

ColumnLayout {
Layout.fillWidth: true
spacing: 9
Expand Down Expand Up @@ -826,6 +888,8 @@ AmmActionCard {
}

function swapTokens() {
var holdingAId = root.selectedHoldingAId
var holdingBId = root.selectedHoldingBId
var tokenId = root.selectedTokenAId
root.selectedTokenAId = root.selectedTokenBId
root.selectedTokenBId = tokenId
Expand All @@ -838,8 +902,12 @@ AmmActionCard {
var priceAmount = root.priceAmountA
root.priceAmountA = root.priceAmountB
root.priceAmountB = priceAmount
root.noteDraftChanged()
root.requestQuote(true)
Qt.callLater(function() {
tokenAInput.setHoldingSelection(holdingBId)
tokenBInput.setHoldingSelection(holdingAId)
root.noteDraftChanged()
root.requestQuote(true)
})
}

function resetPairDraft() {
Expand Down Expand Up @@ -1074,13 +1142,27 @@ AmmActionCard {
}

function pairRequest() {
return {
var request = {
"tokenAId": root.displayIsCanonical
? root.selectedTokenAId : root.selectedTokenBId,
"tokenBId": root.displayIsCanonical
? root.selectedTokenBId : root.selectedTokenAId,
"feeBps": root.selectedFeeBps
}
var holdingAId = root.displayIsCanonical
? root.selectedHoldingAId : root.selectedHoldingBId
var holdingBId = root.displayIsCanonical
? root.selectedHoldingBId : root.selectedHoldingAId
if (holdingAId.length > 0)
request.holdingAId = holdingAId
if (holdingBId.length > 0)
request.holdingBId = holdingBId
if (lpDestinationSelector.createNewSelected) {
request.createFreshLp = true
} else if (lpDestinationSelector.selectedAccountId.length > 0) {
request.lpHoldingId = lpDestinationSelector.selectedAccountId
}
return request
}

function requestQuote(immediate) {
Expand All @@ -1092,7 +1174,10 @@ AmmActionCard {
}

function probeRaw(token, decimals) {
var balance = String(token.balanceRaw || "0")
var holding = token.definitionId === root.tokenA.definitionId
? root.holdingA : root.holdingB
var balance = String(holding && holding.balanceRaw
? holding.balanceRaw : "0")
var simulated = AmountMath.multiply(AmountMath.pow10(decimals), "1000")
if (AmountMath.isUnsigned(balance) && AmountMath.compare(balance, simulated) > 0)
return balance
Expand Down Expand Up @@ -1132,6 +1217,12 @@ AmmActionCard {
return root.displayIsCanonical ? "amountA" : "amountB"
if (field === "amountBRaw")
return root.displayIsCanonical ? "amountB" : "amountA"
if (field === "holdingAId")
return root.displayIsCanonical ? "holdingAId" : "holdingBId"
if (field === "holdingBId")
return root.displayIsCanonical ? "holdingBId" : "holdingAId"
if (field === "lpHoldingId" || field === "createFreshLp")
return "lpHoldingId"
if (field === "initialPriceRealRaw")
return "initialPrice"
return field
Expand Down Expand Up @@ -1192,6 +1283,10 @@ AmmActionCard {
"invalid_amount_precision": qsTr("Token amounts must use whole raw units."),
"invalid_raw_amount": qsTr("Value is outside the supported range."),
"amount_exceeds_balance": qsTr("Amount exceeds the selected holding balance."),
"holding_selection_required": qsTr("Select a wallet TokenHolding for this token."),
"invalid_holding_selection": qsTr("Selected TokenHolding is unavailable."),
"lp_destination_required": qsTr("Select where LP tokens should be deposited."),
"invalid_lp_destination": qsTr("Selected LP TokenHolding is unavailable."),
"amount_too_low": qsTr("Value is too low for this pool."),
"invalid_token_id": qsTr("Enter a valid base58 TokenDefinition ID."),
"deposit_ratio_mismatch": qsTr("Deposit amounts must match the initial price."),
Expand Down Expand Up @@ -1261,8 +1356,10 @@ AmmActionCard {
var reserveB = root.poolReserve("B")
if (!reserveA || !reserveB || reserveA === "0" || reserveB === "0")
return
var balanceA = String(root.tokenA.balanceRaw || "0")
var balanceB = String(root.tokenB.balanceRaw || "0")
var balanceA = String(root.holdingA && root.holdingA.balanceRaw
? root.holdingA.balanceRaw : "0")
var balanceB = String(root.holdingB && root.holdingB.balanceRaw
? root.holdingB.balanceRaw : "0")
var fitA = AmountMath.mulDivFloor(balanceB, reserveA, reserveB)
var rawA = AmountMath.compare(balanceA, fitA) < 0 ? balanceA : fitA
var rawB = AmountMath.mulDivFloor(rawA, reserveB, reserveA)
Expand Down Expand Up @@ -1470,10 +1567,23 @@ AmmActionCard {
return AmountMath.formatRaw(String(token.balanceRaw || "0"), decimals)
}

function holdingBalanceText(holding, decimals) {
return holding ? AmountMath.formatRaw(
String(holding.balanceRaw || "0"), decimals) : ""
}

function tokenBalanceDetail(token) {
return qsTr("Available %1").arg(root.balanceText(token, 0))
}

function lpDefinitionIdHex() {
if (root.quoteMatchesPair())
return String(root.quotePayload.lpDefinitionIdHex || "")
if (root.quoteMatchesSelectedPair(root.activePoolQuote))
return String(root.activePoolQuote.lpDefinitionIdHex || "")
return ""
}

function shortId(value) {
var text = String(value || "")
return text.length > 14 ? text.slice(0, 7) + "…" + text.slice(-5) : text
Expand Down
Loading
Loading