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

Update ledger #289

Merged
merged 5 commits into from
Dec 1, 2023
Merged

Update ledger #289

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5f85a1
getBalanceSummary
guibescos Nov 30, 2023
32305fc
this one works
guibescos Nov 30, 2023
fc380d8
Update ledger stuff
guibescos Nov 30, 2023
7a3613d
Rever this change
guibescos Nov 30, 2023
1ef1efd
Cleanup
guibescos Nov 30, 2023
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
24 changes: 18 additions & 6 deletions staking/app/deploy/ledger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Transport, {
TransportStatusError,
} from "@ledgerhq/hw-transport";
import TransportNodeHid from "@ledgerhq/hw-transport-node-hid";
import { PublicKey, Transaction } from "@solana/web3.js";
import { PublicKey, Transaction, VersionedTransaction } from "@solana/web3.js";

export class LedgerNodeWallet implements Wallet {
private _derivationPath: Buffer;
Expand Down Expand Up @@ -35,7 +35,9 @@ export class LedgerNodeWallet implements Wallet {
return new LedgerNodeWallet(derivationPath, transport, publicKey);
}

async signTransaction(transaction: Transaction): Promise<Transaction> {
async signTransaction<T extends Transaction | VersionedTransaction>(
transaction: T
): Promise<T> {
console.log("Please approve the transaction on your ledger device...");
const transport = this._transport;
const publicKey = this.publicKey;
Expand All @@ -49,7 +51,9 @@ export class LedgerNodeWallet implements Wallet {
return transaction;
}

async signAllTransactions(txs: Transaction[]): Promise<Transaction[]> {
async signAllTransactions<T extends Transaction | VersionedTransaction>(
txs: T[]
): Promise<T[]> {
return await Promise.all(txs.map((tx) => this.signTransaction(tx)));
}
}
Expand Down Expand Up @@ -108,15 +112,23 @@ export async function getPublicKey(
}

/** @internal */
export async function signTransaction(
export async function signTransaction<
T extends Transaction | VersionedTransaction
>(
transport: Transport,
transaction: Transaction,
transaction: T,
derivationPath: Buffer
): Promise<Buffer> {
const paths = Buffer.alloc(1);
paths.writeUInt8(1, 0);

const message = transaction.serializeMessage();
let message: Buffer;
if (transaction instanceof Transaction) {
message = transaction.serializeMessage();
} else {
message = Buffer.from(transaction.serialize());
}

const data = Buffer.concat([paths, derivationPath, message]);

return await send(transport, INS_SIGN_MESSAGE, P1_CONFIRM, data);
Expand Down
Loading