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

feat: disable withdrawal checks for sARBy vault #149

Merged
merged 2 commits into from
Jan 6, 2025
Merged

feat: disable withdrawal checks for sARBy vault #149

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
3667ace
feat: disable withdrawal checks for sARBy vault
dimlbc Dec 19, 2024
a004440
feat: trading widget v3.3.3
dimlbc Jan 6, 2025
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 packages/trading-widget/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dhedge/trading-widget",
"version": "3.3.2",
"version": "3.3.3",
"license": "MIT",
"type": "module",
"main": "index.js",
Expand Down
4 changes: 4 additions & 0 deletions packages/trading-widget/src/core-kit/const/synthetix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export const DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES: Address[] = [
'0xe9b5260d99d283ff887859c569baf8ad1bd12aac', // Synthetix ETH Yield Arbitrum
]

export const DHEDGE_SYNTHETIX_V3_DEPRECATED_VAULT_ADDRESSES: Address[] = [
'0xddd6b1f34e12c0230ab23cbd4514560b24438514', // Synthetix ARB Yield Arbitrum
]

// Should include symbols for all vaults from DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES
export const SYNTHETIX_V3_VAULTS_WITHDRAW_ASSET_SYMBOL_MAP: Record<
string,
Expand Down
6 changes: 6 additions & 0 deletions packages/trading-widget/src/core-kit/utils/synthetix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
DHEDGE_SYNTHETIX_V3_ASSETS_MAP,
DHEDGE_SYNTHETIX_V3_DEPRECATED_VAULT_ADDRESSES,
DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES,
} from 'core-kit/const'

Expand All @@ -14,3 +15,8 @@ export const isSynthetixV3Asset = (address: string) =>
Object.values(DHEDGE_SYNTHETIX_V3_ASSETS_MAP).some((asset) =>
isEqualAddress(asset, address),
)

export const skipSynthetixV3WithdrawalChecks = (address: string) =>
DHEDGE_SYNTHETIX_V3_DEPRECATED_VAULT_ADDRESSES.some((vault) =>
isEqualAddress(vault, address),
)
14 changes: 10 additions & 4 deletions .../withdraw/init-step/button/valid-init-withdraw-button/valid-init-withdraw-button.hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import {
import { useSynthetixV3OraclesUpdate } from 'core-kit/hooks/trading'
import { useWithdrawLiquidity } from 'core-kit/hooks/trading/synthetix-v3/use-withdraw-liquidity'
import { useInitWithdrawAllowance } from 'core-kit/hooks/trading/withdraw-v2/init-step'
import { isSynthetixV3Vault } from 'core-kit/utils'
import {
isSynthetixV3Vault,
skipSynthetixV3WithdrawalChecks,
} from 'core-kit/utils'

import {
useHighSlippageCheck,
Expand Down Expand Up @@ -45,12 +48,15 @@ export const useValidInitWithdrawButton = () => {
})
}

const isSynthetixVault = isSynthetixV3Vault(address)
const performSynthetixWithdrawalChecks =
isSynthetixV3Vault(address) && !skipSynthetixV3WithdrawalChecks(address)

return {
requiresWithdrawalWindow: isSynthetixVault && !isWithdrawal,
requiresWithdrawalWindow: performSynthetixWithdrawalChecks && !isWithdrawal,
requiresWithdrawalLiquidity:
isSynthetixVault && !!sendToken.value && liquidity.noLiquidity,
performSynthetixWithdrawalChecks &&
!!sendToken.value &&
liquidity.noLiquidity,
requiresEndOfCooldown: cooldownActive,
requiresApprove: !canSpend,
requiresHighSlippageConfirm,
Expand Down
Loading