mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-14 03:48:13 +01:00
Code Issues Projects Releases Wiki Activity

now using bitcoinj 0.15-ACINQ-rc6, back to SNAPSHOT

Browse source
This commit is contained in:
pm47 2017-08-24 17:05:02 +02:00
parent 368ee7b9a8
commit 5a18cedd3e
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eclair-core/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-spv-e</version>
<version>0.2-spv-SNAPSHOT</version>
</parent>
<artifactId>eclair-core_2.11</artifactId>
@ -143,7 +143,7 @@
<dependency>
<groupId>org.bitcoinj</groupId>
<artifactId>bitcoinj-core</artifactId>
<version>0.15-A5-a5</version>
<version>${bitcoinj.version}</version>
</dependency>
<!-- SERIALIZATION -->
<dependency>

2
eclair-core/src/main/scala/fr/acinq/eclair/blockchain/spv/BitcoinjKit.scala
View file

@ -20,7 +20,7 @@ import scala.concurrent.Promise
/**
* Created by PM on 09/07/2017.
*/
class BitcoinjKit(chain: String, datadir: File)(implicit system: ActorSystem) extends WalletAppKit(chain2Params(chain), datadir, "bitcoinj") with Logging {
class BitcoinjKit(chain: String, datadir: File)(implicit system: ActorSystem) extends WalletAppKit(chain2Params(chain), datadir, "bitcoinj", true) with Logging {
// tells us when the peerGroup/chain/wallet are accessible
private val initializedPromise = Promise[Boolean]()

5
eclair-core/src/main/scala/fr/acinq/eclair/blockchain/wallet/BitcoinjWallet.scala
View file

@ -1,10 +1,9 @@
package fr.acinq.eclair.blockchain.wallet
import fr.acinq.bitcoin.{Base58, Base58Check, BinaryData, Satoshi, Transaction}
import fr.acinq.bitcoin.{BinaryData, Satoshi, Transaction}
import grizzled.slf4j.Logging
import org.bitcoinj.core.{Coin, Transaction => BitcoinjTransaction}
import org.bitcoinj.script.Script
import org.bitcoinj.wallet.KeyChain.KeyPurpose
import org.bitcoinj.wallet.{SendRequest, Wallet}
import scala.collection.JavaConversions._
@ -19,7 +18,7 @@ class BitcoinjWallet(fWallet: Future[Wallet])(implicit ec: ExecutionContext) ext
override def getFinalAddress: Future[String] = for {
wallet <- fWallet
} yield Base58Check.encode(Base58.Prefix.ScriptAddressTestnet, wallet.freshSegwitAddress(KeyPurpose.RECEIVE_FUNDS).getHash160)
} yield wallet.currentReceiveAddress().toString
override def makeFundingTx(pubkeyScript: BinaryData, amount: Satoshi, feeRatePerKw: Long): Future[MakeFundingTxResponse] = for {
wallet <- fWallet

2
eclair-node-gui/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-spv-e</version>
<version>0.2-spv-SNAPSHOT</version>
</parent>
<artifactId>eclair-node-gui_2.11</artifactId>

2
eclair-node/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-spv-e</version>
<version>0.2-spv-SNAPSHOT</version>
</parent>
<artifactId>eclair-node_2.11</artifactId>

3
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>fr.acinq.eclair</groupId>
<artifactId>eclair_2.11</artifactId>
<version>0.2-spv-e</version>
<version>0.2-spv-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@ -48,6 +48,7 @@
<scala.version.short>2.11</scala.version.short>
<akka.version>2.4.18</akka.version>
<bitcoinlib.version>0.9.13</bitcoinlib.version>
<bitcoinj.version>0.15-ACINQ-rc6</bitcoinj.version>
</properties>
<build>