sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve error messaging for payjoin requests

Browse source
This commit is contained in:
Craig Raw 2022-10-27 08:11:58 +02:00
parent b27709e96f
commit 04a516d56b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java
View file

@ -15,11 +15,7 @@ import com.sparrowwallet.drongo.uri.BitcoinURI;
import com.sparrowwallet.drongo.wallet.Wallet; import com.sparrowwallet.drongo.wallet.Wallet;
import com.sparrowwallet.drongo.wallet.WalletNode; import com.sparrowwallet.drongo.wallet.WalletNode;
import com.sparrowwallet.sparrow.AppServices; import com.sparrowwallet.sparrow.AppServices;
import com.sparrowwallet.sparrow.event.FeeRatesUpdatedEvent; import com.sparrowwallet.sparrow.net.Protocol;
import com.sparrowwallet.sparrow.net.ElectrumServer;
import com.sparrowwallet.sparrow.net.MempoolRateSize;
import com.sparrowwallet.sparrow.net.ServerException;
import com.sparrowwallet.sparrow.wallet.SendController;
import javafx.concurrent.Service; import javafx.concurrent.Service;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -84,6 +80,10 @@ public class Payjoin {
Proxy proxy = AppServices.getProxy(); Proxy proxy = AppServices.getProxy();
if(proxy == null && Protocol.isOnionHost(finalUri.getHost())) {
throw new PayjoinReceiverException("Configure a Tor proxy to get a payjoin transaction from " + finalUri.getHost() + ".");
}
HttpURLConnection connection = proxy == null ? (HttpURLConnection)finalUri.toURL().openConnection() : (HttpURLConnection)finalUri.toURL().openConnection(proxy); HttpURLConnection connection = proxy == null ? (HttpURLConnection)finalUri.toURL().openConnection() : (HttpURLConnection)finalUri.toURL().openConnection(proxy);
connection.setRequestMethod("POST"); connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type", "text/plain"); connection.setRequestProperty("Content-Type", "text/plain");
@ -117,6 +117,9 @@ public class Payjoin {
} catch(URISyntaxException e) { } catch(URISyntaxException e) {
log.error("Invalid payjoin receiver URI", e); log.error("Invalid payjoin receiver URI", e);
throw new PayjoinReceiverException("Invalid payjoin receiver URI", e); throw new PayjoinReceiverException("Invalid payjoin receiver URI", e);
} catch(FileNotFoundException e) {
log.error("Could not find resource at payjoin URL " + uri, e);
throw new PayjoinReceiverException("Could not find resource at payjoin URL " + uri, e);
} catch(IOException e) { } catch(IOException e) {
log.error("Payjoin receiver error", e); log.error("Payjoin receiver error", e);
throw new PayjoinReceiverException("Payjoin receiver error", e); throw new PayjoinReceiverException("Payjoin receiver error", e);