git.iko.soy/bridge
on master help sign in
bitcoin: debugging stuff for demo
1926a63pkova
src/lib/validators.js+4−4
compare with master
unifiedsplit
@@ -134,17 +134,17 @@ export const validateUnique = arr => {
134export const validateChild = ourShip => ship =>
134export const validateChild = ourShip => ship =>
135 ourShip !== ob.sein(ship) && `This point is not a child of ${ourShip}.`;
135 ourShip !== ob.sein(ship) && `This point is not a child of ${ourShip}.`;
136
136
137−export const validatePsbt = hex => {
137+export const validatePsbt = base64 => {
138 try {
138 try {
139− bitcoin.Psbt.fromHex(hex);
139+ bitcoin.Psbt.fromBase64(base64);
140 } catch (e) {
140 } catch (e) {
141 return 'Invalid Partially Signed Bitcoin Transaction';
141 return 'Invalid Partially Signed Bitcoin Transaction';
142 }
142 }
143};
143};
144
144
145−export const validateSignablePsbt = hd => hex => {
145+export const validateSignablePsbt = hd => base64 => {
146 try {
146 try {
147− bitcoin.Psbt.fromHex(hex).signAllInputsHD(hd);
147+ bitcoin.Psbt.fromBase64(base64).signAllInputsHD(hd);
148 } catch (e) {
148 } catch (e) {
149 return 'No inputs were signed';
149 return 'No inputs were signed';
150 }
150 }
src/views/Bitcoin.js+8−1
@@ -26,6 +26,8 @@ export default function Bitcoin() {
26 const { urbitWallet } = useWallet();
26 const { urbitWallet } = useWallet();
27 const { pointCursor } = usePointCursor();
27 const { pointCursor } = usePointCursor();
28
28
29+ window.bitcoin = bitcoin;
30+
29 const empty = new bitcoin.Psbt();
31 const empty = new bitcoin.Psbt();
30
32
31 const [signedTx, setSignedTx] = useState('');
33 const [signedTx, setSignedTx] = useState('');
@@ -56,8 +58,13 @@ export default function Bitcoin() {
56 });
58 });
57
59
58 const onValues = ({ valid, values, form }) => {
60 const onValues = ({ valid, values, form }) => {
61+ try {
62+ window.psbt = bitcoin.Psbt.fromBase64(values.unsignedTransaction);
63+ } catch (e) {
64+ // nop
65+ }
59 if (valid) {
66 if (valid) {
60− const newPsbt = bitcoin.Psbt.fromHex(values.unsignedTransaction);
67+ const newPsbt = bitcoin.Psbt.fromBase64(values.unsignedTransaction);
61 const hex = newPsbt
68 const hex = newPsbt
62 .signAllInputsHD(hd)
69 .signAllInputsHD(hd)
63 .finalizeAllInputs()
70 .finalizeAllInputs()