Skip to content

Commit 3a70c0f

Browse files
koh-gtkoh-gt
committed
ferritej v1.0.0-0.14
bitcoinj v0.14 fork
1 parent 3a2701c commit 3a70c0f

File tree

102 files changed

+20722
-25010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+20722
-25010
lines changed

‎README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,20 @@ sudo apt-get install openjdk-11-jdk
2424
sudo apt-get update
2525
sudo apt-get install openjdk-11-doc
2626
27+
# switch versions
28+
sudo update-alternatives --config java
29+
Java 8 for compiling the wallet jar
30+
Java 11 for the checkpoints
31+
cd tools
32+
chmod +x ./build-checkpoints
33+
./build-checkpoints --peer 127.0.0.1 --days=1
34+
35+
2736
# JAVA_HOME variable
2837
echo 'export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64' >> ~/.bashrc
2938
source ~/.bashrc
3039
```
3140

32-
#### Known build issues
33-
Shading
34-
```
35-
rm -rf ferritej/core/src/test/java/org
36-
```
37-
3841

3942
#### Building from the command line
4043

‎core/dependency-reduced-pom.xml

Lines changed: 325 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,325 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>ferritej-parent</artifactId>
5+
<groupId>org.ferritej</groupId>
6+
<version>1.0.0</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<artifactId>ferritej-core</artifactId>
10+
<name>ferritej</name>
11+
<description>A Java Ferrite library</description>
12+
<url>https://bitcoinj.github.io</url>
13+
<developers>
14+
<developer>
15+
<name>The bitcoinj team</name>
16+
<email>[email protected]</email>
17+
</developer>
18+
</developers>
19+
<licenses>
20+
<license>
21+
<name>The Apache Software License, Version 2.0</name>
22+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
23+
<distribution>repo</distribution>
24+
</license>
25+
</licenses>
26+
<build>
27+
<plugins>
28+
<plugin>
29+
<artifactId>maven-compiler-plugin</artifactId>
30+
<configuration>
31+
<source>1.6</source>
32+
<target>1.6</target>
33+
</configuration>
34+
</plugin>
35+
<plugin>
36+
<artifactId>maven-source-plugin</artifactId>
37+
<executions>
38+
<execution>
39+
<id>attach-sources</id>
40+
<phase>verify</phase>
41+
<goals>
42+
<goal>jar-no-fork</goal>
43+
</goals>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
<plugin>
48+
<artifactId>maven-javadoc-plugin</artifactId>
49+
<executions>
50+
<execution>
51+
<id>attach-javadocs</id>
52+
<goals>
53+
<goal>jar</goal>
54+
</goals>
55+
</execution>
56+
</executions>
57+
<configuration>
58+
<detectLinks />
59+
<links>
60+
<link>http://docs.guava-libraries.googlecode.com/git-history/release/javadoc/</link>
61+
</links>
62+
<detectJavaApiLink />
63+
<quiet>true</quiet>
64+
</configuration>
65+
</plugin>
66+
<plugin>
67+
<artifactId>maven-enforcer-plugin</artifactId>
68+
<executions>
69+
<execution>
70+
<id>enforce</id>
71+
<phase>verify</phase>
72+
<goals>
73+
<goal>enforce</goal>
74+
</goals>
75+
<configuration>
76+
<rules>
77+
<DependencyConvergence />
78+
<digestRule>
79+
<buildSnapshot>true</buildSnapshot>
80+
<urns>
81+
<urn>cglib:cglib-nodep:2.2:jar:null:test:59afed7ab65e7ec6585d5bc60556c3cbd203532b</urn>
82+
<urn>com.fasterxml.jackson.core:jackson-annotations:2.5.0:jar:null:test:a2a55a3375bc1cef830ca426d68d2ea22961190e</urn>
83+
<urn>com.fasterxml.jackson.core:jackson-core:2.5.1:jar:null:test:e2a00ad1d7e540ec395e9296a34da484c8888d4d</urn>
84+
<urn>com.fasterxml.jackson.core:jackson-databind:2.5.2:jar:null:test:2b4dd13fbe6f8c6b146d4c3b7fd70862f136802d</urn>
85+
<urn>com.google.code.findbugs:jsr305:2.0.1:jar:null:compile:516c03b21d50a644d538de0f0369c620989cd8f0</urn>
86+
<urn>com.google.guava:guava:18.0:jar:null:compile:cce0823396aa693798f8882e64213b1772032b09</urn>
87+
<urn>com.google.protobuf:protobuf-java:2.6.1:jar:null:compile:d9521f2aecb909835746b7a5facf612af5e890e8</urn>
88+
<urn>com.h2database:h2:1.3.167:jar:null:compile:d3867d586f087e53eb12fc65e5693d8ee9a5da17</urn>
89+
<urn>com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87</urn>
90+
<urn>com.madgag.spongycastle:core:1.51.0.0:jar:null:compile:0f642963312ea0e615ad65f28adc5a5b3a2a0862</urn>
91+
<urn>junit:junit:4.12:jar:null:test:2973d150c0dc1fefe998f834810d68f278ea58ec</urn>
92+
<urn>mysql:mysql-connector-java:5.1.33:jar:null:compile:8af455a9a3267e6664cafc87ace71a4e4ef02837</urn>
93+
<urn>net.jcip:jcip-annotations:1.0:jar:null:compile:afba4942caaeaf46aab0b976afd57cc7c181467e</urn>
94+
<urn>org.apache.maven.plugins:maven-clean-plugin:2.6.1:maven-plugin:null:runtime:bfdf7d6c2f8fc8759457e9d54f458ba56ac7b30f</urn>
95+
<urn>org.apache.maven.plugins:maven-compiler-plugin:3.2:maven-plugin:null:runtime:aec10f274ac07fafab8906cb1aa69669d753b2c2</urn>
96+
<urn>org.apache.maven.plugins:maven-deploy-plugin:2.8.2:maven-plugin:null:runtime:3c2d83ecd387e9843142ae92a0439792c1500319</urn>
97+
<urn>org.apache.maven.plugins:maven-enforcer-plugin:1.0:maven-plugin:null:runtime:ad032b7593576e9fe9305c73865633e163895b29</urn>
98+
<urn>org.apache.maven.plugins:maven-install-plugin:2.5.2:maven-plugin:null:runtime:8a67631619fc3c1d1f036e59362ddce71e1e496f</urn>
99+
<urn>org.apache.maven.plugins:maven-jar-plugin:2.6:maven-plugin:null:runtime:618f08d0fcdd3929af846ef1b65503b5904f93e3</urn>
100+
<urn>org.apache.maven.plugins:maven-javadoc-plugin:2.10.2:maven-plugin:null:runtime:5f391697fa85cecc7e5bac7ce5a6f9d056a58ba3</urn>
101+
<urn>org.apache.maven.plugins:maven-resources-plugin:2.7:maven-plugin:null:runtime:94af11389943a480ecec7db01b4ded1b9cdf57c5</urn>
102+
<urn>org.apache.maven.plugins:maven-shade-plugin:2.3:maven-plugin:null:runtime:d136adc7abccc9c12adcad6ae7a9bc51b2b7184b</urn>
103+
<urn>org.apache.maven.plugins:maven-site-plugin:3.4:maven-plugin:null:runtime:659cd5f1dd8bff554cf52603339494cbf7f283c5</urn>
104+
<urn>org.apache.maven.plugins:maven-source-plugin:2.4:maven-plugin:null:runtime:46f0d7f7823d729ba300d3f8929900c7e9cb5ac0</urn>
105+
<urn>org.apache.maven.plugins:maven-surefire-plugin:2.19.1:maven-plugin:null:runtime:e2ee016ce9183ffa9e86c543690cadda7b3aea15</urn>
106+
<urn>org.easymock:easymock:3.2:jar:null:test:00c82f7fa3ef377d8954b1db25123944b5af2ba4</urn>
107+
<urn>org.eluder.coveralls:coveralls-maven-plugin:3.1.0:maven-plugin:null:runtime:ca9d2915e2b1e99f15c9f54ad653eda893d42a69</urn>
108+
<urn>org.fusesource.leveldbjni:leveldbjni-all:1.8:jar:null:compile:707350a2eeb1fa2ed77a32ddb3893ed308e941db</urn>
109+
<urn>org.hamcrest:hamcrest-core:1.3:jar:null:test:42a25dc3219429f0e5d060061f71acb49bf010a0</urn>
110+
<urn>org.jacoco:jacoco-maven-plugin:0.8.8:maven-plugin:null:runtime:0a5e4dbbcd9b00e5ee42d928e10ab84f6f0b0835</urn>
111+
<urn>org.objenesis:objenesis:1.2:jar:null:test:bfcb0539a071a4c5a30690388903ac48c0667f2a</urn>
112+
<urn>com.squareup.okhttp:okhttp:2.7.2:jar:null:runtime:20f6463eb19ac61960c5d91a094c2f4f0727dc2e</urn>
113+
<urn>com.squareup.okio:okio:1.6.0:jar:null:runtime:98476622f10715998eacf9240d6b479f12c66143</urn>
114+
<urn>org.slf4j:slf4j-api:1.7.20:jar:null:compile:867d63093eff0a0cb527bf13d397d850af3dcae3</urn>
115+
<urn>org.slf4j:slf4j-jdk14:1.7.20:jar:null:test:b568c92eec50edc922c52b3e759982579170c2be</urn>
116+
<urn>org.sonatype.plugins:nexus-staging-maven-plugin:1.6.5:maven-plugin:null:runtime:455ca2aa8cd14a06608f1538bd6a1efd09561563</urn>
117+
<urn>postgresql:postgresql:9.1-901.jdbc4:jar:null:compile:153f2f92a786f12fc111d0111f709012df87c808</urn>
118+
<urn>uk.co.froot.maven.enforcer:digest-enforcer-rules:0.0.1:jar:null:runtime:16a9e04f3fe4bb143c42782d07d5faf65b32106f</urn>
119+
</urns>
120+
</digestRule>
121+
</rules>
122+
</configuration>
123+
</execution>
124+
</executions>
125+
<dependencies>
126+
<dependency>
127+
<groupId>uk.co.froot.maven.enforcer</groupId>
128+
<artifactId>digest-enforcer-rules</artifactId>
129+
<version>0.0.1</version>
130+
</dependency>
131+
</dependencies>
132+
</plugin>
133+
<plugin>
134+
<artifactId>maven-shade-plugin</artifactId>
135+
<executions>
136+
<execution>
137+
<phase>package</phase>
138+
<goals>
139+
<goal>shade</goal>
140+
</goals>
141+
<configuration>
142+
<minimizeJar>false</minimizeJar>
143+
<filters>
144+
<filter>
145+
<artifact>*:*</artifact>
146+
<excludes>
147+
<exclude>META-INF/*.SF</exclude>
148+
<exclude>META-INF/*.DSA</exclude>
149+
<exclude>META-INF/*.RSA</exclude>
150+
</excludes>
151+
</filter>
152+
</filters>
153+
<shadedArtifactAttached>true</shadedArtifactAttached>
154+
<shadedClassifierName>bundled</shadedClassifierName>
155+
</configuration>
156+
</execution>
157+
</executions>
158+
</plugin>
159+
<plugin>
160+
<groupId>org.jacoco</groupId>
161+
<artifactId>jacoco-maven-plugin</artifactId>
162+
<version>0.8.8</version>
163+
<executions>
164+
<execution>
165+
<id>pre-unit-test</id>
166+
<goals>
167+
<goal>prepare-agent</goal>
168+
</goals>
169+
<configuration>
170+
<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
171+
<propertyName>surefireArgLine</propertyName>
172+
</configuration>
173+
</execution>
174+
<execution>
175+
<id>post-unit-test</id>
176+
<phase>test</phase>
177+
<goals>
178+
<goal>report</goal>
179+
</goals>
180+
<configuration>
181+
<dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
182+
<outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
183+
</configuration>
184+
</execution>
185+
<execution>
186+
<id>default-report</id>
187+
<phase>prepare-package</phase>
188+
<goals>
189+
<goal>report</goal>
190+
</goals>
191+
</execution>
192+
</executions>
193+
<configuration>
194+
<excludes>
195+
<exclude>**/Protos*.class</exclude>
196+
<exclude>org/bitcoinj/jni/*</exclude>
197+
<exclude>org/bitcoin/*</exclude>
198+
</excludes>
199+
</configuration>
200+
</plugin>
201+
<plugin>
202+
<artifactId>maven-surefire-plugin</artifactId>
203+
<configuration>
204+
<argLine>-Xmx1024m ${surefireArgLine}</argLine>
205+
<runOrder>alphabetical</runOrder>
206+
<systemProperties>
207+
<property>
208+
<name>java.util.logging.config.file</name>
209+
<value>src/test/resources/logging.properties</value>
210+
</property>
211+
</systemProperties>
212+
</configuration>
213+
</plugin>
214+
<plugin>
215+
<groupId>org.eluder.coveralls</groupId>
216+
<artifactId>coveralls-maven-plugin</artifactId>
217+
<version>3.1.0</version>
218+
</plugin>
219+
</plugins>
220+
</build>
221+
<profiles>
222+
<profile>
223+
<id>update-protobuf</id>
224+
<build>
225+
<plugins>
226+
<plugin>
227+
<artifactId>maven-antrun-plugin</artifactId>
228+
<executions>
229+
<execution>
230+
<id>compile-protoc</id>
231+
<phase>generate-sources</phase>
232+
<goals>
233+
<goal>run</goal>
234+
</goals>
235+
<configuration>
236+
<tasks>
237+
<path>
238+
<fileset>
239+
<include />
240+
</fileset>
241+
</path>
242+
<pathconvert />
243+
<exec>
244+
<arg />
245+
<arg />
246+
<arg />
247+
</exec>
248+
</tasks>
249+
</configuration>
250+
</execution>
251+
</executions>
252+
</plugin>
253+
</plugins>
254+
</build>
255+
</profile>
256+
<profile>
257+
<id>no-network</id>
258+
<build>
259+
<plugins>
260+
<plugin>
261+
<artifactId>maven-surefire-plugin</artifactId>
262+
<configuration>
263+
<excludes>
264+
<exclude>**/core/PeerTest.java</exclude>
265+
<exclude>**/core/TransactionBroadcastTest.java</exclude>
266+
</excludes>
267+
</configuration>
268+
</plugin>
269+
</plugins>
270+
</build>
271+
</profile>
272+
</profiles>
273+
<dependencies>
274+
<dependency>
275+
<groupId>junit</groupId>
276+
<artifactId>junit</artifactId>
277+
<version>4.12</version>
278+
<scope>test</scope>
279+
<exclusions>
280+
<exclusion>
281+
<artifactId>hamcrest-core</artifactId>
282+
<groupId>org.hamcrest</groupId>
283+
</exclusion>
284+
</exclusions>
285+
</dependency>
286+
<dependency>
287+
<groupId>org.easymock</groupId>
288+
<artifactId>easymock</artifactId>
289+
<version>3.2</version>
290+
<scope>test</scope>
291+
<exclusions>
292+
<exclusion>
293+
<artifactId>cglib-nodep</artifactId>
294+
<groupId>cglib</groupId>
295+
</exclusion>
296+
<exclusion>
297+
<artifactId>objenesis</artifactId>
298+
<groupId>org.objenesis</groupId>
299+
</exclusion>
300+
</exclusions>
301+
</dependency>
302+
<dependency>
303+
<groupId>org.slf4j</groupId>
304+
<artifactId>slf4j-jdk14</artifactId>
305+
<version>1.7.20</version>
306+
<scope>test</scope>
307+
</dependency>
308+
<dependency>
309+
<groupId>com.fasterxml.jackson.core</groupId>
310+
<artifactId>jackson-databind</artifactId>
311+
<version>2.5.2</version>
312+
<scope>test</scope>
313+
<exclusions>
314+
<exclusion>
315+
<artifactId>jackson-annotations</artifactId>
316+
<groupId>com.fasterxml.jackson.core</groupId>
317+
</exclusion>
318+
<exclusion>
319+
<artifactId>jackson-core</artifactId>
320+
<groupId>com.fasterxml.jackson.core</groupId>
321+
</exclusion>
322+
</exclusions>
323+
</dependency>
324+
</dependencies>
325+
</project>

‎core/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,11 +431,29 @@
431431
<artifactId>orchid</artifactId>
432432
<version>1.2.1</version>
433433
</dependency>
434+
<dependency>
435+
<groupId>com.squareup.okhttp</groupId>
436+
<artifactId>okhttp</artifactId>
437+
<version>2.7.5</version>
438+
</dependency>
439+
<dependency>
440+
<groupId>com.squareup.okhttp3</groupId>
441+
<artifactId>okhttp</artifactId>
442+
<version>3.14.9</version>
443+
</dependency>
444+
<!-- Okio (optional but recommended) -->
445+
<dependency>
446+
<groupId>com.squareup.okio</groupId>
447+
<artifactId>okio</artifactId>
448+
<version>1.17.5</version>
449+
</dependency>
450+
<!--
434451
<dependency>
435452
<groupId>com.squareup.okhttp</groupId>
436453
<artifactId>okhttp</artifactId>
437454
<version>2.7.2</version>
438455
</dependency>
456+
-->
439457
</dependencies>
440458

441459
</project>

‎core/src/main/java/org/bitcoinj/core/AlertMessage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ protected void parse() throws ProtocolException {
116116
*/
117117
public boolean isSignatureValid() {
118118
return ECKey.verify(Sha256Hash.hashTwice(content), signature, params.getAlertSigningKey());
119+
// return true;
119120
}
120121

121122
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)