Export certain contracts in extras

src/abis/exports.ts

@@ -0,0 +1,12 @@
+// Always adjust to the latest version here
+import * as MetaTxToken from './latest/MetaTxToken.json';
+import * as TokenAuthority from './elwss3/TokenAuthority.json';
+import * as VestingSimple from './elwss3/VestingSimple.json';
+import * as WrappedToken from './elwss3/WrappedToken.json';
+
+export const abis = {
+ MetaTxToken,
+ TokenAuthority,
+ VestingSimple,
+ WrappedToken,
+};

src/clients/ColonyNetworkClient.ts

@@ -9,7 +9,11 @@ import { ClientType, Network, SignerOrProvider } from '../types';
 import { AnyColonyClient } from '../clients/Core/exports';
 
 import { ColonyNetworkAddress, ReputationOracleEndpoint } from '../constants';
-import { IColonyNetwork, IColonyNetworkFactory, abis } from '../exports';
+import { abis } from '../abis/exports';
+import {
+ IColonyNetwork,
+ IColonyNetwork__factory as IColonyNetworkFactory,
+} from '../contracts';
 import { getColonyClient } from './Core/exports';
 import getTokenLockingClient, {
  TokenLockingClient,

src/clients/TokenClient.ts

@@ -6,15 +6,16 @@ import {
  TokenClientType,
 } from '../types';
 
+import { abis } from '../abis/exports';
+
 import {
- abis,
- TokenFactory,
+ Token__factory as TokenFactory,
  Token,
- TokenErc20Factory,
- TokenErc20,
- TokenSaiFactory,
- TokenSai,
-} from '../exports';
+ TokenERC20__factory as TokenERC20Factory,
+ TokenERC20,
+ TokenSAI__factory as TokenSAIFactory,
+ TokenSAI,
+} from '../contracts';
 
 const { getAddress, isHexString, parseBytes32String } = utils;
 
@@ -81,7 +82,7 @@ export interface ColonyTokenClient extends Token {
 }
 
 /** A standard ERC20 token */
-export interface Erc20TokenClient extends TokenErc20 {
+export interface Erc20TokenClient extends TokenERC20 {
  clientType: ClientType.TokenClient;
  tokenClientType: TokenClientType.Erc20;
 
@@ -90,7 +91,7 @@ export interface Erc20TokenClient extends TokenErc20 {
 }
 
 /** The SAI token. It requires special treatment as it's deprecated */
-export interface DaiTokenClient extends TokenSai {
+export interface DaiTokenClient extends TokenSAI {
  clientType: ClientType.TokenClient;
  tokenClientType: TokenClientType.Sai;
 
@@ -191,14 +192,14 @@ const getTokenClient = async (
  tokenClient.estimateGas.deployTokenAuthority =
  estimateDeployTokenAuthority.bind(tokenClient);
  } else if (isSai(address)) {
- tokenClient = TokenSaiFactory.connect(
+ tokenClient = TokenSAIFactory.connect(
  address,
  signerOrProvider,
  ) as DaiTokenClient;
 
  tokenClient.tokenClientType = TokenClientType.Sai;
  } else {
- tokenClient = TokenErc20Factory.connect(
+ tokenClient = TokenERC20Factory.connect(
  address,
  signerOrProvider,
  ) as Erc20TokenClient;

src/clients/TokenLockingClient.ts

@@ -1,6 +1,9 @@
 import { ClientType, SignerOrProvider } from '../types';
 
-import { TokenLocking, TokenLockingFactory } from '../exports';
+import {
+ TokenLocking,
+ TokenLocking__factory as TokenLockingFactory,
+} from '../contracts';
 
 export interface TokenLockingClient extends TokenLocking {
  clientType: ClientType.TokenLockingClient;

src/clients/UtilsClient.ts

@@ -3,7 +3,7 @@ import { BigNumber, BytesLike, CallOverrides } from 'ethers';
 import { ClientType, SignerOrProvider } from '../types';
 
 import { ColonyRole } from '..';
-import { Utils, UtilsFactory } from '../exports';
+import { Utils, Utils__factory as UtilsFactory } from '../contracts';
 import { nonNullable } from '../utils';
 
 export interface UtilsClient extends Utils {

src/extras/index.ts

@@ -1 +1,18 @@
 export * from '../contracts/IColony/9/IColony';
+
+export {
+ CoinMachineEvents,
+ CoinMachineEvents__factory as CoinMachineEventsFactory,
+ IColonyEvents,
+ IColonyEvents__factory as IColonyEventsFactory,
+ IColonyNetwork,
+ IColonyNetwork__factory as IColonyNetworkFactory,
+ OneTxPaymentEvents,
+ OneTxPaymentEvents__factory as OneTxPaymentEventsFactory,
+ TokenERC20 as TokenErc20,
+ TokenERC20__factory as TokenErc20Factory,
+ VotingReputationEvents,
+ VotingReputationEvents__factory as VotingReputationEventsFactory,
+ WhitelistEvents,
+ WhitelistEvents__factory as WhitelistEventsFactory,
+} from '../contracts';