46dbb79 · bridge · git.iko.soy

git.iko.soy/bridge

Add isZeroAddress helper function

commit46dbb7958f60d8b9e5405200f9c253b3eb7a32c8 authorFang <git@fang.io> dateWed 3 Jul 2019, 20:18 (7 years ago) parentfbcd6b6

5 files changed+12−12

compare with master

unifiedsplit

src/lib/wallet.js+3 src/views/CreateGalaxy.js+2−2 src/views/Point/Actions.js+2−2 src/views/Point/KeysAndMetadata.js+3−6 src/views/Points.js+2−2

src/lib/wallet.js+3

@@ -71,6 +71,8 @@ const keccak256 = str =>

7171

7272const isValidAddress = a => '0x0' === a || isAddress(a);

7373

74+const isZeroAddress = a => ETH_ZERO_ADDR === a;

75+

7476const toChecksumAddress = address => {

7577 const addr = stripHexPrefix(address).toLowerCase();

7678 const hash = keccak256(addr).toString('hex');

@@ -140,6 +142,7 @@ export {

140142 CURVE_ZERO_ADDR,

141143 renderWalletType,

142144 isValidAddress,

145+ isZeroAddress,

143146 toChecksumAddress,

144147 addressFromSecp256k1Public,

145148 eqAddr,

src/views/CreateGalaxy.js+2−2

@@ -18,7 +18,7 @@ import StatelessTransaction from '../components/old/StatelessTransaction';

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

1919import { canDecodePatp } from '../lib/txn';

2020

21−import { ETH_ZERO_ADDR, isValidAddress, eqAddr } from '../lib/wallet';

21+import { isValidAddress, isZeroAddress } from '../lib/wallet';

2222

2323import { isValidGalaxy, compose } from '../lib/lib';

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

@@ -103,7 +103,7 @@ class CreateGalaxy extends React.Component {

103103 galaxyDec

104104 );

105105

106− const available = eqAddr(currentOwner, ETH_ZERO_ADDR);

106+ const available = isZeroAddress(currentOwner);

107107

108108 this.setState({ isAvailable: available });

109109 };

src/views/Point/Actions.js+2−2

@@ -2,7 +2,7 @@ import React from 'react';

22import { azimuth } from 'azimuth-js';

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

5−import { ETH_ZERO_ADDR, CURVE_ZERO_ADDR, eqAddr } from '../../lib/wallet';

5+import { CURVE_ZERO_ADDR, isZeroAddress, eqAddr } from '../../lib/wallet';

66import { H2, P } from '../../components/old/Base';

77import { Button } from '../../components/old/Base';

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

@@ -89,7 +89,7 @@ function Actions() {

8989 Nothing: () => false,

9090 Just: deets =>

9191 eqAddr(deets.value.owner, addr) &&

92− !eqAddr(deets.value.transferProxy, ETH_ZERO_ADDR),

92+ !isZeroAddress(deets.value.transferProxy),

9393 });

9494

9595 const displayReminder = pointDetails.matchWith({

src/views/Point/KeysAndMetadata.js+3−6

@@ -1,14 +1,11 @@

11import React from 'react';

22import { H2, H4 } from '../../components/old/Base';

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

4+import { CURVE_ZERO_ADDR, isZeroAddress } from '../../lib/wallet';

55import { Grid } from 'indigo-react';

7−const NULL_KEY =

8− '0x0000000000000000000000000000000000000000000000000000000000000000';

9−

107const renderAddress = addr =>

11− eqAddr(addr, ETH_ZERO_ADDR) ? (

8+ isZeroAddress(addr) ? (

129 <div>{'(not set)'}</div>

1310 ) : (

1411 <div>

@@ -27,7 +24,7 @@ const renderAddress = addr =>

2724const renderNetworkKey = hex => {

2825 const sl = i => hex.slice(i, i + 4);

2926 const rowFrom = i => `${sl(i)}.${sl(i + 4)}.${sl(i + 8)}.${sl(i + 12)}`;

30− return hex === NULL_KEY ? (

27+ return hex === CURVE_ZERO_ADDR ? (

3128 <div>{'(not set)'}</div>

3229 ) : (

3330 <div>

src/views/Points.js+2−2

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

33import { H1, H2, P, Grid } from 'indigo-react';

55import { ROUTE_NAMES } from 'lib/routeNames';

6−import { ETH_ZERO_ADDR, eqAddr } from 'lib/wallet';

6+import { isZeroAddress } from 'lib/wallet';

77import useIsEclipticOwner from 'lib/useIsEclipticOwner';

88import { useSyncKnownPoints } from 'lib/useSyncPoints';

@@ -20,7 +20,7 @@ const matchArray = obj =>

2020 obj.matchWith({ Nothing: () => [], Just: p => p.value });

2121

2222const hasTransferProxy = (details, point) =>

23− !eqAddr(details.transferProxy, ETH_ZERO_ADDR);

23+ !isZeroAddress(details.transferProxy);

2424

2525export default function Points() {

2626 const { wallet } = useWallet();