Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 22:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional small scale core changes

Browse Source
This commit is contained in:
langerhans
2014-10-18 21:56:49 +02:00
parent 3070012f4e
commit 7219e746ac
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentProtocol.java
View File

@@ -46,10 +46,10 @@ import java.util.List;
*/ */
public class PaymentProtocol { public class PaymentProtocol {
// MIME types as defined in BIP71. // MIME types as defined in DIP71.
public static final String MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest"; public static final String MIMETYPE_PAYMENTREQUEST = "application/vnd.doge.payment.request";
public static final String MIMETYPE_PAYMENT = "application/bitcoin-payment"; public static final String MIMETYPE_PAYMENT = "application/vnd.doge.payment.payment";
public static final String MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack"; public static final String MIMETYPE_PAYMENTACK = "application/vnd.doge.payment.ack";
/** /**
* Create a payment request with one standard pay to address output. You may want to sign the request using * Create a payment request with one standard pay to address output. You may want to sign the request using

10
core/src/main/java/com/dogecoin/dogecoinj/uri/BitcoinURI.java
View File

@@ -93,7 +93,7 @@ public class BitcoinURI {
public static final String FIELD_ADDRESS = "address"; public static final String FIELD_ADDRESS = "address";
public static final String FIELD_PAYMENT_REQUEST_URL = "r"; public static final String FIELD_PAYMENT_REQUEST_URL = "r";
public static final String BITCOIN_SCHEME = "bitcoin"; public static final String BITCOIN_SCHEME = "dogecoin";
private static final String ENCODED_SPACE_CHARACTER = "%20"; private static final String ENCODED_SPACE_CHARACTER = "%20";
private static final String AMPERSAND_SEPARATOR = "&"; private static final String AMPERSAND_SEPARATOR = "&";
private static final String QUESTION_MARK_SEPARATOR = "?"; private static final String QUESTION_MARK_SEPARATOR = "?";
@@ -144,10 +144,10 @@ public class BitcoinURI {
// the & (%26) in Tom and Jerry gets interpreted as a separator and the label then gets parsed // the & (%26) in Tom and Jerry gets interpreted as a separator and the label then gets parsed
// as 'Tom ' instead of 'Tom & Jerry') // as 'Tom ' instead of 'Tom & Jerry')
String schemeSpecificPart; String schemeSpecificPart;
if (input.startsWith("bitcoin://")) { if (input.startsWith("dogecoin://")) {
schemeSpecificPart = input.substring("bitcoin://".length()); schemeSpecificPart = input.substring("dogecoin://".length());
} else if (input.startsWith("bitcoin:")) { } else if (input.startsWith("dogecoin:")) {
schemeSpecificPart = input.substring("bitcoin:".length()); schemeSpecificPart = input.substring("dogecoin:".length());
} else { } else {
throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme()); throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme());
} }

6
core/src/main/java/com/dogecoin/dogecoinj/utils/BlockFileLoader.java
View File

@@ -53,11 +53,11 @@ public class BlockFileLoader implements Iterable<Block>, Iterator<Block> {
String defaultDataDir; String defaultDataDir;
String OS = System.getProperty("os.name").toLowerCase(); String OS = System.getProperty("os.name").toLowerCase();
if (OS.indexOf("win") >= 0) { if (OS.indexOf("win") >= 0) {
defaultDataDir = System.getenv("APPDATA") + "\\.bitcoin\\blocks\\"; defaultDataDir = System.getenv("APPDATA") + "\\.dogecoin\\blocks\\";
} else if (OS.indexOf("mac") >= 0 || (OS.indexOf("darwin") >= 0)) { } else if (OS.indexOf("mac") >= 0 || (OS.indexOf("darwin") >= 0)) {
defaultDataDir = System.getProperty("user.home") + "/Library/Application Support/Bitcoin/blocks/"; defaultDataDir = System.getProperty("user.home") + "/Library/Application Support/Dogecoin/blocks/";
} else { } else {
defaultDataDir = System.getProperty("user.home") + "/.bitcoin/blocks/"; defaultDataDir = System.getProperty("user.home") + "/.dogecoin/blocks/";
} }
List<File> list = new LinkedList<File>(); List<File> list = new LinkedList<File>();

2
core/src/main/java/com/dogecoin/dogecoinj/wallet/DefaultCoinSelector.java
View File

@@ -88,6 +88,6 @@ public class DefaultCoinSelector implements CoinSelector {
confidence.getSource().equals(TransactionConfidence.Source.SELF) && confidence.getSource().equals(TransactionConfidence.Source.SELF) &&
// In regtest mode we expect to have only one peer, so we won't see transactions propagate. // In regtest mode we expect to have only one peer, so we won't see transactions propagate.
// TODO: The value 1 below dates from a time when transactions we broadcast *to* were counted, set to 0 // TODO: The value 1 below dates from a time when transactions we broadcast *to* were counted, set to 0
(confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get()); (confidence.numBroadcastPeers() > 1 ); //|| tx.getParams() == RegTestParams.get());
} }
} }