fix: refactor import paths to fix generated types (#1130)

Co-authored-by: Jimmy Hardwick <[email protected]>
immutable · Nov 9, 2023 · cd3f434 · cd3f434
1 parent 8f5983d
commit cd3f434
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/packages/internal/dex/sdk/src/config/config.test.ts b/packages/internal/dex/sdk/src/config/config.test.ts
@@ -2,8 +2,8 @@ import { Environment, ImmutableConfiguration } from '@imtbl/config';
 import { ChainNotSupportedError, InvalidConfigurationError } from 'errors';
 import * as test from 'test/utils';
 import { ERC20 } from 'types';
-import { ExchangeModuleConfiguration, ExchangeOverrides } from '../types';
-import { ExchangeConfiguration, ExchangeContracts } from './index';
+import { ExchangeContracts, ExchangeModuleConfiguration, ExchangeOverrides } from '../types';
+import { ExchangeConfiguration } from './index';
 import { IMMUTABLE_TESTNET_CHAIN_ID } from '../constants/chains';
 
 describe('ExchangeConfiguration', () => {

diff --git a/packages/internal/dex/sdk/src/config/index.ts b/packages/internal/dex/sdk/src/config/index.ts
@@ -1,7 +1,7 @@
 import { Environment, ImmutableConfiguration } from '@imtbl/config';
 import { ChainNotSupportedError, InvalidConfigurationError } from 'errors';
 import { isValidNonZeroAddress } from 'lib';
-import { ExchangeModuleConfiguration, ExchangeOverrides, SecondaryFee, Chain } from '../types';
+import { ExchangeContracts, ExchangeModuleConfiguration, ExchangeOverrides, SecondaryFee, Chain } from '../types';
 import {
   IMMUTABLE_TESTNET_CHAIN_ID,
   IMMUTABLE_TESTNET_COMMON_ROUTING_TOKENS,
@@ -10,14 +10,6 @@ import {
   TIMX_IMMUTABLE_TESTNET,
 } from '../constants';
 
-export type ExchangeContracts = {
-  multicall: string;
-  coreFactory: string;
-  quoterV2: string;
-  peripheryRouter: string;
-  secondaryFee: string;
-};
-
 export const CONTRACTS_FOR_CHAIN_ID: Record<number, ExchangeContracts> = {
   [IMMUTABLE_TESTNET_CHAIN_ID]: {
     multicall: '0xD17c98b38bA28c7eA1080317EB9AB2b9663BEd92',

diff --git a/packages/internal/dex/sdk/src/types/index.ts b/packages/internal/dex/sdk/src/types/index.ts
@@ -1,6 +1,13 @@
 import { ethers } from 'ethers';
 import { ModuleConfiguration } from '@imtbl/config';
-import { ExchangeContracts } from 'config';
+
+export type ExchangeContracts = {
+  multicall: string;
+  coreFactory: string;
+  quoterV2: string;
+  peripheryRouter: string;
+  secondaryFee: string;
+};
 
 /**
  * Type representing a Chain

diff --git a/packages/provider/src/genericImxProvider.ts b/packages/provider/src/genericImxProvider.ts
@@ -1,4 +1,3 @@
-import { ProviderConfiguration } from 'config';
 import {
   AnyToken,
   RegisterUserResponse,
@@ -19,6 +18,7 @@ import {
   EthSigner,
 } from '@imtbl/core-sdk';
 import { TransactionResponse } from '@ethersproject/providers';
+import { ProviderConfiguration } from './config';
 import { IMXProvider } from './imxProvider';
 import { Signers } from './signable-actions/types';
 import { batchTransfer, transfer } from './signable-actions/transfer';

diff --git a/packages/provider/src/l1-providers/metaMaskWrapper.ts b/packages/provider/src/l1-providers/metaMaskWrapper.ts
@@ -1,4 +1,4 @@
-import { ProviderConfiguration } from 'config';
+import { ProviderConfiguration } from '../config';
 import { connect } from './metaMask';
 import {
   connect as buildImxSigner,

diff --git a/packages/provider/src/signable-actions/withdrawal-actions/completeERC721Withdrawal.ts b/packages/provider/src/signable-actions/withdrawal-actions/completeERC721Withdrawal.ts
@@ -8,7 +8,7 @@ import {
 } from '@imtbl/core-sdk';
 import * as encUtils from 'enc-utils';
 import { TransactionResponse } from '@ethersproject/providers';
-import { ProviderConfiguration } from 'config';
+import { ProviderConfiguration } from '../../config';
 import { getEncodeAssetInfo } from './getEncodeAssetInfo';
 import {
   getSignableRegistrationOnchain,

diff --git a/packages/provider/src/signable-actions/withdrawal-actions/completeEthWithdrawal.ts b/packages/provider/src/signable-actions/withdrawal-actions/completeEthWithdrawal.ts
@@ -1,7 +1,7 @@
 import { Signer } from '@ethersproject/abstract-signer';
 import { TransactionResponse } from '@ethersproject/providers';
 import { Contracts, ImmutableXConfiguration, UsersApi } from '@imtbl/core-sdk';
-import { ProviderConfiguration } from 'config';
+import { ProviderConfiguration } from '../../config';
 import {
   getSignableRegistrationOnchain,
   isRegisteredOnChain,

diff --git a/packages/provider/src/signable-actions/withdrawal.ts b/packages/provider/src/signable-actions/withdrawal.ts
@@ -1,5 +1,5 @@
 import { TokenAmount, AnyToken } from '@imtbl/core-sdk';
-import { ProviderConfiguration } from 'config';
+import { ProviderConfiguration } from '../config';
 import { Signers } from './types';
 import {
   prepareWithdrawalAction,