0770795 · bridge · git.iko.soy

src/bridge/Bridge.js+29−78

compare with master

unifiedsplit

@@ -1,44 +1,47 @@

1import React from 'react';

2import { Just, Nothing } from 'folktale/maybe';

3−import { includes } from 'lodash';

4

3

5import Footer from './components/Footer';

4import Footer from './components/Footer';

6import Header from './components/Header';

5import Header from './components/Header';

7import { Container, Row, Col } from './components/Base';

6import { Container, Row, Col } from './components/Base';

8

7

8+import nest from './lib/nest';

9import { router } from './lib/router';

10import { ROUTE_NAMES } from './lib/routeNames';

11−import { HistoryProvider, withHistory, useHistory } from './store/history';

12−import { TxnConfirmationsProvider } from './store/txnConfirmations';

13import { NETWORK_TYPES } from './lib/network';

11import { NETWORK_TYPES } from './lib/network';

14−import {

15− WALLET_NAMES,

16− DEFAULT_HD_PATH,

17− walletFromMnemonic,

12+import { DEFAULT_HD_PATH, walletFromMnemonic } from './lib/wallet';

18− addressFromSecp256k1Public,

19−} from './lib/wallet';

20−import { BRIDGE_ERROR } from './lib/error';

21import { isDevelopment } from './lib/flags';

13import { isDevelopment } from './lib/flags';

22−import nest from './lib/nest';

14+

15+import { HistoryProvider, withHistory, useHistory } from './store/history';

16+import { TxnConfirmationsProvider } from './store/txnConfirmations';

23import { OnlineProvider } from './store/online';

17import { OnlineProvider } from './store/online';

24import { NetworkProvider } from './store/network';

18import { NetworkProvider } from './store/network';

19+import { WalletProvider } from './store/wallet';

25

20

21+const kInitialNetworkType = isDevelopment

22+ ? NETWORK_TYPES.LOCAL

23+ : NETWORK_TYPES.MAINNET;

24+

26−// NB(shrugs): toggle this variable to use the default local state.

25+// NB(shrugs): toggle these variables to change the default local state.

27−// don't commit changes to this line, but there shouldn't be a problem

26+// try not to commit changes to this line, but there shouldn't be a problem

28// if you do because we'll never stub on a production build.

27// if you do because we'll never stub on a production build.

29const shouldStubLocal = false;

28const shouldStubLocal = false;

30−const isStubbed = isDevelopment && shouldStubLocal;

29+const kIsStubbed = isDevelopment && shouldStubLocal;

31−const kInitialRoutes = isStubbed

30+const kInitialRoutes = kIsStubbed

32 ? [

31 ? [

33− { name: ROUTE_NAMES.SHIPS },

34− { name: ROUTE_NAMES.WALLET },

35− { name: ROUTE_NAMES.NETWORK },

36 { name: ROUTE_NAMES.LANDING },

32 { name: ROUTE_NAMES.LANDING },

33+ { name: ROUTE_NAMES.NETWORK },

34+ { name: ROUTE_NAMES.WALLET },

35+ { name: ROUTE_NAMES.SHIPS },

37 ]

36 ]

38 : [{ name: ROUTE_NAMES.LANDING }];

37 : [{ name: ROUTE_NAMES.LANDING }];

39−const kInitialNetworkType = isDevelopment

38+

40− ? NETWORK_TYPES.LOCAL

39+const kInitialWallet = kIsStubbed

41− : NETWORK_TYPES.MAINNET;

40+ ? walletFromMnemonic(

41+ process.env.REACT_APP_DEV_MNEMONIC,

42+ process.env.REACT_APP_HD_PATH

43+ )

44+ : undefined;

42

45

43// the router itself is just a component that renders a specific view

46// the router itself is just a component that renders a specific view

44// depending on the history

47// depending on the history

@@ -73,30 +76,14 @@ const AllProviders = nest([

73 TxnConfirmationsProvider,

76 TxnConfirmationsProvider,

74 OnlineProvider,

77 OnlineProvider,

75 NetworkProvider,

78 NetworkProvider,

79+ WalletProvider,

76]);

80]);

77

81

78class Bridge extends React.Component {

82class Bridge extends React.Component {

79 constructor(props) {

83 constructor(props) {

80 super(props);

84 super(props);

81

85

82− // NB (jtobin):

83− //

84− // Note that the 'wallet' prop has type depending on the 'walletType' prop.

85− // These could be bound together in a single structure (so that

86− // 'walletType' acted more explicitly as a data constructor of sorts) but

87− // it doesn't necessarily help us much, since we branch on 'walletType'

88− // before setting 'wallet'.

89− //

90− // Wallets are always wrapped in Maybe. For most authentication

91− // mechanisms, Maybe wraps a BIP32 HD wallet; for Ethereum private keys,

92− // JSON keystore files, and Metamask authentication, it wraps an

93− // 'EthereumWallet'.

94−

95 this.state = {

86 this.state = {

96− // wallet

97− walletType: WALLET_NAMES.MNEMONIC,

98− wallet: Nothing(),

99− walletHdPath: DEFAULT_HD_PATH,

100 // urbit wallet-related

87 // urbit wallet-related

101 urbitWallet: Nothing(),

88 urbitWallet: Nothing(),

102 authMnemonic: Nothing(),

89 authMnemonic: Nothing(),

@@ -109,9 +96,6 @@ class Bridge extends React.Component {

109 txnConfirmations: {},

96 txnConfirmations: {},

110 };

97 };

111

98

112− this.setWalletType = this.setWalletType.bind(this);

113− this.setWallet = this.setWallet.bind(this);

114− this.setWalletHdPath = this.setWalletHdPath.bind(this);

115 this.setUrbitWallet = this.setUrbitWallet.bind(this);

99 this.setUrbitWallet = this.setUrbitWallet.bind(this);

116 this.setAuthMnemonic = this.setAuthMnemonic.bind(this);

100 this.setAuthMnemonic = this.setAuthMnemonic.bind(this);

117 this.setPointCursor = this.setPointCursor.bind(this);

101 this.setPointCursor = this.setPointCursor.bind(this);

@@ -125,14 +109,11 @@ class Bridge extends React.Component {

125 //

109 //

126 // If running in development, the following can be tweaked to get you set

110 // If running in development, the following can be tweaked to get you set

127 // up with a desirable initial state.

111 // up with a desirable initial state.

128− if (isStubbed) {

112+ if (kIsStubbed) {

129 const mnemonic = process.env.REACT_APP_DEV_MNEMONIC;

113 const mnemonic = process.env.REACT_APP_DEV_MNEMONIC;

130− const hdpath = process.env.REACT_APP_HD_PATH;

131

114

132 this.setState({

115 this.setState({

133 pointCursor: Just(0),

116 pointCursor: Just(0),

134− walletType: WALLET_NAMES.MNEMONIC,

135− wallet: walletFromMnemonic(mnemonic, hdpath),

136 urbitWallet: Nothing(),

117 urbitWallet: Nothing(),

137 authMnemonic: Just(mnemonic),

118 authMnemonic: Just(mnemonic),

138 });

119 });

@@ -146,28 +127,6 @@ class Bridge extends React.Component {

146 });

127 });

147 }

128 }

148

129

149− setWalletType(symbol) {

150− if (includes(WALLET_NAMES, symbol)) {

151− this.setState({

152− walletType: symbol,

153− });

154− } else {

155− throw BRIDGE_ERROR.INVALID_WALLET_TYPE;

156− }

157− }

158−

159− setWallet(wallet) {

160− wallet.map(wal => {

161− wal.address = wal.address || addressFromSecp256k1Public(wal.publicKey);

162− return wal;

163− });

164− this.setState({ wallet });

165− }

166−

167− setWalletHdPath(walletHdPath) {

168− this.setState({ walletHdPath });

169− }

170−

171 // also sets wallet to ownership address

130 // also sets wallet to ownership address

172 setUrbitWallet(urbitWallet) {

131 setUrbitWallet(urbitWallet) {

173 let wallet = this.state.wallet;

132 let wallet = this.state.wallet;

@@ -206,9 +165,6 @@ class Bridge extends React.Component {

206

165

207 render() {

166 render() {

208 const {

167 const {

209− walletType,

210− walletHdPath,

211− wallet,

212 urbitWallet,

168 urbitWallet,

213 authMnemonic,

169 authMnemonic,

214 networkSeedCache,

170 networkSeedCache,

@@ -221,20 +177,15 @@ class Bridge extends React.Component {

221 return (

177 return (

222 <AllProviders

178 <AllProviders

223 initialRoutes={kInitialRoutes}

179 initialRoutes={kInitialRoutes}

224− initialNetworkType={kInitialNetworkType}>

180+ initialNetworkType={kInitialNetworkType}

181+ initialWallet={kInitialWallet}>

225 <Container>

182 <Container>

226 <Row>

183 <Row>

227 <VariableWidthColumn>

184 <VariableWidthColumn>

228− <Header wallet={wallet} pointCursor={pointCursor} />

185+ <Header pointCursor={pointCursor} />

229

186

230 <Row className={'row wrapper'}>

187 <Row className={'row wrapper'}>

231 <Router

188 <Router

232− setWalletType={this.setWalletType}

233− setWalletHdPath={this.setWalletHdPath}

234− setWallet={this.setWallet}

235− walletType={walletType}

236− walletHdPath={walletHdPath}

237− wallet={wallet}

238 urbitWallet={urbitWallet}

189 urbitWallet={urbitWallet}

239 setUrbitWallet={this.setUrbitWallet}

190 setUrbitWallet={this.setUrbitWallet}

240 authMnemonic={authMnemonic}

191 authMnemonic={authMnemonic}

src/bridge/components/Header.js+7−2

@@ -6,10 +6,15 @@ import { ROUTE_NAMES } from '../lib/routeNames';

6import { useHistory } from '../store/history';

7import { isLast } from '../lib/lib';

8import { useNetwork } from '../store/network';

9+import { useWallet } from '../store/wallet';

9

10

11+// hook to create a breadcrumb builder function based on the current

12+// global states

10function useRouteBreadcrumbBuilder(props) {

13function useRouteBreadcrumbBuilder(props) {

11 const { networkType } = useNetwork();

14 const { networkType } = useNetwork();

15+ const { wallet } = useWallet();

16+

12− return getRouteBreadcrumb({ ...props, networkType });

17+ return getRouteBreadcrumb({ ...props, networkType, wallet });

13}

18}

14

19

15function Crumbs(props) {

20function Crumbs(props) {

@@ -48,7 +53,7 @@ function Header(props) {

48 if (showCrumbs) {

53 if (showCrumbs) {

49 return (

54 return (

50 <div className={'flex items-center h-10'}>

55 <div className={'flex items-center h-10'}>

51− <Crumbs wallet={props.wallet} pointCursor={props.pointCursor} />

56+ <Crumbs pointCursor={props.pointCursor} />

52 </div>

57 </div>

53 );

58 );

54 }

59 }

src/bridge/components/Passport.js+3−1

@@ -8,6 +8,8 @@ import { Button } from './Base';

8

9import { WALLET_STATES } from '../lib/invite';

10import { downloadWallet } from '../lib/invite';

11+import { compose } from '../lib/lib';

12+import { withWallet } from '../store/wallet';

11

13

12class Passport extends React.Component {

14class Passport extends React.Component {

13 constructor(props) {

15 constructor(props) {

@@ -231,4 +233,4 @@ Passport.defaultProps = {

231 wallet: null,

233 wallet: null,

232};

234};

233

235

234−export default Passport;

236+export default compose(withWallet)(Passport);

src/bridge/components/StatelessTransaction.js+3−1

@@ -24,6 +24,7 @@ import {

24import { withTxnConfirmations } from '../store/txnConfirmations';

25import { withNetwork } from '../store/network';

26import { withHistory } from '../store/history';

27+import { withWallet } from '../store/wallet';

27

28

28const SUBMISSION_STATES = {

29const SUBMISSION_STATES = {

29 PROMPT: 'Send transaction',

30 PROMPT: 'Send transaction',

@@ -584,5 +585,6 @@ class StatelessTransaction extends React.Component {

584export default compose(

585export default compose(

585 withNetwork,

586 withNetwork,

586 withTxnConfirmations,

587 withTxnConfirmations,

587− withHistory

588+ withHistory,

589+ withWallet

588)(StatelessTransaction);

590)(StatelessTransaction);

src/bridge/lib/invite.js+2−2

@@ -12,7 +12,7 @@ import saveAs from 'file-saver';

12import { sendSignedTransaction } from './txn';

13import { BRIDGE_ERROR } from '../lib/error';

14import { attemptSeedDerivation } from './keys';

15−import { addHexPrefix, WALLET_NAMES } from './wallet';

15+import { addHexPrefix, WALLET_TYPES } from './wallet';

16

17const INVITE_STAGES = {

18 INVITE_LOGIN: 'invite login',

@@ -213,7 +213,7 @@ async function startTransactions(args) {

213 // configure networking public keys

214 //TODO feels like more of this logic should live in a lib?

215 let networkSeed = await attemptSeedDerivation(true, {

216− walletType: WALLET_NAMES.TICKET,

216+ walletType: WALLET_TYPES.TICKET,

217 urbitWallet: Just(realWallet),

218 pointCursor: Just(point),

219 pointCache: { [point]: { keyRevisionNumber: 0 } },

src/bridge/lib/keys.js+4−5

@@ -7,7 +7,7 @@ import * as serial from '../nockjs/serial';

7import * as kg from 'urbit-key-generation/dist/index';

8

9import { BRIDGE_ERROR } from './error';

10−import { WALLET_NAMES, eqAddr } from './wallet';

10+import { WALLET_TYPES, eqAddr } from './wallet';

11

12// ctsy joemfb

13const b64 = buf => {

@@ -67,8 +67,7 @@ const genKey = (networkSeed, point, revision) => {

67// 'next' refers to setting the next set of keys

68// if false, we use revision - 1

69const attemptSeedDerivation = async (next, args) => {

70− const { walletType } = args;

71− const { urbitWallet, authMnemonic } = args;

70+ const { walletType, urbitWallet, authMnemonic } = args;

72

71

73 // NB (jtobin):

72 // NB (jtobin):

74 //

73 //

@@ -84,7 +83,7 @@ const attemptSeedDerivation = async (next, args) => {

84

83

85 let managementSeed = '';

84 let managementSeed = '';

86

85

87− const ticketLike = [WALLET_NAMES.TICKET, WALLET_NAMES.SHARDS];

86+ const ticketLike = [WALLET_TYPES.TICKET, WALLET_TYPES.SHARDS];

88

87

89 if (ticketLike.includes(walletType)) {

88 if (ticketLike.includes(walletType)) {

90 const uwal = urbitWallet.matchWith({

89 const uwal = urbitWallet.matchWith({

@@ -95,7 +94,7 @@ const attemptSeedDerivation = async (next, args) => {

95 });

94 });

96

95

97 managementSeed = uwal.management.seed;

96 managementSeed = uwal.management.seed;

98− } else if (walletType === WALLET_NAMES.MNEMONIC) {

97+ } else if (walletType === WALLET_TYPES.MNEMONIC) {

99 const walProxy = need.address(args);

98 const walProxy = need.address(args);

100

99

101 const mnemonic = authMnemonic.matchWith({

100 const mnemonic = authMnemonic.matchWith({

src/bridge/lib/txn.js+4−4

@@ -7,7 +7,7 @@ import { BRIDGE_ERROR } from '../lib/error';

7import { NETWORK_TYPES } from '../lib/network';

8import { ledgerSignTransaction } from '../lib/ledger';

9import { trezorSignTransaction } from '../lib/trezor';

10−import { WALLET_NAMES, addHexPrefix } from '../lib/wallet';

10+import { WALLET_TYPES, addHexPrefix } from '../lib/wallet';

11

12const TXN_PURPOSE = {

13 SET_MANAGEMENT_PROXY: Symbol('SET_MANAGEMENT_PROXY'),

@@ -96,7 +96,7 @@ const signTransaction = async config => {

96 ];

97

98 const needEip155Params =

99− walletType === WALLET_NAMES.LEDGER &&

99+ walletType === WALLET_TYPES.LEDGER &&

100 defaultEip155Networks.includes(networkType);

101

102 const signingParams = needEip155Params

@@ -121,9 +121,9 @@ const signTransaction = async config => {

121

122 const stx = new Tx(utx);

123

124− if (walletType === WALLET_NAMES.LEDGER) {

124+ if (walletType === WALLET_TYPES.LEDGER) {

125 await ledgerSignTransaction(stx, walletHdPath);

126− } else if (walletType === WALLET_NAMES.TREZOR) {

126+ } else if (walletType === WALLET_TYPES.TREZOR) {

127 await trezorSignTransaction(stx, walletHdPath);

128 } else {

129 stx.sign(sec);

src/bridge/lib/wallet.js+9−9

@@ -14,7 +14,7 @@ const ETH_ZERO_ADDR = '0x0000000000000000000000000000000000000000';

14const CURVE_ZERO_ADDR =

15 '0x0000000000000000000000000000000000000000000000000000000000000000';

16

17−const WALLET_NAMES = {

17+const WALLET_TYPES = {

18 MNEMONIC: Symbol('MNEMONIC'),

19 TICKET: Symbol('TICKET'),

20 SHARDS: Symbol('SHARDS'),

@@ -32,19 +32,19 @@ function EthereumWallet(privateKey) {

32}

33

34const renderWalletType = wallet =>

35− wallet === WALLET_NAMES.MNEMONIC

35+ wallet === WALLET_TYPES.MNEMONIC

36 ? 'Mnemonic'

37− : wallet === WALLET_NAMES.TICKET

37+ : wallet === WALLET_TYPES.TICKET

38 ? 'Ticket'

39− : wallet === WALLET_NAMES.SHARDS

39+ : wallet === WALLET_TYPES.SHARDS

40 ? 'Ticket Shards'

41− : wallet === WALLET_NAMES.LEDGER

41+ : wallet === WALLET_TYPES.LEDGER

42 ? 'Ledger'

43− : wallet === WALLET_NAMES.TREZOR

43+ : wallet === WALLET_TYPES.TREZOR

44 ? 'Trezor'

45− : wallet === WALLET_NAMES.PRIVATE_KEY

45+ : wallet === WALLET_TYPES.PRIVATE_KEY

46 ? 'Private Key'

47− : wallet === WALLET_NAMES.KEYSTORE

47+ : wallet === WALLET_TYPES.KEYSTORE

48 ? 'Keystore File'

49 : 'Wallet';

50

@@ -135,7 +135,7 @@ const walletFromMnemonic = (mnemonic, hdpath, passphrase) => {

135

136export {

137 DEFAULT_HD_PATH,

138− WALLET_NAMES,

138+ WALLET_TYPES,

139 ETH_ZERO_ADDR,

140 CURVE_ZERO_ADDR,

141 renderWalletType,

src/bridge/store/wallet.jsnew file+86

@@ -0,0 +1,86 @@

1+import React, { createContext, forwardRef, useContext, useState } from 'react';

2+import Maybe from 'folktale/maybe';

3+import { includes } from 'lodash';

4+

5+import {

6+ WALLET_TYPES,

7+ DEFAULT_HD_PATH,

8+ addressFromSecp256k1Public,

9+} from '../lib/wallet';

10+import { BRIDGE_ERROR } from '../lib/error';

11+

12+export const WalletContext = createContext(null);

13+

14+// NB (jtobin):

15+//

16+// Note that the 'wallet' prop has type depending on the 'walletType' prop.

17+// These could be bound together in a single structure (so that

18+// 'walletType' acted more explicitly as a data constructor of sorts) but

19+// it doesn't necessarily help us much, since we branch on 'walletType'

20+// before setting 'wallet'.

21+//

22+// Wallets are always wrapped in Maybe. For most authentication

23+// mechanisms, Maybe wraps a BIP32 HD wallet; for Ethereum private keys,

24+// JSON keystore files, and Metamask authentication, it wraps an

25+// 'EthereumWallet'.

26+function _useWallet(initialWallet = Maybe.Nothing()) {

27+ const [walletType, _setWalletType] = useState(WALLET_TYPES.MNEMONIC);

28+ const [walletHdPath, setWalletHdPath] = useState(DEFAULT_HD_PATH);

29+ const [wallet, _setWallet] = useState(initialWallet);

30+

31+ const setWalletType = walletType => {

32+ if (!includes(WALLET_TYPES, walletType)) {

33+ throw BRIDGE_ERROR.INVALID_WALLET_TYPE;

34+ }

35+

36+ _setWalletType(walletType);

37+ };

38+

39+ const setWallet = wallet => {

40+ // force that public addresses are derived for each wallet

41+ wallet.map(wal => {

42+ wal.address = wal.address || addressFromSecp256k1Public(wal.publicKey);

43+ return wal;

44+ });

45+

46+ _setWallet(wallet);

47+ };

48+

49+ return {

50+ //

51+ walletType,

52+ setWalletType,

53+ //

54+ walletHdPath,

55+ setWalletHdPath,

56+ //

57+ wallet,

58+ setWallet,

59+ //

60+ // urbitWallet

61+ // setUrbitWallet

62+ // authMnemonic

63+ // setAuthMnemonic

64+ };

65+}

66+

67+export function WalletProvider({ initialWallet, children }) {

68+ const wallet = _useWallet(initialWallet);

69+

70+ return (

71+ <WalletContext.Provider value={wallet}>{children}</WalletContext.Provider>

72+ );

73+}

74+

75+// Hook version

76+export function useWallet() {

77+ return useContext(WalletContext);

78+}

79+

80+// HOC version

81+export const withWallet = Component =>

82+ forwardRef((props, ref) => (

83+ <WalletContext.Consumer>

84+ {wallet => <Component ref={ref} {...wallet} {...props} />}

85+ </WalletContext.Consumer>

86+ ));

src/bridge/views/GenKeyfile.js+3−1

@@ -11,6 +11,8 @@ import saveAs from 'file-saver';

11

12import { attemptSeedDerivation, genKey } from '../lib/keys';

13import { addHexPrefix } from '../lib/wallet';

14+import { compose } from '../lib/lib';

15+import { withWallet } from '../store/wallet';

14

16

15class GenKeyfile extends React.Component {

17class GenKeyfile extends React.Component {

16 constructor(props) {

18 constructor(props) {

@@ -132,4 +134,4 @@ class GenKeyfile extends React.Component {

132 }

134 }

133}

135}

134

136

135−export default GenKeyfile;

137+export default compose(withWallet)(GenKeyfile);

src/bridge/views/InvitesSend.js+5−1

@@ -21,6 +21,7 @@ import {

21import * as tank from '../lib/tank';

22import { withNetwork } from '../store/network';

23import { compose } from '../lib/lib';

24+import { withWallet } from '../store/wallet';

24

25

25const GAS_PRICE_GWEI = 20; // we pay the premium for faster ux

26const GAS_PRICE_GWEI = 20; // we pay the premium for faster ux

26const GAS_LIMIT = 350000;

27const GAS_LIMIT = 350000;

@@ -493,4 +494,7 @@ class InvitesSend extends React.Component {

493 }

494 }

494}

495}

495

496

496−export default compose(withNetwork)(InvitesSend);

497+export default compose(

498+ withNetwork,

499+ withWallet

500+)(InvitesSend);

src/bridge/views/Keystore.js+5−1

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

11import { withHistory } from '../store/history';

12import { EthereumWallet } from '../lib/wallet';

13import { compose } from '../lib/lib';

14+import { withWallet } from '../store/wallet';

14

15

15class Keystore extends React.Component {

16class Keystore extends React.Component {

16 constructor(props) {

17 constructor(props) {

@@ -160,4 +161,7 @@ class Keystore extends React.Component {

160 }

161 }

161}

162}

162

163

163−export default compose(withHistory)(Keystore);

164+export default compose(

165+ withHistory,

166+ withWallet

167+)(Keystore);

src/bridge/views/Ledger.js+5−1

@@ -12,6 +12,7 @@ import { LEDGER_LIVE_PATH, LEDGER_LEGACY_PATH } from '../lib/ledger';

12import { ROUTE_NAMES } from '../lib/routeNames';

13import { withHistory } from '../store/history';

14import { compose } from '../lib/lib';

15+import { withWallet } from '../store/wallet';

15

16

16const chopHdPrefix = str => (str.slice(0, 2) === 'm/' ? str.slice(2) : str);

17const chopHdPrefix = str => (str.slice(0, 2) === 'm/' ? str.slice(2) : str);

17

18

@@ -218,4 +219,7 @@ class Ledger extends React.Component {

218 }

219 }

219}

220}

220

221

221−export default compose(withHistory)(Ledger);

222+export default compose(

223+ withHistory,

224+ withWallet

225+)(Ledger);

src/bridge/views/Mnemonic.js+5−1

@@ -14,6 +14,7 @@ import { ROUTE_NAMES } from '../lib/routeNames';

14import { withHistory } from '../store/history';

15import { DEFAULT_HD_PATH, walletFromMnemonic } from '../lib/wallet';

16import { compose } from '../lib/lib';

17+import { withWallet } from '../store/wallet';

17

18

18class Mnemonic extends React.Component {

19class Mnemonic extends React.Component {

19 constructor(props) {

20 constructor(props) {

@@ -161,4 +162,7 @@ class Mnemonic extends React.Component {

161 }

162 }

162}

163}

163

164

164−export default compose(withHistory)(Mnemonic);

165+export default compose(

166+ withHistory,

167+ withWallet

168+)(Mnemonic);

src/bridge/views/Point.js+3−1

@@ -13,6 +13,7 @@ import { Row, Col, H1, H3 } from '../components/Base';

13import { withHistory } from '../store/history';

14import { withNetwork } from '../store/network';

15import { compose } from '../lib/lib';

16+import { withWallet } from '../store/wallet';

16

17

17class Point extends React.Component {

18class Point extends React.Component {

18 constructor(props) {

19 constructor(props) {

@@ -139,5 +140,6 @@ class Point extends React.Component {

139

140

140export default compose(

141export default compose(

141 withNetwork,

142 withNetwork,

142− withHistory

143+ withHistory,

144+ withWallet

143)(Point);

145)(Point);

src/bridge/views/Points.js+4−3

@@ -10,6 +10,7 @@ import { withHistory } from '../store/history';

10import { ETH_ZERO_ADDR, eqAddr } from '../lib/wallet';

11import { withNetwork } from '../store/network';

12import { compose } from '../lib/lib';

13+import { withWallet } from '../store/wallet';

13

14

14const hasTransferProxy = (cache, point) =>

15const hasTransferProxy = (cache, point) =>

15 point in cache ? !eqAddr(cache[point].transferProxy, ETH_ZERO_ADDR) : false;

16 point in cache ? !eqAddr(cache[point].transferProxy, ETH_ZERO_ADDR) : false;

@@ -82,8 +83,7 @@ class Points extends React.Component {

82 }

83 }

83

84

84 render() {

85 render() {

85− const { setPointCursor, history } = this.props;

86+ const { setPointCursor, history, pointCache } = this.props;

86− const { pointCache } = this.props;

87

88 const {

89 points,

@@ -259,5 +259,6 @@ class Points extends React.Component {

259

260export default compose(

261 withNetwork,

262− withHistory

262+ withHistory,

263+ withWallet

263)(Points);

264)(Points);

src/bridge/views/PrivateKey.js+5−1

@@ -8,6 +8,7 @@ import { ROUTE_NAMES } from '../lib/routeNames';

8import { withHistory } from '../store/history';

9import { EthereumWallet } from '../lib/wallet';

10import { compose } from '../lib/lib';

11+import { withWallet } from '../store/wallet';

11

12

12class PrivateKey extends React.Component {

13class PrivateKey extends React.Component {

13 constructor(props) {

14 constructor(props) {

@@ -74,4 +75,7 @@ class PrivateKey extends React.Component {

74 }

75 }

75}

76}

76

77

77−export default compose(withHistory)(PrivateKey);

78+export default compose(

79+ withHistory,

80+ withWallet

81+)(PrivateKey);

src/bridge/views/SetKeys.js+8−4

@@ -3,17 +3,18 @@ import Maybe from 'folktale/maybe';

3import * as azimuth from 'azimuth-js';

4import * as ob from 'urbit-ob';

5import * as need from '../lib/need';

6+import * as kg from 'urbit-key-generation/dist/index';

6import { Row, Col, H1, P, Warning, CheckboxButton } from '../components/Base';

7import { Row, Col, H1, P, Warning, CheckboxButton } from '../components/Base';

7

8

8import StatelessTransaction from '../components/StatelessTransaction';

9import StatelessTransaction from '../components/StatelessTransaction';

9import { attemptSeedDerivation } from '../lib/keys';

10import { attemptSeedDerivation } from '../lib/keys';

10

11

11−import * as kg from 'urbit-key-generation/dist/index';

12−

13import { addHexPrefix } from '../lib/wallet';

12import { addHexPrefix } from '../lib/wallet';

14−import { withNetwork } from '../store/network';

15import { compose } from '../lib/lib';

13import { compose } from '../lib/lib';

16

14

15+import { withNetwork } from '../store/network';

16+import { withWallet } from '../store/wallet';

17+

17class SetKeys extends React.Component {

18class SetKeys extends React.Component {

18 constructor(props) {

19 constructor(props) {

19 super(props);

20 super(props);

@@ -198,4 +199,7 @@ class SetKeys extends React.Component {

198 }

199 }

199}

200}

200

201

201−export default compose(withNetwork)(SetKeys);

202+export default compose(

203+ withNetwork,

204+ withWallet

205+)(SetKeys);

src/bridge/views/Shards.js+5−1

@@ -17,6 +17,7 @@ import { ROUTE_NAMES } from '../lib/routeNames';

17import { withHistory } from '../store/history';

18import { urbitWalletFromTicket } from '../lib/wallet';

19import { compose } from '../lib/lib';

20+import { withWallet } from '../store/wallet';

20

21

21const placeholder = len => {

22const placeholder = len => {

22 let bytes = window.crypto.getRandomValues(new Uint8Array(len));

23 let bytes = window.crypto.getRandomValues(new Uint8Array(len));

@@ -212,4 +213,7 @@ class Shards extends React.Component {

212 }

213 }

213}

214}

214

215

215−export default compose(withHistory)(Shards);

216+export default compose(

217+ withHistory,

218+ withWallet

219+)(Shards);

src/bridge/views/Ticket.js+5−1

@@ -15,6 +15,7 @@ import { randomPatq, compose } from '../lib/lib';

15import { ROUTE_NAMES } from '../lib/routeNames';

16import { withHistory } from '../store/history';

17import { urbitWalletFromTicket } from '../lib/wallet';

18+import { withWallet } from '../store/wallet';

18

19

19class Ticket extends React.Component {

20class Ticket extends React.Component {

20 constructor(props) {

21 constructor(props) {

@@ -150,4 +151,7 @@ class Ticket extends React.Component {

150 }

151 }

151}

152}

152

153

153−export default compose(withHistory)(Ticket);

154+export default compose(

155+ withHistory,

156+ withWallet

157+)(Ticket);

src/bridge/views/Trezor.js+5−1

@@ -11,6 +11,7 @@ import { TREZOR_PATH } from '../lib/trezor';

11import { ROUTE_NAMES } from '../lib/routeNames';

12import { withHistory } from '../store/history';

13import { compose } from '../lib/lib';

14+import { withWallet } from '../store/wallet';

14

15

15class Trezor extends React.Component {

16class Trezor extends React.Component {

16 constructor(props) {

17 constructor(props) {

@@ -140,4 +141,7 @@ class Trezor extends React.Component {

140 }

141 }

141}

142}

142

143

143−export default compose(withHistory)(Trezor);

144+export default compose(

145+ withHistory,

146+ withWallet

147+)(Trezor);

src/bridge/views/Wallet.js+20−16

@@ -6,8 +6,9 @@ import { Row, Col } from '../components/Base';

6

7import { ROUTE_NAMES } from '../lib/routeNames';

8import { withHistory } from '../store/history';

9−import { WALLET_NAMES, renderWalletType } from '../lib/wallet';

9+import { WALLET_TYPES, renderWalletType } from '../lib/wallet';

10import { compose } from '../lib/lib';

11+import { withWallet } from '../store/wallet';

11

12

12class Wallet extends React.Component {

13class Wallet extends React.Component {

13 componentDidMount() {

14 componentDidMount() {

@@ -19,37 +20,37 @@ class Wallet extends React.Component {

19 return [

20 return [

20 {

21 {

21 title: 'Urbit Master Ticket',

22 title: 'Urbit Master Ticket',

22− value: WALLET_NAMES.TICKET,

23+ value: WALLET_TYPES.TICKET,

23 },

24 },

24 {

25 {

25 title: 'Urbit Master Ticket (Shards)',

26 title: 'Urbit Master Ticket (Shards)',

26− value: WALLET_NAMES.SHARDS,

27+ value: WALLET_TYPES.SHARDS,

27 },

28 },

28 {

29 {

29 type: 'divider',

30 type: 'divider',

30 },

31 },

31 {

32 {

32 title: 'Ledger',

33 title: 'Ledger',

33− value: WALLET_NAMES.LEDGER,

34+ value: WALLET_TYPES.LEDGER,

34 },

35 },

35 {

36 {

36 title: 'Trezor',

37 title: 'Trezor',

37− value: WALLET_NAMES.TREZOR,

38+ value: WALLET_TYPES.TREZOR,

38 },

39 },

39 {

40 {

40 type: 'divider',

41 type: 'divider',

41 },

42 },

42 {

43 {

43 title: 'BIP39 Mnemonic',

44 title: 'BIP39 Mnemonic',

44− value: WALLET_NAMES.MNEMONIC,

45+ value: WALLET_TYPES.MNEMONIC,

45 },

46 },

46 {

47 {

47 title: 'Ethereum Private Key',

48 title: 'Ethereum Private Key',

48− value: WALLET_NAMES.PRIVATE_KEY,

49+ value: WALLET_TYPES.PRIVATE_KEY,

49 },

50 },

50 {

51 {

51 title: 'Ethereum Keystore File',

52 title: 'Ethereum Keystore File',

52− value: WALLET_NAMES.KEYSTORE,

53+ value: WALLET_TYPES.KEYSTORE,

53 },

54 },

54 ];

55 ];

55 }

56 }

@@ -80,19 +81,19 @@ class Wallet extends React.Component {

80 className={'mt-10'}

81 className={'mt-10'}

81 onClick={() =>

82 onClick={() =>

82 props.history.push(

83 props.history.push(

83− props.walletType === WALLET_NAMES.MNEMONIC

84+ props.walletType === WALLET_TYPES.MNEMONIC

84 ? ROUTE_NAMES.MNEMONIC

85 ? ROUTE_NAMES.MNEMONIC

85− : props.walletType === WALLET_NAMES.TICKET

86+ : props.walletType === WALLET_TYPES.TICKET

86 ? ROUTE_NAMES.TICKET

87 ? ROUTE_NAMES.TICKET

87− : props.walletType === WALLET_NAMES.SHARDS

88+ : props.walletType === WALLET_TYPES.SHARDS

88 ? ROUTE_NAMES.SHARDS

89 ? ROUTE_NAMES.SHARDS

89− : props.walletType === WALLET_NAMES.LEDGER

90+ : props.walletType === WALLET_TYPES.LEDGER

90 ? ROUTE_NAMES.LEDGER

91 ? ROUTE_NAMES.LEDGER

91− : props.walletType === WALLET_NAMES.TREZOR

92+ : props.walletType === WALLET_TYPES.TREZOR

92 ? ROUTE_NAMES.TREZOR

93 ? ROUTE_NAMES.TREZOR

93− : props.walletType === WALLET_NAMES.PRIVATE_KEY

94+ : props.walletType === WALLET_TYPES.PRIVATE_KEY

94 ? ROUTE_NAMES.PRIVATE_KEY

95 ? ROUTE_NAMES.PRIVATE_KEY

95− : props.walletType === WALLET_NAMES.KEYSTORE

96+ : props.walletType === WALLET_TYPES.KEYSTORE

96 ? ROUTE_NAMES.KEYSTORE

97 ? ROUTE_NAMES.KEYSTORE

97 : ROUTE_NAMES.DEFAULT

98 : ROUTE_NAMES.DEFAULT

98 )

99 )

@@ -105,4 +106,7 @@ class Wallet extends React.Component {

105 }

106 }

106}

107}

107

108

108−export default compose(withHistory)(Wallet);

109+export default compose(

110+ withHistory,

111+ withWallet

112+)(Wallet);