Network Agnosticism

.env.example

@@ -1,15 +1,9 @@
-# rinkeby, trufflepig
-LOADER=trufflepig
-
 # local, goerli, mainnet
 NETWORK=local
 
 # verbose logger
 VERBOSE=true
 
-# ethplorer key (use `freekey` for rate limited dev trial)
-ETHPLORER_API_KEY=freekey
-
 # Add a key to not be rate limited with INFURA
 # INFURA_ID=
 

package.json

@@ -4,7 +4,7 @@
   "engines": {
     "node": ">=12.19.0 <13"
   },
-  "version": "3.0.2",
+  "version": "3.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -128,7 +128,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.0.2",
-    "@colony/colony-js": "^2.0.2",
+    "@colony/colony-js": "^2.1.0-xdai.3",
     "@colony/redux-promise-listener": "^1.2.0",
     "@formatjs/intl-pluralrules": "^1.5.7",
     "@formatjs/intl-relativetimeformat": "^4.5.14",

src/data/resolvers/token.ts

@@ -4,20 +4,21 @@ import { AddressZero } from 'ethers/constants';
 import { ClientType, ColonyClient } from '@colony/colony-js';
 
 import { Context, ContextModule } from '~context/index';
-import { COLONY_TOTAL_BALANCE_DOMAIN_ID } from '~constants';
+import {
+  COLONY_TOTAL_BALANCE_DOMAIN_ID,
+  DEFAULT_NETWORK_TOKEN,
+} from '~constants';
 import { TokenInfo, TokenInfoDocument } from '~data/index';
 import { Address } from '~types/index';
 import { createAddress, isAddress } from '~utils/web3';
 import { getTokenDecimalsWithFallback } from '~utils/tokens';
 
-const ETHER_INFO = Object.freeze({
+const TOKEN_INFO = Object.freeze({
   id: AddressZero,
   address: AddressZero,
-  name: 'Ether',
-  symbol: 'ETH',
-  decimals: 18,
   verified: true,
   iconHash: '',
+  ...DEFAULT_NETWORK_TOKEN,
 });
 
 // Token data is used a lot and never change. They require a custom cache
@@ -64,7 +65,7 @@ const getTokenData = async (
     return {
       __typename: 'Token',
       verified: true,
-      ...ETHER_INFO,
+      ...TOKEN_INFO,
     };
   }
 

src/environment.d.ts

@@ -3,10 +3,8 @@ namespace NodeJS {
   interface ProcessEnv {
     NODE_ENV: 'development' | 'production';
     COLONY_NETWORK_ENS_NAME: string;
-    LOADER: string;
     NETWORK: string;
     PINNING_ROOM: string;
-    ETHPLORER_API_KEY: string;
     INFURA_ID: string;
     VERSION: string;
   }

src/immutable/GasPrices.ts

@@ -11,6 +11,11 @@ export interface GasPricesProps {
   network?: BigNumber;
   suggested?: BigNumber;
   suggestedWait?: number;
+  /**
+   * On xdai the gas price of 1 gwei will always work, so for now, we're setting it manually
+   */
+  fixed?: BigNumber;
+  fixedWait?: number;
   timestamp?: number;
 }
 
@@ -22,6 +27,11 @@ const defaultValues: DefaultValues<GasPricesProps> = {
   network: undefined,
   suggested: undefined,
   suggestedWait: undefined,
+  /**
+   * 1 Gwei converted into wei
+   */
+  fixed: new BigNumber('1000000000'),
+  fixedWait: 5,
   timestamp: undefined,
 };
 

src/lib/ENS/ENS.ts

@@ -10,7 +10,7 @@ import { Address, ENSName } from '~types/index';
 import { createAddress, isAddress } from '~utils/web3';
 
 const COLONY_NETWORK_ENS_NAME =
-  process.env.COLONY_NETWORK_ENS_NAME || 'joincolony.eth';
+  process.env.COLONY_NETWORK_ENS_NAME || 'joincolony.colonyxdai';
 const EXTERNAL_PREFIX = '$';
 
 class ENS {
@@ -77,7 +77,7 @@ class ENS {
     }
 
     // eslint-disable-next-line max-len
-    const ensName = await networkClient.lookupRegisteredENSDomainWithGoerliPatch(
+    const ensName = await networkClient.lookupRegisteredENSDomainWithNetworkPatches(
       address,
     );
 
@@ -100,7 +100,7 @@ class ENS {
     return !address;
   }
 
-  /* Returns an Ethereum address, when given the human-readable name */
+  /* Returns an xDai Chain address, when given the human-readable name */
   async getAddress(
     domain: string,
     networkClient: ColonyNetworkClient,

src/lib/ipfs/IPFSNode.ts

@@ -13,7 +13,7 @@ const configMap = {
 };
 
 class IPFSNode {
-  static getIpfsConfig = configMap[NETWORK];
+  static getIpfsConfig = configMap[NETWORK] || configMap.mainnet;
 
   _ipfs: IPFS;
 

src/modules/constants.ts

@@ -1,4 +1,29 @@
-export const DEFAULT_NETWORK = process.env.NETWORK || 'goerli';
+import { Network } from '@colony/colony-js';
+
+export type TokenInfo = {
+  name: string;
+  symbol: string;
+  decimals?: number;
+};
+
+export type NetworkInfo = {
+  name: string;
+  description?: string;
+  displayENSDomain?: string;
+  /**
+   * Used just to display references to the current networks's
+   */
+  blockExplorerName?: string;
+  /**
+   * Link to a token list from the current network's block explorer.
+   * This will just be used for information messages and tooltips.
+   * We actually linking to it we have a method that generates the
+   * link programatically: `getBlockExplorerLink()`
+   */
+  tokenExplorerLink?: string;
+};
+
+export const DEFAULT_NETWORK = process.env.NETWORK || Network.Goerli;
 export const COLONY_TOTAL_BALANCE_DOMAIN_ID = 0;
 export const DEFAULT_TOKEN_DECIMALS = 18;
 
@@ -7,3 +32,39 @@ export enum ROLES_COMMUNITY {
   admin = 'role.admin',
   member = 'role.member',
 }
+
+export const XDAI_TOKEN: TokenInfo = {
+  name: 'XDAI Token',
+  symbol: 'XDAI',
+  decimals: 18,
+};
+
+export const ETHER_TOKEN: TokenInfo = {
+  name: 'Ether',
+  symbol: 'ETH',
+  decimals: 18,
+};
+
+export const XDAI_NETWORK: NetworkInfo = {
+  name: 'xDai Chain',
+  displayENSDomain: 'joincolony.colonyxdai',
+  blockExplorerName: 'Blockscout',
+  tokenExplorerLink: 'https://blockscout.com/poa/xdai/tokens',
+};
+
+export const ETHEREUM_NETWORK: NetworkInfo = {
+  name: 'Ethereum',
+  blockExplorerName: 'Etherscan',
+  displayENSDomain: 'joincolony.eth',
+  tokenExplorerLink: 'https://etherscan.io/tokens',
+};
+
+export const DEFAULT_NETWORK_TOKEN =
+  DEFAULT_NETWORK === Network.Xdai || DEFAULT_NETWORK === Network.XdaiFork
+    ? XDAI_TOKEN
+    : ETHER_TOKEN;
+
+export const DEFAULT_NETWORK_INFO =
+  DEFAULT_NETWORK === Network.Xdai || DEFAULT_NETWORK === Network.XdaiFork
+    ? XDAI_NETWORK
+    : ETHEREUM_NETWORK;

src/modules/core/components/Fields/Input/Input.md

@@ -22,7 +22,7 @@ import { Form } from '../';
   initialValues={{ input: '' }}
   initialErrors={{ input: 'Wrong!' }}
   touched={{ input: true }}
-  validate={{ input: 'Wrong!' }}  
+  validate={{ input: 'Wrong!' }}
 >
   <Input
     elementOnly
@@ -71,7 +71,7 @@ import { Form } from '../';
   initialValues={{ input: '' }}
   initialErrors={{ input: 'Wrong!' }}
   touched={{ input: true }}
-  validate={{ input: 'Wrong!' }}  
+  validate={{ input: 'Wrong!' }}
 >
   <Input
     name="input"
@@ -135,7 +135,7 @@ import { Form } from '../';
   initialValues={{ input: '' }}
   initialErrors={{ input: 'Wrong!' }}
   touched={{ input: true }}
-  validate={{ input: 'Wrong!' }}  
+  validate={{ input: 'Wrong!' }}
 >
   <Input
     appearance={{ direction: 'horizontal' }}
@@ -158,7 +158,7 @@ import { Form } from '../';
     appearance={{ colorSchema: 'dark' }}
     name="input"
     placeholder="I'm dark!"
-    label="Dark label" 
+    label="Dark label"
   />
 </Form>
 ```
@@ -219,7 +219,7 @@ import { Form } from '../';
   initialValues={{ input: '' }}
   initialErrors={{ input: 'Wrong!' }}
   touched={{ input: true }}
-  validate={{ input: 'Wrong!' }}  
+  validate={{ input: 'Wrong!' }}
 >
   <Input
     appearance={{ theme: 'underlined', direction: 'horizontal' }}

src/modules/core/components/InfoPopover/TokenInfoPopover.tsx

@@ -5,6 +5,7 @@ import CopyableAddress from '~core/CopyableAddress';
 import TokenLink from '~core/TokenLink';
 import TokenIcon from '~dashboard/HookedTokenIcon';
 import { AnyToken } from '~data/index';
+import { DEFAULT_NETWORK_INFO } from '~constants';
 
 import styles from './InfoPopover.css';
 
@@ -15,7 +16,7 @@ const MSG = defineMessages({
   },
   viewOnEtherscan: {
     id: 'InfoPopover.TokenInfoPopover.viewOnEtherscan',
-    defaultMessage: 'View on Etherscan',
+    defaultMessage: 'View on {blockExplorerName}',
   },
 });
 
@@ -56,7 +57,13 @@ const TokenInfoPopover = ({ token, isTokenNative }: Props) => {
         )}
       </div>
       <div className={styles.section}>
-        <TokenLink tokenAddress={address} text={MSG.viewOnEtherscan} />
+        <TokenLink
+          tokenAddress={address}
+          text={MSG.viewOnEtherscan}
+          textValues={{
+            blockExplorerName: DEFAULT_NETWORK_INFO.blockExplorerName,
+          }}
+        />
       </div>
     </div>
   );

src/modules/core/components/Numeral/AbbreviatedNumeral.tsx

@@ -7,7 +7,7 @@ import { useIntl } from 'react-intl';
 import type { Unit } from '~utils/web3';
 
 interface Props extends HTMLAttributes<HTMLSpanElement> {
-  /** When dealing with ethereum units */
+  /** When dealing with xDai chain units */
   ethUnit?: Unit;
   /** Disallow children */
   children?: never;

src/modules/core/components/TokenLink/TokenLink.tsx

@@ -1,10 +1,9 @@
 import { MessageDescriptor } from 'react-intl';
 import React from 'react';
 
-import { DEFAULT_NETWORK } from '~constants';
 import ExternalLink from '~core/ExternalLink';
 import { SimpleMessageValues } from '~types/index';
-import { getEtherscanLink } from '~utils/external';
+import { getBlockExplorerLink } from '~utils/external';
 
 interface Props {
   /*
@@ -16,9 +15,6 @@ interface Props {
   /** Address of the token to link to */
   tokenAddress: string;
 
-  /** Optionally override current network */
-  network?: string;
-
   /** A string or a `messageDescriptor` that make up the link's text. Defaults to `tokenAddress`. */
   text?: MessageDescriptor | string;
 
@@ -28,17 +24,10 @@ interface Props {
 
 const displayName = 'TokenLink';
 
-const TokenLink = ({
-  className,
-  tokenAddress,
-  network = DEFAULT_NETWORK,
-  text,
-  textValues,
-}: Props) => (
+const TokenLink = ({ className, tokenAddress, text, textValues }: Props) => (
   <ExternalLink
     className={className}
-    href={getEtherscanLink({
-      network,
+    href={getBlockExplorerLink({
       linkType: 'token',
       addressOrHash: tokenAddress,
     })}

src/modules/core/components/TransactionLink/TransactionLink.tsx

@@ -1,10 +1,9 @@
 import { MessageDescriptor } from 'react-intl';
 import React from 'react';
 
-import { DEFAULT_NETWORK } from '~constants';
 import ExternalLink from '~core/ExternalLink';
 import { SimpleMessageValues } from '~types/index';
-import { getEtherscanLink } from '~utils/external';
+import { getBlockExplorerLink } from '~utils/external';
 
 interface Props {
   /*
@@ -16,9 +15,6 @@ interface Props {
   /** Transaction hash */
   hash: string;
 
-  /** Optionally override current network */
-  network?: string;
-
   /** A string or a `messageDescriptor` that make up the link's text. Defaults to `hash`. */
   text?: MessageDescriptor | string;
 
@@ -28,17 +24,10 @@ interface Props {
 
 const displayName = 'TransactionLink';
 
-const TransactionLink = ({
-  className,
-  hash,
-  network = DEFAULT_NETWORK,
-  text,
-  textValues,
-}: Props) => (
+const TransactionLink = ({ className, hash, text, textValues }: Props) => (
   <ExternalLink
     className={className}
-    href={getEtherscanLink({
-      network,
+    href={getBlockExplorerLink({
       linkType: 'tx',
       addressOrHash: hash,
     })}