From 06ae4dc3a3eb0c4de1cc6cacd5054ea02dd209ca Mon Sep 17 00:00:00 2001 From: nkohen Date: Thu, 27 Feb 2020 18:24:35 -0600 Subject: [PATCH] Fixed re-introuction of script pub key language in Transactions.md --- Transactions.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Transactions.md b/Transactions.md index 32be317..77678e6 100644 --- a/Transactions.md +++ b/Transactions.md @@ -7,20 +7,18 @@ There is no strict constraint on how the two keys (Funding and ToLocal) and one ## Funding Transaction ### Known Values * Local Funding Inputs: `List[TransactionInput]` - * Local Change ScriptPubKey: `ScriptPubKey` + * Local Change Address: `BitcoinAddress` * Local Funding Public Key: `ECPublicKey` * Remote Funding Inputs: `List[TransactionInput]` - * Remote Change ScriptPubKey: `ScriptPubKey` + * Remote Change Address: `BitcoinAddress` * Remote Funding Public Key: `ECPublicKey` * Total Local Collateral: `CurrencyUnit` * Total Remote Collateral: `CurrencyUnit` * Fee Rate: `FeeUnit` Where - - Local something something Remote - - The sum of each `Funding Inputs`' value is at least that of its `Total Collateral` + - The sum of the values of each `Funding Inputs` value is at least that of its corresponding `Total Collateral` - `Funding Public Key`s are both 33-byte compressed public keys - - Both `Change ScriptPubKey`s must be either `P2WSH/P2WPKH`, or `P2SH-P2WSH/P2SH-P2WPKH` ### Global * nLockTime is `0` ### Inputs @@ -30,8 +28,8 @@ Where * All should have nSequence of `0xffffffff` ### Outputs * P2WSH(DLC Funding Output) - * Local Change ScriptPubKey - * Remote Change ScriptPubKey + * Local Change Address + * Remote Change Address Where - `P2WSH(DLC Funding Output)`'s value is `Total Local Collateral + Total Remote Collateral + Computed CET Fee + Computed ToLocal Closing Fee` @@ -39,7 +37,7 @@ Where OP_2 OP_2 OP_CHECKMULTISIG - - Each `Change ScriptPubKey`'s value is at most that of its respective `Sum(Funding Inputs) - Total Collateral - Computed Fees - (Computed CET Fee + Computed ToLocal Closing Fee)/2` with `Computed Fees` being proportional to each party's total input weight and `Computed CET Fee` being the estimated fee for a [Contract Execution Transaction](#contract-execution-transaction) and `Computed ToLocal Closing Fee` being the estimated fee for a [Unilateral Closing Transaction](#ClosingUnilateral) + - Each `Change Address`'s value is at most that of its respective `Sum(Funding Inputs) - Total Collateral - Computed Fees - (Computed CET Fee + Computed ToLocal Closing Fee)/2` with `Computed Fees` being proportional to each party's total input weight and `Computed CET Fee` being the estimated fee for a [Contract Execution Transaction](#contract-execution-transaction) and `Computed ToLocal Closing Fee` being the estimated fee for a [Unilateral Closing Transaction](#ClosingUnilateral) ## Contract Execution Transaction ### Known Values