Merge pull request #255 from bhandras/htlc_v2

preliminary work for integrating the v2 HTLC script

Author: bhandras

client.go

@@ -175,9 +175,9 @@ func (s *Client) FetchSwaps() ([]*SwapInfo, error) {
 
 	for _, swp := range loopOutSwaps {
 		htlc, err := swap.NewHtlc(
-			swp.Contract.CltvExpiry, swp.Contract.SenderKey,
-			swp.Contract.ReceiverKey, swp.Hash, swap.HtlcP2WSH,
-			s.lndServices.ChainParams,
+			swap.HtlcV1, swp.Contract.CltvExpiry,
+			swp.Contract.SenderKey, swp.Contract.ReceiverKey,
+			swp.Hash, swap.HtlcP2WSH, s.lndServices.ChainParams,
 		)
 		if err != nil {
 			return nil, err
@@ -195,18 +195,18 @@ func (s *Client) FetchSwaps() ([]*SwapInfo, error) {
 
 	for _, swp := range loopInSwaps {
 		htlcNP2WSH, err := swap.NewHtlc(
-			swp.Contract.CltvExpiry, swp.Contract.SenderKey,
-			swp.Contract.ReceiverKey, swp.Hash, swap.HtlcNP2WSH,
-			s.lndServices.ChainParams,
+			swap.HtlcV1, swp.Contract.CltvExpiry,
+			swp.Contract.SenderKey, swp.Contract.ReceiverKey,
+			swp.Hash, swap.HtlcNP2WSH, s.lndServices.ChainParams,
 		)
 		if err != nil {
 			return nil, err
 		}
 
 		htlcP2WSH, err := swap.NewHtlc(
-			swp.Contract.CltvExpiry, swp.Contract.SenderKey,
-			swp.Contract.ReceiverKey, swp.Hash, swap.HtlcP2WSH,
-			s.lndServices.ChainParams,
+			swap.HtlcV1, swp.Contract.CltvExpiry,
+			swp.Contract.SenderKey, swp.Contract.ReceiverKey,
+			swp.Hash, swap.HtlcP2WSH, s.lndServices.ChainParams,
 		)
 		if err != nil {
 			return nil, err

loopd/view.go

@@ -50,6 +50,7 @@ func viewOut(swapClient *loop.Client, chainParams *chaincfg.Params) error {
 
 	for _, s := range swaps {
 		htlc, err := swap.NewHtlc(
+			swap.HtlcV1,
 			s.Contract.CltvExpiry,
 			s.Contract.SenderKey,
 			s.Contract.ReceiverKey,
@@ -101,6 +102,7 @@ func viewIn(swapClient *loop.Client, chainParams *chaincfg.Params) error {
 
 	for _, s := range swaps {
 		htlc, err := swap.NewHtlc(
+			swap.HtlcV1,
 			s.Contract.CltvExpiry,
 			s.Contract.SenderKey,
 			s.Contract.ReceiverKey,

loopin.go

@@ -756,12 +756,13 @@ func (s *loopInSwap) publishTimeoutTx(ctx context.Context,
 	}
 
 	witnessFunc := func(sig []byte) (wire.TxWitness, error) {
-		return s.htlc.GenTimeoutWitness(sig)
+		return s.htlc.GenTimeoutWitness(sig), nil
 	}
 
+	sequence := uint32(0)
 	timeoutTx, err := s.sweeper.CreateSweepTx(
-		ctx, s.height, s.htlc, *htlcOutpoint, s.SenderKey, witnessFunc,
-		htlcValue, fee, s.timeoutAddr,
+		ctx, s.height, sequence, s.htlc, *htlcOutpoint, s.SenderKey,
+		witnessFunc, htlcValue, fee, s.timeoutAddr,
 	)
 	if err != nil {
 		return err

loopin_test.go

@@ -331,8 +331,9 @@ func testLoopInResume(t *testing.T, state loopdb.SwapState, expired bool) {
 	}
 
 	htlc, err := swap.NewHtlc(
-		contract.CltvExpiry, contract.SenderKey, contract.ReceiverKey,
-		testPreimage.Hash(), swap.HtlcNP2WSH, cfg.lnd.ChainParams,
+		swap.HtlcV1, contract.CltvExpiry, contract.SenderKey,
+		contract.ReceiverKey, testPreimage.Hash(), swap.HtlcNP2WSH,
+		cfg.lnd.ChainParams,
 	)
 	if err != nil {
 		t.Fatal(err)

loopout.go

@@ -937,8 +937,8 @@ func (s *loopOutSwap) sweep(ctx context.Context,
 
 	// Create sweep tx.
 	sweepTx, err := s.sweeper.CreateSweepTx(
-		ctx, s.height, s.htlc, htlcOutpoint, s.ReceiverKey, witnessFunc,
-		htlcValue, fee, s.DestAddr,
+		ctx, s.height, s.htlc.SuccessSequence(), s.htlc, htlcOutpoint,
+		s.ReceiverKey, witnessFunc, htlcValue, fee, s.DestAddr,
 	)
 	if err != nil {
 		return err

swap.go

@@ -51,7 +51,7 @@ func newSwapKit(hash lntypes.Hash, swapType swap.Type, cfg *swapConfig,
 // getHtlc composes and returns the on-chain swap script.
 func (s *swapKit) getHtlc(outputType swap.HtlcOutputType) (*swap.Htlc, error) {
 	return swap.NewHtlc(
-		s.contract.CltvExpiry, s.contract.SenderKey,
+		swap.HtlcV1, s.contract.CltvExpiry, s.contract.SenderKey,
 		s.contract.ReceiverKey, s.hash, outputType,
 		s.swapConfig.lnd.ChainParams,
 	)