a08c595 · bridge · git.iko.soy

package.json+1

compare with master

unifiedsplit

@@ -111,6 +111,7 @@

111 "pilot:setup": "npm run pilot:ganache && truffle deploy",

112 "pilot": "HTTPS=true npm-run-all pilot:setup start pilot:cleanup --continue-on-error",

113 "pilot-invites": "WITH_TEST_STATE=INVITES npm run pilot",

114+ "pilot-mainnet": "REACT_APP_MAINNET=true HTTPS=true npm-run-all start --continue-on-error",

114 "pilot-release": "WITH_TEST_STATE=STAR_RELEASE npm run pilot",

115 "pilot-release": "WITH_TEST_STATE=STAR_RELEASE npm run pilot",

115 "pilot-residents": "WITH_TEST_STATE=RESIDENTS npm run pilot",

116 "pilot-residents": "WITH_TEST_STATE=RESIDENTS npm run pilot",

116 "pilot-ropsten": "REACT_APP_ROPSTEN=true HTTPS=true npm-run-all start --continue-on-error",

117 "pilot-ropsten": "REACT_APP_ROPSTEN=true HTTPS=true npm-run-all start --continue-on-error",

src/Bridge.js+2−2

@@ -11,7 +11,7 @@ import { ROUTE_NAMES } from 'lib/routeNames';

11import { ROUTES } from 'lib/router';

12import { NETWORK_TYPES } from 'lib/network';

13import { walletFromMnemonic } from 'lib/wallet';

14−import { isDevelopment, isRopsten } from 'lib/flags';

14+import { isDevelopment, isMainnet, isRopsten } from 'lib/flags';

15import useImpliedTicket from 'lib/useImpliedTicket';

16import useHasDisclaimed from 'lib/useHasDisclaimed';

17

@@ -21,7 +21,7 @@ import GlobalErrorBoundary from 'components/GlobalErrorBoundary';

21

22const INITIAL_NETWORK_TYPE = isRopsten

23 ? NETWORK_TYPES.ROPSTEN

24− : isDevelopment

24+ : (isDevelopment && !isMainnet)

25 ? NETWORK_TYPES.LOCAL

26 : NETWORK_TYPES.MAINNET;

27

src/lib/flags.js+1

@@ -3,5 +3,6 @@ import { version } from '../../package.json';

3// are we running bridge in a development build

4export const isDevelopment = process.env.NODE_ENV === 'development';

5export const isRopsten = process.env.REACT_APP_ROPSTEN === 'true';

6+export const isMainnet = process.env.REACT_APP_MAINNET === 'true';

6export const versionLabel =

7export const versionLabel =

7 process.env.REACT_APP_BRIDGE_VERSION || `${version}${isRopsten ? 'r' : ''}`;

8 process.env.REACT_APP_BRIDGE_VERSION || `${version}${isRopsten ? 'r' : ''}`;

src/lib/utils/address.ts+1−1

@@ -1,5 +1,5 @@

1import { reduce } from 'lodash';

2−import { isAddress, keccak256, toHex } from 'web3-utils';

2+import { isAddress, keccak256 } from 'web3-utils';

3import { pubToAddress } from 'ethereumjs-util';

4import { ETH_ZERO_ADDR, ETH_ZERO_ADDR_SHORT } from 'lib/constants';

5