Skip to content
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

Add partial liquidity withdraw #2510

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Add partial liquidity withdraw #2510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
612e5ba
Add partial liquidity withdraw
bob0005 Dec 14, 2024
0907ce1
Merge branch 'next' into fix/partial-liquidity-withdrawal
bob0005 Dec 15, 2024
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
125 changes: 84 additions & 41 deletions client/src/ui/components/bank/LiquidityResourceRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const LiquidityResourceRow = ({
const [canCarry, setCanCarry] = useState(false);
const [openConfirmation, setOpenConfirmation] = useState(false);
const [showInputResourcesPrice, setShowInputResourcesPrice] = useState(false);
const [withdrawalPercentage, setWithdrawalPercentage] = useState(100);

const marketEntityId = useMemo(
() => getEntityIdFromKeys([BigInt(bankEntityId), BigInt(resourceId)]),
Expand Down Expand Up @@ -80,29 +81,52 @@ export const LiquidityResourceRow = ({

const { computeTravelTime } = useTravel();

const onWithdraw = useCallback(() => {
setIsLoading(true);
const sharesUnscaled = marketManager.getSharesUnscaled();
const totalLiquidityUnscaled = marketManager.getTotalLiquidityUnscaled();
const withdrawShares = sharesUnscaled > totalLiquidityUnscaled ? totalLiquidityUnscaled : sharesUnscaled;
dojoContext.setup.systemCalls
.remove_liquidity({
bank_entity_id: bankEntityId,
entity_id: entityId,
resource_type: BigInt(resourceId),
shares: withdrawShares,
signer: dojoContext.account.account,
})
.finally(() => {
setIsLoading(false);
setOpenConfirmation(false);
});
}, [dojoContext, bankEntityId, entityId, resourceId, marketManager]);
const onWithdraw = useCallback(
(percentage: number) => {
setIsLoading(true);
const { withdrawShares } = calculateWithdrawAmounts(percentage);

dojoContext.setup.systemCalls
.remove_liquidity({
bank_entity_id: bankEntityId,
entity_id: entityId,
resource_type: BigInt(resourceId),
shares: withdrawShares,
signer: dojoContext.account.account,
})
.finally(() => {
setIsLoading(false);
setOpenConfirmation(false);
});
},
[dojoContext, bankEntityId, entityId, resourceId, marketManager],
);
Comment on lines +84 to +103
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add error handling to onWithdraw function

The onWithdraw function currently lacks error handling for the remove_liquidity system call. Implement error handling to manage potential failures, such as network errors or transaction rejections, to improve reliability and user experience.

Apply this diff to add error handling:

          dojoContext.setup.systemCalls
            .remove_liquidity({
              bank_entity_id: bankEntityId,
              entity_id: entityId,
              resource_type: BigInt(resourceId),
              shares: withdrawShares,
              signer: dojoContext.account.account,
            })
+           .catch((error) => {
+             console.error("Failed to remove liquidity:", error);
+             // Optionally, display an error message to the user
+           })
            .finally(() => {
              setIsLoading(false);
              setOpenConfirmation(false);
            });

Committable suggestion skipped: line range outside the PR's diff.


const calculateWithdrawAmounts = useCallback(
(percentage: number) => {
const sharesUnscaled = marketManager.getSharesUnscaled();
const totalLiquidityUnscaled = marketManager.getTotalLiquidityUnscaled();
const maxShares = sharesUnscaled > totalLiquidityUnscaled ? totalLiquidityUnscaled : sharesUnscaled;
const withdrawShares = (maxShares * BigInt(percentage)) / BigInt(100);

const lordsToReceive = (lordsAmount * percentage) / 100;
const resourceToReceive = (resourceAmount * percentage) / 100;

return {
withdrawShares: withdrawShares,
lords: lordsToReceive,
resource: resourceToReceive,
};
},
[marketManager, lordsAmount, resourceAmount],
);

const renderConfirmationPopup = useMemo(() => {
const { lords, resource } = calculateWithdrawAmounts(withdrawalPercentage);

const travelResources = [
{ amount: divideByPrecision(lordsAmount), resourceId: ResourcesIds.Lords },
{ amount: divideByPrecision(resourceAmount), resourceId: resourceId },
{ amount: divideByPrecision(lords), resourceId: ResourcesIds.Lords },
{ amount: divideByPrecision(resource), resourceId: resourceId },
];

return (
Expand All @@ -111,36 +135,54 @@ export const LiquidityResourceRow = ({
warning="Warning: not enough donkeys to transport resources"
disabled={!canCarry}
isLoading={isLoading}
onConfirm={onWithdraw}
onConfirm={() => onWithdraw(withdrawalPercentage)}
onCancel={() => setOpenConfirmation(false)}
>
<div>
<div className="flex items-center justify-center space-x-2">
{travelResources.map((cost, index) => (
<div key={index} className="flex items-center">
<ResourceCost withTooltip amount={cost.amount} resourceId={cost.resourceId} />
</div>
))}
<div className="space-y-4">
<div className="flex flex-col items-center space-y-2">
<div className="w-full flex items-center justify-between">
<span>Withdrawal Amount:</span>
<span className="font-bold">{withdrawalPercentage}%</span>
</div>
<input
type="range"
min="0"
max="100"
value={withdrawalPercentage}
onChange={(e) => setWithdrawalPercentage(Number(e.target.value))}
className="w-full appearance-none bg-gold/20 h-2 rounded-lg focus:outline-none [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:w-4 [&::-webkit-slider-thumb]:h-4 [&::-webkit-slider-thumb]:bg-gold [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:cursor-pointer [&::-moz-range-thumb]:w-4 [&::-moz-range-thumb]:h-4 [&::-moz-range-thumb]:bg-gold [&::-moz-range-thumb]:border-0 [&::-moz-range-thumb]:rounded-full [&::-moz-range-thumb]:cursor-pointer"
/>
</div>
<div className="bg-gold/10 p-2 mt-2 rounded-lg h-auto">
<div className="flex flex-col items-center">
<TravelInfo
entityId={entityId}
resources={travelResources}
travelTime={computeTravelTime(
bankEntityId,
entityId,
configManager.getSpeedConfig(EntityType.DONKEY),
true,
)}
setCanCarry={setCanCarry}
/>

<div>
<div className="flex items-center justify-center space-x-2">
{travelResources.map((cost, index) => (
<div key={index} className="flex items-center">
<ResourceCost withTooltip amount={cost.amount} resourceId={cost.resourceId} />
</div>
))}
</div>
<div className="bg-gold/10 p-2 mt-2 rounded-lg h-auto">
<div className="flex flex-col items-center">
<TravelInfo
entityId={entityId}
resources={travelResources}
travelTime={computeTravelTime(
bankEntityId,
entityId,
configManager.getSpeedConfig(EntityType.DONKEY),
true,
)}
setCanCarry={setCanCarry}
/>
</div>
</div>
</div>
</div>
</ConfirmationPopup>
);
}, [
withdrawalPercentage,
lordsAmount,
resourceAmount,
canCarry,
Expand All @@ -151,6 +193,7 @@ export const LiquidityResourceRow = ({
entityId,
computeTravelTime,
setCanCarry,
calculateWithdrawAmounts,
]);

return (
Expand Down
2 changes: 1 addition & 1 deletion client/src/ui/components/trading/MarketModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export const MarketModal = () => {
</Select>
</div>
<div className=" ml-2 bg-map align-middle flex gap-2">
{currencyFormat(Number(lordsBalance), 0)}{" "}
{currencyFormat(Number(lordsBalance), 2)}{" "}
<ResourceIcon resource={ResourcesIds[ResourcesIds.Lords]} size="lg" />
</div>
</div>
Expand Down
Loading