diff --git a/app/src/common/constants.ts b/app/src/common/constants.ts
index 4ef00524c8..593b70c836 100644
--- a/app/src/common/constants.ts
+++ b/app/src/common/constants.ts
@@ -57,6 +57,8 @@ export const GRAPH_RINKEBY_HTTP = 'https://api.thegraph.com/subgraphs/name/proto
 export const GRAPH_RINKEBY_WS = 'wss://api.thegraph.com/subgraphs/name/protofire/omen-rinkeby'
 export const GRAPH_SOKOL_HTTP = 'https://api.thegraph.com/subgraphs/name/protofire/omen-sokol'
 export const GRAPH_SOKOL_WS = 'wss://api.thegraph.com/subgraphs/name/protofire/omen-sokol'
+export const GRAPH_XDAI_HTTP = 'https://api.thegraph.com/subgraphs/name/protofire/omen-xdai'
+export const GRAPH_XDAI_WS = 'wss://api.thegraph.com/subgraphs/name/protofire/omen-xdai'
 
 export const KLEROS_CURATE_GRAPH_MAINNET_HTTP = 'https://api.thegraph.com/subgraphs/name/kleros/curate'
 export const KLEROS_CURATE_GRAPH_MAINNET_WS = 'wss://api.thegraph.com/subgraphs/name/kleros/curate'
diff --git a/app/src/components/market/common/currency_selector/index.tsx b/app/src/components/market/common/currency_selector/index.tsx
index 685a66ff7a..95989628e0 100644
--- a/app/src/components/market/common/currency_selector/index.tsx
+++ b/app/src/components/market/common/currency_selector/index.tsx
@@ -35,11 +35,13 @@ interface Props {
   balance?: string
   placeholder?: Maybe<string>
   addAll?: boolean
+  addNativeAsset?: boolean
 }
 
 export const CurrencySelector: React.FC<Props> = props => {
   const {
     addAll = false,
+    addNativeAsset = false,
     balance,
     context,
     currency,
@@ -50,7 +52,7 @@ export const CurrencySelector: React.FC<Props> = props => {
     ...restProps
   } = props
 
-  const tokens = useTokens(context)
+  const tokens = useTokens(context, addNativeAsset)
 
   const currencyDropdownData: Array<DropdownItemProps> = []
 
@@ -73,7 +75,6 @@ export const CurrencySelector: React.FC<Props> = props => {
         }
       },
     })
-
     currentItem = 0
   }
 
diff --git a/app/src/components/market/common/outcome_table/index.tsx b/app/src/components/market/common/outcome_table/index.tsx
index 82806348b2..cc046031ec 100644
--- a/app/src/components/market/common/outcome_table/index.tsx
+++ b/app/src/components/market/common/outcome_table/index.tsx
@@ -3,7 +3,9 @@ import { BigNumber } from 'ethers/utils'
 import React, { useCallback } from 'react'
 import styled, { css } from 'styled-components'
 
+import { useConnectedWeb3Context } from '../../../../hooks'
 import { getOutcomeColor } from '../../../../theme/utils'
+import { getWrapToken, pseudoNativeAssetAddress } from '../../../../util/networks'
 import { formatBigNumber, formatNumber, mulBN } from '../../../../util/tools'
 import { BalanceItem, BondItem, OutcomeTableValue, Token, TokenEthereum } from '../../../../util/types'
 import { RadioInput, TD, TH, THead, TR, Table } from '../../../common'
@@ -125,6 +127,10 @@ export const OutcomeTable = (props: Props) => {
 
   const TableCellsAlign = ['left', 'left', 'right', 'right', 'right', 'right', 'right']
 
+  const context = useConnectedWeb3Context()
+  const wrapSymbol = getWrapToken(context.networkId).symbol
+  const symbol = collateral.address === pseudoNativeAssetAddress ? wrapSymbol : collateral.symbol
+
   const renderTableHeader = () => {
     return (
       <THead>
@@ -137,7 +143,7 @@ export const OutcomeTable = (props: Props) => {
                 style={isBond && index === 1 ? { width: '53%' } : {}}
                 textAlign={TableCellsAlign[index]}
               >
-                {value} {value === OutcomeTableValue.CurrentPrice && `(${collateral.symbol})`}
+                {value} {value === OutcomeTableValue.CurrentPrice && `(${symbol})`}
               </THStyled>
             ) : null
           })}
diff --git a/app/src/components/market/sections/market_buy/market_buy.tsx b/app/src/components/market/sections/market_buy/market_buy.tsx
index 85ef713455..9b063018d1 100644
--- a/app/src/components/market/sections/market_buy/market_buy.tsx
+++ b/app/src/components/market/sections/market_buy/market_buy.tsx
@@ -14,9 +14,11 @@ import {
   useConnectedWeb3Context,
   useContracts,
   useCpkAllowance,
+  useCpkProxy,
 } from '../../../../hooks'
 import { MarketMakerService } from '../../../../services'
 import { getLogger } from '../../../../util/logger'
+import { getNativeAsset, getWrapToken, pseudoNativeAssetAddress } from '../../../../util/networks'
 import { RemoteData } from '../../../../util/remote_data'
 import { computeBalanceAfterTrade, formatBigNumber, formatNumber, mulBN } from '../../../../util/tools'
 import { MarketDetailsTab, MarketMakerData, OutcomeTableValue, Status, Ternary, Token } from '../../../../util/types'
@@ -60,7 +62,7 @@ interface Props extends RouteComponentProps<any> {
 const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
   const context = useConnectedWeb3Context()
   const cpk = useConnectedCPKContext()
-  const { library: provider } = context
+  const { library: provider, networkId } = context
   const signer = useMemo(() => provider.getSigner(), [provider])
 
   const { buildMarketMaker } = useContracts(context)
@@ -85,6 +87,10 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
   const hasEnoughAllowance = RemoteData.mapToTernary(allowance, allowance => allowance.gte(amount || Zero))
   const hasZeroAllowance = RemoteData.mapToTernary(allowance, allowance => allowance.isZero())
 
+  const [upgradeFinished, setUpgradeFinished] = useState(false)
+  const { proxyIsUpToDate, updateProxy } = useCpkProxy()
+  const isUpdated = RemoteData.hasData(proxyIsUpToDate) ? proxyIsUpToDate.data : false
+
   useEffect(() => {
     setIsNegativeAmount(formatBigNumber(amount || Zero, collateral.decimals).includes('-'))
   }, [amount, collateral.decimals])
@@ -145,6 +151,19 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
     setAllowanceFinished(true)
   }
 
+  const showUpgrade =
+    (!isUpdated && collateral.address === pseudoNativeAssetAddress) ||
+    (upgradeFinished && collateral.address === pseudoNativeAssetAddress)
+
+  const upgradeProxy = async () => {
+    if (!cpk) {
+      return
+    }
+
+    await updateProxy()
+    setUpgradeFinished(true)
+  }
+
   const finish = async () => {
     try {
       if (!cpk) {
@@ -158,6 +177,7 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
 
       await cpk.buyOutcomes({
         amount: amount || Zero,
+        collateral,
         outcomeIndex,
         marketMaker,
       })
@@ -185,6 +205,7 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
   }
 
   const showSetAllowance =
+    collateral.address !== pseudoNativeAssetAddress &&
     !cpk?.cpk.isSafeApp() &&
     (allowanceFinished || hasZeroAllowance === Ternary.True || hasEnoughAllowance === Ternary.False)
 
@@ -218,14 +239,23 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
     !amount ||
     (status !== Status.Ready && status !== Status.Error) ||
     amount?.isZero() ||
-    (!cpk?.cpk.isSafeApp() && hasEnoughAllowance !== Ternary.True) ||
+    (!cpk?.cpk.isSafeApp() && collateral.address !== pseudoNativeAssetAddress && hasEnoughAllowance !== Ternary.True) ||
     amountError !== null ||
-    isNegativeAmount
+    isNegativeAmount ||
+    (!isUpdated && collateral.address === pseudoNativeAssetAddress)
+
+  const wrapAddress = getWrapToken(networkId).address
+
+  const currencyFilters =
+    collateral.address === wrapAddress || collateral.address === pseudoNativeAssetAddress
+      ? [wrapAddress, pseudoNativeAssetAddress.toLowerCase()]
+      : []
 
   const switchOutcome = (value: number) => {
     setNewShares(balances.map((balance, i) => (i === outcomeIndex ? balance.shares.add(tradedShares) : balance.shares)))
     setOutcomeIndex(value)
   }
+
   return (
     <>
       <OutcomeTable
@@ -256,10 +286,12 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
         <div>
           <CurrenciesWrapper>
             <CurrencySelector
+              addNativeAsset
               balance={formatBigNumber(maybeCollateralBalance || Zero, collateral.decimals, 5)}
               context={context}
               currency={collateral.address}
-              disabled
+              disabled={currencyFilters.length ? false : true}
+              filters={currencyFilters}
               onSelect={(token: Token | null) => {
                 if (token) {
                   setCollateral(token)
@@ -335,6 +367,14 @@ const MarketBuyWrapper: React.FC<Props> = (props: Props) => {
           onUnlock={unlockCollateral}
         />
       )}
+      {showUpgrade && (
+        <SetAllowance
+          collateral={getNativeAsset(context.networkId)}
+          finished={upgradeFinished && RemoteData.is.success(proxyIsUpToDate)}
+          loading={RemoteData.is.asking(proxyIsUpToDate)}
+          onUnlock={upgradeProxy}
+        />
+      )}
       <StyledButtonContainer borderTop={true} marginTop={showSetAllowance || isNegativeAmount}>
         <Button buttonType={ButtonType.secondaryLine} onClick={() => switchMarketTab(MarketDetailsTab.swap)}>
           Cancel
diff --git a/app/src/components/market/sections/market_create/market_wizard_creator_container.tsx b/app/src/components/market/sections/market_create/market_wizard_creator_container.tsx
index 18ed9cd5dd..a370c656ce 100644
--- a/app/src/components/market/sections/market_create/market_wizard_creator_container.tsx
+++ b/app/src/components/market/sections/market_create/market_wizard_creator_container.tsx
@@ -6,6 +6,7 @@ import { useConnectedWeb3Context } from '../../../../hooks/connectedWeb3'
 import { ERC20Service } from '../../../../services'
 import { getLogger } from '../../../../util/logger'
 import { MarketCreationStatus } from '../../../../util/market_creation_status_data'
+import { pseudoNativeAssetAddress } from '../../../../util/networks'
 import { MarketData } from '../../../../util/types'
 import { ModalConnectWallet } from '../../../modal'
 
@@ -40,7 +41,7 @@ const MarketWizardCreatorContainer: FC = () => {
 
         setMarketCreationStatus(MarketCreationStatus.creatingAMarket())
 
-        if (!cpk.cpk.isSafeApp()) {
+        if (!cpk.cpk.isSafeApp() && marketData.collateral.address !== pseudoNativeAssetAddress) {
           // Approve collateral to the proxy contract
           const collateralService = new ERC20Service(provider, account, marketData.collateral.address)
           const hasEnoughAlowance = await collateralService.hasEnoughAllowance(account, cpk.address, marketData.funding)
@@ -49,6 +50,7 @@ const MarketWizardCreatorContainer: FC = () => {
             await collateralService.approveUnlimited(cpk.address)
           }
         }
+
         const { marketMakerAddress, transaction } = await cpk.createMarket({
           marketData,
           conditionalTokens,
diff --git a/app/src/components/market/sections/market_create/steps/items/funding_and_fee_step.tsx b/app/src/components/market/sections/market_create/steps/items/funding_and_fee_step.tsx
index e07d8466f9..ceca24c67f 100644
--- a/app/src/components/market/sections/market_create/steps/items/funding_and_fee_step.tsx
+++ b/app/src/components/market/sections/market_create/steps/items/funding_and_fee_step.tsx
@@ -15,10 +15,12 @@ import {
   useConnectedCPKContext,
   useConnectedWeb3Context,
   useCpkAllowance,
+  useCpkProxy,
 } from '../../../../../../hooks'
 import { useGraphMarketsFromQuestion } from '../../../../../../hooks/useGraphMarketsFromQuestion'
 import { BalanceState, fetchAccountBalance } from '../../../../../../store/reducer'
 import { MarketCreationStatus } from '../../../../../../util/market_creation_status_data'
+import { getNativeAsset, pseudoNativeAssetAddress } from '../../../../../../util/networks'
 import { RemoteData } from '../../../../../../util/remote_data'
 import { formatBigNumber, formatDate, formatNumber } from '../../../../../../util/tools'
 import { Arbitrator, Ternary, Token } from '../../../../../../util/types'
@@ -224,10 +226,13 @@ const FundingAndFeeStep: React.FC<Props> = (props: Props) => {
 
   const [amount, setAmount] = useState<BigNumber>(funding)
   const [amountToDispaly, setAmountToDisplay] = useState<string>('')
-
   const hasEnoughAllowance = RemoteData.mapToTernary(allowance, allowance => allowance.gte(funding))
   const hasZeroAllowance = RemoteData.mapToTernary(allowance, allowance => allowance.isZero())
 
+  const [upgradeFinished, setUpgradeFinished] = useState(false)
+  const { proxyIsUpToDate, updateProxy } = useCpkProxy()
+  const isUpdated = RemoteData.hasData(proxyIsUpToDate) ? proxyIsUpToDate.data : false
+
   useEffect(() => {
     dispatch(fetchAccountBalance(account, provider, collateral))
   }, [dispatch, account, provider, collateral])
@@ -273,12 +278,27 @@ const FundingAndFeeStep: React.FC<Props> = (props: Props) => {
     !account ||
     amountError !== null ||
     exceedsMaxFee ||
-    isNegativeDepositAmount
+    isNegativeDepositAmount ||
+    (!isUpdated && collateral.address === pseudoNativeAssetAddress)
 
   const showSetAllowance =
+    collateral.address !== pseudoNativeAssetAddress &&
     !cpk?.cpk.isSafeApp() &&
     (allowanceFinished || hasZeroAllowance === Ternary.True || hasEnoughAllowance === Ternary.False)
 
+  const showUpgrade =
+    (!isUpdated && collateral.address === pseudoNativeAssetAddress) ||
+    (upgradeFinished && collateral.address === pseudoNativeAssetAddress)
+
+  const upgradeProxy = async () => {
+    if (!cpk) {
+      return
+    }
+
+    await updateProxy()
+    setUpgradeFinished(true)
+  }
+
   const unlockCollateral = async () => {
     if (!cpk) {
       return
@@ -386,6 +406,7 @@ const FundingAndFeeStep: React.FC<Props> = (props: Props) => {
           <div>
             <CurrenciesWrapper>
               <CurrencySelector
+                addNativeAsset
                 balance={formatNumber(collateralBalanceFormatted, 5)}
                 context={context}
                 currency={collateral.address}
@@ -460,6 +481,15 @@ const FundingAndFeeStep: React.FC<Props> = (props: Props) => {
             style={{ marginBottom: 20 }}
           />
         )}
+        {showUpgrade && (
+          <SetAllowance
+            collateral={getNativeAsset(context.networkId)}
+            finished={upgradeFinished && RemoteData.is.success(proxyIsUpToDate)}
+            loading={RemoteData.is.asking(proxyIsUpToDate)}
+            onUnlock={upgradeProxy}
+            style={{ marginBottom: 20 }}
+          />
+        )}
         <WarningMessage
           additionalDescription={''}
           description={
diff --git a/app/src/components/market/sections/market_pooling/market_pool_liquidity.tsx b/app/src/components/market/sections/market_pooling/market_pool_liquidity.tsx
index 3e321dcf8b..84f1c38586 100644
--- a/app/src/components/market/sections/market_pooling/market_pool_liquidity.tsx
+++ b/app/src/components/market/sections/market_pooling/market_pool_liquidity.tsx
@@ -11,10 +11,12 @@ import {
   useConnectedWeb3Context,
   useContracts,
   useCpkAllowance,
+  useCpkProxy,
   useFundingBalance,
 } from '../../../../hooks'
 import { ERC20Service } from '../../../../services'
 import { getLogger } from '../../../../util/logger'
+import { getNativeAsset, getWrapToken, pseudoNativeAssetAddress } from '../../../../util/networks'
 import { RemoteData } from '../../../../util/remote_data'
 import {
   calcAddFundingSendAmounts,
@@ -124,7 +126,7 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
   const { address: marketMakerAddress, balances, fee, totalEarnings, totalPoolShares, userEarnings } = marketMakerData
   const history = useHistory()
   const context = useConnectedWeb3Context()
-  const { account, library: provider } = context
+  const { account, library: provider, networkId } = context
   const cpk = useConnectedCPKContext()
 
   const { buildMarketMaker, conditionalTokens } = useContracts(context)
@@ -146,6 +148,10 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
   const [message, setMessage] = useState<string>('')
   const [isModalTransactionResultOpen, setIsModalTransactionResultOpen] = useState(false)
 
+  const [upgradeFinished, setUpgradeFinished] = useState(false)
+  const { proxyIsUpToDate, updateProxy } = useCpkProxy()
+  const isUpdated = RemoteData.hasData(proxyIsUpToDate) ? proxyIsUpToDate.data : false
+
   useEffect(() => {
     setIsNegativeAmountToFund(formatBigNumber(amountToFund || Zero, collateral.decimals).includes('-'))
   }, [amountToFund, collateral.decimals])
@@ -210,6 +216,7 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
   const collateralBalance = maybeCollateralBalance || Zero
   const probabilities = balances.map(balance => balance.probability)
   const showSetAllowance =
+    collateral.address !== pseudoNativeAssetAddress &&
     !cpk?.cpk.isSafeApp() &&
     (allowanceFinished || hasZeroAllowance === Ternary.True || hasEnoughAllowance === Ternary.False)
   const depositedTokensTotal = depositedTokens.add(userEarnings)
@@ -231,6 +238,9 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
 
   const totalUserLiquidity = totalDepositedTokens.add(userEarnings)
 
+  const wrapToken = getWrapToken(networkId)
+  const symbol = collateral.address === pseudoNativeAssetAddress ? wrapToken.symbol : collateral.symbol
+
   const addFunding = async () => {
     setModalTitle('Funds Deposit')
 
@@ -250,7 +260,7 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
       setStatus(Status.Loading)
       setMessage(`Depositing funds: ${fundsAmount} ${collateral.symbol}...`)
 
-      if (!cpk.cpk.isSafeApp()) {
+      if (!cpk.cpk.isSafeApp() && collateral.address !== pseudoNativeAssetAddress) {
         const collateralAddress = await marketMaker.getCollateralToken()
         const collateralService = new ERC20Service(provider, account, collateralAddress)
 
@@ -291,7 +301,7 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
 
       const fundsAmount = formatBigNumber(depositedTokensTotal, collateral.decimals)
 
-      setMessage(`Withdrawing funds: ${fundsAmount} ${collateral.symbol}...`)
+      setMessage(`Withdrawing funds: ${fundsAmount} ${symbol}...`)
 
       const collateralAddress = await marketMaker.getCollateralToken()
       const conditionId = await marketMaker.getConditionId()
@@ -313,7 +323,7 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
       setStatus(Status.Ready)
       setAmountToRemove(null)
       setAmountToRemoveDisplay('')
-      setMessage(`Successfully withdrew ${fundsAmount} ${collateral.symbol}`)
+      setMessage(`Successfully withdrew ${fundsAmount} ${symbol}`)
       setIsModalTransactionResultOpen(true)
     } catch (err) {
       setStatus(Status.Error)
@@ -333,13 +343,26 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
     setAllowanceFinished(true)
   }
 
+  const showUpgrade =
+    (!isUpdated && collateral.address === pseudoNativeAssetAddress) ||
+    (upgradeFinished && collateral.address === pseudoNativeAssetAddress)
+
+  const upgradeProxy = async () => {
+    if (!cpk) {
+      return
+    }
+
+    await updateProxy()
+    setUpgradeFinished(true)
+  }
+
   const collateralAmountError =
     maybeCollateralBalance === null
       ? null
       : maybeCollateralBalance.isZero() && amountToFund?.gt(maybeCollateralBalance)
       ? `Insufficient balance`
       : amountToFund?.gt(maybeCollateralBalance)
-      ? `Value must be less than or equal to ${walletBalance} ${collateral.symbol}`
+      ? `Value must be less than or equal to ${walletBalance} ${symbol}`
       : null
 
   const sharesAmountError =
@@ -354,7 +377,7 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
   const disableDepositButton =
     !amountToFund ||
     amountToFund?.isZero() ||
-    (!cpk?.cpk.isSafeApp() && hasEnoughAllowance !== Ternary.True) ||
+    (!cpk?.cpk.isSafeApp() && collateral.address !== pseudoNativeAssetAddress && hasEnoughAllowance !== Ternary.True) ||
     collateralAmountError !== null ||
     currentDate > resolutionDate ||
     isNegativeAmountToFund
@@ -366,12 +389,19 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
     sharesAmountError !== null ||
     isNegativeAmountToRemove
 
+  const wrapAddress = wrapToken.address
+
+  const currencyFilters =
+    collateral.address === wrapAddress || collateral.address === pseudoNativeAssetAddress
+      ? [wrapAddress, pseudoNativeAssetAddress.toLowerCase()]
+      : []
+
   return (
     <>
       <UserData>
         <UserDataTitleValue
           title="Your Liquidity"
-          value={`${formatNumber(formatBigNumber(totalUserLiquidity, collateral.decimals))} ${collateral.symbol}`}
+          value={`${formatNumber(formatBigNumber(totalUserLiquidity, collateral.decimals))} ${symbol}`}
         />
         <UserDataTitleValue
           title="Total Pool Tokens"
@@ -380,16 +410,16 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
         <UserDataTitleValue
           state={userEarnings.gt(0) ? ValueStates.success : undefined}
           title="Your Earnings"
-          value={`${userEarnings.gt(0) ? '+' : ''}${formatNumber(formatBigNumber(userEarnings, collateral.decimals))} ${
-            collateral.symbol
-          }`}
+          value={`${userEarnings.gt(0) ? '+' : ''}${formatNumber(
+            formatBigNumber(userEarnings, collateral.decimals),
+          )} ${symbol}`}
         />
         <UserDataTitleValue
           state={totalEarnings.gt(0) ? ValueStates.success : undefined}
           title="Total Earnings"
           value={`${totalEarnings.gt(0) ? '+' : ''}${formatNumber(
             formatBigNumber(totalEarnings, collateral.decimals),
-          )} ${collateral.symbol}`}
+          )} ${symbol}`}
         />
       </UserData>
       <OutcomeTable
@@ -422,10 +452,12 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
             <>
               <CurrenciesWrapper>
                 <CurrencySelector
+                  addNativeAsset
                   balance={walletBalance}
                   context={context}
                   currency={collateral.address}
-                  disabled
+                  disabled={currencyFilters.length ? false : true}
+                  filters={currencyFilters}
                   onSelect={(token: Token | null) => {
                     if (token) {
                       setCollateral(token)
@@ -514,21 +546,19 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
                 emphasizeValue={userEarnings.gt(0)}
                 state={ValueStates.success}
                 title="Earned"
-                value={`${formatNumber(formatBigNumber(userEarnings, collateral.decimals))} ${collateral.symbol}`}
+                value={`${formatNumber(formatBigNumber(userEarnings, collateral.decimals))} ${symbol}`}
               />
               <TransactionDetailsRow
                 state={ValueStates.normal}
                 title="Deposited"
-                value={`${formatNumber(formatBigNumber(depositedTokens, collateral.decimals))} ${collateral.symbol}`}
+                value={`${formatNumber(formatBigNumber(depositedTokens, collateral.decimals))} ${symbol}`}
               />
               <TransactionDetailsLine />
               <TransactionDetailsRow
                 emphasizeValue={depositedTokensTotal.gt(0)}
                 state={(depositedTokensTotal.gt(0) && ValueStates.important) || ValueStates.normal}
                 title="Total"
-                value={`${formatNumber(formatBigNumber(depositedTokensTotal, collateral.decimals))} ${
-                  collateral.symbol
-                }`}
+                value={`${formatNumber(formatBigNumber(depositedTokensTotal, collateral.decimals))} ${symbol}`}
               />
             </TransactionDetailsCard>
           )}
@@ -542,6 +572,14 @@ const MarketPoolLiquidityWrapper: React.FC<Props> = (props: Props) => {
           onUnlock={unlockCollateral}
         />
       )}
+      {activeTab === Tabs.deposit && showUpgrade && (
+        <SetAllowanceStyled
+          collateral={getNativeAsset(context.networkId)}
+          finished={upgradeFinished && RemoteData.is.success(proxyIsUpToDate)}
+          loading={RemoteData.is.asking(proxyIsUpToDate)}
+          onUnlock={upgradeProxy}
+        />
+      )}
       <WarningMessageStyled
         additionalDescription=""
         description="Providing liquidity is risky and could result in near total loss. It is important to withdraw liquidity before the event occurs and to be aware the market could move abruptly at any time."
diff --git a/app/src/global.d.ts b/app/src/global.d.ts
index 16f37bf923..82e9089189 100644
--- a/app/src/global.d.ts
+++ b/app/src/global.d.ts
@@ -10,6 +10,6 @@ declare module 'react-share'
 
 declare type Maybe<T> = T | null
 
-declare type KnownToken = 'cdai' | 'usdc' | 'dai' | 'weth' | 'owl' | 'chai' | 'gno' | 'pnk' | 'dxd' | 'wspoa'
+declare type KnownToken = 'cdai' | 'usdc' | 'dai' | 'weth' | 'owl' | 'chai' | 'gno' | 'pnk' | 'dxd' | 'wspoa' | 'wxdai'
 
 declare type KnownArbitrator = 'kleros' | 'unknown'
diff --git a/app/src/hooks/index.ts b/app/src/hooks/index.ts
index c8456ba0d4..3854d62b72 100644
--- a/app/src/hooks/index.ts
+++ b/app/src/hooks/index.ts
@@ -8,6 +8,7 @@ export { useCollateral } from './useCollateral'
 export { useCollateralBalance } from './useCollateralBalance'
 export { useContracts } from './useContracts'
 export { useCpkAllowance } from './useCpkAllowance'
+export { useCpkProxy } from './useCpkProxy'
 export { useDetectAdblocker } from './useDetectAdblocker'
 export { useDocumentDescription } from './useDocumentDescription'
 export { useDocumentTitle } from './useDocumentTitle'
diff --git a/app/src/hooks/useCollateralBalance.tsx b/app/src/hooks/useCollateralBalance.tsx
index a53e8451f1..53e1fe3da8 100644
--- a/app/src/hooks/useCollateralBalance.tsx
+++ b/app/src/hooks/useCollateralBalance.tsx
@@ -2,6 +2,7 @@ import { BigNumber } from 'ethers/utils'
 import { useEffect, useState } from 'react'
 
 import { ERC20Service } from '../services'
+import { pseudoNativeAssetAddress } from '../util/networks'
 import { Token } from '../util/types'
 
 import { ConnectedWeb3Context } from './connectedWeb3'
@@ -20,8 +21,12 @@ export const useCollateralBalance = (
   const fetchCollateralBalance = async () => {
     let collateralBalance = new BigNumber(0)
     if (account) {
-      const collateralService = new ERC20Service(provider, account, collateral.address)
-      collateralBalance = await collateralService.getCollateral(account)
+      if (collateral.address === pseudoNativeAssetAddress) {
+        collateralBalance = await provider.getBalance(account)
+      } else {
+        const collateralService = new ERC20Service(provider, account, collateral.address)
+        collateralBalance = await collateralService.getCollateral(account)
+      }
     }
 
     setCollateralBalance(collateralBalance)
diff --git a/app/src/hooks/useCpkAllowance.tsx b/app/src/hooks/useCpkAllowance.tsx
index dc2eb07b28..0cf7d11431 100644
--- a/app/src/hooks/useCpkAllowance.tsx
+++ b/app/src/hooks/useCpkAllowance.tsx
@@ -3,6 +3,7 @@ import { BigNumber } from 'ethers/utils'
 import { useCallback, useEffect, useState } from 'react'
 
 import { ERC20Service } from '../services'
+import { pseudoNativeAssetAddress } from '../util/networks'
 import { RemoteData } from '../util/remote_data'
 
 import { useConnectedCPKContext } from './connectedCpk'
@@ -21,7 +22,7 @@ export const useCpkAllowance = (signer: Signer, tokenAddress: string) => {
   const provider = signer.provider
 
   const updateAllowance = useCallback(async () => {
-    if (cpk && provider) {
+    if (cpk && provider && tokenAddress !== pseudoNativeAssetAddress) {
       const account = await signer.getAddress()
       const collateralService = new ERC20Service(provider, account, tokenAddress)
       const allowance = await collateralService.allowance(account, cpk.address)
diff --git a/app/src/hooks/useCpkProxy.tsx b/app/src/hooks/useCpkProxy.tsx
new file mode 100644
index 0000000000..a3ca8885b6
--- /dev/null
+++ b/app/src/hooks/useCpkProxy.tsx
@@ -0,0 +1,43 @@
+import { useCallback, useEffect, useState } from 'react'
+
+import { RemoteData } from '../util/remote_data'
+
+import { useConnectedCPKContext } from './connectedCpk'
+
+/**
+ * Return details about a user's proxy contract
+ * proxyIsUpToDate: Has the proxy implementation been upgraded to the target implementation
+ */
+export const useCpkProxy = () => {
+  const cpk = useConnectedCPKContext()
+
+  const [proxyIsUpToDate, setUpdated] = useState<RemoteData<boolean>>(RemoteData.notAsked())
+
+  const fetchUpdated = useCallback(async () => {
+    if (cpk) {
+      const updated = await cpk.proxyIsUpToDate()
+      setUpdated(RemoteData.success(updated))
+    }
+  }, [cpk])
+
+  const updateProxy = useCallback(async () => {
+    if (cpk) {
+      setUpdated(proxyIsUpToDate => RemoteData.load(proxyIsUpToDate))
+      try {
+        await cpk.upgradeProxyImplementation()
+        setUpdated(RemoteData.success(true))
+      } catch (e) {
+        setUpdated(RemoteData.failure(e))
+      }
+    }
+  }, [cpk])
+
+  useEffect(() => {
+    fetchUpdated()
+  }, [cpk, fetchUpdated])
+
+  return {
+    proxyIsUpToDate,
+    updateProxy,
+  }
+}
diff --git a/app/src/hooks/useTokens.tsx b/app/src/hooks/useTokens.tsx
index 91e3f68a54..ed28246e5c 100644
--- a/app/src/hooks/useTokens.tsx
+++ b/app/src/hooks/useTokens.tsx
@@ -2,7 +2,7 @@ import { useQuery } from '@apollo/react-hooks'
 import gql from 'graphql-tag'
 import { useEffect, useState } from 'react'
 
-import { getOmenTCRListId, getTokensByNetwork } from '../util/networks'
+import { getNativeAsset, getOmenTCRListId, getTokensByNetwork } from '../util/networks'
 import { getImageUrl } from '../util/token'
 import { isObjectEqual } from '../util/tools'
 import { Token } from '../util/types'
@@ -38,9 +38,13 @@ type GraphResponse = {
   ]
 }
 
-export const useTokens = (context: ConnectedWeb3Context) => {
+export const useTokens = (context: ConnectedWeb3Context, addNativeAsset?: boolean) => {
   const defaultTokens = getTokensByNetwork(context.networkId)
+  if (addNativeAsset) {
+    defaultTokens.splice(1, 0, getNativeAsset(context.networkId))
+  }
   const [tokens, setTokens] = useState<Token[]>(defaultTokens)
+
   const omenTCRListId = getOmenTCRListId(context.networkId)
 
   const { data, error, loading, refetch } = useQuery<GraphResponse>(query, {
@@ -54,8 +58,20 @@ export const useTokens = (context: ConnectedWeb3Context) => {
       ...token,
       image: getImageUrl(token.address),
     }))
-    if (!isObjectEqual(tokens, tokensWithImage)) {
-      setTokens(tokensWithImage)
+
+    // preserve ordering of default tokens and remove duplicates from TCR
+    const combinedTokens: Token[] = Object.values(
+      [...defaultTokens, ...tokensWithImage].reduce((prev, curr) => {
+        // @ts-expect-error ignore
+        if (prev[curr.symbol.toLowerCase()]) {
+          return prev
+        }
+        return { ...prev, [curr.symbol.toLowerCase()]: curr }
+      }, {}),
+    )
+
+    if (!isObjectEqual(tokens, combinedTokens)) {
+      setTokens(combinedTokens)
     }
   }
 
diff --git a/app/src/services/cpk.ts b/app/src/services/cpk.ts
index df3408bce0..cfdf6002dc 100644
--- a/app/src/services/cpk.ts
+++ b/app/src/services/cpk.ts
@@ -1,13 +1,17 @@
 import { txs } from '@gnosis.pm/safe-apps-sdk/dist/txs'
-import CPK from 'contract-proxy-kit/lib/esm'
-import EthersAdapter from 'contract-proxy-kit/lib/esm/ethLibAdapters/EthersAdapter'
 import { ethers } from 'ethers'
 import { TransactionReceipt, Web3Provider } from 'ethers/providers'
 import { BigNumber } from 'ethers/utils'
 import moment from 'moment'
 
+import { createCPK } from '../util/cpk'
 import { getLogger } from '../util/logger'
-import { getCPKAddresses, getContractAddress } from '../util/networks'
+import {
+  getContractAddress,
+  getTargetSafeImplementation,
+  getWrapToken,
+  pseudoNativeAssetAddress,
+} from '../util/networks'
 import { calcDistributionHint, waitABit } from '../util/tools'
 import { MarketData, Question, Token } from '../util/types'
 
@@ -23,6 +27,7 @@ const logger = getLogger('Services::CPKService')
 
 interface CPKBuyOutcomesParams {
   amount: BigNumber
+  collateral: Token
   outcomeIndex: number
   marketMaker: MarketMakerService
 }
@@ -79,6 +84,13 @@ interface TxOptions {
   gas?: number
 }
 
+const proxyAbi = [
+  'function masterCopy() external view returns (address)',
+  'function changeMasterCopy(address _masterCopy) external',
+  'function swapOwner(address prevOwner, address oldOwner, address newOwner) external',
+  'function getOwners() public view returns (address[] memory)',
+]
+
 interface CPKRequestVerificationParams {
   params: string
   ovmAddress: string
@@ -93,28 +105,16 @@ interface CreateMarketResult {
 class CPKService {
   cpk: any
   provider: Web3Provider
+  proxy: any
 
   constructor(cpk: any, provider: Web3Provider) {
     this.cpk = cpk
     this.provider = provider
+    this.proxy = new ethers.Contract(cpk.address, proxyAbi, provider.getSigner())
   }
 
   static async create(provider: Web3Provider) {
-    const signer = provider.getSigner()
-    const network = await provider.getNetwork()
-    const cpkAddresses = getCPKAddresses(network.chainId)
-    const networks = cpkAddresses
-      ? {
-          [network.chainId]: cpkAddresses,
-        }
-      : {}
-    const cpk = await CPK.create({
-      ethLibAdapter: new EthersAdapter({
-        ethers,
-        signer,
-      }),
-      networks,
-    })
+    const cpk = await createCPK(provider)
     return new CPKService(cpk, provider)
   }
 
@@ -143,12 +143,45 @@ class CPKService {
     return ''
   }
 
-  buyOutcomes = async ({ amount, marketMaker, outcomeIndex }: CPKBuyOutcomesParams): Promise<TransactionReceipt> => {
+  buyOutcomes = async ({
+    amount,
+    collateral,
+    marketMaker,
+    outcomeIndex,
+  }: CPKBuyOutcomesParams): Promise<TransactionReceipt> => {
     try {
       const signer = this.provider.getSigner()
       const account = await signer.getAddress()
+      const network = await this.provider.getNetwork()
+      const networkId = network.chainId
+
+      const transactions = []
+
+      const txOptions: TxOptions = {}
+
+      if (this.cpk.isSafeApp() || collateral.address === pseudoNativeAssetAddress) {
+        txOptions.gas = 500000
+      }
+
+      let collateralAddress
+      if (collateral.address === pseudoNativeAssetAddress) {
+        // ultimately WETH will be the collateral if we fund with native ether
+        collateralAddress = getWrapToken(networkId).address
+
+        // we need to send the funding amount in native ether
+        if (!this.cpk.isSafeApp()) {
+          txOptions.value = amount
+        }
+
+        // Step 0: Wrap ether
+        transactions.push({
+          to: collateralAddress,
+          value: amount,
+        })
+      } else {
+        collateralAddress = await marketMaker.getCollateralToken()
+      }
 
-      const collateralAddress = await marketMaker.getCollateralToken()
       const marketMakerAddress = marketMaker.address
 
       const collateralService = new ERC20Service(this.provider, account, collateralAddress)
@@ -157,13 +190,6 @@ class CPKService {
 
       const outcomeTokensToBuy = await marketMaker.calcBuyAmount(amount, outcomeIndex)
       logger.log(`Min outcome tokens to buy: ${outcomeTokensToBuy}`)
-      const transactions = []
-
-      const txOptions: TxOptions = {}
-
-      if (this.cpk.isSafeApp()) {
-        txOptions.gas = 500000
-      }
 
       // Check  if the allowance of the CPK to the market maker is enough.
       const hasCPKEnoughAlowance = await collateralService.hasEnoughAllowance(
@@ -180,9 +206,10 @@ class CPKService {
         })
       }
 
+      // Step 2: Transfer the amount of collateral being spent from the user to the CPK
+      // If we are funding with native ether we can skip this step
       // If we are signed in as a safe we don't need to transfer
-      if (!this.cpk.isSafeApp()) {
-        // Step 2: Transfer the amount of collateral being spent from the user to the CPK
+      if (!this.cpk.isSafeApp() && collateral.address !== pseudoNativeAssetAddress) {
         transactions.push({
           to: collateralAddress,
           data: ERC20Service.encodeTransferFrom(account, this.cpk.address, amount),
@@ -212,7 +239,7 @@ class CPKService {
     realitio,
   }: CPKCreateMarketParams): Promise<CreateMarketResult> => {
     try {
-      const { arbitrator, category, collateral, loadedQuestionId, outcomes, question, resolution, spread } = marketData
+      const { arbitrator, category, loadedQuestionId, outcomes, question, resolution, spread } = marketData
 
       if (!resolution) {
         throw new Error('Resolution time was not specified')
@@ -232,10 +259,30 @@ class CPKService {
       const transactions = []
       const txOptions: TxOptions = {}
 
-      if (this.cpk.isSafeApp()) {
+      if (this.cpk.isSafeApp() || marketData.collateral.address === pseudoNativeAssetAddress) {
         txOptions.gas = 1200000
       }
 
+      let collateral
+
+      if (marketData.collateral.address === pseudoNativeAssetAddress) {
+        // ultimately WETH will be the collateral if we fund with native ether
+        collateral = getWrapToken(networkId)
+
+        // we need to send the funding amount in native ether
+        if (!this.cpk.isSafeApp()) {
+          txOptions.value = marketData.funding
+        }
+
+        // Step 0: Wrap ether
+        transactions.push({
+          to: collateral.address,
+          value: marketData.funding,
+        })
+      } else {
+        collateral = marketData.collateral
+      }
+
       let questionId: string
       if (loadedQuestionId) {
         questionId = loadedQuestionId
@@ -290,9 +337,10 @@ class CPKService {
         data: ERC20Service.encodeApproveUnlimited(marketMakerFactory.address),
       })
 
+      // Step 4: Transfer funding from user
+      // If we are funding with native ether we can skip this step
       // If we are signed in as a safe we don't need to transfer
-      if (!this.cpk.isSafeApp()) {
-        // Step 4: Transfer funding from user
+      if (!this.cpk.isSafeApp() && marketData.collateral.address !== pseudoNativeAssetAddress) {
         transactions.push({
           to: collateral.address,
           data: ERC20Service.encodeTransferFrom(account, this.cpk.address, marketData.funding),
@@ -325,6 +373,7 @@ class CPKService {
       })
 
       const txObject = await this.cpk.execTransactions(transactions, txOptions)
+
       const txHash = await this.getTransactionHash(txObject)
       logger.log(`Transaction hash: ${txHash}`)
 
@@ -400,16 +449,39 @@ class CPKService {
       const signer = this.provider.getSigner()
       const account = await signer.getAddress()
 
-      // Check  if the allowance of the CPK to the market maker is enough.
-      const collateralService = new ERC20Service(this.provider, account, collateral.address)
+      const network = await this.provider.getNetwork()
+      const networkId = network.chainId
 
       const transactions = []
+
       const txOptions: TxOptions = {}
 
-      if (this.cpk.isSafeApp()) {
+      if (this.cpk.isSafeApp() || collateral.address === pseudoNativeAssetAddress) {
         txOptions.gas = 500000
       }
 
+      let collateralAddress
+      if (collateral.address === pseudoNativeAssetAddress) {
+        // ultimately WETH will be the collateral if we fund with native ether
+        collateralAddress = getWrapToken(networkId).address
+
+        // we need to send the funding amount in native ether
+        if (!this.cpk.isSafeApp()) {
+          txOptions.value = amount
+        }
+
+        // Step 0: Wrap ether
+        transactions.push({
+          to: collateralAddress,
+          value: amount,
+        })
+      } else {
+        collateralAddress = collateral.address
+      }
+
+      // Check  if the allowance of the CPK to the market maker is enough.
+      const collateralService = new ERC20Service(this.provider, account, collateralAddress)
+
       const hasCPKEnoughAlowance = await collateralService.hasEnoughAllowance(
         this.cpk.address,
         marketMaker.address,
@@ -419,20 +491,22 @@ class CPKService {
       if (!hasCPKEnoughAlowance) {
         // Step 1:  Approve unlimited amount to be transferred to the market maker
         transactions.push({
-          to: collateral.address,
+          to: collateralAddress,
           data: ERC20Service.encodeApproveUnlimited(marketMaker.address),
         })
       }
 
+      // Step 2: Transfer funding from user
+      // If we are funding with native ether we can skip this step
       // If we are signed in as a safe we don't need to transfer
-      if (!this.cpk.isSafeApp()) {
-        // Step 4: Transfer funding from user
+      if (!this.cpk.isSafeApp() && collateral.address !== pseudoNativeAssetAddress) {
         transactions.push({
           to: collateral.address,
           data: ERC20Service.encodeTransferFrom(account, this.cpk.address, amount),
         })
       }
 
+      // Step 3: Add funding to market
       transactions.push({
         to: marketMaker.address,
         data: MarketMakerService.encodeAddFunding(amount),
@@ -543,6 +617,7 @@ class CPKService {
       if (this.cpk.isSafeApp()) {
         txOptions.gas = 500000
       }
+
       if (!isConditionResolved) {
         transactions.push({
           to: oracle.address,
@@ -574,6 +649,39 @@ class CPKService {
       throw err
     }
   }
+
+  proxyIsUpToDate = async (): Promise<boolean> => {
+    const deployed = await this.cpk.isProxyDeployed()
+    if (deployed) {
+      const network = await this.provider.getNetwork()
+      const implementation = await this.proxy.masterCopy()
+      if (implementation.toLowerCase() === getTargetSafeImplementation(network.chainId).toLowerCase()) {
+        return true
+      }
+    }
+    return false
+  }
+
+  upgradeProxyImplementation = async (): Promise<TransactionReceipt> => {
+    try {
+      const txOptions: TxOptions = {}
+      // add plenty of gas to avoid locked proxy https://github.com/gnosis/contract-proxy-kit/issues/132
+      txOptions.gas = 500000
+      const network = await this.provider.getNetwork()
+      const targetGnosisSafeImplementation = getTargetSafeImplementation(network.chainId)
+      const transactions = [
+        {
+          to: this.cpk.address,
+          data: this.proxy.interface.functions.changeMasterCopy.encode([targetGnosisSafeImplementation]),
+        },
+      ]
+      const txObject = await this.cpk.execTransactions(transactions, txOptions)
+      return this.provider.waitForTransaction(txObject.hash)
+    } catch (err) {
+      logger.error(`Error trying to update proxy`, err.message)
+      throw err
+    }
+  }
 }
 
 export { CPKService }
diff --git a/app/src/store/reducer.ts b/app/src/store/reducer.ts
index 0c47f79547..811aad74bb 100644
--- a/app/src/store/reducer.ts
+++ b/app/src/store/reducer.ts
@@ -3,6 +3,7 @@ import { BigNumber } from 'ethers/utils'
 
 import { ERC20Service } from '../services'
 import { getLogger } from '../util/logger'
+import { pseudoNativeAssetAddress } from '../util/networks'
 
 export type BalanceState = {
   balance: Maybe<BigNumber>
@@ -27,11 +28,16 @@ export const { setBalance } = balanceSlice.actions
 export default balanceSlice.reducer
 
 export const fetchAccountBalance = (account: any, provider: any, collateral: any) => async (dispatch: any) => {
-  const collateralService = new ERC20Service(provider, account, collateral.address)
   try {
     if (account) {
-      const balance = await collateralService.getCollateral(account)
-      dispatch(setBalance({ balance: balance.toString() }))
+      if (collateral.address === pseudoNativeAssetAddress) {
+        const balance = await provider.getBalance(account)
+        dispatch(setBalance({ balance: balance.toString() }))
+      } else {
+        const collateralService = new ERC20Service(provider, account, collateral.address)
+        const balance = await collateralService.getCollateral(account)
+        dispatch(setBalance({ balance: balance.toString() }))
+      }
     } else {
       dispatch(setBalance({ balance: null }))
     }
diff --git a/app/src/util/cpk.ts b/app/src/util/cpk.ts
index de85b9b212..e2282e7b0a 100644
--- a/app/src/util/cpk.ts
+++ b/app/src/util/cpk.ts
@@ -64,6 +64,8 @@ function standardizeTransaction(tx: Transaction): StandardTransaction {
 }
 
 // Omen CPK monkey patch
+
+// @ts-expect-error ignore
 class OCPK extends CPK {
   txCallbacks = new Map<RequestId, TxCallback>()
 
@@ -120,13 +122,30 @@ class OCPK extends CPK {
   }
 
   async execTransactions(transactions: Transaction[], options?: ExecOptions): Promise<TransactionResult> {
-    if (this.isSafeApp() && transactions.length >= 1) {
+    if (this.isSafeApp()) {
       return this.sendTransactions(transactions.map(standardizeTransaction), options)
     }
 
     return super.execTransactions(transactions, options)
   }
 
+  private getSafeExecTxParams(transactions: Transaction[]): StandardTransaction {
+    if (transactions.length === 1) {
+      return standardizeTransaction(transactions[0])
+    }
+
+    if (!this.multiSend) {
+      throw new Error('CPK MultiSend uninitialized')
+    }
+
+    return {
+      to: this.multiSend.address,
+      value: '',
+      data: this.encodeMultiSendCallData(transactions),
+      operation: CPK.DelegateCall,
+    }
+  }
+
   encodeMultiSendCallData(transactions: Transaction[]): string {
     if (!this.ethLibAdapter) {
       throw new Error('CPK ethLibAdapter uninitialized')
diff --git a/app/src/util/networks.ts b/app/src/util/networks.ts
index af3a7df65c..fdfa264b46 100644
--- a/app/src/util/networks.ts
+++ b/app/src/util/networks.ts
@@ -8,6 +8,8 @@ import {
   GRAPH_RINKEBY_WS,
   GRAPH_SOKOL_HTTP,
   GRAPH_SOKOL_WS,
+  GRAPH_XDAI_HTTP,
+  GRAPH_XDAI_WS,
   INFURA_PROJECT_ID,
   KLEROS_CURATE_GRAPH_MAINNET_HTTP,
   KLEROS_CURATE_GRAPH_MAINNET_WS,
@@ -19,12 +21,13 @@ import { entries, isNotNull } from '../util/type-utils'
 import { getImageUrl } from './token'
 import { Arbitrator, Token } from './types'
 
-export type NetworkId = 1 | 4 | 77
+export type NetworkId = 1 | 4 | 77 | 100
 
 export const networkIds = {
   MAINNET: 1,
   RINKEBY: 4,
   SOKOL: 77,
+  XDAI: 100,
 } as const
 
 type CPKAddresses = {
@@ -56,6 +59,9 @@ interface Network {
     omenVerifiedMarkets: string
   }
   cpk?: CPKAddresses
+  wrapToken: string
+  targetSafeImplementation: string
+  nativeAsset: Token
   defaultToken: string
 }
 
@@ -70,6 +76,8 @@ interface KnownTokenData {
   order: number
 }
 
+export const pseudoNativeAssetAddress = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'
+
 const networks: { [K in NetworkId]: Network } = {
   [networkIds.MAINNET]: {
     label: 'Mainnet',
@@ -92,6 +100,20 @@ const networks: { [K in NetworkId]: Network } = {
       dxTCR: '0x93DB90445B76329e9ed96ECd74e76D8fbf2590d8',
       omenVerifiedMarkets: '0xb72103eE8819F2480c25d306eEAb7c3382fBA612',
     },
+    cpk: {
+      masterCopyAddress: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F',
+      proxyFactoryAddress: '0x0fB4340432e56c014fa96286de17222822a9281b',
+      multiSendAddress: '0xc3BD4deCF75e9937aefb7a4CE6Ec8931dB4cfAF0',
+      fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980',
+    },
+    wrapToken: 'weth',
+    nativeAsset: {
+      address: pseudoNativeAssetAddress,
+      image: getImageUrl('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+      symbol: 'ETH',
+      decimals: 18,
+    },
+    targetSafeImplementation: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185',
     defaultToken: 'dai',
   },
   [networkIds.RINKEBY]: {
@@ -115,6 +137,20 @@ const networks: { [K in NetworkId]: Network } = {
       dxTCR: '0x03165DF66d9448E45c2f5137486af3E7e752a352',
       omenVerifiedMarkets: '0x3b29096b7ab49428923d902cEC3dFEaa49993234',
     },
+    cpk: {
+      masterCopyAddress: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F',
+      proxyFactoryAddress: '0x336c19296d3989e9e0c2561ef21c964068657c38',
+      multiSendAddress: '0x82CFd05a033e202E980Bc99eA50A4C6BB91CE0d7',
+      fallbackHandlerAddress: '0x40A930851BD2e590Bd5A5C981b436de25742E980',
+    },
+    wrapToken: 'weth',
+    nativeAsset: {
+      address: pseudoNativeAssetAddress,
+      image: getImageUrl('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+      symbol: 'ETH',
+      decimals: 18,
+    },
+    targetSafeImplementation: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185',
     defaultToken: 'dai',
   },
   [networkIds.SOKOL]: {
@@ -144,8 +180,53 @@ const networks: { [K in NetworkId]: Network } = {
       multiSendAddress: '0xBe95a1C930B7d4F816518Ad7742062537F928b99',
       fallbackHandlerAddress: '0x1e9C3EBAd833b26E522D2fDa180Af3D2A32459D2',
     },
+    wrapToken: 'wspoa',
+    nativeAsset: {
+      address: pseudoNativeAssetAddress,
+      image: getImageUrl('0x6b175474e89094c44da98b954eedeac495271d0f'),
+      symbol: 'SPOA',
+      decimals: 18,
+    },
+    targetSafeImplementation: '0x035000FC773f4a0e39FcdeD08A46aBBDBF196fd3',
     defaultToken: 'wspoa',
   },
+  [networkIds.XDAI]: {
+    label: 'xDai',
+    url: 'https://rpc.xdaichain.com/',
+    graphHttpUri: GRAPH_XDAI_HTTP,
+    graphWsUri: GRAPH_XDAI_WS,
+    klerosCurateGraphHttpUri: KLEROS_CURATE_GRAPH_RINKEBY_HTTP,
+    klerosCurateGraphWsUri: KLEROS_CURATE_GRAPH_RINKEBY_WS,
+    realitioTimeout: 86400,
+    earliestBlockToCheck: EARLIEST_RINKEBY_BLOCK_TO_CHECK,
+    omenTCRListId: 1,
+    contracts: {
+      realitio: '0x90a617ed516ab7fAaBA56CcEDA0C5D952f294d03',
+      marketMakerFactory: '0x9083A2B699c0a4AD06F63580BDE2635d26a3eeF0',
+      conditionalTokens: '0xCeAfDD6bc0bEF976fdCd1112955828E00543c0Ce',
+      oracle: '0x2bf1BFb0eB6276a4F4B60044068Cb8CdEB89f79B',
+      klerosBadge: '0x0000000000000000000000000000000000000000',
+      klerosTokenView: '0x0000000000000000000000000000000000000000',
+      klerosTCR: '0x0000000000000000000000000000000000000000',
+      dxTCR: '0x0000000000000000000000000000000000000000',
+      omenVerifiedMarkets: '0x0000000000000000000000000000000000000000',
+    },
+    cpk: {
+      masterCopyAddress: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185',
+      proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
+      multiSendAddress: '0x035000FC773f4a0e39FcdeD08A46aBBDBF196fd3',
+      fallbackHandlerAddress: '0x602DF5F404f86469459D5e604CDa43A2cdFb7580',
+    },
+    wrapToken: 'wxdai',
+    nativeAsset: {
+      address: pseudoNativeAssetAddress,
+      image: getImageUrl('0x6b175474e89094c44da98b954eedeac495271d0f'),
+      symbol: 'xDAI',
+      decimals: 18,
+    },
+    targetSafeImplementation: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185',
+    defaultToken: 'wxdai',
+  },
 }
 
 export const supportedNetworkIds = Object.keys(networks).map(Number) as NetworkId[]
@@ -192,7 +273,15 @@ export const knownTokens: { [name in KnownToken]: KnownTokenData } = {
     symbol: 'WSPOA',
     decimals: 18,
     addresses: {
-      [networkIds.SOKOL]: '0xc655c6D80ac92d75fBF4F40e95280aEb855B1E87',
+      [networkIds.SOKOL]: '0xc655c6d80ac92d75fbf4f40e95280aeb855b1e87',
+    },
+    order: 1,
+  },
+  wxdai: {
+    symbol: 'wxDAI',
+    decimals: 18,
+    addresses: {
+      [networkIds.XDAI]: '0xe91d153e0b41518a2ce8dd3d7944fa863463a97d',
     },
     order: 1,
   },
@@ -373,6 +462,7 @@ export const knownArbitrators: { [name in KnownArbitrator]: KnownArbitratorData
       [networkIds.MAINNET]: '0xd47f72a2d1d0E91b0Ec5e5f5d02B2dc26d00A14D',
       [networkIds.RINKEBY]: '0xcafa054b1b054581faf65adce667bf1c684b6ef0',
       [networkIds.SOKOL]: '0xf3Aaf8A99f1119d02Af9bBfEafA8a71dDD4c582e',
+      [networkIds.XDAI]: '0xa0Baf56D83be19Eb6bA8aFAD2Db812Bc13D8Be1d',
     },
     isSelectionEnabled: true,
   },
@@ -542,3 +632,25 @@ export const getOmenTCRListId = (networkId: number): number => {
 
   return networks[networkId].omenTCRListId
 }
+
+export const getWrapToken = (networkId: number): Token => {
+  if (!validNetworkId(networkId)) {
+    throw new Error(`Unsupported network id: '${networkId}'`)
+  }
+  const tokenId = networks[networkId].wrapToken as KnownToken
+  return getToken(networkId, tokenId)
+}
+
+export const getNativeAsset = (networkId: number): Token => {
+  if (!validNetworkId(networkId)) {
+    throw new Error(`Unsupported network id: '${networkId}'`)
+  }
+  return networks[networkId].nativeAsset as Token
+}
+
+export const getTargetSafeImplementation = (networkId: number): string => {
+  if (!validNetworkId(networkId)) {
+    throw new Error(`Unsupported network id: '${networkId}'`)
+  }
+  return networks[networkId].targetSafeImplementation.toLowerCase()
+}
diff --git a/app/yarn.lock b/app/yarn.lock
index fedda39b60..9ad1b62966 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -3384,10 +3384,10 @@
   dependencies:
     source-map-support "^0.5.19"
 
-"@truffle/codec@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.8.0.tgz#7ad35a2564dc5e4a5d63f9b71aa3ac6188f0c344"
-  integrity sha512-sxT1FfykqxcuvXPuvM9BUR2NOeamh/8vUieVRtetMeEx1H0OBDY7WDuKOC4GydWOd7oO8w9EvOsiqTGKkzPXQQ==
+"@truffle/codec@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.9.0.tgz#ccdc9f79c6784447c70925bebc26319cd8bca155"
+  integrity sha512-lAkycqrvALZn677H9/CWxmpWVBejYCWbytNeFuHHM69gqNtwzZjDjbIyEUHQNiH5ZWed4XkIdJj7AxvlaCc5jw==
   dependencies:
     big.js "^5.2.2"
     bn.js "^4.11.8"
@@ -3421,13 +3421,13 @@
     debug "^4.1.0"
 
 "@truffle/contract@^4.2.23":
-  version "4.2.29"
-  resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.2.29.tgz#ace820def695ed1dca2a1537d0786637e8295324"
-  integrity sha512-pJx9LBmT9KrF+n6zl6J4AYkR3M8QGW9shjkJ9VWVF96bQ1uOrLP2DkhQknkIkVkQ+4NCgge2Q9cncFI5QAE6nw==
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@truffle/contract/-/contract-4.3.0.tgz#37458d9f9fbf287d45130a09d855f68a1923cb77"
+  integrity sha512-3x9dhBuDElRixR8bxknPfuGH7bBaOlYGF2FsUsuK3CoXo7hblXSQg8VZ/ns55oTSxDzRkwmI0EnRtwzGObaoGA==
   dependencies:
     "@truffle/blockchain-utils" "^0.0.25"
     "@truffle/contract-schema" "^3.3.2"
-    "@truffle/debug-utils" "^5.0.0"
+    "@truffle/debug-utils" "^5.0.3"
     "@truffle/error" "^0.0.11"
     "@truffle/interface-adapter" "^0.4.18"
     bignumber.js "^7.2.1"
@@ -3440,17 +3440,17 @@
     web3-eth-abi "1.2.9"
     web3-utils "1.2.9"
 
-"@truffle/debug-utils@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-5.0.0.tgz#de1f2d13259911fc71d825491ae2a72fdf9b73e5"
-  integrity sha512-ss0wiJLjIdKGp+gjwybjvje/q3cqNe1fvJXSV2bNke8mGssfQ4hcrhdrZG4BR80k5DIrYchoyA/a07UmVxpPDQ==
+"@truffle/debug-utils@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@truffle/debug-utils/-/debug-utils-5.0.3.tgz#c4e5f9489adb3f85d055934625e0d9c84fdd6599"
+  integrity sha512-pVbYg13gsCWTUQzEycr2fy0knIeegkj/yxJi2xf3BwEIAw4poYPl4ItxDMX9MTgNTwSe7ta+BykECj6djMuQNw==
   dependencies:
-    "@truffle/codec" "^0.8.0"
+    "@truffle/codec" "^0.9.0"
     "@trufflesuite/chromafi" "^2.2.1"
     chalk "^2.4.2"
     debug "^4.1.0"
-    highlight.js "^9.15.8"
-    highlightjs-solidity "^1.0.18"
+    highlight.js "^10.4.0"
+    highlightjs-solidity "^1.0.19"
 
 "@truffle/error@^0.0.11":
   version "0.0.11"
@@ -11711,15 +11711,20 @@ hi-base32@~0.5.0:
   resolved "https://registry.yarnpkg.com/hi-base32/-/hi-base32-0.5.0.tgz#61329f76a31f31008533f1c36f2473e259d64571"
   integrity sha512-DDRmxSyoYuvjUb9EnXdoiMChBZ7ZcUVJsK5Frd3kqMhuBxvmZdnBeynAVfj7/ECbn++CekcoprvC/rprHPAtow==
 
-highlight.js@^9.12.0, highlight.js@^9.15.8:
+highlight.js@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.0.tgz#ef3ce475e5dfa7a48484260b49ea242ddab823a0"
+  integrity sha512-EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA==
+
+highlight.js@^9.12.0:
   version "9.18.3"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.3.tgz#a1a0a2028d5e3149e2380f8a865ee8516703d634"
   integrity sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ==
 
-highlightjs-solidity@^1.0.18:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-1.0.18.tgz#3deb0593689a26fbadf98e631bf2cd305a6417c9"
-  integrity sha512-k15h0br4oCRT0F0jTRuZbimerVt5V4n0k25h7oWi0kVqlBNeXPbSr5ddw02/2ukJmYfB8jauFDmxSauJjwM7Eg==
+highlightjs-solidity@^1.0.19:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/highlightjs-solidity/-/highlightjs-solidity-1.0.19.tgz#a2f05bcfadd295a8eefb9cc20dcb18a3ba48e49c"
+  integrity sha512-ZIzMlxZxkcNnzWC1LeOeUjQjywzXnGyDxexOPKzz8hWFqdE2uRvz1BxD0joOkr41z4SU2ABXVGDx6EWlbzTBLQ==
 
 history@^4.9.0:
   version "4.10.1"