Skip to content

Tidy up logic and consts in getSignatureFromScan #7

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

Open
Arkay92 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tidy up logic and consts in getSignatureFromScan #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 22 additions & 16 deletions src/kong/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export const getSignatureFromScan = async ({
}

const sigCmd = generateCmd(1, 1, address, hash);

const sig = await triggerScan({
reqx: sigCmd,
rpId: rpId ?? parseHostName(),
Expand All @@ -173,32 +174,37 @@ export const getSignatureFromScan = async ({
return;
}

let vType = undefined;

const computedAddress = ethers.utils.computeAddress("0x" + chipPublicKey);
const addressToLower = computedAddress.toLowerCase();
const messageHash = hashMessageEIP191SolidityKeccak(address, hash);

const sigString = buf2hex(sig);
const sigSplit = unpackDERsignature(sigString);

const vArr27 = new Uint8Array(1);
vArr27[0] = 27;
const v27 = buf2hex(vArr27);

const vArr28 = new Uint8Array(1);

vArr27[0] = 27;
vArr28[0] = 28;

const v27 = buf2hex(vArr27);
const v28 = buf2hex(vArr28);

const computedAddress = ethers.utils.computeAddress("0x" + chipPublicKey);
const messageHash = hashMessageEIP191SolidityKeccak(address, hash);
const v27Sig = `0x${sigSplit.r}${sigSplit.s}${v27}`;
const v28Sig = `0x${sigSplit.r}${sigSplit.s}${v28}`;

let vType = undefined;
if (
ethers.utils
.recoverAddress(messageHash, `0x${sigSplit.r}${sigSplit.s}${v27}`)
.toLowerCase() === computedAddress.toLowerCase()
) {
const isV27 =
ethers.utils.recoverAddress(messageHash, v27Sig).toLowerCase() ===
addressToLower;
const isV28 =
ethers.utils.recoverAddress(messageHash, v28Sig).toLowerCase() ===
addressToLower;

if (isV27) {
vType = "27";
} else if (
ethers.utils
.recoverAddress(messageHash, `0x${sigSplit.r}${sigSplit.s}${v28}`)
.toLowerCase() === computedAddress.toLowerCase()
) {
} else if (isV28) {
vType = "28";
} else {
throw new Error("addressMismatch");
Expand Down