Merge branch 'BTC-ACCT' into launch

This commit is contained in:
catbref
2020-05-01 10:09:54 +01:00
66 changed files with 6963 additions and 559 deletions

View File

@@ -6,9 +6,10 @@
<version>1.0.7</version>
<packaging>jar</packaging>
<properties>
<bitcoin.version>0.15.4</bitcoin.version>
<bitcoinj.version>0.15.5</bitcoinj.version>
<bouncycastle.version>1.64</bouncycastle.version>
<build.timestamp>${maven.build.timestamp}</build.timestamp>
<ciyam-at.version>1.3.4</ciyam-at.version>
<commons-net.version>3.6</commons-net.version>
<commons-text.version>1.8</commons-text.version>
<dagger.version>1.2.2</dagger.version>
@@ -405,14 +406,14 @@
<!-- CIYAM AT (automated transactions) -->
<dependency>
<groupId>org.ciyam</groupId>
<artifactId>at</artifactId>
<version>1.0</version>
<artifactId>AT</artifactId>
<version>${ciyam-at.version}</version>
</dependency>
<!-- Bitcoin support -->
<dependency>
<groupId>org.bitcoinj</groupId>
<artifactId>bitcoinj-core</artifactId>
<version>${bitcoin.version}</version>
<version>${bitcoinj.version}</version>
</dependency>
<!-- Utilities -->
<dependency>