mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-22 22:25:26 +01:00
Code Issues Projects Releases Wiki Activity

funding: remove redundant address test

Browse source
This commit is contained in:
sstone 2017-04-24 18:05:02 +02:00 • committed by Pierre-Marie Padiou
parent 8589294933
commit 645cb657d5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eclair-node/src/main/scala/fr/acinq/eclair/blockchain/ExtendedBitcoinClient.scala
View file

@ -168,9 +168,9 @@ class ExtendedBitcoinClient(val client: BitcoinJsonRPCClient) {
JString(address) <- client.invoke("getnewaddress")
JString(wif) <- client.invoke("dumpprivkey", address)
JString(segwitAddress) <- client.invoke("addwitnessaddress", address)
priv = PrivateKey.fromBase58(wif, Base58.Prefix.SecretKeyTestnet)
(prefix, raw) = Base58Check.decode(wif)
priv = PrivateKey(raw, compressed = true)
pub = priv.publicKey
_ = require(segwitAddress == Base58Check.encode(Base58.Prefix.ScriptAddressTestnet, Crypto.hash160(Script.write(Script.pay2wpkh(priv.publicKey.hash160)))))
// create a tx that sends money to a P2SH(WPKH) output that matches our private key
parentFee = Satoshi(250 * 2 * 2 * feeRatePerKw / 1024)
partialParentTx = Transaction(version = 2, txIn = Nil, txOut = TxOut(amount + parentFee, Script.pay2sh(Script.pay2wpkh(pub))) :: Nil, lockTime = 0L)