c8cd811 · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

Fix incorrect sponsor displayed for L1 ships after escape

c8cd811Shawn Tobin3 years ago

src/lib/useRoller.ts+19−22

compare with master

unifiedsplit

@@ -139,9 +139,8 @@ export default function useRoller() {

139 const initPoint = useCallback(

140 async (point: string | number): Promise<Point> => {

141 const _wallet = wallet.getOrElse(null);

142− const _contracts = contracts.getOrElse(null);

143

142

144− if (!_wallet || !_contracts) {

143+ if (!_wallet) {

145 return EMPTY_POINT;

144 return EMPTY_POINT;

146 }

145 }

147

146

@@ -152,9 +151,7 @@ export default function useRoller() {

152 const l2Quota = isL2 ? await api.getRemainingQuota(pointNum) : 0;

151 const l2Quota = isL2 ? await api.getRemainingQuota(pointNum) : 0;

153 const l2Allowance = isL2 ? await api.getAllowance(pointNum) : 0;

152 const l2Allowance = isL2 ? await api.getAllowance(pointNum) : 0;

154

153

155− const details = isL2Spawn(rawDetails?.dominion)

156− ? toL1Details(rawDetails)

154+ const details = toL1Details(rawDetails);

157− : await azimuth.azimuth.getPoint(_contracts, point);

158

155

159 return new Point({

156 return new Point({

160 value: pointNum,

157 value: pointNum,

@@ -309,14 +306,14 @@ export default function useRoller() {

309 proxy === 'own'

306 proxy === 'own'

310 ? await api.getOwnedPoints(address)

307 ? await api.getOwnedPoints(address)

311 : proxy === 'manage'

308 : proxy === 'manage'

312− ? await api.getManagerFor(address)

309+ ? await api.getManagerFor(address)

313− : proxy === 'vote'

310+ : proxy === 'vote'

314− ? await api.getVotingFor(address)

311+ ? await api.getVotingFor(address)

315− : proxy === 'transfer'

312+ : proxy === 'transfer'

316− ? await api.getTransferringFor(address)

313+ ? await api.getTransferringFor(address)

317− : proxy === 'spawn'

314+ : proxy === 'spawn'

318− ? await api.getSpawningFor(address)

315+ ? await api.getSpawningFor(address)

319− : [];

316+ : [];

320

317

321 return points;

318 return points;

322 },

319 },

@@ -365,14 +362,14 @@ export default function useRoller() {

365 const networkSeed = customNetworkSeed

362 const networkSeed = customNetworkSeed

366 ? customNetworkSeed

363 ? customNetworkSeed

367 : await attemptNetworkSeedDerivation({

364 : await attemptNetworkSeedDerivation({

368− urbitWallet,

365+ urbitWallet,

369− wallet,

366+ wallet,

370− authMnemonic,

367+ authMnemonic,

371− details: point,

368+ details: point,

372− authToken,

369+ authToken,

373− point: point.value,

370+ point: point.value,

374− revision: nextRevision,

371+ revision: nextRevision,

375− });

372+ });

376 const txHash = await submitL2Transaction({

373 const txHash = await submitL2Transaction({

377 api,

374 api,

378 wallet: _wallet,

375 wallet: _wallet,

@@ -422,7 +419,7 @@ export default function useRoller() {

422 let nonce = await api.getNonce({ ship: point, proxy });

419 let nonce = await api.getNonce({ ship: point, proxy });

423 const progress = onUpdate

420 const progress = onUpdate

424 ? (state: number) => onUpdate({ type: 'progress', state })

421 ? (state: number) => onUpdate({ type: 'progress', state })

425− : () => { };

422+ : () => {};

426

423

427 let requests = [];

424 let requests = [];

428

425

src/store/lib/useDetailsStore.ts+8−10

@@ -33,18 +33,10 @@ export default function useDetailsStore() {

34 const syncDetails = useCallback(

35 async point => {

36− const _contracts = contracts.getOrElse(null);

37− if (!_contracts) {

38− return;

39− }

40−

41 // fetch point details

36 // fetch point details

42 try {

37 try {

43− const l2Point = await api.getPoint(point);

38+ const _point = await api.getPoint(point);

44− const details =

39+ const details = toL1Details(_point);

45− l2Point && (l2Point.dominion === 'l2' || l2Point.dominion === 'spawn')

46− ? toL1Details(l2Point)

47− : await azimuth.azimuth.getPoint(_contracts, point);

48 addToDetails({

40 addToDetails({

49 [point]: details,

41 [point]: details,

50 });

42 });

@@ -53,7 +45,13 @@ export default function useDetailsStore() {

53 console.warn(error);

45 console.warn(error);

54 }

46 }

48+ // Try getting the details from L1

56 try {

49 try {

50+ const _contracts = contracts.getOrElse(null);

51+ if (!_contracts) {

52+ return;

53+ }

54+

57 const details = await azimuth.azimuth.getPoint(_contracts, point);

55 const details = await azimuth.azimuth.getPoint(_contracts, point);

58 addToDetails({

56 addToDetails({

59 [point]: details,

57 [point]: details,