5580cb6 · bridge · git.iko.soy

git.iko.soy/bridge

Always use lib/patp2dec in place of ob.patp2dec

commit5580cb6ac80b9ff06bb9d474d84b7c02dce9fc76 authorFang <git@fang.io> dateThu 25 Jul 2019, 22:36 (7 years ago) parent2b7d948

3 files changed+8−6

compare with master

unifiedsplit

src/lib/lib.js+2−1 src/lib/txn.js+2−2 src/views/Login/Ticket.js+4−3

src/lib/lib.js+2−1

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

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

2+import patp2dec from './patp2dec';

34const compose = (...fs) =>

45 fs.reduceRight((pF, nF) => (...args) => nF(pF(...args)), v => v);

@@ -18,7 +19,7 @@ const fill = (n, v) => Array.from(Array(n), () => v);

1819const isValidGalaxy = name => {

1920 let point;

2021 try {

21− point = parseInt(ob.patp2dec(name), 10);

22+ point = patp2dec(name);

2223 } catch (err) {

2324 return false;

2425 }

src/lib/txn.js+2−2

@@ -1,4 +1,3 @@

1−import * as ob from 'urbit-ob';

21import Tx from 'ethereumjs-tx';

32import { toWei, fromWei, toHex } from 'web3-utils';

43import retry from 'async-retry';

@@ -8,6 +7,7 @@ import { ledgerSignTransaction } from './ledger';

87import { trezorSignTransaction } from './trezor';

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

109import { CHECK_BLOCK_EVERY_MS } from './constants';

10+import patp2dec from './patp2dec';

1111

1212const RETRY_OPTIONS = {

1313 retries: 99999,

@@ -177,7 +177,7 @@ const getTxnInfo = async (web3, addr) => {

177177// TODO(shrugs): deprecate, unifiy with other callsites

178178const canDecodePatp = p => {

179179 try {

180− ob.patp2dec(p);

180+ patp2dec(p);

181181 return true;

182182 } catch (_) {

183183 return false;

src/views/Login/Ticket.js+4−3

@@ -20,6 +20,7 @@ import * as need from 'lib/need';

2020import { WALLET_TYPES, urbitWalletFromTicket } from 'lib/wallet';

2121import useImpliedPoint from 'lib/useImpliedPoint';

2222import useLoginView from 'lib/useLoginView';

23+import patp2dec from 'lib/patp2dec';

2324

2425export default function Ticket({ className }) {

2526 useLoginView(WALLET_TYPES.TICKET);

@@ -100,7 +101,7 @@ export default function Ticket({ className }) {

100101 }

101102

102103 const _contracts = need.contracts(contracts);

103− const point = ob.patp2dec(pointName);

104+ const point = patp2dec(pointName);

104105 const urbitWallet = await urbitWalletFromTicket(ticket, point, passphrase);

105106 const [isOwner, isTransferProxy] = await Promise.all([

106107 azimuth.azimuth.isOwner(

@@ -123,7 +124,7 @@ export default function Ticket({ className }) {

123124 }

124125

125126 setUrbitWallet(Just(urbitWallet));

126− setPointCursor(Just(ob.patp2dec(pointName)));

127+ setPointCursor(Just(point));

127128 setDeriving(false);

128129 }, [

129130 pointName,

@@ -142,7 +143,7 @@ export default function Ticket({ className }) {

142143

143144 try {

144145 const ticket = kg.combine([s1, s2, s3]);

145− const point = ob.patp2dec(pointName);

146+ const point = patp2dec(pointName);

146147 const uhdw = await urbitWalletFromTicket(ticket, point, passphrase);

147148 setUrbitWallet(Just(uhdw));

148149 } catch (_) {