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

Upgrade wallet:multisig:sign to use ui.ledger #5489

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Upgrade wallet:multisig:sign to use ui.ledger #5489

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5406e
Upgrade wallet:multisig:sign to use ui.ledger
NullSoldier Oct 7, 2024
1a797d0
Update ironfish-cli/src/commands/wallet/multisig/sign.ts
NullSoldier Oct 7, 2024
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
36 changes: 20 additions & 16 deletions ironfish-cli/src/commands/wallet/multisig/sign.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ export class SignMultisigTransactionCommand extends IronfishCommand {

if (flags.ledger) {
ledger = new LedgerMultiSigner(this.logger)
try {
await ledger.connect()
} catch (e) {
if (e instanceof Error) {
this.error(e.message)
} else {
throw e
}
}
}

let multisigAccountName: string
Expand Down Expand Up @@ -387,11 +378,16 @@ export class SignMultisigTransactionCommand extends IronfishCommand {
const signingPackage = new multisig.SigningPackage(Buffer.from(signingPackageString, 'hex'))

if (ledger) {
const frostSignatureShare = await ledger.dkgSign(
unsignedTransaction.publicKeyRandomness(),
signingPackage.frostSigningPackage().toString('hex'),
unsignedTransaction.hash().toString('hex'),
)
const frostSignatureShare = await ui.ledger({
ledger,
message: 'Sign Transaction',
action: () =>
ledger.dkgSign(
unsignedTransaction.publicKeyRandomness(),
signingPackage.frostSigningPackage().toString('hex'),
unsignedTransaction.hash().toString('hex'),
),
})

signatureShare = multisig.SignatureShare.fromFrost(
frostSignatureShare,
Expand Down Expand Up @@ -515,7 +511,11 @@ export class SignMultisigTransactionCommand extends IronfishCommand {

let commitment
if (ledger) {
await ledger.reviewTransaction(unsignedTransactionHex)
await ui.ledger({
ledger,
message: 'Review Transaction',
action: () => ledger.reviewTransaction(unsignedTransactionHex),
NullSoldier marked this conversation as resolved.
Show resolved Hide resolved
})

commitment = await this.createSigningCommitmentWithLedger(
ledger,
Expand Down Expand Up @@ -545,7 +545,11 @@ export class SignMultisigTransactionCommand extends IronfishCommand {
transactionHash: Buffer,
signers: string[],
): Promise<string> {
const rawCommitments = await ledger.dkgGetCommitments(transactionHash.toString('hex'))
const rawCommitments = await ui.ledger({
ledger,
message: 'Get Commitments',
action: () => ledger.dkgGetCommitments(transactionHash.toString('hex')),
})

const sigingCommitment = multisig.SigningCommitment.fromRaw(
participant.identity,
Expand Down