Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support 32bits chainid with the latest Ledger app #2094

Merged
merged 4 commits into from
Sep 4, 2018
Merged

support 32bits chainid with the latest Ledger app #2094

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7030990
support 32bits chainid with the latest Ledger app
hackmod Jul 29, 2018
c58d0fb
Merge branch 'develop' into ledger-32bits-chainid
ConnorBryan Aug 15, 2018
059404f
comments added
hackmod Aug 16, 2018
20fb2e7
Merge branch 'develop' into ledger-32bits-chainid
ConnorBryan Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions common/libs/wallet/deterministic/ledger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,29 @@ export class LedgerWallet extends HardwareWallet {

public async signRawTransaction(t: EthTx): Promise<Buffer> {
const txFields = getTransactionFields(t);
t.v = Buffer.from([t._chainId]);
t.v = toBuffer(t._chainId);
t.r = toBuffer(0);
t.s = toBuffer(0);

try {
const ethApp = await makeApp();
const result = await ethApp.signTransaction(this.getPath(), t.serialize().toString('hex'));

let v = result.v;
hackmod marked this conversation as resolved.
Show resolved Hide resolved
if (t._chainId > 0) {
// EIP155 support. check/recalc signature v value.
const rv = parseInt(v, 16);
let cv = t._chainId * 2 + 35;
/* tslint:disable no-bitwise */
if (rv !== cv && (rv & cv) !== rv) {
cv += 1; // add signature v bit.
}
v = cv.toString(16);
}

const txToSerialize: TxObj = {
...txFields,
v: addHexPrefix(result.v),
v: addHexPrefix(v),
r: addHexPrefix(result.r),
s: addHexPrefix(result.s)
};
Expand Down