git.iko.soy/bridge
on master help sign in
transfer: use setTransferProxy in Transfer.js
commit355856b6f71cc8baafd153d4bb33d652fc21c17f authoryosoyubik <yosoyubik@gmail.com> dateThu 30 Sep 2021, 05:49 (5 years ago) parentbaa23b6
4 files changed+22−18
compare with master
unifiedsplit
src/lib/utils/proxy.ts+4−3 src/lib/utils/roller.ts+13−12 src/views/Point/Point.tsx+2 src/views/UrbitID/Transfer.js+3−3
src/lib/utils/proxy.ts+4−3
@@ -1,13 +1,14 @@
11import { Ownership } from '@urbit/roller-api';
22
3+// TODO: test when all proxies are configured to the same address
34export const getProxy = (
45 owner: Ownership,
56 address: string
67): string | undefined =>
7− owner.managementProxy?.address === address
8− ? 'manage'
9− : owner.owner?.address === address
8+ owner.owner?.address === address
109 ? 'own'
10+ : owner.managementProxy?.address === address
11+ ? 'manage'
1112 : owner.spawnProxy?.address === address
1213 ? 'spawn'
1314 : owner.votingProxy?.address === address
src/lib/utils/roller.ts+13−12
@@ -3,7 +3,7 @@ import { Invite } from 'lib/types/Invite';
33import { Just, Nothing } from 'folktale/maybe';
44import { randomHex } from 'web3-utils';
55
6−import {
6+import RollerRPCAPI, {
77 Proxy,
88 Signature,
99 From,
@@ -49,7 +49,7 @@ export const generateInviteWallet = async (point: number, seed: string) => {
4949};
5050
5151export const spawn = async (
52− api: any,
52+ api: RollerRPCAPI,
5353 _wallet: any,
5454 _point: number,
5555 proxy: string,
@@ -72,7 +72,7 @@ export const spawn = async (
7272};
7373
7474export const configureKeys = async (
75− api: any,
75+ api: RollerRPCAPI,
7676 wallet: any,
7777 point: Ship,
7878 proxy: string,
@@ -110,7 +110,7 @@ export const configureKeys = async (
110110};
111111
112112export const transferPointRequest = async (
113− api: any,
113+ api: RollerRPCAPI,
114114 _wallet: any,
115115 _point: Ship,
116116 proxy: string,
@@ -146,7 +146,7 @@ const proxyType = (proxy: Proxy) => {
146146};
147147
148148const setProxy = async (
149− api: any,
149+ api: RollerRPCAPI,
150150 proxyAddressType: string,
151151 sig: Signature,
152152 from: From,
@@ -159,14 +159,14 @@ const setProxy = async (
159159 case 'spawn':
160160 return await api.setSpawnProxy(sig, from, address, data);
161161 case 'transfer':
162− return await api.setTrasferProxy(sig, from, address, data);
162+ return await api.setTransferProxy(sig, from, address, data);
163163 default:
164164 throw new Error(`Unknown proxyType ${proxyAddressType}`);
165165 }
166166};
167167
168168export const registerProxyAddress = async (
169− api: any,
169+ api: RollerRPCAPI,
170170 _wallet: any,
171171 _point: Ship,
172172 proxy: string,
@@ -178,20 +178,21 @@ export const registerProxyAddress = async (
178178 ship: _point,
179179 proxy,
180180 };
181− const managementData = { address };
182− const managementHash = await api.hashTransaction(
181+ const proxyData = { address };
182+ const proxyHash = await api.hashTransaction(
183183 nonce,
184184 from,
185185 proxyType(proxyAddressType),
186− managementData
186+ proxyData
187187 );
188+
188189 return setProxy(
189190 api,
190191 proxyAddressType,
191− signTransactionHash(managementHash, _wallet.privateKey),
192+ signTransactionHash(proxyHash, _wallet.privateKey),
192193 from,
193194 _wallet.address,
194− managementData
195+ proxyData
195196 );
196197};
197198
src/views/Point/Point.tsx+2
@@ -189,6 +189,8 @@ export default function Point() {
189189 ? 'Network Keys Configured'
190190 : pendingTx.rawTx?.tx?.type === 'transfer-point'
191191 ? 'Point Transfered'
192+ : pendingTx.rawTx?.tx?.type === 'set-transfer-proxy'
193+ ? 'Transfer Proxy Changed'
192194 : ''}
193195 </div>
194196 <div className="rollup-timer">
src/views/UrbitID/Transfer.js+3−3
@@ -48,7 +48,7 @@ export default function AdminTransfer() {
4848 const { pointCursor } = usePointCursor();
4949 const { starReleaseDetails } = useStarReleaseCache();
5050 const { currentL2 } = useRollerStore();
51− const { transferPoint, getPendingTransactions } = useRoller();
51+ const { setProxyAddress, getPendingTransactions } = useRoller();
5252 const [owner, setNewOwner] = useState('');
5353
5454 const {
@@ -78,7 +78,7 @@ export default function AdminTransfer() {
7878 // setLoading(true);
7979 if (owner === '') return;
8080 try {
81− await transferPoint(owner);
81+ await setProxyAddress('transfer', owner);
8282 getPendingTransactions(point);
8383 pop();
8484 } catch (error) {
@@ -86,7 +86,7 @@ export default function AdminTransfer() {
8686 } finally {
8787 // setLoading(false);
8888 }
89− }, [owner, getPendingTransactions, point, pop, transferPoint]);
89+ }, [owner, getPendingTransactions, point, pop, setProxyAddress]);
9090
9191 const onValues = useCallback(
9292 ({ valid, values }) => {