Merge pull request #186 from JoinColony/fix/minor-loader-changes

Minor loader changes

docs/_API_ColonyClient.md

@@ -410,7 +410,7 @@ Sets the payout given to the MANAGER role when the task is finalized. This Sende
 |Argument|Type|Description|
 |---|---|---|
 |taskId|number|Integer taskId.|
-|source|Payable address|ddress to send funds from, e.g. the token's contract address, or empty address (`0x0` for Ether)|
+|source|Payable address|Address to send funds from, e.g. the token's contract address, or empty address (`0x0` for Ether)|
 |amount|BigNumber|Amount to be paid.|
 
 **Returns**

docs/_Docs_GetStarted.md

@@ -176,7 +176,7 @@ Save the file, and run with `$ node example.js` - You should see your new cool c
 
 
 ## Funding your Colony
-Whether you've brought your ERC20 token from an existing token contract or created a new one at the same time as the colony (as shown in the above example), you can use the [tokenClient](/colonyJS/api-tokenclient/) to call and sent transactions relating to your colony's funding. This client handles all the functions in the ERC20 standard interface, as well as `mint` and `burn`. Functions that would ordinarily be performed by the contract owner may be performed by anyone in the colony with ADMIN authority. You can learn more about authority roles in the [authorityClient API](/docs-authorityclient/).
+Whether you've brought your ERC20 token from an existing token contract or created a new one at the same time as the colony (as shown in the above example), you can use the [tokenClient](/colonyJS/api-tokenclient/) to call and sent transactions relating to your colony's funding. This client handles all the functions in the ERC20 standard interface, as well as `mint` and `burn`. Functions that would ordinarily be performed by the contract owner may be performed by anyone in the colony with ADMIN authority. You can learn more about authority roles in the [authorityClient API](/colonyJS/api-authorityclient/).
 
 Your colony's token is an important component in the [reputation system](/colonyNetwork/docs-reputation/). Any task payouts in the native token of the colony grant the recipient reputation (proportional to the task rating). Any member of the colony's combined reputation and token holdings determine the amount they can claim from the [rewards pot](/colonyNetwork/docs-pots-and-funding/).
 

packages/colony-js-contract-loader/src/defaults.js

@@ -3,6 +3,6 @@
 // eslint-disable-next-line import/prefer-default-export
 export const DEFAULT_REQUIRED_CONTRACT_PROPS = {
  abi: true,
- address: true,
+ address: false,
  bytecode: false,
 };

packages/colony-js-contract-loader/src/interface/ContractLoader.js

@@ -3,7 +3,6 @@
 export type Query = {
  contractAddress?: string,
  contractName?: string,
- networkId?: number,
  routerAddress?: string,
  routerName?: string,
  version?: string,

packages/colony-js-contract-loader/src/transforms/truffleTransform.js

@@ -1,7 +1,5 @@
 /* @flow */
 
-import type { Query } from '../interface/ContractLoader';
-
 type TruffleArtifact = {
  abi: Array<{}>,
  bytecode: string,
@@ -12,23 +10,15 @@ type TruffleArtifact = {
  },
 };
 
-export default function truffleTransform(
- { abi = [], bytecode, networks = {} }: TruffleArtifact = {},
- { networkId }: Query = {},
-) {
- let address;
-
+export default function truffleTransform({
+ abi = [],
+ bytecode,
+ networks = {},
+}: TruffleArtifact = {}) {
  const networkIds = Object.keys(networks);
-
- if (networkId && networkIds.length) {
- if (!networks[networkId])
- throw new Error(`Network ID ${networkId} not found in contract`);
- ({ address } = networks[networkId]);
- } else {
- // Pick the last network (assumed to be the most recent)
- ({ address } =
- networks[parseInt(networkIds[networkIds.length - 1], 10)] || {});
- }
+ // Pick the last network (assumed to be the most recent)
+ const { address } =
+ networks[parseInt(networkIds[networkIds.length - 1], 10)] || {};
 
  return {
  abi,