git.iko.soy/bridge
on master help sign in
invites: fix nonces in generateInviteCodes
commit2bca737ac77bbb55a831c6b6abd02bfc42372c8f authoryosoyubik <yosoyubik@gmail.com> dateTue 21 Sep 2021, 10:11 (5 years ago) parent9e302d6
3 files changed+11−11
compare with master
unifiedsplit
src/lib/useRoller.ts+5−5 src/lib/utils/roller.ts+5−5 src/views/Point/Point.js+1−1
src/lib/useRoller.ts+5−5
@@ -153,7 +153,7 @@ export default function useRoller() {
153153
154154 for (let i = 0; i < numInvites && planets[i]; i++) {
155155 const planet = planets[i];
156− const nonceInc = i * 3;
156+ const nonceInc = i + nonce;
157157
158158 const { ticket, owner } = await wg.generateTemporaryDeterministicWallet(
159159 planet,
@@ -172,9 +172,9 @@ export default function useRoller() {
172172 const configureKeysRequest = await configureKeys(
173173 api,
174174 _wallet,
175− _point,
175+ planet,
176176 proxy,
177− nonceInc + 1,
177+ 0, //nonceInc + 1,
178178 _details,
179179 authToken,
180180 authMnemonic,
@@ -187,7 +187,7 @@ export default function useRoller() {
187187 _wallet,
188188 planet,
189189 proxy,
190− nonceInc + 2,
190+ 1, //nonceInc + 2,
191191 owner.keys.address
192192 );
193193
@@ -271,7 +271,7 @@ export default function useRoller() {
271271
272272 const stillPending = invites.pending.filter(invite => {
273273 const completed = !pendingTransactions.find(
274− p => `~${p?.rawTx?.tx?.tx?.data?.ship}` === ob.patp(invite.planet)
274+ p => `~${p?.rawTx?.tx?.data?.ship}` === ob.patp(invite.planet)
275275 );
276276
277277 if (
src/lib/utils/roller.ts+5−5
@@ -1,5 +1,5 @@
1−import { signTransactionHash } from "lib/authToken";
2−import { Invite } from "lib/types/Invite";
1+import { signTransactionHash } from 'lib/authToken';
2+import { Invite } from 'lib/types/Invite';
33import { Just } from 'folktale/maybe';
44import { randomHex } from 'web3-utils';
55import {
@@ -65,7 +65,7 @@ export const configureKeys = async (
6565 urbitWallet: any
6666) => {
6767 const from = {
68− ship: _point, //ship that is spawning the planet
68+ ship: _point, //ship to configure keys
6969 proxy,
7070 };
7171
@@ -100,13 +100,13 @@ export const configureKeys = async (
100100export const transferPoint = async (
101101 api: any,
102102 _wallet: any,
103− planet: number,
103+ _point: number,
104104 proxy: string,
105105 nonce: number,
106106 address: string
107107) => {
108108 const from = {
109− ship: planet, //planet to transfer
109+ ship: _point, // ship to transfer
110110 proxy,
111111 };
112112
src/views/Point/Point.js+1−1
@@ -235,7 +235,7 @@ export default function Point() {
235235
236236 const address = need.addressFromWallet(wallet);
237237 const numPending = pendingTransactions.filter(
238− ({ rawTx }) => rawTx?.tx?.tx?.type === 'spawn'
238+ ({ rawTx }) => rawTx?.tx?.type === 'spawn'
239239 ).length;
240240
241241 return (