git.iko.soy/bridge
on master help sign in
bitcoin: debugging stuff for demo
commit1926a6318483734d495d1dca9860f66b7ad99f20 authorpkova <pyry.kovanen@gmail.com> dateThu 10 Dec 2020, 13:37 (6 years ago) parentfb2aecb
2 files changed+12−5
compare with master
unifiedsplit
src/lib/validators.js+4−4 src/views/Bitcoin.js+8−1
src/lib/validators.js+4−4
@@ -134,17 +134,17 @@ export const validateUnique = arr => {
134134export const validateChild = ourShip => ship =>
135135 ourShip !== ob.sein(ship) && `This point is not a child of ${ourShip}.`;
136136
137−export const validatePsbt = hex => {
137+export const validatePsbt = base64 => {
138138 try {
139− bitcoin.Psbt.fromHex(hex);
139+ bitcoin.Psbt.fromBase64(base64);
140140 } catch (e) {
141141 return 'Invalid Partially Signed Bitcoin Transaction';
142142 }
143143};
144144
145−export const validateSignablePsbt = hd => hex => {
145+export const validateSignablePsbt = hd => base64 => {
146146 try {
147− bitcoin.Psbt.fromHex(hex).signAllInputsHD(hd);
147+ bitcoin.Psbt.fromBase64(base64).signAllInputsHD(hd);
148148 } catch (e) {
149149 return 'No inputs were signed';
150150 }
src/views/Bitcoin.js+8−1
@@ -26,6 +26,8 @@ export default function Bitcoin() {
2626 const { urbitWallet } = useWallet();
2727 const { pointCursor } = usePointCursor();
2828
29+ window.bitcoin = bitcoin;
30+
2931 const empty = new bitcoin.Psbt();
3032
3133 const [signedTx, setSignedTx] = useState('');
@@ -56,8 +58,13 @@ export default function Bitcoin() {
5658 });
5759
5860 const onValues = ({ valid, values, form }) => {
61+ try {
62+ window.psbt = bitcoin.Psbt.fromBase64(values.unsignedTransaction);
63+ } catch (e) {
64+ // nop
65+ }
5966 if (valid) {
60− const newPsbt = bitcoin.Psbt.fromHex(values.unsignedTransaction);
67+ const newPsbt = bitcoin.Psbt.fromBase64(values.unsignedTransaction);
6168 const hex = newPsbt
6269 .signAllInputsHD(hd)
6370 .finalizeAllInputs()