gnosis / contract-proxy-kit / 451

pending completion

Build # 451

Build Type

Pull #126

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/gnosis/contract-proxy-kit/commit/<a class=hub.com/gnosis/contract-proxy-kit/commit/ffeb42400870a720eef77e423e3a838a7cf4feec">ffeb42400<a href="https://github.com/gnosis/contract-proxy-kit/commit/ffeb42400870a720eef77e423e3a838a7cf4feec">">Merge </a><a class="double-link" href="https://github.com/gnosis/contract-proxy-kit/commit/<a class="double-link" href="https://github.com/gnosis/contract-proxy-kit/commit/3461f599c6be9bbee59e4f3e97cf9e95cb861914">3461f599c</a>">3461f599c</a><a href="https://github.com/gnosis/contract-proxy-kit/commit/ffeb42400870a720eef77e423e3a838a7cf4feec"> into e52b8b40b">e52b8b40b</a>

Pull Request Pull Request #126: Contract v1.2.0

Run Details

241 of 358 branches covered (67.32%)

Branch coverage included in aggregate %.

150 of 150 new or added lines in 13 files covered. (100.0%)

496 of 600 relevant lines covered (82.67%)

140.63 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.0

/src/config/networks.ts

import { Address } from '../utils/basicTypes'

interface MasterCopyAddressVersion {
  version: string
  address: Address
}

export interface NetworkConfigEntry {
  masterCopyAddress?: Address
  masterCopyAddressVersions?: Array<MasterCopyAddressVersion>
  proxyFactoryAddress: Address
  multiSendAddress: Address
  fallbackHandlerAddress: Address
}

export interface NetworksConfig {
  [id: string]: NetworkConfigEntry
}

export interface NormalizedNetworkConfigEntry {
  masterCopyAddressVersions: MasterCopyAddressVersion[]
  proxyFactoryAddress: Address
  multiSendAddress: Address
  fallbackHandlerAddress: Address
}

export interface NormalizedNetworksConfig {
  [id: string]: NormalizedNetworkConfigEntry
}

// First element belongs to latest release. Do not alter this order. New releases go first.
const masterCopyAddressVersions: MasterCopyAddressVersion[] = [
  {
    version: '1.2.0',
    address: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185'
  },
  {
    version: '1.1.1',
    address: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F'
  }
]

export const defaultNetworks: NormalizedNetworksConfig = {
  // mainnet
  1: {
    masterCopyAddressVersions,
    proxyFactoryAddress: '0x0fB4340432e56c014fa96286de17222822a9281b',
    multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
    fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
  },
  // rinkeby
  4: {
    masterCopyAddressVersions,
    proxyFactoryAddress: '0x336c19296d3989e9e0c2561ef21c964068657c38',
    multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
    fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
  },
  // goerli
  5: {
    masterCopyAddressVersions,
    proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
    multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
    fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
  },
  // kovan
  42: {
    masterCopyAddressVersions,
    proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
    multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
    fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
  },
  // xdai
  100: {
    masterCopyAddressVersions,
    proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
    multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
    fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
  }
}

export function normalizeNetworksConfig(
  defaultNetworks: NormalizedNetworksConfig,
  networks?: NetworksConfig
): NormalizedNetworksConfig {
  if (!networks) {
    return defaultNetworks
  }
  const normalizedNetworks: NormalizedNetworksConfig = {}
  for (const networkId of Object.keys(networks)) {
    const currentNetwork = networks[networkId]
    let mcVersions: MasterCopyAddressVersion[] = []
    if (currentNetwork.masterCopyAddress) {
      mcVersions = [
        {
          version: masterCopyAddressVersions[0].version,
          address: currentNetwork.masterCopyAddress
        }
      ]
    } else if (currentNetwork.masterCopyAddressVersions) {
      mcVersions = currentNetwork.masterCopyAddressVersions
    }
    if (mcVersions.length === 0) {
      throw new Error(
        'Properties "masterCopyAddress" or "masterCopyAddressVersions" are missing in CPK network configuration'
      )
    }
    normalizedNetworks[networkId] = {
      masterCopyAddressVersions: mcVersions,
      proxyFactoryAddress: currentNetwork.proxyFactoryAddress,
      multiSendAddress: currentNetwork.multiSendAddress,
      fallbackHandlerAddress: currentNetwork.fallbackHandlerAddress
    }
  }
  return {
    ...defaultNetworks,
    ...normalizedNetworks
  }
}

1	import { Address } from '../utils/basicTypes'
2
3	interface MasterCopyAddressVersion {
4	version: string
5	address: Address
6	}
7
8	export interface NetworkConfigEntry {
9	masterCopyAddress?: Address
10	masterCopyAddressVersions?: Array<MasterCopyAddressVersion>
11	proxyFactoryAddress: Address
12	multiSendAddress: Address
13	fallbackHandlerAddress: Address
14	}
15
16	export interface NetworksConfig {
17	[id: string]: NetworkConfigEntry
18	}
19
20	export interface NormalizedNetworkConfigEntry {
21	masterCopyAddressVersions: MasterCopyAddressVersion[]
22	proxyFactoryAddress: Address
23	multiSendAddress: Address
24	fallbackHandlerAddress: Address
25	}
26
27	export interface NormalizedNetworksConfig {
28	[id: string]: NormalizedNetworkConfigEntry
29	}
30
31	// First element belongs to latest release. Do not alter this order. New releases go first.
32	const masterCopyAddressVersions: MasterCopyAddressVersion[] = [	1✔
33	{
34	version: '1.2.0',
35	address: '0x6851D6fDFAfD08c0295C392436245E5bc78B0185'
36	},
37	{
38	version: '1.1.1',
39	address: '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F'
40	}
41	]
42
43	export const defaultNetworks: NormalizedNetworksConfig = {	1✔
44	// mainnet
45	1: {
46	masterCopyAddressVersions,
47	proxyFactoryAddress: '0x0fB4340432e56c014fa96286de17222822a9281b',
48	multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
49	fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
50	},
51	// rinkeby
52	4: {
53	masterCopyAddressVersions,
54	proxyFactoryAddress: '0x336c19296d3989e9e0c2561ef21c964068657c38',
55	multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
56	fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
57	},
58	// goerli
59	5: {
60	masterCopyAddressVersions,
61	proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
62	multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
63	fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
64	},
65	// kovan
66	42: {
67	masterCopyAddressVersions,
68	proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
69	multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
70	fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
71	},
72	// xdai
73	100: {
74	masterCopyAddressVersions,
75	proxyFactoryAddress: '0xfC7577774887aAE7bAcdf0Fc8ce041DA0b3200f7',
76	multiSendAddress: '0x8D29bE29923b68abfDD21e541b9374737B49cdAD',
77	fallbackHandlerAddress: '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
78	}
79	}
80
81	export function normalizeNetworksConfig(	1✔
82	defaultNetworks: NormalizedNetworksConfig,
83	networks?: NetworksConfig
84	): NormalizedNetworksConfig {
85	if (!networks) {	144✔
86	return defaultNetworks	16✔
87	}
88	const normalizedNetworks: NormalizedNetworksConfig = {}	128✔
89	for (const networkId of Object.keys(networks)) {	128✔
90	const currentNetwork = networks[networkId]	128✔
91	let mcVersions: MasterCopyAddressVersion[] = []	128✔
92	if (currentNetwork.masterCopyAddress) {	128!
93	mcVersions = [	×
94	{
95	version: masterCopyAddressVersions[0].version,
96	address: currentNetwork.masterCopyAddress
97	}
98	]
99	} else if (currentNetwork.masterCopyAddressVersions) {	128!
100	mcVersions = currentNetwork.masterCopyAddressVersions	128✔
101	}
102	if (mcVersions.length === 0) {	128!
103	throw new Error(	×
104	'Properties "masterCopyAddress" or "masterCopyAddressVersions" are missing in CPK network configuration'
105	)
106	}
107	normalizedNetworks[networkId] = {	128✔
108	masterCopyAddressVersions: mcVersions,
109	proxyFactoryAddress: currentNetwork.proxyFactoryAddress,
110	multiSendAddress: currentNetwork.multiSendAddress,
111	fallbackHandlerAddress: currentNetwork.fallbackHandlerAddress
112	}
113	}
114	return {	128✔
115	...defaultNetworks,
116	...normalizedNetworks
117	}
118	}

gnosis / contract-proxy-kit / 451

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous