Merge pull request #571 from bhandras/unrecorded-proto-version-fixup

bhandras · web-flow · commit 21c85bcfee60 · 2023-04-20T14:09:43.000+02:00
loop: correct htlc script version for very old swaps
diff --git a/swap.go b/swap.go
@@ -56,7 +56,9 @@ func GetHtlcScriptVersion(
 	protocolVersion loopdb.ProtocolVersion) swap.ScriptVersion {
 
 	// If the swap was initiated before we had our v3 script, use v2.
-	if protocolVersion < loopdb.ProtocolVersionHtlcV3 {
+	if protocolVersion < loopdb.ProtocolVersionHtlcV3 ||
+		protocolVersion == loopdb.ProtocolVersionUnrecorded {
+
 		return swap.HtlcV2
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@ func GetHtlcScriptVersion(`
`56`	`56`	`protocolVersion loopdb.ProtocolVersion) swap.ScriptVersion {`
`57`	`57`
`58`	`58`	`// If the swap was initiated before we had our v3 script, use v2.`
`59`		`- if protocolVersion < loopdb.ProtocolVersionHtlcV3 {`
	`59`	`+ if protocolVersion < loopdb.ProtocolVersionHtlcV3 \|\|`
	`60`	`+ protocolVersion == loopdb.ProtocolVersionUnrecorded {`
	`61`	`+`
`60`	`62`	`return swap.HtlcV2`
`61`	`63`	`}`
`62`	`64`