Merge pull request #6775 from guggero/import-taproot-pubkey

Import Taproot pubkey
lightningnetwork · Aug 25, 2022 · cf9a986 · cf9a986
2 parents 2ad6b57 + 9fe97af
commit cf9a986
Show file tree

Hide file tree

Showing 23 changed files with 2,447 additions and 983 deletions.
diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md
@@ -23,6 +23,13 @@ transaction](https://github.com/lightningnetwork/lnd/pull/6730).
 
 * [Add list addresses RPC](https://github.com/lightningnetwork/lnd/pull/6596).
 
+## Wallet
+
+* [Allows Taproot public keys and tap scripts to be imported as watch-only
+  addresses into the internal
+  wallet](https://github.com/lightningnetwork/lnd/pull/6775). NOTE that funding
+  PSBTs from imported tap scripts is not currently possible.
+
 ## Build
 
 [The project has updated to Go

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.5
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
-	github.com/btcsuite/btcwallet v0.15.1
+	github.com/btcsuite/btcwallet v0.15.2-0.20220804001213-5aafe4789850
 	github.com/btcsuite/btcwallet/wallet/txauthor v1.2.3
 	github.com/btcsuite/btcwallet/wallet/txrules v1.2.0
 	github.com/btcsuite/btcwallet/walletdb v1.4.0

diff --git a/go.sum b/go.sum
@@ -97,8 +97,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtyd
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/btcwallet v0.15.1 h1:SKfh/l2Bgz9sJwHZvfiVbZ8Pl3N/8fFcWWXzsAPz9GU=
-github.com/btcsuite/btcwallet v0.15.1/go.mod h1:7OFsQ8ypiRwmr67hE0z98uXgJgXGAihE79jCib9x6ag=
+github.com/btcsuite/btcwallet v0.15.2-0.20220804001213-5aafe4789850 h1:yhtY53u3I6qT0yMJg35Yfa+yCVhvoqWWKTB2D2GBNJE=
+github.com/btcsuite/btcwallet v0.15.2-0.20220804001213-5aafe4789850/go.mod h1:7OFsQ8ypiRwmr67hE0z98uXgJgXGAihE79jCib9x6ag=
 github.com/btcsuite/btcwallet/wallet/txauthor v1.2.3 h1:M2yr5UlULvpqtxUqpMxTME/pA92Z9cpqeyvAFk9lAg0=
 github.com/btcsuite/btcwallet/wallet/txauthor v1.2.3/go.mod h1:T2xSiKGpUkSLCh68aF+FMXmKK9mFqNdHl9VaqOr+JjU=
 github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 h1:BtEN5Empw62/RVnZ0VcJaVtVlBijnLlJY+dwjAye2Bg=

diff --git a/input/taproot.go b/input/taproot.go
@@ -105,3 +105,33 @@ func TapscriptPartialReveal(internalKey *btcec.PublicKey,
 		RevealedScript: revealedLeaf.Script,
 	}
 }
+
+// TapscriptRootHashOnly creates a waddrmgr.Tapscript for the given internal key
+// and root hash.
+func TapscriptRootHashOnly(internalKey *btcec.PublicKey,
+	rootHash []byte) *waddrmgr.Tapscript {
+
+	controlBlock := &txscript.ControlBlock{
+		InternalKey: internalKey,
+	}
+
+	tapKey := txscript.ComputeTaprootOutputKey(internalKey, rootHash)
+	if tapKey.SerializeCompressed()[0] == PubKeyFormatCompressedOdd {
+		controlBlock.OutputKeyYIsOdd = true
+	}
+
+	return &waddrmgr.Tapscript{
+		Type:         waddrmgr.TaprootKeySpendRootHash,
+		ControlBlock: controlBlock,
+		RootHash:     rootHash,
+	}
+}
+
+// TapscriptFullKeyOnly creates a waddrmgr.Tapscript for the given full Taproot
+// key.
+func TapscriptFullKeyOnly(taprootKey *btcec.PublicKey) *waddrmgr.Tapscript {
+	return &waddrmgr.Tapscript{
+		Type:          waddrmgr.TaprootFullKeyOnly,
+		FullOutputKey: taprootKey,
+	}
+}
diff --git a/lnrpc/lightning.pb.go b/lnrpc/lightning.pb.go
diff --git a/lnrpc/lightning.proto b/lnrpc/lightning.proto
@@ -637,6 +637,7 @@ enum OutputScriptType {
     SCRIPT_TYPE_NULLDATA = 6;
     SCRIPT_TYPE_NON_STANDARD = 7;
     SCRIPT_TYPE_WITNESS_UNKNOWN = 8;
+    SCRIPT_TYPE_WITNESS_V1_TAPROOT = 9;
 }
 
 message OutputDetail {

diff --git a/lnrpc/lightning.swagger.json b/lnrpc/lightning.swagger.json
@@ -5611,7 +5611,8 @@
         "SCRIPT_TYPE_MULTISIG",
         "SCRIPT_TYPE_NULLDATA",
         "SCRIPT_TYPE_NON_STANDARD",
-        "SCRIPT_TYPE_WITNESS_UNKNOWN"
+        "SCRIPT_TYPE_WITNESS_UNKNOWN",
+        "SCRIPT_TYPE_WITNESS_V1_TAPROOT"
       ],
       "default": "SCRIPT_TYPE_PUBKEY_HASH"
     },

diff --git a/lnrpc/marshall_utils.go b/lnrpc/marshall_utils.go
@@ -167,6 +167,8 @@ func MarshallOutputType(o txscript.ScriptClass) OutputScriptType {
 		return OutputScriptType_SCRIPT_TYPE_NON_STANDARD
 	case txscript.WitnessUnknownTy:
 		return OutputScriptType_SCRIPT_TYPE_WITNESS_UNKNOWN
+	case txscript.WitnessV1TaprootTy:
+		return OutputScriptType_SCRIPT_TYPE_WITNESS_V1_TAPROOT
 	default:
 		return OutputScriptType_SCRIPT_TYPE_PUBKEY_HASH
 	}