diff --git a/src/components/cards/PairPriceGraph/PairPriceGraph.vue b/src/components/cards/PairPriceGraph/PairPriceGraph.vue
index 5880ed909b..e37c8983e7 100644
--- a/src/components/cards/PairPriceGraph/PairPriceGraph.vue
+++ b/src/components/cards/PairPriceGraph/PairPriceGraph.vue
@@ -155,7 +155,10 @@ const {
 );
 
 const equivalentTokenPairs = [
-  [appNetworkConfig.addresses.weth, appNetworkConfig.nativeAsset.address],
+  [
+    appNetworkConfig.tokens.Addresses.wNativeAsset,
+    appNetworkConfig.tokens.Addresses.nativeAsset,
+  ],
 ];
 
 const allChartValuesEqual = computed(() =>
diff --git a/src/components/cards/SwapCard/SwapCard.vue b/src/components/cards/SwapCard/SwapCard.vue
index 32a8bc1d15..e5cb1c0870 100644
--- a/src/components/cards/SwapCard/SwapCard.vue
+++ b/src/components/cards/SwapCard/SwapCard.vue
@@ -405,9 +405,6 @@ export default defineComponent({
         setTokenOutAmount(assetOutAmount);
       }
     }
-    function switchToWETH() {
-      tokenInAddress.value = appNetworkConfig.addresses.weth;
-    }
     function handlePreviewButton() {
       swapping.resetSubmissionError();
       modalSwapPreviewIsOpen.value = true;
@@ -447,7 +444,6 @@ export default defineComponent({
       handlePreviewButton,
       handlePreviewModalClose,
       // methods
-      switchToWETH,
       handleErrorButtonClick,
     };
   },
diff --git a/src/components/cards/SwapCard/SwapRoute.vue b/src/components/cards/SwapCard/SwapRoute.vue
index 839a2ecf8c..2180ece84f 100644
--- a/src/components/cards/SwapCard/SwapRoute.vue
+++ b/src/components/cards/SwapCard/SwapRoute.vue
@@ -6,10 +6,12 @@ import BigNumber from 'bignumber.js';
 
 import useNumbers, { FNumFormats } from '@/composables/useNumbers';
 import { useTokens } from '@/providers/tokens.provider';
-import { NATIVE_ASSET_ADDRESS } from '@/constants/tokens';
+import {
+  NATIVE_ASSET_ADDRESS,
+  WRAPPED_NATIVE_ASSET_ADDRESS,
+} from '@/constants/tokens';
 import { isSameAddress } from '@/lib/utils';
 import { SorReturn } from '@/lib/utils/balancer/helpers/sor/sorManager';
-import useWeb3 from '@/services/web3/useWeb3';
 import { networkSlug } from '@/composables/useNetwork';
 
 interface Props {
@@ -46,7 +48,6 @@ const props = defineProps<Props>();
 
 const { fNum } = useNumbers();
 
-const { appNetworkConfig } = useWeb3();
 const { getToken } = useTokens();
 
 const visible = ref(false);
@@ -97,13 +98,13 @@ function getV2Routes(
   addresses: string[]
 ): Route[] {
   // ) {
-  const { addresses: constants } = appNetworkConfig;
-
   addressIn =
-    addressIn === NATIVE_ASSET_ADDRESS ? constants.weth : getAddress(addressIn);
+    addressIn === NATIVE_ASSET_ADDRESS
+      ? WRAPPED_NATIVE_ASSET_ADDRESS
+      : getAddress(addressIn);
   addressOut =
     addressOut === NATIVE_ASSET_ADDRESS
-      ? constants.weth
+      ? WRAPPED_NATIVE_ASSET_ADDRESS
       : getAddress(addressOut);
 
   if (
@@ -131,11 +132,11 @@ function getV2Routes(
     if (rawPool) {
       const tokenIn =
         addresses[swap.assetInIndex] === AddressZero
-          ? constants.weth
+          ? WRAPPED_NATIVE_ASSET_ADDRESS
           : getAddress(addresses[swap.assetInIndex]);
       const tokenOut =
         addresses[swap.assetOutIndex] === AddressZero
-          ? constants.weth
+          ? WRAPPED_NATIVE_ASSET_ADDRESS
           : getAddress(addresses[swap.assetOutIndex]);
 
       const isDirectSwap =
diff --git a/src/components/contextual/pages/pool/add-liquidity/WrapStEthLink.vue b/src/components/contextual/pages/pool/add-liquidity/WrapStEthLink.vue
index fb67730b87..9c3e9e3f94 100644
--- a/src/components/contextual/pages/pool/add-liquidity/WrapStEthLink.vue
+++ b/src/components/contextual/pages/pool/add-liquidity/WrapStEthLink.vue
@@ -30,8 +30,12 @@ const { networkSlug } = useNetwork();
 /**
  * COMPUTED
  */
-const stETH = computed(() => getToken(networkConfig.addresses.stETH));
-const wstETH = computed(() => getToken(networkConfig.addresses.wstETH));
+const stETH = computed(() =>
+  getToken(networkConfig.tokens.Addresses.stETH || '')
+);
+const wstETH = computed(() =>
+  getToken(networkConfig.tokens.Addresses.wstETH || '')
+);
 </script>
 
 <template>
diff --git a/src/components/inputs/TokenSearchInput.vue b/src/components/inputs/TokenSearchInput.vue
index fa2e2b532a..ab6b219c73 100644
--- a/src/components/inputs/TokenSearchInput.vue
+++ b/src/components/inputs/TokenSearchInput.vue
@@ -7,7 +7,11 @@ import { useI18n } from 'vue-i18n';
 import SelectTokenModal from '@/components/modals/SelectTokenModal/SelectTokenModal.vue';
 import { useTokens } from '@/providers/tokens.provider';
 import useVeBal from '@/composables/useVeBAL';
-import { NATIVE_ASSET_ADDRESS, TOKENS } from '@/constants/tokens';
+import {
+  NATIVE_ASSET_ADDRESS,
+  TOKENS,
+  WRAPPED_NATIVE_ASSET_ADDRESS,
+} from '@/constants/tokens';
 import { includesAddress } from '@/lib/utils';
 import useWeb3 from '@/services/web3/useWeb3';
 
@@ -36,7 +40,7 @@ const selectTokenModal = ref(false);
  * COMPOSABLES
  */
 const { getToken, tokens, balances } = useTokens();
-const { account, appNetworkConfig } = useWeb3();
+const { account } = useWeb3();
 const { veBalTokenInfo } = useVeBal();
 const { t } = useI18n();
 const { upToMediumBreakpoint } = useBreakpoints();
@@ -93,10 +97,10 @@ const selectableTokensAddresses = computed<string[]>(() => {
  */
 function addToken(token: string) {
   let _token = token;
-  // special case for ETH where we want it to filter as WETH regardless
-  // as ETH is the native asset
+  // special case for the native asset where we want it to filter as
+  // wrapped native asset regardless as the native asset can't be in pools
   if (getAddress(token) === NATIVE_ASSET_ADDRESS) {
-    _token = appNetworkConfig.addresses.weth;
+    _token = WRAPPED_NATIVE_ASSET_ADDRESS;
   }
   // const newSelected = [...props.modelValue, _token];
   emit('add', _token);
diff --git a/src/components/tooltips/APRTooltip/APRTooltip.spec.ts b/src/components/tooltips/APRTooltip/APRTooltip.spec.ts
index eb9535a615..40e67323f2 100644
--- a/src/components/tooltips/APRTooltip/APRTooltip.spec.ts
+++ b/src/components/tooltips/APRTooltip/APRTooltip.spec.ts
@@ -180,7 +180,7 @@ describe('APRTooltip', () => {
         tokenAprs: {
           total: 166,
           breakdown: {
-            [configService.network.addresses.wstETH]: 166,
+            [configService.network.tokens.Addresses.wstETH || '']: 166,
           },
         },
         min: 166,
@@ -188,7 +188,7 @@ describe('APRTooltip', () => {
       };
       const poolMock: Pool = {
         ...EmptyPoolMock,
-        tokensList: [configService.network.addresses.wstETH],
+        tokensList: [configService.network.tokens.Addresses.wstETH || ''],
       };
       const { getByTestId } = renderComponent(APRTooltip, {
         props: {
@@ -214,7 +214,7 @@ describe('APRTooltip', () => {
       };
       const poolMock: Pool = {
         ...EmptyPoolMock,
-        tokensList: [configService.network.addresses.stMATIC],
+        tokensList: [configService.network.tokens.Addresses.stMATIC || ''],
       };
       const { getByTestId } = renderComponent(APRTooltip, {
         props: {
@@ -233,7 +233,7 @@ describe('APRTooltip', () => {
         tokenAprs: {
           total: 73,
           breakdown: {
-            [configService.network.addresses.rETH]: 73,
+            [configService.network.tokens.Addresses.rETH || '']: 73,
           },
         },
         min: 102,
@@ -241,7 +241,7 @@ describe('APRTooltip', () => {
       };
       const poolMock: Pool = {
         ...EmptyPoolMock,
-        tokensList: [configService.network.addresses.rETH],
+        tokensList: [configService.network.tokens.Addresses.rETH || ''],
       };
       const { getByTestId } = renderComponent(APRTooltip, {
         props: {
@@ -270,7 +270,7 @@ describe('APRTooltip', () => {
       };
       const poolMock: Pool = {
         ...EmptyPoolMock,
-        tokensList: [configService.network.addresses.rETH],
+        tokensList: [configService.network.tokens.Addresses.rETH || ''],
       };
       const { getByTestId } = renderComponent(APRTooltip, {
         props: {
diff --git a/src/composables/swap/useSor.spec.ts b/src/composables/swap/useSor.spec.ts
index dbb4ccf531..7a4626f7bb 100644
--- a/src/composables/swap/useSor.spec.ts
+++ b/src/composables/swap/useSor.spec.ts
@@ -66,9 +66,7 @@ describe('setSwapCost', () => {
   const sorManager = new SorManager(
     rpcProviderService.jsonProvider,
     BigNumber.from(1),
-    1,
-    1,
-    '1'
+    1
   );
 
   const mockedSorManager = vi.mocked(sorManager);
diff --git a/src/composables/swap/useSor.ts b/src/composables/swap/useSor.ts
index bad0548f58..8d818eca52 100644
--- a/src/composables/swap/useSor.ts
+++ b/src/composables/swap/useSor.ts
@@ -16,7 +16,7 @@ import { useI18n } from 'vue-i18n';
 
 import { NATIVE_ASSET_ADDRESS } from '@/constants/tokens';
 import { getBalancerSDK } from '@/dependencies/balancer-sdk';
-import { bnum, isSameAddress } from '@/lib/utils';
+import { bnum } from '@/lib/utils';
 import {
   SorManager,
   SorReturn,
@@ -231,9 +231,7 @@ export default function useSor({
     sorManager = new SorManager(
       rpcProviderService.jsonProvider,
       BigNumber.from(GAS_PRICE),
-      Number(MAX_POOLS),
-      configService.network.chainId,
-      configService.network.addresses.weth
+      Number(MAX_POOLS)
     );
 
     fetchPools();
@@ -299,9 +297,9 @@ export default function useSor({
         // wstETH. This is a crude hack to replace token in/out address
         // with wstETH so the index mapping works.
         if (isStEthAddress(tokenInAddressInput.value))
-          tokenInAddress = configService.network.addresses.wstETH;
+          tokenInAddress = configService.network.tokens.Addresses.wstETH || '';
         if (isStEthAddress(tokenOutAddressInput.value))
-          tokenOutAddress = configService.network.addresses.wstETH;
+          tokenOutAddress = configService.network.tokens.Addresses.wstETH || '';
 
         const tokenInPosition = result.tokenAddresses.indexOf(
           tokenInAddress.toLowerCase()
@@ -791,10 +789,7 @@ export default function useSor({
     address: string;
     isInputToken: boolean;
   }): Promise<BigNumber> {
-    if (
-      isSameAddress(address, appNetworkConfig.addresses.stETH) &&
-      isMainnet.value
-    ) {
+    if (isStEthAddress(address) && isMainnet.value) {
       return convertStEthWrap({ amount, isWrap: isInputToken });
     }
     return amount;
diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts
index fc44be2b02..6891283a0e 100644
--- a/src/constants/tokens.ts
+++ b/src/constants/tokens.ts
@@ -3,7 +3,10 @@ import { configService } from '@/services/config/config.service';
 /**
  * CONSTANTS
  */
-export const NATIVE_ASSET_ADDRESS = configService.network.nativeAsset.address;
+export const NATIVE_ASSET_ADDRESS =
+  configService.network.tokens.Addresses.nativeAsset;
+export const WRAPPED_NATIVE_ASSET_ADDRESS =
+  configService.network.tokens.Addresses.wNativeAsset;
 export const DEFAULT_TOKEN_DECIMALS = 18;
 
 export const TOKENS = configService.network.tokens;
diff --git a/src/lib/config/arbitrum/contracts.ts b/src/lib/config/arbitrum/contracts.ts
index b553dc8743..ff7c738f7e 100644
--- a/src/lib/config/arbitrum/contracts.ts
+++ b/src/lib/config/arbitrum/contracts.ts
@@ -10,11 +10,6 @@ const contracts: Contracts = {
   vault: arbitrum.Vault,
   weightedPoolFactory: arbitrum.WeightedPoolFactory,
   stablePoolFactory: '0x2433477A10FC5d31B9513C638F19eE85CaED53Fd',
-  weth: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
-  stMATIC: '',
-  rETH: '0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8',
-  stETH: '',
-  wstETH: '0x5979d7b546e38e414f7e9822514be443a4800529',
   lidoRelayer: '',
   balancerHelpers: arbitrum.BalancerHelpers,
   batchRelayer: arbitrum.BalancerRelayer,
diff --git a/src/lib/config/arbitrum/tokens.ts b/src/lib/config/arbitrum/tokens.ts
index c709352c7b..9d07b53b68 100644
--- a/src/lib/config/arbitrum/tokens.ts
+++ b/src/lib/config/arbitrum/tokens.ts
@@ -13,6 +13,8 @@ const tokens: TokenConstants = {
     wNativeAsset: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
     WETH: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
     BAL: '0x040d1EdC9569d4Bab2D15287Dc5A4F10F56a56B8',
+    rETH: '0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8',
+    wstETH: '0x5979d7b546e38e414f7e9822514be443a4800529',
   },
 };
 
diff --git a/src/lib/config/docker/contracts.ts b/src/lib/config/docker/contracts.ts
index fc6fcf078d..59a75880ce 100644
--- a/src/lib/config/docker/contracts.ts
+++ b/src/lib/config/docker/contracts.ts
@@ -9,11 +9,6 @@ const contracts: Contracts = {
   vault: '0x293f6758Fe4a4343E367Ac8E6A697eC6315fBEd7',
   weightedPoolFactory: '0xE48Aae4178612fdF77af25C83fa1099491A8AD1B',
   stablePoolFactory: '0xb4F97F452D71C3bba3c30c554305A7250c08b23A',
-  weth: '0x6c37Fa9557C135dF4323004D3f0549f3e94F112D',
-  rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
-  stMATIC: '',
-  stETH: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-  wstETH: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
   lidoRelayer: '',
   balancerHelpers: '',
   batchRelayer: '',
diff --git a/src/lib/config/gnosis-chain/contracts.ts b/src/lib/config/gnosis-chain/contracts.ts
index 4dbf59f458..596216a381 100644
--- a/src/lib/config/gnosis-chain/contracts.ts
+++ b/src/lib/config/gnosis-chain/contracts.ts
@@ -9,11 +9,6 @@ const contracts: Contracts = {
   vault: gnosis.Vault,
   weightedPoolFactory: gnosis.WeightedPoolFactory,
   stablePoolFactory: gnosis.StablePoolFactory,
-  weth: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d',
-  rETH: '',
-  stMATIC: '',
-  stETH: '',
-  wstETH: '',
   lidoRelayer: '',
   balancerHelpers: gnosis.BalancerHelpers,
   batchRelayer: gnosis.BalancerRelayer,
diff --git a/src/lib/config/gnosis-chain/tokens.ts b/src/lib/config/gnosis-chain/tokens.ts
index edbfc6ca08..00601e328a 100644
--- a/src/lib/config/gnosis-chain/tokens.ts
+++ b/src/lib/config/gnosis-chain/tokens.ts
@@ -10,7 +10,7 @@ const tokens: TokenConstants = {
   },
   Addresses: {
     nativeAsset: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-    wNativeAsset: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d',
+    wNativeAsset: '0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d',
     WETH: '0x6A023CCd1ff6F2045C3309768eAd9E68F978f6e1',
     BAL: '0x7eF541E2a22058048904fE5744f9c7E4C57AF717',
   },
diff --git a/src/lib/config/goerli/contracts.ts b/src/lib/config/goerli/contracts.ts
index 6e0136bc53..b86deb3aad 100644
--- a/src/lib/config/goerli/contracts.ts
+++ b/src/lib/config/goerli/contracts.ts
@@ -9,11 +9,6 @@ const contracts: Contracts = {
   vault: goerli.Vault,
   weightedPoolFactory: goerli.WeightedPoolFactory,
   stablePoolFactory: '0x44afeb87c871D8fEA9398a026DeA2BD3A13F5769',
-  weth: '0xdFCeA9088c8A88A76FF74892C1457C17dfeef9C1',
-  rETH: '0x178E141a0E3b34152f73Ff610437A7bf9B83267A',
-  stMATIC: '0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4',
-  stETH: '0x1643E812aE58766192Cf7D2Cf9567dF2C37e9B7F',
-  wstETH: '0x6320cD32aA674d2898A68ec82e869385Fc5f7E2f',
   lidoRelayer: goerli.LidoRelayer,
   balancerHelpers: goerli.BalancerHelpers,
   batchRelayer: goerli.BalancerRelayer,
diff --git a/src/lib/config/goerli/tokens.ts b/src/lib/config/goerli/tokens.ts
index faf5f484a2..ae4dd7541c 100644
--- a/src/lib/config/goerli/tokens.ts
+++ b/src/lib/config/goerli/tokens.ts
@@ -15,6 +15,10 @@ const tokens: TokenConstants = {
     BAL: '0xfA8449189744799aD2AcE7e0EBAC8BB7575eff47',
     bbaUSD: '0x13ACD41C585d7EbB4a9460f7C8f50BE60DC080Cd',
     bbaUSDv2: '0x3d5981bdd8d3e49eb7bbdc1d2b156a3ee019c18e',
+    rETH: '0x178E141a0E3b34152f73Ff610437A7bf9B83267A',
+    stMATIC: '0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4',
+    stETH: '0x1643E812aE58766192Cf7D2Cf9567dF2C37e9B7F',
+    wstETH: '0x6320cD32aA674d2898A68ec82e869385Fc5f7E2f',
   },
   PriceChainMap: {
     /**
diff --git a/src/lib/config/mainnet/contracts.ts b/src/lib/config/mainnet/contracts.ts
index 8eb72eeb04..6688925a41 100644
--- a/src/lib/config/mainnet/contracts.ts
+++ b/src/lib/config/mainnet/contracts.ts
@@ -10,11 +10,6 @@ const contracts: Contracts = {
   vault: mainnet.Vault,
   weightedPoolFactory: mainnet.WeightedPoolFactory,
   stablePoolFactory: '0xc66Ba2B6595D3613CCab350C886aCE23866EDe24',
-  weth: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-  rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
-  stMATIC: '',
-  stETH: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
-  wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
   lidoRelayer: mainnet.LidoRelayer,
   balancerHelpers: mainnet.BalancerHelpers,
   batchRelayer: mainnet.BalancerRelayer,
diff --git a/src/lib/config/mainnet/tokens.ts b/src/lib/config/mainnet/tokens.ts
index 7ae3cc69b2..c53d963823 100644
--- a/src/lib/config/mainnet/tokens.ts
+++ b/src/lib/config/mainnet/tokens.ts
@@ -15,6 +15,9 @@ const tokens: TokenConstants = {
     BAL: '0xba100000625a3754423978a60c9317c58a424e3d',
     bbaUSD: '0x7B50775383d3D6f0215A8F290f2C9e2eEBBEceb2',
     bbaUSDv2: '0xA13a9247ea42D743238089903570127DdA72fE44',
+    rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
+    stETH: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
+    wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
   },
   DisableInternalBalanceWithdrawals: [
     '0xEb91861f8A4e1C12333F42DCE8fB0Ecdc28dA716',
diff --git a/src/lib/config/optimism/contracts.ts b/src/lib/config/optimism/contracts.ts
index 205a413af5..0c4f0d64e4 100644
--- a/src/lib/config/optimism/contracts.ts
+++ b/src/lib/config/optimism/contracts.ts
@@ -9,11 +9,6 @@ const contracts: Contracts = {
   vault: '',
   weightedPoolFactory: optimism.WeightedPoolFactory,
   stablePoolFactory: '',
-  weth: '',
-  rETH: '',
-  stMATIC: '',
-  stETH: '',
-  wstETH: '',
   lidoRelayer: '',
   balancerHelpers: '',
   batchRelayer: optimism.BalancerRelayer,
diff --git a/src/lib/config/polygon/contracts.ts b/src/lib/config/polygon/contracts.ts
index 563ffdd838..19d36c01b0 100644
--- a/src/lib/config/polygon/contracts.ts
+++ b/src/lib/config/polygon/contracts.ts
@@ -10,11 +10,6 @@ const contracts: Contracts = {
   vault: polygon.Vault,
   weightedPoolFactory: polygon.WeightedPoolFactory,
   stablePoolFactory: '0xc66Ba2B6595D3613CCab350C886aCE23866EDe24',
-  weth: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
-  rETH: '0x0266F4F08D82372CF0FcbCCc0Ff74309089c74d1',
-  stMATIC: '0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4',
-  stETH: '',
-  wstETH: '',
   lidoRelayer: '',
   balancerHelpers: '0x94905e703fead7f0fd0eee355d267ee909784e6d',
   batchRelayer: polygon.BalancerRelayer,
diff --git a/src/lib/config/polygon/tokens.ts b/src/lib/config/polygon/tokens.ts
index d8d5a70196..9af0feca31 100644
--- a/src/lib/config/polygon/tokens.ts
+++ b/src/lib/config/polygon/tokens.ts
@@ -13,6 +13,9 @@ const tokens: TokenConstants = {
     wNativeAsset: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
     WETH: '0x7ceb23fd6bc0add59e62ac25578270cff1b9f619',
     BAL: '0x9a71012b13ca4d3d0cdc72a177df3ef03b0e76a3',
+    wstETH: '0x03b54a6e9a984069379fae1a4fc4dbae93b3bccd',
+    rETH: '0x0266F4F08D82372CF0FcbCCc0Ff74309089c74d1',
+    stMATIC: '0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4',
   },
 };
 
diff --git a/src/lib/config/test/index.ts b/src/lib/config/test/index.ts
index 0a6a0e3cc7..7b76064c44 100644
--- a/src/lib/config/test/index.ts
+++ b/src/lib/config/test/index.ts
@@ -52,11 +52,6 @@ const config: Config = {
     vault: '0xBA12222222228d8Ba445958a75a0704d566BF2C8',
     weightedPoolFactory: '0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9',
     stablePoolFactory: '0xc66Ba2B6595D3613CCab350C886aCE23866EDe24',
-    weth: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-    rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393',
-    stMATIC: '0x3a58a54c066fdc0f2d55fc9c89f0415c92ebf3c4',
-    stETH: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-    wstETH: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
     lidoRelayer: '',
     balancerHelpers: '0x5aDDCCa35b7A0D07C74063c48700C8590E87864E',
     batchRelayer: '',
diff --git a/src/lib/config/types.ts b/src/lib/config/types.ts
index ebe44387a6..4c8b3af6bd 100644
--- a/src/lib/config/types.ts
+++ b/src/lib/config/types.ts
@@ -9,6 +9,10 @@ export type CommonTokens = {
   BAL: string;
   bbaUSD?: string;
   bbaUSDv2?: string;
+  rETH?: string;
+  stETH?: string;
+  wstETH?: string;
+  stMATIC?: string;
 };
 
 export type TokenConstants = {
@@ -33,11 +37,6 @@ export interface Contracts {
   vault: string;
   weightedPoolFactory: string;
   stablePoolFactory: string;
-  weth: string;
-  rETH: string;
-  stMATIC: string;
-  stETH: string;
-  wstETH: string;
   lidoRelayer: string;
   balancerHelpers: string;
   batchRelayer: string;
diff --git a/src/lib/utils/balancer/__mocks__/lido.ts b/src/lib/utils/balancer/__mocks__/lido.ts
index 580a882f00..3f5104d297 100644
--- a/src/lib/utils/balancer/__mocks__/lido.ts
+++ b/src/lib/utils/balancer/__mocks__/lido.ts
@@ -4,7 +4,7 @@ import { configService } from '@/services/config/config.service';
 
 import { includesAddress } from '../..';
 
-const { stETH: stEthAddress } = configService.network.addresses;
+const { stETH: stEthAddress } = configService.network.tokens.Addresses;
 
 export function isStETH(tokenInAddress: string, tokenOutAddress: string) {
   if (!tokenInAddress || !tokenOutAddress || !stEthAddress) return false;
@@ -12,6 +12,11 @@ export function isStETH(tokenInAddress: string, tokenOutAddress: string) {
   return includesAddress([tokenInAddress, tokenOutAddress], stEthAddress);
 }
 
+export function isStEthAddress(address: string): boolean {
+  if (!stEthAddress) return false;
+  return address.toLowerCase() === stEthAddress.toLowerCase();
+}
+
 export function getWstETHByStETH(stETHAmount: BigNumberish) {
   return stETHAmount;
 }
diff --git a/src/lib/utils/balancer/helpers/sor/sorManager.ts b/src/lib/utils/balancer/helpers/sor/sorManager.ts
index b0f8ce9081..fe6671e219 100644
--- a/src/lib/utils/balancer/helpers/sor/sorManager.ts
+++ b/src/lib/utils/balancer/helpers/sor/sorManager.ts
@@ -10,7 +10,10 @@ import { BigNumber } from '@ethersproject/bignumber';
 import { AddressZero } from '@ethersproject/constants';
 import { Provider } from '@ethersproject/providers';
 
-import { NATIVE_ASSET_ADDRESS } from '@/constants/tokens';
+import {
+  NATIVE_ASSET_ADDRESS,
+  WRAPPED_NATIVE_ASSET_ADDRESS,
+} from '@/constants/tokens';
 import { getBalancerSDK } from '@/dependencies/balancer-sdk';
 
 const SWAP_COST = import.meta.env.VITE_SWAP_COST || '100000';
@@ -35,7 +38,6 @@ Aims to manage liquidity using SOR.
 */
 export class SorManager {
   private sorV2: SORV2;
-  private weth: string;
   private fetchStatus: FetchStatus = {
     v2finishedFetch: false,
     v2success: false,
@@ -45,15 +47,8 @@ export class SorManager {
   gasPrice: BigNumber;
   selectedPools: SubgraphPoolBase[] = [];
 
-  constructor(
-    provider: Provider,
-    gasPrice: BigNumber,
-    maxPools: number,
-    chainId: number,
-    weth: string
-  ) {
+  constructor(provider: Provider, gasPrice: BigNumber, maxPools: number) {
     this.sorV2 = getBalancerSDK().sor;
-    this.weth = weth;
     this.gasPrice = gasPrice;
     this.maxPools = maxPools;
     this.isFetching = false;
@@ -66,7 +61,10 @@ export class SorManager {
     tokenDecimals: number,
     manualCost: string | null = null
   ): Promise<BigNumber> {
-    tokenAddr = tokenAddr === NATIVE_ASSET_ADDRESS ? this.weth : tokenAddr;
+    tokenAddr =
+      tokenAddr === NATIVE_ASSET_ADDRESS
+        ? WRAPPED_NATIVE_ASSET_ADDRESS
+        : tokenAddr;
 
     if (manualCost) {
       await this.sorV2.swapCostCalculator.setNativeAssetPriceInToken(
diff --git a/src/lib/utils/balancer/lido.ts b/src/lib/utils/balancer/lido.ts
index 4af26fdbd7..9dce3e54d2 100644
--- a/src/lib/utils/balancer/lido.ts
+++ b/src/lib/utils/balancer/lido.ts
@@ -7,7 +7,7 @@ import { rpcProviderService } from '@/services/rpc-provider/rpc-provider.service
 import { includesAddress } from '..';
 
 const { stETH: stEthAddress, wstETH: wstEthAddress } =
-  configService.network.addresses;
+  configService.network.tokens.Addresses;
 
 const MAINNET_RATE_PROVIDER_ADDRESS =
   '0x72d07d7dca67b8a406ad1ec34ce969c90bfee768';
@@ -24,16 +24,18 @@ export function isStETH(tokenInAddress: string, tokenOutAddress: string) {
 }
 
 export function isStEthAddress(address: string): boolean {
+  if (!stEthAddress) return false;
   return address.toLowerCase() === stEthAddress.toLowerCase();
 }
 
 export function isWstEthAddress(address: string): boolean {
+  if (!wstEthAddress) return false;
   return address.toLowerCase() === wstEthAddress.toLowerCase();
 }
 
 export function includesWstEth(
   addresses: string[],
-  wstEthAddress = configService.network.addresses.wstETH
+  wstEthAddress = configService.network.tokens.Addresses.wstETH
 ): boolean {
   if (!wstEthAddress) return false;
 
@@ -44,6 +46,11 @@ export function includesWstEth(
  * @notice Get amount of wstETH for a given amount of stETH
  */
 export function getWstETHByStETH(stETHAmount: BigNumberish) {
+  if (!wstEthAddress) {
+    throw new Error(
+      'Attempted to read wstETH contract on Network that doesnt support wstETH'
+    );
+  }
   const wstETH = new Contract(
     wstEthAddress,
     [
diff --git a/src/lib/utils/balancer/wrapper.ts b/src/lib/utils/balancer/wrapper.ts
index 3940bf958a..68892e1531 100644
--- a/src/lib/utils/balancer/wrapper.ts
+++ b/src/lib/utils/balancer/wrapper.ts
@@ -18,19 +18,22 @@ export const isNativeAssetWrap = (
   tokenIn: string,
   tokenOut: string
 ): boolean => {
-  const nativeAddress = configService.network.nativeAsset.address;
-  const { weth } = configService.network.addresses;
-  return tokenIn === nativeAddress && tokenOut === weth;
+  const nativeAddress = configService.network.tokens.Addresses.nativeAsset;
+  const wNativeAddress = configService.network.tokens.Addresses.wNativeAsset;
+  return tokenIn === nativeAddress && tokenOut === wNativeAddress;
 };
 
 export const getWrapAction = (tokenIn: string, tokenOut: string): WrapType => {
-  const nativeAddress = configService.network.nativeAsset.address;
-  const { weth, stETH, wstETH } = configService.network.addresses;
+  const nativeAddress = configService.network.tokens.Addresses.nativeAsset;
+  const wNativeAddress = configService.network.tokens.Addresses.wNativeAsset;
+  const { stETH, wstETH } = configService.network.tokens.Addresses;
 
-  if (tokenIn === nativeAddress && tokenOut === weth) return WrapType.Wrap;
+  if (tokenIn === nativeAddress && tokenOut === wNativeAddress)
+    return WrapType.Wrap;
   if (tokenIn === stETH && tokenOut === wstETH) return WrapType.Wrap;
 
-  if (tokenOut === nativeAddress && tokenIn === weth) return WrapType.Unwrap;
+  if (tokenOut === nativeAddress && tokenIn === wNativeAddress)
+    return WrapType.Unwrap;
   if (tokenOut === stETH && tokenIn === wstETH) return WrapType.Unwrap;
 
   return WrapType.NonWrap;
@@ -42,9 +45,10 @@ export const getWrapOutput = async (
   wrapAmount: BigNumber
 ): Promise<BigNumber> => {
   if (wrapType === WrapType.NonWrap) throw new Error('Invalid wrap type');
-  const { weth, wstETH } = configService.network.addresses;
+  const wNativeAddress = configService.network.tokens.Addresses.wNativeAsset;
+  const { wstETH } = configService.network.tokens.Addresses;
 
-  if (wrapper === weth) return BigNumber.from(wrapAmount);
+  if (wrapper === wNativeAddress) return BigNumber.from(wrapAmount);
   if (wrapper === wstETH) {
     return convertStEthWrap({
       amount: wrapAmount,
@@ -61,9 +65,9 @@ export async function wrap(
   amount: BigNumber
 ): Promise<TransactionResponse> {
   try {
-    if (wrapper === configs[network].addresses.weth) {
+    if (wrapper === configs[network].tokens.Addresses.wNativeAsset) {
       return wrapNative(network, web3, amount);
-    } else if (wrapper === configs[network].addresses.wstETH) {
+    } else if (wrapper === configs[network].tokens.Addresses.wstETH) {
       return wrapLido(network, web3, amount);
     }
     throw new Error('Unrecognised wrapper contract');
@@ -80,9 +84,9 @@ export async function unwrap(
   amount: BigNumber
 ): Promise<TransactionResponse> {
   try {
-    if (wrapper === configs[network].addresses.weth) {
+    if (wrapper === configs[network].tokens.Addresses.wNativeAsset) {
       return unwrapNative(network, web3, amount);
-    } else if (wrapper === configs[network].addresses.wstETH) {
+    } else if (wrapper === configs[network].tokens.Addresses.wstETH) {
       return unwrapLido(network, web3, amount);
     }
     throw new Error('Unrecognised wrapper contract');
@@ -99,7 +103,7 @@ const wrapNative = async (
 ): Promise<TransactionResponse> => {
   const txBuilder = new TransactionBuilder(web3.getSigner());
   return await txBuilder.contract.sendTransaction({
-    contractAddress: configs[network].addresses.weth,
+    contractAddress: configs[network].tokens.Addresses.wNativeAsset,
     abi: ['function deposit() payable'],
     action: 'deposit',
     options: { value: amount },
@@ -113,7 +117,7 @@ const unwrapNative = async (
 ): Promise<TransactionResponse> => {
   const txBuilder = new TransactionBuilder(web3.getSigner());
   return await txBuilder.contract.sendTransaction({
-    contractAddress: configs[network].addresses.weth,
+    contractAddress: configs[network].tokens.Addresses.wNativeAsset,
     abi: ['function withdraw(uint256 wad)'],
     action: 'withdraw',
     params: [amount],
@@ -127,7 +131,7 @@ const wrapLido = async (
 ): Promise<TransactionResponse> => {
   const txBuilder = new TransactionBuilder(web3.getSigner());
   return await txBuilder.contract.sendTransaction({
-    contractAddress: configs[network].addresses.wstETH,
+    contractAddress: configs[network].tokens.Addresses.wstETH,
     abi: ['function wrap(uint256 _stETHAmount) returns (uint256)'],
     action: 'wrap',
     params: [amount],
@@ -141,7 +145,7 @@ const unwrapLido = async (
 ): Promise<TransactionResponse> => {
   const txBuilder = new TransactionBuilder(web3.getSigner());
   return await txBuilder.contract.sendTransaction({
-    contractAddress: configs[network].addresses.wstETH,
+    contractAddress: configs[network].tokens.Addresses.wstETH,
     abi: ['function unwrap(uint256 _wstETHAmount) returns (uint256)'],
     action: 'unwrap',
     params: [amount],
diff --git a/src/providers/tokens.provider.ts b/src/providers/tokens.provider.ts
index 945183e88a..7fa041704d 100644
--- a/src/providers/tokens.provider.ts
+++ b/src/providers/tokens.provider.ts
@@ -88,7 +88,7 @@ export const tokensProvider = (
     injectedTokens: {},
     allowanceContracts: compact([
       networkConfig.addresses.vault,
-      networkConfig.addresses.wstETH,
+      networkConfig.tokens.Addresses.wstETH,
       configService.network.addresses.veBAL,
     ]),
     injectedPrices: {},
diff --git a/src/services/cowswap/utils.ts b/src/services/cowswap/utils.ts
index d3fa6a8747..57c5dedc36 100644
--- a/src/services/cowswap/utils.ts
+++ b/src/services/cowswap/utils.ts
@@ -2,10 +2,10 @@ import { configService } from '../config/config.service';
 import { MAX_VALID_TO_EPOCH } from './constants';
 
 export function toErc20Address(tokenAddress: string) {
-  const nativeAssetAddress = configService.network.nativeAsset.address;
+  const nativeAssetAddress = configService.network.tokens.Addresses.nativeAsset;
 
   if (tokenAddress.toLowerCase() === nativeAssetAddress.toLowerCase()) {
-    return configService.network.addresses.weth;
+    return configService.network.tokens.Addresses.wNativeAsset;
   }
 
   return tokenAddress;
diff --git a/src/services/lido/lido.service.ts b/src/services/lido/lido.service.ts
index e4f25ca4f4..f91f98a8ac 100644
--- a/src/services/lido/lido.service.ts
+++ b/src/services/lido/lido.service.ts
@@ -21,7 +21,7 @@ export default class LidoService {
 
   constructor(readonly config: ConfigService = configService) {
     this.wethAddress = TOKENS.Addresses.WETH;
-    this.wstEthAddress = config.network.addresses.wstETH;
+    this.wstEthAddress = TOKENS.Addresses.wstETH || '';
   }
 
   async getStEthAPR(): Promise<string> {
diff --git a/src/services/swap/swap.service.spec.ts b/src/services/swap/swap.service.spec.ts
index 478acd764e..6b76beff88 100644
--- a/src/services/swap/swap.service.spec.ts
+++ b/src/services/swap/swap.service.spec.ts
@@ -72,12 +72,12 @@ describe('swap.service', () => {
       type: SwapTokenType.fixed,
     };
     tokens.stETH = {
-      address: configService.network.addresses.stETH,
+      address: configService.network.tokens.Addresses.stETH || '',
       amount: BigNumber.from(2e15),
       type: SwapTokenType.fixed,
     };
     tokens.wstETH = {
-      address: configService.network.addresses.wstETH,
+      address: configService.network.tokens.Addresses.wstETH || '',
       amount: BigNumber.from(3e15),
       type: SwapTokenType.fixed,
     };
diff --git a/src/services/swap/swap.service.ts b/src/services/swap/swap.service.ts
index 34735decfb..047260e95e 100644
--- a/src/services/swap/swap.service.ts
+++ b/src/services/swap/swap.service.ts
@@ -10,7 +10,11 @@ import { BigNumber } from '@ethersproject/bignumber';
 import { AddressZero } from '@ethersproject/constants';
 
 import { isSameAddress } from '@/lib/utils';
-import { getWstETHByStETH, isStETH } from '@/lib/utils/balancer/lido';
+import {
+  getWstETHByStETH,
+  isStETH,
+  isStEthAddress,
+} from '@/lib/utils/balancer/lido';
 import ConfigService, { configService } from '@/services/config/config.service';
 import { lidoRelayerService } from '@/services/contracts/lido-relayer.service';
 import { vaultService } from '@/services/contracts/vault.service';
@@ -128,14 +132,14 @@ export class SwapService {
     }
 
     // Convert tokenIn/tokenOut so that it matches what's in tokenAddresses
-    const { stETH, wstETH } = this.config.network.addresses;
-    if (tokenIn.address.toLowerCase() === stETH.toLowerCase()) {
+    const wstETH = this.config.network.tokens.Addresses.wstETH || '';
+    if (isStEthAddress(tokenIn.address)) {
       tokenIn = {
         address: wstETH.toLowerCase(),
         amount: await getWstETHByStETH(tokenIn.amount),
         type: tokenIn.type,
       };
-    } else if (tokenOut.address.toLowerCase() === stETH.toLowerCase()) {
+    } else if (isStEthAddress(tokenOut.address)) {
       tokenOut = {
         address: wstETH.toLowerCase(),
         amount: await getWstETHByStETH(tokenOut.amount),