git.iko.soy/bridge
on master help sign in
bitcoin: rename hd to btcWallet
d779a1apkova
src/form/validators.js+2−2
compare with master
unifiedsplit
@@ -124,8 +124,8 @@ export const buildEmailValidator = validate =>
124export const buildEmailArrayValidator = () =>
124export const buildEmailArrayValidator = () =>
125 buildValidator([validateUnique, buildArrayValidator(buildEmailValidator())]);
125 buildValidator([validateUnique, buildArrayValidator(buildEmailValidator())]);
126
126
127−export const buildPsbtValidator = hd =>
127+export const buildPsbtValidator = btcWallet =>
128− buildValidator([validatePsbt, validateSignablePsbt(hd)]);
128+ buildValidator([validatePsbt, validateSignablePsbt(btcWallet)]);
129
129
130// the form validator is the composition of all of the field validators
130// the form validator is the composition of all of the field validators
131// plus an additional form validator function
131// plus an additional form validator function
src/lib/validators.js+2−2
@@ -142,13 +142,13 @@ export const validatePsbt = base64 => {
142 }
142 }
143};
143};
144
144
145−export const validateSignablePsbt = hd => base64 => {
145+export const validateSignablePsbt = btcWallet => base64 => {
146 const psbt = bitcoin.Psbt.fromBase64(base64);
146 const psbt = bitcoin.Psbt.fromBase64(base64);
147 return !psbt.data.inputs.some((input, idx) => {
147 return !psbt.data.inputs.some((input, idx) => {
148 try {
148 try {
149 // removing already derived part, eg m/84'/0'/0'/0/0 becomes 0/0
149 // removing already derived part, eg m/84'/0'/0'/0/0 becomes 0/0
150 const path = input.bip32Derivation[0].path.substring(12);
150 const path = input.bip32Derivation[0].path.substring(12);
151− const prv = hd.derivePath(path).privateKey;
151+ const prv = btcWallet.derivePath(path).privateKey;
152 psbt.signInput(idx, bitcoin.ECPair.fromPrivateKey(prv));
152 psbt.signInput(idx, bitcoin.ECPair.fromPrivateKey(prv));
153 return true;
153 return true;
154 } catch (e) {
154 } catch (e) {
src/views/Bitcoin.js+3−3
@@ -46,7 +46,7 @@ export default function Bitcoin() {
46 const pubKey = need.urbitWallet(urbitWallet).bitcoin.keys.public;
46 const pubKey = need.urbitWallet(urbitWallet).bitcoin.keys.public;
47 const chain = need.urbitWallet(urbitWallet).bitcoin.keys.chain;
47 const chain = need.urbitWallet(urbitWallet).bitcoin.keys.chain;
48
48
49− const hd = bitcoin.bip32.fromPrivateKey(
49+ const btcWallet = bitcoin.bip32.fromPrivateKey(
50 Buffer.from(privKey, 'hex'),
50 Buffer.from(privKey, 'hex'),
51 Buffer.from(chain, 'hex'),
51 Buffer.from(chain, 'hex'),
52 bitcoin.networks.bitcoin
52 bitcoin.networks.bitcoin
@@ -63,7 +63,7 @@ export default function Bitcoin() {
63 );
63 );
64
64
65 const validate = composeValidator({
65 const validate = composeValidator({
66− unsignedTransaction: buildPsbtValidator(hd),
66+ unsignedTransaction: buildPsbtValidator(btcWallet),
67 });
67 });
68
68
69 const onValues = ({ valid, values, form }) => {
69 const onValues = ({ valid, values, form }) => {
@@ -73,7 +73,7 @@ export default function Bitcoin() {
73 .reduce((psbt, input, idx) => {
73 .reduce((psbt, input, idx) => {
74 // removing already derived part, eg m/84'/0'/0'/0/0 becomes 0/0
74 // removing already derived part, eg m/84'/0'/0'/0/0 becomes 0/0
75 const path = input.bip32Derivation[0].path.substring(12);
75 const path = input.bip32Derivation[0].path.substring(12);
76− const prv = hd.derivePath(path).privateKey;
76+ const prv = btcWallet.derivePath(path).privateKey;
77 try {
77 try {
78 return psbt.signInput(idx, bitcoin.ECPair.fromPrivateKey(prv));
78 return psbt.signInput(idx, bitcoin.ECPair.fromPrivateKey(prv));
79 } catch (e) {
79 } catch (e) {