a08c595 · bridge · git.iko.soy

git.iko.soy/bridge

Merge pull request #608 from urbit/t/pilot-mainnet

dx: add `pilot-mainnet` script

commita08c595480a25b09538e7ba91a0ed13c58b50789 authorfang <github@fang.io> dateMon 16 Aug 2021, 23:43 (5 years ago) parent3dc583f cca3524

4 files changed+5−3

compare with master

unifiedsplit

package.json+1 src/Bridge.js+2−2 src/lib/flags.js+1 src/lib/utils/address.ts+1−1

package.json+1

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

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

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

113113 "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",

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

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

116117 "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';

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

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

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

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

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

1515import useImpliedTicket from 'lib/useImpliedTicket';

1616import useHasDisclaimed from 'lib/useHasDisclaimed';

1717

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

2121

2222const INITIAL_NETWORK_TYPE = isRopsten

2323 ? NETWORK_TYPES.ROPSTEN

24− : isDevelopment

24+ : (isDevelopment && !isMainnet)

2525 ? NETWORK_TYPES.LOCAL

2626 : NETWORK_TYPES.MAINNET;

2727

src/lib/flags.js+1

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

33// are we running bridge in a development build

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

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

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

67export const versionLabel =

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

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

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

11import { reduce } from 'lodash';

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

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

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

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