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.

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

[STK-123][CHORE] -Update CoW typing to remove errors #1933

Merged
merged 6 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "DXswap Decentralized Application",
"license": "GPL-3.0-or-later",
"scripts": {
"start": "yarn codegen:socket && yarn codegen:graphql && react-app-rewired start",
"start": "yarn codegen:graphql && react-app-rewired start",
"build": "git config --global --add safe.directory /workspace && yarn codegen:wallet-connect-domain-verification && cross-env GENERATE_SOURCEMAP=false react-app-rewired build",
"build:simple": "git config --global --add safe.directory /workspace && cross-env GENERATE_SOURCEMAP=false react-app-rewired build",
"build:serve": "yarn build && serve -s ./build -l 5001",
Expand Down
11 changes: 8 additions & 3 deletions src/pages/Swap/LimitOrderBox/api/cow.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Signer } from '@ethersproject/abstract-signer'
import { ChainId, CoWTrade, GPv2SupportedChainId, JSBI } from '@swapr/sdk'
import { CoWTrade, JSBI } from '@swapr/sdk'

import contractNetworks from '@cowprotocol/contracts/networks.json'
import { OrderKind as CoWOrderKind } from '@cowprotocol/cow-sdk'
Expand Down Expand Up @@ -171,9 +171,14 @@ export async function createCoWLimitOrder({ order, signer, chainId }: GetLimitOr
* @param chainId The chain Id
* @returns The vault relayer address
*/
export function getVaultRelayerAddress(chainId: ChainId) {
export type GPV2ContractChainId = keyof typeof contractNetworks.GPv2VaultRelayer
export function getVaultRelayerAddress(chainId: GPV2ContractChainId) {
const gpv2RelayerChainIds = Object.keys(JSON.parse(JSON.stringify(contractNetworks.GPv2VaultRelayer)))

if (!chainId || !gpv2RelayerChainIds.includes(chainId.toString())) return undefined

const GPv2VaultRelayer = contractNetworks.GPv2VaultRelayer as Record<
GPv2SupportedChainId,
GPV2ContractChainId,
Record<'transactionHash' | 'address', string>
>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Field } from '../../../../../state/swap/types'
import { useCurrencyBalances } from '../../../../../state/wallet/hooks'
import { maxAmountSpend } from '../../../../../utils/maxAmountSpend'
import AppBody from '../../../../AppBody'
import { createCoWLimitOrder, getQuote, getVaultRelayerAddress } from '../../api/cow'
import { createCoWLimitOrder, getQuote, getVaultRelayerAddress, GPV2ContractChainId } from '../../api/cow'
import { BUY_LIMIT_PRICE_PERCENTAGE, GET_QUOTE_EXPIRY_MINUTES, SELL_LIMIT_PRICE_PERCENTAGE } from '../../constants'
import { LimitOrderFormContext } from '../../contexts/LimitOrderFormContext'
import { InputFocus, LimitOrderKind, MarketPrices, OrderExpiresInUnit } from '../../interfaces'
Expand Down Expand Up @@ -96,7 +96,7 @@ export function LimitOrderForm({ account, provider, chainId }: LimitOrderFormPro

const [tokenInApproval, tokenInApprovalCallback] = useApproveCallback(
sellTokenAmount,
getVaultRelayerAddress(chainId)
getVaultRelayerAddress(chainId as unknown as GPV2ContractChainId)
)

const onModalDismiss = () => {
Expand Down
7 changes: 4 additions & 3 deletions src/state/transactions/updater.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { ChainId, CoWTrade, GPv2SupportedChainId } from '@swapr/sdk'
import { ChainId, CoWTrade } from '@swapr/sdk'

import contractNetworks from '@cowprotocol/contracts/networks.json'
import { useCallback, useEffect, useMemo } from 'react'
import { useDispatch, useSelector } from 'react-redux'

import { useActiveWeb3React } from '../../hooks'
import { GPV2ContractChainId } from '../../pages/Swap/LimitOrderBox/api/cow'
import { retry, RetryableError, RetryOptions } from '../../utils/retry'
import { updateBlockNumber } from '../application/actions'
import { useAddPopup, useBlockNumber } from '../application/hooks'
Expand Down Expand Up @@ -115,10 +116,10 @@ export default function Updater(): null {

// The settlement contract from COW
const GPv2Settlement = contractNetworks.GPv2Settlement as Record<
GPv2SupportedChainId,
GPV2ContractChainId,
Record<'transactionHash' | 'address', string>
>
const contractAddress = GPv2Settlement[chainId]?.address
const contractAddress = GPv2Settlement[chainId as unknown as GPV2ContractChainId]?.address

dispatch(
finalizeTransaction({
Expand Down
5 changes: 4 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx"
"jsx": "react-jsx",
"paths": {
"react": ["./node_modules/@types/react"]
}
},
"exclude": ["./src/services/EcoBridge/Socket/api/generated"],
"include": ["src"]
Expand Down
Loading