network id and user agent

.gitignore

@@ -6,3 +6,5 @@ target
 *.iml
 *.chain
 *.spvchain
+checkpoints
+checkpoints.txt

core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.ferritej</groupId>
         <artifactId>ferritej-parent</artifactId>
-        <version>0.14.2</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>ferritej-core</artifactId>

core/src/main/java/org/bitcoinj/core/NetworkParameters.java

@@ -52,13 +52,13 @@ public abstract class NetworkParameters {
     public static final byte[] SATOSHI_KEY = Utils.HEX.decode("04fc9702847840aaf195de8442ebecedf5b095cdbb9bc716bda9110971b28a49e0ead8564ff0db22209e0374782c093bb899692d524e9d6a6956e7c5ecbcd68284");
     // Alert: removed from Bitcoin Core since March 2016 - 1AGRxqDa5WjUKBwHB9XYEjmkv1ucoUUy1s
     /** The string returned by getId() for the main, production network where people trade things. */
-    public static final String ID_MAINNET = "org.bitcoin.production";
+    public static final String ID_MAINNET = "org.ferrite.production";
     /** The string returned by getId() for the testnet. */
-    public static final String ID_TESTNET = "org.bitcoin.test";
+    public static final String ID_TESTNET = "org.ferrite.test";
     /** The string returned by getId() for regtest mode. */
-    public static final String ID_REGTEST = "org.bitcoin.regtest";
+    public static final String ID_REGTEST = "org.ferrite.regtest";
     /** Unit test network. */
-    public static final String ID_UNITTESTNET = "org.bitcoinj.unittest";
+    public static final String ID_UNITTESTNET = "org.ferritej.unittest";
 
     /** The string used by the payment protocol to represent the main net. */
     public static final String PAYMENT_PROTOCOL_ID_MAINNET = "main";

core/src/main/java/org/bitcoinj/core/VersionMessage.java

@@ -78,9 +78,9 @@ public class VersionMessage extends Message {
     public boolean relayTxesBeforeFilter;
 
     /** The version of this library release, as a string. */
-    public static final String BITCOINJ_VERSION = "0.14.2";
+    public static final String BITCOINJ_VERSION = "1.0.0";
     /** The value that is prepended to the subVer field of this application. */
-    public static final String LIBRARY_SUBVER = "/bitcoinj:" + BITCOINJ_VERSION + "/";
+    public static final String LIBRARY_SUBVER = "/FerriteJ:" + BITCOINJ_VERSION + "/";
 
     public VersionMessage(NetworkParameters params, byte[] payload) throws ProtocolException {
         super(params, payload, 0);

core/src/main/java/org/bitcoinj/script/ScriptBuilder.java

@@ -433,7 +433,7 @@ public static Script createRedeemScript(int threshold, List<ECKey> pubkeys) {
      * the ledger.
      */
     public static Script createOpReturnScript(byte[] data) {
-        checkArgument(data.length <= 40);
+        checkArgument(data.length <= 80);
         return new ScriptBuilder().op(OP_RETURN).data(data).build();
     }
 

core/src/main/java/org/bitcoinj/wallet/Wallet.java

@@ -5068,7 +5068,9 @@ public void setTransactionBroadcaster(@Nullable org.bitcoinj.core.TransactionBro
         // Don't hold the wallet lock whilst doing this, so if the broadcaster accesses the wallet at some point there
         // is no inversion.
         for (Transaction tx : toBroadcast) {
-            checkState(tx.getConfidence().getConfidenceType() == ConfidenceType.PENDING);
+            ConfidenceType confidenceType = tx.getConfidence().getConfidenceType();
+            checkState(confidenceType == ConfidenceType.PENDING || confidenceType == ConfidenceType.IN_CONFLICT,
+                    "Expected PENDING or IN_CONFLICT, was %s.", confidenceType);
             // Re-broadcast even if it's marked as already seen for two reasons
             // 1) Old wallets may have transactions marked as broadcast by 1 peer when in reality the network
             //    never saw it, due to bugs.

core/src/test/java/org/bitcoinj/wallet/WalletTest.java

@@ -2167,6 +2167,17 @@ public void opReturnOneOutputTest() throws Exception {
         wallet.completeTx(request);
     }
 
+    @Test
+    public void opReturnMaxBytes() throws Exception {
+        receiveATransaction(wallet, myAddress);
+        Transaction tx = new Transaction(PARAMS);
+        Script script = ScriptBuilder.createOpReturnScript(new byte[80]);
+        tx.addOutput(Coin.ZERO, script);
+        SendRequest request = SendRequest.forTx(tx);
+        request.ensureMinRequiredFee = true;
+        wallet.completeTx(request);
+    }
+
     @Test
     public void opReturnOneOutputWithValueTest() throws Exception {
         // Tests basic send of transaction with one output that destroys coins and has an OP_RETURN.

examples/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.ferritej</groupId>
         <artifactId>ferritej-parent</artifactId>
-        <version>0.14.2</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.ferritej</groupId>
   <artifactId>ferritej-parent</artifactId>
-  <version>0.14.2</version>
+  <version>1.0.0</version>
   <packaging>pom</packaging>
 
   <modules>

tools/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.ferritej</groupId>
     <artifactId>ferritej-parent</artifactId>
-    <version>0.14.2</version>
+    <version>1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

wallettemplate/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ferritej</groupId>
         <artifactId>ferritej-parent</artifactId>
-        <version>0.14.2</version>
+        <version>1.0.0</version>
     </parent>
 
     <artifactId>wallettemplate</artifactId>