f877a8a · bridge · git.iko.soy

git.iko.soy/bridge

refactor ledgerSignMessage

commitf877a8a7bea1d340b050b16d5dd48c21f32a16c0 authorLiam Fitzgerald <liam@urizen.co> dateSat 28 Mar 2020, 11:46 (7 years ago) parent2448f54

2 files changed+13−14

compare with master

unifiedsplit

src/lib/authToken.js+1−11 src/lib/ledger.js+12−3

src/lib/authToken.js+1−11

@@ -20,15 +20,6 @@ function signMessage(privateKey) {

2020 return ethSignature;

2121}

2222

23−function signatureToHex(v, r, s) {

24− const ethSignature = new Uint8Array(65);

25− ethSignature.set(Buffer.from(r, 'hex'));

26− ethSignature.set(Buffer.from(s, 'hex'), 32);

27− ethSignature[64] = v;

28−

29− return `0x${Buffer.from(ethSignature).toString('hex')}`;

30−}

31−

3223export const getAuthToken = async ({

3324 wallet,

3425 walletType,

@@ -39,8 +30,7 @@ export const getAuthToken = async ({

3930 return web3.eth.personal.sign(MESSAGE, wallet.address, '');

4031 }

4132 if (walletType === WALLET_TYPES.LEDGER) {

42− const { v, r, s } = await ledgerSignMessage(MESSAGE, walletHdPath);

43− return signatureToHex(v, r, s);

33+ return ledgerSignMessage(MESSAGE, walletHdPath);

4434 }

4535 if (walletType === WALLET_TYPES.TREZOR) {

4636 return trezorSignMessage(MESSAGE, walletHdPath);

src/lib/ledger.js+12−3

@@ -8,11 +8,11 @@ export const chopHdPrefix = str =>

88 str.slice(0, 2) === 'm/' ? str.slice(2) : str;

99export const addHdPrefix = str => (str.slice(0, 2) === 'm/' ? str : 'm/' + str);

1010

11−export const ledgerSignTransaction = async (txn, hdpath) => {

11+export const ledgerSignTransaction = async (txn, hdPath) => {

1212 const transport = await Transport.create();

1313 const eth = new Eth(transport);

1414

15− const path = chopHdPrefix(hdpath);

15+ const path = chopHdPrefix(hdPath);

1616 const serializedTx = txn.serialize().toString('hex');

1717 const sig = await eth.signTransaction(path, serializedTx);

1818

@@ -28,5 +28,14 @@ export const ledgerSignMessage = async (message, hdPath) => {

2828 const eth = new Eth(transport);

2929

3030 const path = chopHdPrefix(hdPath);

31− return eth.signPersonalMessage(path, Buffer.from(message).toString('hex'));

31+ const { r, s, v } = await eth.signPersonalMessage(

32+ path,

33+ Buffer.from(message).toString('hex')

34+ );

35+ const ethSignature = new Uint8Array(65);

36+ ethSignature.set(Buffer.from(r, 'hex'));

37+ ethSignature.set(Buffer.from(s, 'hex'), 32);

38+ ethSignature[64] = v;

39+

40+ return `0x${Buffer.from(ethSignature).toString('hex')}`;

3241};