Skip to content

Commit

Permalink
ci(release): publish latest release
Browse files Browse the repository at this point in the history
  • Loading branch information
hello-happy-puppy committed Jan 23, 2025
1 parent 63abe13 commit f16a99c
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 76 deletions.
14 changes: 7 additions & 7 deletions RELEASE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
IPFS hash of the deployment:
- CIDv0: `QmSmvQMNhi4BXMeBcTtjzRqkSkUM6BrLUjoiF4iqydKdxD`
- CIDv1: `bafybeicb5abvqxhmsyufrrsh67h2q6cdomr673nes6umxcq2uvnmcnglei`
- CIDv0: `QmcrR5faskhjW7PVj7g5tA4gAqASyDvySRHAQes9fVCSvJ`
- CIDv1: `bafybeigxuoq3myrrht67aku2bu7jqvr6rdfwfp6bycbgu7tbybbktumvz4`

The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).

Expand All @@ -10,15 +10,15 @@ You can also access the Uniswap Interface from an IPFS gateway.
Your Uniswap settings are never remembered across different URLs.

IPFS gateways:
- https://bafybeicb5abvqxhmsyufrrsh67h2q6cdomr673nes6umxcq2uvnmcnglei.ipfs.dweb.link/
- https://bafybeicb5abvqxhmsyufrrsh67h2q6cdomr673nes6umxcq2uvnmcnglei.ipfs.cf-ipfs.com/
- [ipfs://QmSmvQMNhi4BXMeBcTtjzRqkSkUM6BrLUjoiF4iqydKdxD/](ipfs://QmSmvQMNhi4BXMeBcTtjzRqkSkUM6BrLUjoiF4iqydKdxD/)
- https://bafybeigxuoq3myrrht67aku2bu7jqvr6rdfwfp6bycbgu7tbybbktumvz4.ipfs.dweb.link/
- https://bafybeigxuoq3myrrht67aku2bu7jqvr6rdfwfp6bycbgu7tbybbktumvz4.ipfs.cf-ipfs.com/
- [ipfs://QmcrR5faskhjW7PVj7g5tA4gAqASyDvySRHAQes9fVCSvJ/](ipfs://QmcrR5faskhjW7PVj7g5tA4gAqASyDvySRHAQes9fVCSvJ/)

### 5.67.2 (2025-01-23)
### 5.67.3 (2025-01-23)


### Bug Fixes

* **web:** send updated user property chainId (#15417) 731a83d
* **web:** lp flow error logging updates (#15424) d7de5d5


2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web/5.67.2
web/5.67.3
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ProtocolVersion } from '@uniswap/client-pools/dist/pools/v1/types_pb'
import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
import { useIncreaseLiquidityContext } from 'components/IncreaseLiquidity/IncreaseLiquidityContext'
import { useModalLiquidityInitialState } from 'components/Liquidity/hooks'
import { getProtocolItems } from 'components/Liquidity/utils'
import { getProtocolItems, parseErrorMessageTitle } from 'components/Liquidity/utils'
import { ZERO_ADDRESS } from 'constants/misc'
import { getCurrencyAddressForTradingApi } from 'pages/Pool/Positions/create/utils'
import { PropsWithChildren, createContext, useContext, useMemo } from 'react'
Expand Down Expand Up @@ -69,18 +69,18 @@ export function IncreaseLiquidityTxContextProvider({ children }: PropsWithChildr
} = useCheckLpApprovalQuery({
params: increaseLiquidityApprovalParams,
staleTime: 5 * ONE_SECOND_MS,
enabled: !error,
enabled: !!increaseLiquidityApprovalParams && !error,
})

if (approvalError) {
logger.info(
'IncreaseLiquidityTxContext',
'IncreaseLiquidityTxContext',
'CheckLpApprovalQuery',
JSON.stringify({
error: approvalError,
increaseLiquidityApprovalParams,
}),
parseErrorMessageTitle(approvalError, 'unknown CheckLpApprovalQuery'),
{
error: JSON.stringify(approvalError),
increaseLiquidityApprovalParams: JSON.stringify(increaseLiquidityApprovalParams),
},
)
}

Expand Down Expand Up @@ -168,10 +168,15 @@ export function IncreaseLiquidityTxContextProvider({ children }: PropsWithChildr
const { increase, gasFee: actualGasFee, dependentAmount } = increaseCalldata || {}

if (calldataError) {
logger.warn('IncreaseLiquidityTxContext', 'IncreaseLiquidityTxContext', 'IncreaseLpPositionCalldataQuery', {
error: JSON.stringify(calldataError),
increaseCalldataQueryParams: JSON.stringify(increaseCalldataQueryParams),
})
logger.info(
'IncreaseLiquidityTxContext',
'IncreaseLiquidityTxContext',
parseErrorMessageTitle(calldataError, 'unknown IncreaseLpPositionCalldataQuery'),
{
error: JSON.stringify(calldataError),
increaseCalldataQueryParams: JSON.stringify(increaseCalldataQueryParams),
},
)
}

const { value: calculatedGasFee } = useTransactionGasFee(increase, !!actualGasFee)
Expand Down
9 changes: 9 additions & 0 deletions apps/web/src/components/Liquidity/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -656,3 +656,12 @@ export function getDisplayedAmountsFromDependentAmount({
displayCurrencyAmounts: currencyAmounts,
}
}

export function parseErrorMessageTitle(error: unknown, defaultTitle: string) {
if (!error) {
return defaultTitle
}

const errorWithData = error as { data?: { detail?: string }; name?: string }
return errorWithData.data?.detail || errorWithData.name || defaultTitle
}
28 changes: 15 additions & 13 deletions apps/web/src/components/RemoveLiquidity/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// eslint-disable-next-line no-restricted-imports
import { ProtocolVersion } from '@uniswap/client-pools/dist/pools/v1/types_pb'
import { useV3OrV4PositionDerivedInfo } from 'components/Liquidity/hooks'
import { getProtocolItems } from 'components/Liquidity/utils'
import { getProtocolItems, parseErrorMessageTitle } from 'components/Liquidity/utils'
import { useRemoveLiquidityModalContext } from 'components/RemoveLiquidity/RemoveLiquidityModalContext'
import { RemoveLiquidityTxInfo } from 'components/RemoveLiquidity/RemoveLiquidityTxContext'
import { ZERO_ADDRESS } from 'constants/misc'
Expand Down Expand Up @@ -56,17 +56,18 @@ export function useRemoveLiquidityTxAndGasInfo({ account }: { account?: string }
} = useCheckLpApprovalQuery({
params: v2LpTokenApprovalQueryParams,
staleTime: 5 * ONE_SECOND_MS,
enabled: Boolean(v2LpTokenApprovalQueryParams),
})

if (approvalError) {
logger.info(
'RemoveLiquidityTxAndGasInfo',
'RemoveLiquidityTxAndGasInfo',
'CheckLpApprovalQuery',
JSON.stringify({
error: approvalError,
v2LpTokenApprovalQueryParams,
}),
parseErrorMessageTitle(approvalError, 'unkown CheckLpApprovalQuery'),
{
error: JSON.stringify(approvalError),
v2LpTokenApprovalQueryParams: JSON.stringify(v2LpTokenApprovalQueryParams),
},
)
}

Expand Down Expand Up @@ -141,19 +142,20 @@ export function useRemoveLiquidityTxAndGasInfo({ account }: { account?: string }
deadlineInMinutes: customDeadline,
refetchInterval: 5 * ONE_SECOND_MS,
enabled:
(!percentInvalid && !v2LpTokenApprovalQueryParams) ||
(!v2ApprovalLoading && !approvalError && Boolean(v2LpTokenApproval)),
!!decreaseCalldataQueryParams &&
((!percentInvalid && !v2LpTokenApprovalQueryParams) ||
(!v2ApprovalLoading && !approvalError && Boolean(v2LpTokenApproval))),
})

if (calldataError) {
logger.info(
'RemoveLiquidityTxAndGasInfo',
'RemoveLiquidityTxAndGasInfo',
'DecreaseLpPositionCalldataQuery',
JSON.stringify({
error: calldataError,
decreaseCalldataQueryParams,
}),
parseErrorMessageTitle(calldataError, 'DecreaseLpPositionCalldataQuery'),
{
error: JSON.stringify(calldataError),
decreaseCalldataQueryParams: JSON.stringify(decreaseCalldataQueryParams),
},
)
}

Expand Down
20 changes: 11 additions & 9 deletions apps/web/src/pages/MigrateV3/MigrateV3LiquidityTxContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ProtocolVersion } from '@uniswap/client-pools/dist/pools/v1/types_pb'
import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
import { useV3OrV4PositionDerivedInfo } from 'components/Liquidity/hooks'
import { V3PositionInfo } from 'components/Liquidity/types'
import { parseErrorMessageTitle } from 'components/Liquidity/utils'
import { ZERO_ADDRESS } from 'constants/misc'
import { useCreatePositionContext, usePriceRangeContext } from 'pages/Pool/Positions/create/CreatePositionContext'
import { PropsWithChildren, createContext, useContext, useMemo } from 'react'
Expand Down Expand Up @@ -75,17 +76,18 @@ export function MigrateV3PositionTxContextProvider({
'x-universal-router-version': '2.0',
},
staleTime: 5 * ONE_SECOND_MS,
enabled: Boolean(increaseLiquidityApprovalParams),
})

if (approvalError) {
logger.info(
'MigrateV3LiquidityTxContext',
'MigrateV3LiquidityTxContext',
'CheckLpApprovalQuery',
JSON.stringify({
error: approvalError,
increaseLiquidityApprovalParams,
}),
parseErrorMessageTitle(approvalError, 'unknown CheckLpApprovalQuery'),
{
error: JSON.stringify(approvalError),
increaseLiquidityApprovalParams: JSON.stringify(increaseLiquidityApprovalParams),
},
)
}

Expand Down Expand Up @@ -189,11 +191,11 @@ export function MigrateV3PositionTxContextProvider({
logger.info(
'MigrateV3LiquidityTxContext',
'MigrateV3LiquidityTxContext',
'MigrateLpPositionCalldataQuery',
JSON.stringify({
error: migrateError,
parseErrorMessageTitle(migrateError, 'unknown MigrateLpPositionCalldataQuery'),
{
error: JSON.stringify(migrateError),
migrateCalldataQueryParams: JSON.stringify(migratePositionRequestArgs),
}),
},
)
}

Expand Down
19 changes: 8 additions & 11 deletions apps/web/src/pages/Pool/Positions/ClaimFeeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ProtocolVersion } from '@uniswap/client-pools/dist/pools/v1/types_pb'
import { LoaderButton } from 'components/Button/LoaderButton'
import { getLPBaseAnalyticsProperties } from 'components/Liquidity/analytics'
import { useModalLiquidityInitialState, useV3OrV4PositionDerivedInfo } from 'components/Liquidity/hooks'
import { getProtocolItems } from 'components/Liquidity/utils'
import { getProtocolItems, parseErrorMessageTitle } from 'components/Liquidity/utils'
import { GetHelpHeader } from 'components/Modal/GetHelpHeader'
import { ZERO_ADDRESS } from 'constants/misc'
import { useAccount } from 'hooks/useAccount'
Expand Down Expand Up @@ -112,18 +112,15 @@ export function ClaimFeeModal() {
refetch,
} = useClaimLpFeesCalldataQuery({
params: claimLpFeesParams,
enabled: Boolean(claimLpFeesParams),
})

if (error) {
logger.info(
'ClaimFeeModal',
'ClaimFeeModal',
'ClaimLPFeesCalldataQuery',
JSON.stringify({
error,
claimLpFeesParams,
}),
)
// prevent logging of the empty error object for now since those are burying signals
if (error && Object.keys(error).length > 0) {
logger.info('ClaimFeeModal', 'ClaimFeeModal', parseErrorMessageTitle(error, 'unknown ClaimLPFeesCalldataQuery'), {
error: JSON.stringify(error),
claimLpFeesParams: JSON.stringify(claimLpFeesParams),
})
}

const txInfo = useMemo(() => {
Expand Down
30 changes: 18 additions & 12 deletions apps/web/src/pages/Pool/Positions/create/ContextProviders.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FeeTierSearchModal } from 'components/Liquidity/FeeTierSearchModal'
import { DepositState } from 'components/Liquidity/types'
import { parseErrorMessageTitle } from 'components/Liquidity/utils'
import {
CreatePositionContext,
CreateTxContext,
Expand Down Expand Up @@ -168,18 +169,18 @@ export function CreateTxContextProvider({ children }: { children: React.ReactNod
} = useCheckLpApprovalQuery({
params: addLiquidityApprovalParams,
staleTime: 5 * ONE_SECOND_MS,
enabled: !hasError,
enabled: !!addLiquidityApprovalParams && !hasError,
})

if (approvalError) {
logger.info(
'CreateTxContextProvider',
'CreateTxContextProvider',
'CheckLpApprovalQuery',
JSON.stringify({
error: approvalError,
addLiquidityApprovalParams,
}),
parseErrorMessageTitle(approvalError, 'unknown CheckLpApprovalQuery'),
{
error: JSON.stringify(approvalError),
addLiquidityApprovalParams: JSON.stringify(addLiquidityApprovalParams),
},
)
}

Expand Down Expand Up @@ -221,18 +222,23 @@ export function CreateTxContextProvider({ children }: { children: React.ReactNod
params: createCalldataQueryParams,
deadlineInMinutes: swapSettings.customDeadline,
refetchInterval: 5 * ONE_SECOND_MS,
enabled: !hasError && !approvalLoading && !approvalError && Boolean(approvalCalldata),
enabled:
!hasError &&
!approvalLoading &&
!approvalError &&
Boolean(approvalCalldata) &&
Boolean(createCalldataQueryParams),
})

if (createError) {
logger.info(
'CreateTxContextProvider',
'CreateTxContextProvider',
'CreateLpPositionCalldataQuery',
JSON.stringify({
error: createError,
createCalldataQueryParams,
}),
parseErrorMessageTitle(createError, 'unknown CreateLpPositionCalldataQuery'),
{
error: JSON.stringify(createError),
createCalldataQueryParams: JSON.stringify(createCalldataQueryParams),
},
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ export function useCheckLpApprovalQuery({

return useQuery<CheckApprovalLPResponse>({
queryKey,
enabled: !!params,
queryFn: async () => {
if (!params) {
throw new Error('Params are required')
throw { name: 'Params are required' }
}
return await checkLpApproval(params, headers)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ export function useClaimLpFeesCalldataQuery({

return useQuery<ClaimLPFeesResponse>({
queryKey,
enabled: !!params,
queryFn: async () => {
if (!params) {
throw new Error('Params are required')
throw { name: 'Params are required' }
}
return await claimLpFees(params)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ export function useCreateLpPositionCalldataQuery({

return useQuery<CreateLPPositionResponse>({
queryKey,
enabled: !!params,
queryFn: async () => {
if (!params) {
throw new Error('Params are required')
throw { name: 'Params are required' }
}
return await createLpPosition(paramsWithDeadline)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ export function useDecreaseLpPositionCalldataQuery({

return useQuery<DecreaseLPPositionResponse>({
queryKey,
enabled: !!params,
queryFn: async () => {
if (!params) {
throw new Error('Params are required')
throw { name: 'Params are required' }
}
return await decreaseLpPosition(paramsWithDeadline)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ export function useIncreaseLpPositionCalldataQuery({
const paramsWithDeadline = { ...params, deadline }
return useQuery<IncreaseLPPositionResponse>({
queryKey,
enabled: !!params,
queryFn: async () => {
if (!params) {
throw new Error('Params are required')
throw { name: 'Params are required' }
}
return await increaseLpPosition(paramsWithDeadline)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ export function useMigrateV3LpPositionCalldataQuery({

return useQuery<MigrateLPPositionResponse>({
queryKey,
enabled: !!params,
queryFn: async () => {
if (!params) {
throw new Error('Params are required')
throw { name: 'Params are required' }
}
return await migrateLpPosition(params)
},
Expand Down

0 comments on commit f16a99c

Please sign in to comment.