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 Synthetix V3 checks #156

Merged
merged 1 commit into from
Jan 29, 2025
Merged

feat: disable Synthetix V3 checks #156

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
35 changes: 2 additions & 33 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 @@ -8,51 +8,20 @@ export const DHEDGE_SYNTHETIX_V3_ASSETS_MAP: Record<ChainId, Address> = {
[arbitrum.id]: '0xffffffaeff0b96ea8e4f94b2253f31abdd875847',
}

export const DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES: Address[] = [
'0xc1e02884af4a283ca25ab63c45360d220d69da52', // Synthetix USDC Yield Base
'0xc3198eb5102fb3335c0e911ef1da4bc07e403dd1', // Synthetix USD Yield Arbitrum
'0xddd6b1f34e12c0230ab23cbd4514560b24438514', // Synthetix ARB Yield Arbitrum
'0xe9b5260d99d283ff887859c569baf8ad1bd12aac', // Synthetix ETH Yield Arbitrum
]

export const DHEDGE_SYNTHETIX_V3_DEPRECATED_VAULT_ADDRESSES: Address[] = [
'0xddd6b1f34e12c0230ab23cbd4514560b24438514', // Synthetix ARB Yield Arbitrum
'0xc3198eb5102fb3335c0e911ef1da4bc07e403dd1', // Synthetix USD Yield Arbitrum
'0xe9b5260d99d283ff887859c569baf8ad1bd12aac', // Synthetix ETH Yield Arbitrum
]
export const DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES: Address[] = []

// Should include symbols for all vaults from DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES
export const SYNTHETIX_V3_VAULTS_WITHDRAW_ASSET_SYMBOL_MAP: Record<
string,
string
> = {
'0xc1e02884af4a283ca25ab63c45360d220d69da52': 'USDC',
'0xc3198eb5102fb3335c0e911ef1da4bc07e403dd1': 'USDC',
'0xddd6b1f34e12c0230ab23cbd4514560b24438514': 'ARB',
'0xe9b5260d99d283ff887859c569baf8ad1bd12aac': 'wstETH',
}
> = {}

export const SYNTHETIX_V3_POSITION_DEBT_ARGUMENTS: Record<string, string[]> = {
'0xc1e02884af4a283ca25ab63c45360d220d69da52': [
'170141183460469231731687303715884105982', // Synthetix USDC Yield Base ID
'1',
'0xC74eA762cF06c9151cE074E6a569a5945b6302E7',
],
'0xc3198eb5102fb3335c0e911ef1da4bc07e403dd1': [
'170141183460469231731687303715884106252', // Synthetix USD Yield Arbitrum ID
'1',
'0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
],
'0xddd6b1f34e12c0230ab23cbd4514560b24438514': [
'170141183460469231731687303715884106481', // Synthetix ARB Yield Arbitrum ID
'1',
'0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
],
'0xe9b5260d99d283ff887859c569baf8ad1bd12aac': [
'170141183460469231731687303715884106484', // Synthetix ETH Yield Arbitrum ID
'1',
'0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
],
}

export const WITHDRAWAL_FEE_MAP = new Map<Address, number>([
Expand Down
134 changes: 65 additions & 69 deletions packages/trading-widget/src/core-kit/hooks/pool/use-contract-pool-composition.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { expect } from 'vitest'

import { erc20Abi } from 'core-kit/abi'
import {
DEFAULT_PRECISION,
DHEDGE_SYNTHETIX_V3_ASSETS_MAP,
DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES,
optimism,
} from 'core-kit/const'
import { DEFAULT_PRECISION, optimism } from 'core-kit/const'
import * as poolHooks from 'core-kit/hooks/pool'
import * as poolMulticallHooks from 'core-kit/hooks/pool/multicall'
import * as stateHooks from 'core-kit/hooks/state'
import * as web3Hooks from 'core-kit/hooks/web3'
import type { Address, PoolComposition } from 'core-kit/types'
import type { PoolComposition } from 'core-kit/types'
import { TEST_ADDRESS } from 'tests/mocks'
import { renderHook } from 'tests/test-utils'

Expand Down Expand Up @@ -218,66 +213,67 @@ describe('useContractPoolComposition', () => {
expect(result.current).toMatchSnapshot()
})

it('should return extended fund composition data with synthetix v3 asset balance', () => {
const address = DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES[0] as Address
const chainId = optimism.id
const fallbackPoolComposition: PoolComposition = {
tokenName: 'fallback_tokenName',
rate: 'fallback_rate',
amount: 'fallback_amount',
isDeposit: true,
tokenAddress: TEST_ADDRESS,
precision: DEFAULT_PRECISION,
asset: {
iconSymbols: ['fallback_iconSymbol'],
},
}
const fallbackPoolData = { poolCompositions: [fallbackPoolComposition] }
const contractFundComposition = [
[
{ asset: TEST_ADDRESS, isDeposit: true },
{ asset: DHEDGE_SYNTHETIX_V3_ASSETS_MAP[chainId], isDeposit: false },
],
[BigInt(1), BigInt(2)],
[BigInt(1), BigInt(2)],
]
const symbol = 'symbol'
const decimals = DEFAULT_PRECISION

vi.mocked(stateHooks.useTradingPanelPoolFallbackData).mockImplementation(
() =>
[fallbackPoolData, vi.fn()] as unknown as ReturnType<
typeof stateHooks.useTradingPanelPoolFallbackData
>,
)
vi.mocked(poolHooks.useSynthetixV3AssetBalance).mockImplementation(
() => '3',
)
vi.mocked(poolMulticallHooks.usePoolManagerDynamic).mockImplementationOnce(
() =>
({
data: { getFundComposition: contractFundComposition },
isFetched: true,
}) as unknown as ReturnType<
typeof poolMulticallHooks.usePoolManagerDynamic
>,
)
vi.mocked(web3Hooks.useReadContracts).mockImplementation(
() =>
({
data: [{ result: symbol }, { result: decimals }],
}) as unknown as ReturnType<typeof web3Hooks.useReadContracts>,
)

const { result } = renderHook(() =>
useContractPoolComposition({ address, chainId }),
)

expect(poolHooks.useSynthetixV3AssetBalance).toHaveBeenCalledWith({
vaultAddress: address,
chainId,
disabled: false,
})
expect(result.current).toMatchSnapshot()
})
// temporary disabled
// it('should return extended fund composition data with synthetix v3 asset balance', () => {
// const address = DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES[0] as Address
// const chainId = optimism.id
// const fallbackPoolComposition: PoolComposition = {
// tokenName: 'fallback_tokenName',
// rate: 'fallback_rate',
// amount: 'fallback_amount',
// isDeposit: true,
// tokenAddress: TEST_ADDRESS,
// precision: DEFAULT_PRECISION,
// asset: {
// iconSymbols: ['fallback_iconSymbol'],
// },
// }
// const fallbackPoolData = { poolCompositions: [fallbackPoolComposition] }
// const contractFundComposition = [
// [
// { asset: TEST_ADDRESS, isDeposit: true },
// { asset: DHEDGE_SYNTHETIX_V3_ASSETS_MAP[chainId], isDeposit: false },
// ],
// [BigInt(1), BigInt(2)],
// [BigInt(1), BigInt(2)],
// ]
// const symbol = 'symbol'
// const decimals = DEFAULT_PRECISION
//
// vi.mocked(stateHooks.useTradingPanelPoolFallbackData).mockImplementation(
// () =>
// [fallbackPoolData, vi.fn()] as unknown as ReturnType<
// typeof stateHooks.useTradingPanelPoolFallbackData
// >,
// )
// vi.mocked(poolHooks.useSynthetixV3AssetBalance).mockImplementation(
// () => '3',
// )
// vi.mocked(poolMulticallHooks.usePoolManagerDynamic).mockImplementationOnce(
// () =>
// ({
// data: { getFundComposition: contractFundComposition },
// isFetched: true,
// }) as unknown as ReturnType<
// typeof poolMulticallHooks.usePoolManagerDynamic
// >,
// )
// vi.mocked(web3Hooks.useReadContracts).mockImplementation(
// () =>
// ({
// data: [{ result: symbol }, { result: decimals }],
// }) as unknown as ReturnType<typeof web3Hooks.useReadContracts>,
// )
//
// const { result } = renderHook(() =>
// useContractPoolComposition({ address, chainId }),
// )
//
// expect(poolHooks.useSynthetixV3AssetBalance).toHaveBeenCalledWith({
// vaultAddress: address,
// chainId,
// disabled: false,
// })
// expect(result.current).toMatchSnapshot()
// })
})
123 changes: 61 additions & 62 deletions packages/trading-widget/src/core-kit/hooks/pool/use-pool-dynamic-contract-data.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import { formatDuration, intervalToDuration } from 'date-fns'

import { expect } from 'vitest'

import { DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES, optimism } from 'core-kit/const'
import * as poolHooks from 'core-kit/hooks/pool'
import { optimism } from 'core-kit/const'
import * as poolMulticallHooks from 'core-kit/hooks/pool/multicall'
import type { Address } from 'core-kit/types'
import { TEST_ADDRESS } from 'tests/mocks'
import { renderHook } from 'tests/test-utils'

Expand Down Expand Up @@ -119,63 +117,64 @@ describe('usePoolDynamicContractData', () => {
)
})

it('should return parsed fund summary data for synthetix v3 vault', () => {
const exitCooldown = undefined
const chainId = optimism.id
const isFetched = true
const address = DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES[0] as Address
const managerLogicAddress = '0x123' as Address
const customTotalFundValue = '1111111'

vi.mocked(poolMulticallHooks.usePoolsDynamic).mockImplementation(
() =>
({
data: {
[address]: {
userBalance: '1',
tokenPrice: '2',
totalValue: '3',
totalSupply: '4',
isPrivateVault: true,
performanceFee: '5',
streamingFee: '6',
entryFee: '7',
exitFee: '10',
getExitRemainingCooldown: exitCooldown,
},
},
isFetched: true,
}) as ReturnType<typeof poolMulticallHooks.usePoolsDynamic>,
)

vi.mocked(poolHooks.useManagerLogicAddress).mockImplementationOnce(
() => managerLogicAddress,
)
vi.mocked(poolHooks.useTotalFundValueMutable).mockImplementationOnce(
() => customTotalFundValue,
)

const { result } = renderHook(() =>
usePoolDynamicContractData({
address,
chainId,
}),
)

expect(poolHooks.useManagerLogicAddress).toHaveBeenCalledWith({
address,
chainId,
})

expect(poolHooks.useTotalFundValueMutable).toHaveBeenCalledWith(
expect.objectContaining({ disabled: false }),
)

expect(result.current).toEqual(
expect.objectContaining({
totalValue: customTotalFundValue,
isFetched,
}),
)
})
// temporary disabled
// it('should return parsed fund summary data for synthetix v3 vault', () => {
// const exitCooldown = undefined
// const chainId = optimism.id
// const isFetched = true
// const address = DHEDGE_SYNTHETIX_V3_VAULT_ADDRESSES[0] as Address
// const managerLogicAddress = '0x123' as Address
// const customTotalFundValue = '1111111'
//
// vi.mocked(poolMulticallHooks.usePoolsDynamic).mockImplementation(
// () =>
// ({
// data: {
// [address]: {
// userBalance: '1',
// tokenPrice: '2',
// totalValue: '3',
// totalSupply: '4',
// isPrivateVault: true,
// performanceFee: '5',
// streamingFee: '6',
// entryFee: '7',
// exitFee: '10',
// getExitRemainingCooldown: exitCooldown,
// },
// },
// isFetched: true,
// }) as ReturnType<typeof poolMulticallHooks.usePoolsDynamic>,
// )
//
// vi.mocked(poolHooks.useManagerLogicAddress).mockImplementationOnce(
// () => managerLogicAddress,
// )
// vi.mocked(poolHooks.useTotalFundValueMutable).mockImplementationOnce(
// () => customTotalFundValue,
// )
//
// const { result } = renderHook(() =>
// usePoolDynamicContractData({
// address,
// chainId,
// }),
// )
//
// expect(poolHooks.useManagerLogicAddress).toHaveBeenCalledWith({
// address,
// chainId,
// })
//
// expect(poolHooks.useTotalFundValueMutable).toHaveBeenCalledWith(
// expect.objectContaining({ disabled: false }),
// )
//
// expect(result.current).toEqual(
// expect.objectContaining({
// totalValue: customTotalFundValue,
// isFetched,
// }),
// )
// })
})
Loading