pharpend/Vanillae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msg confirm sends back error if user rejects tx

Browse Source
This commit is contained in:
pharpend
2023-10-02 07:51:38 -06:00
parent f5a267fd43
commit cc72856aa3
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jrx/pages/msg_confirm.html
+3 -3
View File
@@ -5,14 +5,14 @@
<title>Is this message good or bad?</title> <title>Is this message good or bad?</title>
</head> </head>
<body> <body>
<h1>Is this message good or bad?</h1> <h1>Do you want to sign this message?</h1>
<pre id="message"></pre> <pre id="message"></pre>
<br> <br>
<button id="good">Good</button> <button id="good">Yes</button>
<br> <br>
<button id="bad">Bad</button> <button id="bad">No</button>
<script type="module" src="../dist/msg_confirm.js"></script> <script type="module" src="../dist/msg_confirm.js"></script>
jrx/src/b_lib.ts
+21 -7
View File
@@ -321,8 +321,13 @@ bi_msg_handler_content
let msg_str : string = msg.data.params.message; let msg_str : string = msg.data.params.message;
// TODO: need to break here on whether the msg signature was good // TODO: need to break here on whether the msg signature was good
// (signed) or bad (not) // (signed) or bad (not)
let resultt = await msg_sign(msg_str, secret_key) let resultt = await msg_sign(msg_str, secret_key);
return w2a_ok(resultt); if (resultt.result === 'good') {
return w2a_ok({signature: resultt.signature});
}
else {
return w2a_err(awcp.ERROR_CODE_RpcRejectedByUserError, "you're not pretty enough");
}
// right now just sign tx // right now just sign tx
case "transaction.sign": case "transaction.sign":
@@ -330,8 +335,13 @@ bi_msg_handler_content
let tx_str : string = msg.data.params.tx; let tx_str : string = msg.data.params.tx;
console.log('transaction: ', tx_str); console.log('transaction: ', tx_str);
let result = await tx_sign(tx_str, secret_key) let result = await tx_sign(tx_str, secret_key)
console.log('signed transaction: ', result.signedTransaction); return w2a_ok({signedTransaction: result.signedTransaction});
return w2a_ok(result); //if (result.result === 'good') {
// return w2a_ok({signedTransaction: result.signedTransaction});
//}
//else {
// return w2a_err(awcp.ERROR_CODE_RpcRejectedByUserError, "you will never be pretty enough");
//}
// default is NYI // default is NYI
default: default:
@@ -354,7 +364,10 @@ async function
msg_sign msg_sign
(msg_str : string, (msg_str : string,
secret_key : Uint8Array) secret_key : Uint8Array)
: Promise<{signature : string}> : Promise< {result : 'good',
signature : string}
| {result : 'bad'}
>
{ {
// does the user want to sign the message // does the user want to sign the message
let confirm_window = await browser.windows.create({url : '../pages/msg_confirm.html', let confirm_window = await browser.windows.create({url : '../pages/msg_confirm.html',
@@ -387,10 +400,11 @@ msg_sign
// @ts-ignore yes nacl is stupid // @ts-ignore yes nacl is stupid
let signature : Uint8Array = nacl.sign.detached(hashed_salted_msg, secret_key); let signature : Uint8Array = nacl.sign.detached(hashed_salted_msg, secret_key);
let signature_str : string = vdk_binary.bytes_to_hex_str(signature); let signature_str : string = vdk_binary.bytes_to_hex_str(signature);
return {signature: signature_str}; return {result : 'good',
signature : signature_str};
} }
else { else {
return { return {result : 'bad'};
} }
} }