git.iko.soy/bridge
on master help sign in
bitcoin: rename hd to btcWallet
commitd779a1a985db0c0f206489919ceba741e14c936d authorpkova <pyry.kovanen@gmail.com> dateSun 7 Feb 2021, 20:47 (6 years ago) parent61d0d8e
3 files changed+7−7
compare with master
unifiedsplit
src/form/validators.js+2−2 src/lib/validators.js+2−2 src/views/Bitcoin.js+3−3
src/form/validators.js+2−2
@@ -124,8 +124,8 @@ export const buildEmailValidator = validate =>
124124export const buildEmailArrayValidator = () =>
125125 buildValidator([validateUnique, buildArrayValidator(buildEmailValidator())]);
126126
127−export const buildPsbtValidator = hd =>
128− buildValidator([validatePsbt, validateSignablePsbt(hd)]);
127+export const buildPsbtValidator = btcWallet =>
128+ buildValidator([validatePsbt, validateSignablePsbt(btcWallet)]);
129129
130130// the form validator is the composition of all of the field validators
131131// plus an additional form validator function
src/lib/validators.js+2−2
@@ -142,13 +142,13 @@ export const validatePsbt = base64 => {
142142 }
143143};
144144
145−export const validateSignablePsbt = hd => base64 => {
145+export const validateSignablePsbt = btcWallet => base64 => {
146146 const psbt = bitcoin.Psbt.fromBase64(base64);
147147 return !psbt.data.inputs.some((input, idx) => {
148148 try {
149149 // removing already derived part, eg m/84'/0'/0'/0/0 becomes 0/0
150150 const path = input.bip32Derivation[0].path.substring(12);
151− const prv = hd.derivePath(path).privateKey;
151+ const prv = btcWallet.derivePath(path).privateKey;
152152 psbt.signInput(idx, bitcoin.ECPair.fromPrivateKey(prv));
153153 return true;
154154 } catch (e) {
src/views/Bitcoin.js+3−3
@@ -46,7 +46,7 @@ export default function Bitcoin() {
4646 const pubKey = need.urbitWallet(urbitWallet).bitcoin.keys.public;
4747 const chain = need.urbitWallet(urbitWallet).bitcoin.keys.chain;
4848
49− const hd = bitcoin.bip32.fromPrivateKey(
49+ const btcWallet = bitcoin.bip32.fromPrivateKey(
5050 Buffer.from(privKey, 'hex'),
5151 Buffer.from(chain, 'hex'),
5252 bitcoin.networks.bitcoin
@@ -63,7 +63,7 @@ export default function Bitcoin() {
6363 );
6464
6565 const validate = composeValidator({
66− unsignedTransaction: buildPsbtValidator(hd),
66+ unsignedTransaction: buildPsbtValidator(btcWallet),
6767 });
6868
6969 const onValues = ({ valid, values, form }) => {
@@ -73,7 +73,7 @@ export default function Bitcoin() {
7373 .reduce((psbt, input, idx) => {
7474 // removing already derived part, eg m/84'/0'/0'/0/0 becomes 0/0
7575 const path = input.bip32Derivation[0].path.substring(12);
76− const prv = hd.derivePath(path).privateKey;
76+ const prv = btcWallet.derivePath(path).privateKey;
7777 try {
7878 return psbt.signInput(idx, bitcoin.ECPair.fromPrivateKey(prv));
7979 } catch (e) {