Skip to content

fix trustline bug #1947

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

Draft
jeesunikim wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix trustline bug #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
204 changes: 113 additions & 91 deletions src/app/(sidebar)/account/fund/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,102 +389,124 @@ export default function FundAccount() {
<Text size="xs" as="div" weight="medium">
Choose asset to fund
</Text>

<Link
href="https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/accounts#trustlines"
icon={<Icon.LinkExternal01 />}
size="sm"
>
What is a trustline?
</Link>
</Box>

<div className="Account__fundTokens">
{fundTokens.map((t) => {
const asset = `${t.assetCode}:${t.assetIssuer}`;
const hasTrustline = Boolean(accountBalances?.[asset]);

return (
<div
key={t.id}
className="Account__fundTokens__item"
data-testid="fund-account-token"
>
<div className="Account__fundTokens__item__icon">
<Image
src={`/images/token-icon-${t.id}.png`}
alt={`${t.label} icon`}
width={32}
height={32}
/>
</div>

<div className="Account__fundTokens__item__info">
<Text as="div" size="xs" weight="medium">
{t.label}
</Text>
<Text
as="div"
size="md"
weight="medium"
addlClassName="Account__fundTokens__item__amount"
>{`${formatNumber(parseFloat(t.amount))} ${t.currency}`}</Text>
{fundTokens
.filter((t) => {
// Hide XLM if the account is already funded
if (t.id === "xlm" && accountInfo?.isFunded) {
return false;
}
return true;
})
.map((t) => {
const asset = `${t.assetCode}:${t.assetIssuer}`;
const hasTrustline = Boolean(accountBalances?.[asset]);

return (
<div
key={t.id}
className="Account__fundTokens__item"
data-testid="fund-account-token"
>
<div className="Account__fundTokens__item__icon">
<Image
src={`/images/token-icon-${t.id}.png`}
alt={`${t.label} icon`}
width={32}
height={32}
/>
</div>

<div className="Account__fundTokens__item__info">
<Text as="div" size="xs" weight="medium">
{t.label}
</Text>
<Text
as="div"
size="md"
weight="medium"
addlClassName="Account__fundTokens__item__amount"
>{`${formatNumber(parseFloat(t.amount))} ${t.currency}`}</Text>
</div>

{t.id === "xlm" || hasTrustline ? (
// Fund button
<Button
variant="secondary"
size="md"
disabled={isFundButtonDisabled()}
isLoading={
isAccountLoading ||
(isFriendBotFundLoading && t.id === activeToken)
}
onClick={() => {
handleFund(t.id);
}}
>
Fund
</Button>
) : (
// Add trustline button
<Button
variant="secondary"
size="md"
disabled={
!accountInfo ||
!accountInfo?.isFunded ||
isFriendBotFundLoading ||
((isAddTrustlineInProgress ||
Boolean(addTrustlineTx)) &&
t.id !== activeToken)
}
isLoading={
isAccountLoading || isAddTrustlineInProgress
}
title={
!accountInfo?.isFunded
? "Account must be funded with XLM first"
: undefined
}
onClick={() => {
setActiveToken(t.id);

delayedAction({
action: () => {
resetFriendBotQuery();
addTrustline();
},
delay: 300,
});
}}
>
Add trustline
</Button>
)}
</div>

{t.id === "xlm" || hasTrustline ? (
// Fund button
<Button
variant="secondary"
size="md"
disabled={isFundButtonDisabled()}
isLoading={
isAccountLoading ||
(isFriendBotFundLoading && t.id === activeToken)
}
onClick={() => {
handleFund(t.id);
}}
>
Fund
</Button>
) : (
// Add trustline button
<Button
variant="secondary"
size="md"
disabled={
!accountInfo ||
!accountInfo?.isFunded ||
isFriendBotFundLoading ||
((isAddTrustlineInProgress ||
Boolean(addTrustlineTx)) &&
t.id !== activeToken)
}
isLoading={isAccountLoading || isAddTrustlineInProgress}
title={
!accountInfo?.isFunded
? "Account must be funded with XLM first"
: undefined
}
onClick={() => {
setActiveToken(t.id);

delayedAction({
action: () => {
resetFriendBotQuery();
addTrustline();
},
delay: 300,
});
}}
>
Add trustline
</Button>
)}
</div>
);
})}
);
})}
</div>

<Box
gap="md"
direction="row"
justify="space-between"
align="center"
wrap="wrap"
>
<Text size="xs" as="div" weight="medium">
A trustline lets your account hold and receive this asset. Your
address must have XLM to submit the transaction.{" "}
<Link
href="https://developers.stellar.org/docs/learn/fundamentals/stellar-data-structures/accounts#trustlines"
icon={<Icon.LinkExternal01 />}
size="xs"
>
What is a trustline?
</Link>
</Text>
</Box>
</Box>

{isFriendBotFetchedAfterMount && friendBotError ? (
Expand Down
25 changes: 22 additions & 3 deletions src/components/SignTransactionXdr/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ export const SignTransactionXdr = ({
signatureSigs = sigSignature;
}

const tx = TransactionBuilder.fromXDR(xdrToSign, network.passphrase);
const allSigs = [
...secretKeySigs,
...hardwareSigs,
Expand All @@ -248,9 +247,29 @@ export const SignTransactionXdr = ({
setAllSigsCount(allSigsCount);

if (allSigs.length > 0) {
tx.signatures.push(...allSigs);
// When only the extension wallet signed, use its signed XDR directly.
// This avoids issues where wallets may modify the transaction
// (e.g., fee adjustments), making the extracted signature invalid
// for the original unsigned transaction.
const isExtensionWalletOnly =
extensionSigs.length > 0 &&
secretKeySigs.length === 0 &&
hardwareSigs.length === 0 &&
signatureSigs.length === 0;

let signedTx: string;

if (isExtensionWalletOnly && exSignedTxXdr) {
signedTx = exSignedTxXdr;
} else {
const tx = TransactionBuilder.fromXDR(
xdrToSign,
network.passphrase,
);
tx.signatures.push(...allSigs);
signedTx = tx.toEnvelope().toXDR("base64");
}

const signedTx = tx.toEnvelope().toXDR("base64");
onDoneAction({
signedXdr: signedTx,
successMessage: getAllSigsMessage(allSigsCount),
Expand Down
Loading