mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-19 18:10:42 +01:00
Code Issues Projects Releases Wiki Activity

fix final tx

Browse Source
This commit is contained in:
sstone 2016-02-08 00:02:07 +01:00
parent bdbd733e16
commit 74130c66d5
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclair-demo/src/main/scala/fr/acinq/eclair/Boot.scala
View File

@ -27,7 +27,7 @@ object Boot extends App with Logging {
val config = ConfigFactory.load()
val testnet = Await.result(bitcoin_client.invoke("getinfo").map(json => (json \ "testnet").extract[Boolean]), 10 seconds)
assert(testnet, "you should be on testnet")
//assert(testnet, "you should be on testnet")
val blockchain = system.actorOf(Props(new PollingWatcher(bitcoin_client)), name = "blockchain")
val register = system.actorOf(Props[RegisterActor], name = "register")

1
eclair-demo/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View File

@ -253,6 +253,7 @@ class Channel(val blockchain: ActorRef, val params: OurChannelParams, val anchor
when(OPEN_WAIT_FOR_OPEN_WITHANCHOR) {
case Event(open_channel(delay, theirRevocationHash, commitKey, finalKey, WONT_CREATE_ANCHOR, minDepth, commitmentFee), DATA_OPEN_WAIT_FOR_OPEN_WITHANCHOR(ourParams, anchorInput)) =>
val theirParams = TheirChannelParams(delay, commitKey, finalKey, minDepth, commitmentFee)
log.debug(s"their params: $theirParams")
Anchor.makeAnchorTx(Globals.bitcoin_client, ourCommitPubKey, theirParams.commitPubKey, anchorInput.amount).pipeTo(self)
stay using DATA_OPEN_WITH_ANCHOR_WAIT_FOR_ANCHOR(ourParams, theirParams, theirRevocationHash)

25
eclair-demo/src/main/scala/fr/acinq/eclair/channel/Scripts.scala
View File

@ -48,14 +48,9 @@ object Scripts {
//TODO : this function does not handle the case where the anchor tx does not spend all previous tx output (meaning there is change)
def makeAnchorTx(pubkey1: BinaryData, pubkey2: BinaryData, amount: Long, previousTxOutput: OutPoint, signData: SignData): (Transaction, Int) = {
val scriptPubKey = if (isLess(pubkey1, pubkey2))
Script.createMultiSigMofN(2, Seq(pubkey1, pubkey2))
else
Script.createMultiSigMofN(2, Seq(pubkey2, pubkey1))
val tx = Transaction(version = 1,
txIn = TxIn(outPoint = previousTxOutput, signatureScript = Array.emptyByteArray, sequence = 0xffffffffL) :: Nil,
txOut = TxOut(amount, publicKeyScript = OP_HASH160 :: OP_PUSHDATA(hash160(scriptPubKey)) :: OP_EQUAL :: Nil) :: Nil,
txOut = TxOut(amount, publicKeyScript = pay2sh(multiSig2of2(pubkey1, pubkey2))) :: Nil,
lockTime = 0)
val signedTx = Transaction.sign(tx, Seq(signData))
// we don't permute outputs because by convention the multisig output has index = 0
@ -135,13 +130,14 @@ object Scripts {
}
/**
* This is a simple tx with a multisig input and two pay2pk output
* This is a simple tx with a multisig input and two pay2sh output
*
* @param inputs
* @param ourFinalKey
* @param theirFinalKey
* @param channelState
* @return
* @param inputs inputs to include in the tx. In most cases, there's only one input that points to the output of
* the anchor tx
* @param ourFinalKey our final public key
* @param theirFinalKey their final public key
* @param channelState channel state
* @return an unsigned "final" tx
*/
def makeFinalTx(inputs: Seq[TxIn], ourFinalKey: BinaryData, theirFinalKey: BinaryData, channelState: ChannelState): Transaction = {
// TODO : is this the proper behaviour ?
@ -150,8 +146,9 @@ object Scripts {
version = 1,
txIn = inputs,
txOut = Seq(
TxOut(amount = channelState.them.pay_msat / 1000, publicKeyScript = OP_DUP :: OP_HASH160 :: OP_PUSHDATA(theirFinalKey) :: OP_EQUALVERIFY :: OP_CHECKSIG :: Nil),
TxOut(amount = channelState.us.pay_msat / 1000, publicKeyScript = OP_DUP :: OP_HASH160 :: OP_PUSHDATA(ourFinalKey) :: OP_EQUALVERIFY :: OP_CHECKSIG :: Nil)),
TxOut(amount = channelState.them.pay_msat / 1000, publicKeyScript = pay2sh(OP_PUSHDATA(theirFinalKey) :: OP_CHECKSIG :: Nil)),
TxOut(amount = channelState.us.pay_msat / 1000, publicKeyScript = pay2sh(OP_PUSHDATA(ourFinalKey) :: OP_CHECKSIG :: Nil))
),
lockTime = 0))
}