diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/004ab974f1a9282b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/004ab974f1a9282b
new file mode 100644
index 00000000..9aa05c07
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/004ab974f1a9282b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n800000000000000000000000000000000000000000000000000000000\xff 0000000+0000000000000000000000000000000000000000000\xff00000000\xa8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/035646d7f6a246fe b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/035646d7f6a246fe
new file mode 100644
index 00000000..bce55024
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/035646d7f6a246fe
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06*X0&Z0\x04\x040707\n\x029C\xfe(710\x04(Bx0\xfe0 ca\x02',\xfe00 .\x02,0\xfe0000\x04ZC10\xfe0001\x027'\xfe001A\x17*C(00'aA#2y0AZ000Cy\x141*0\xff #)70092\x050B2 0\xff\"0bY&**c\x00\xff'9C0200b\x04A00a\xff0!X. c00\x040+C0\xff0&0002zc\x04\"0A0\xff00!0CC09\x04!X99\xff08.9X!%0\x02#y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/06a39653822fa9f2 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/06a39653822fa9f2
new file mode 100644
index 00000000..bb5000e3
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/06a39653822fa9f2
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x03000\x04\x010\n\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0770f29d401e50b9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0770f29d401e50b9
new file mode 100644
index 00000000..4a7256b5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0770f29d401e50b9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x010\x04\x03000\n\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0ecfefd9cc726492 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0ecfefd9cc726492
new file mode 100644
index 00000000..1bfca9cb
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0ecfefd9cc726492
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06bca7b9\x04\x04!a&0\n\x02Y*\xfe+b%$\x049797\xfe0(\b8\x020Z\xfe00 $\x0219\xfe00%C\x040Y '\xfe20&.\x021%\xfec!Xc\x17Ob\"*7X0A0X1bb*CaaCZzcAa\xff !ZYZB!$\x0572011\xff AB&y8AZ\x00\xff0 CAc0 X\x04(Z0a\xff0$b2a1c#\x0401y%\xff0&BX+10a\x049$8X\xff00!07b8%\x04zZ\n9\xffB98,\"\x97\x977\x0291")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0f14254bcc061aea b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0f14254bcc061aea
new file mode 100644
index 00000000..d39433ec
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0f14254bcc061aea
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0500000\x12\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0f25f96282ebeba0 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0f25f96282ebeba0
new file mode 100644
index 00000000..0c84c37f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/0f25f96282ebeba0
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x0200\n\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/101773c271e0d7e4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/101773c271e0d7e4
new file mode 100644
index 00000000..7cbf9e65
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/101773c271e0d7e4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06212AAC\x04\x04X991\n\x0417Z2\xff0&0a1172\x041107\xff89770027\x0227")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/19af8aaa31dea7c1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/19af8aaa31dea7c1
new file mode 100644
index 00000000..eac05cc0
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/19af8aaa31dea7c1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\xff00000000\x040000\xff00000100\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/1a26b4978558b8fe b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/1a26b4978558b8fe
new file mode 100644
index 00000000..32d93a53
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/1a26b4978558b8fe
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x067Y0207\x04\x0417#0\n\x0591000\xfe#7Z1\x02B7\xfe$011\x04B110\xfe(902\x0200\xfe0C08\x17A21207b099A#7091a28C1X0\xff %0B0071\x05Y11b0\xff%1z2C2BA\x00\xff&0C81C70\x047010\xff178b9A10\x0287")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/24a8ea8c3a8a000c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/24a8ea8c3a8a000c
new file mode 100644
index 00000000..37253188
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/24a8ea8c3a8a000c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\b%0000000000000000000000000000000000000\n\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/345617e83548ae18 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/345617e83548ae18
new file mode 100644
index 00000000..365732d5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/345617e83548ae18
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x03\x03000\x04\x0400000\x0200\xfe 000\x040000\xfe00\b0\x0200\xfe00 0\x0200\xfe0000\x040000\xfe0001\x0200\xfe0010\x1700000000000000000000000\xff  000000\x0500000\xff 0000000\x00\xff0 000000\x040000\xff0 000100\x040000\xff00000000\x040000\xff00000100\x040000\xff0001000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3844a022718ded6e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3844a022718ded6e
new file mode 100644
index 00000000..ca10f4c9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3844a022718ded6e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06BAa7b9\x04\x04!7bA\n\x02A7\xfe+b2'\x049&+0\xfe0(xz\x02Z!\xfe00 $\x02A9\xfe00%C\x040'8,\xfe0X&!\x02&'\xfezB0c\x17YZ)C$z0%8A1A9*+BaC.Cc# \xff !ZY\"B!C\x057#0cz\xff 0Zyz!B1\x00\xff0 +A70Yx\x040Z8a\xff0$Z2a&(2\x04079%\xff0&BX.+0a\x049BZX\xff00!x17)b\x04zZ1 \xffB98,C'B0\x0291")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3997f658a1dfbbdd b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3997f658a1dfbbdd
new file mode 100644
index 00000000..35a0bf40
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3997f658a1dfbbdd
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06  )0By\x04\x04B0*A\n\x027 \xfe 0Cz\x04(7 .\xfe(\"#B\x02zy\xfe0)1*\x02C0\xfe000!\x04zZ8)\xfe0001\x027,\xfez0+0\x17m0(0'\"!Xy XzbA#01(9yY29\xff  \"#abZ)\x05)Z&0,\xff 009cc77\x00\xff0 2xXB!X\x04A0bA\xff0* B80\"\"\x04B9AC\xff0002x+0A\x04$0! \xff0X10xY77\x042AXx\xff0Xaa20b0\x02 1")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3c9367665803bee0 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3c9367665803bee0
new file mode 100644
index 00000000..461593e5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3c9367665803bee0
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0500000\x04\x040000\n\x0500000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3e639cdde89b88fd b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3e639cdde89b88fd
new file mode 100644
index 00000000..ef0c9760
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/3e639cdde89b88fd
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\b 00000000000000000000000000000000\n\x0200\x12\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/427fc60f24d04a01 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/427fc60f24d04a01
new file mode 100644
index 00000000..4ea99fd0
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/427fc60f24d04a01
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069*8X0X\x04\x042+%C\n\x029'\xfe 010\x04009y\xfe\"0%8\x0200\xfe00!$\x02,1\xfe012#\x04bZ7B\xfe088!\x020x\xfe8#x1\x170b)0B '1z1 0070Aba7#1YC\xff ,y.70.(\x050B0zy\xff C00Z .(\x00\xff!00\"\xffA0#\x047&y\"\xff!Z0zXX,!\x04a7Z2\xff*0B8B001\x040y00\xff0)0BB\"zx\x04c00&\xff8z08!0cy\x020#")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/428da8f562633da4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/428da8f562633da4
new file mode 100644
index 00000000..b9de3b46
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/428da8f562633da4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0200\x04\x010\n\x0200\x12\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4291abcb4ba36a5a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4291abcb4ba36a5a
new file mode 100644
index 00000000..5e61a883
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4291abcb4ba36a5a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06027c21\x04\x04A177\n\x1702927A078170CZ200ZA809C\xff\"711X017\x00\xff#ax1bY78\x04Z10Y\xff.B10A172\x0477X0\xffCZ711a 1\x0202")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/42ba94d1d69b8d47 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/42ba94d1d69b8d47
new file mode 100644
index 00000000..a0e8543a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/42ba94d1d69b8d47
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06100801\x04\x049XAC\n\x0202\xfe&201\x04128a\xfe.110\x021Z\xfe00 2\x0290\xfe00!8\x04020Y\xfe2Bc2\x02X1\xfeA819\x17c1A2279)000207781110YAB\xff  7187CZ\x0587111\xff 0Ax2012\x00\xff! 928092\x04AC2Y\xff0\"8 AXCB\x042c00\xff0'0CY070\x04A01A\xff0'11a7b9\x04202A\xff00880170\x028b")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/448572cbdd9280ab b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/448572cbdd9280ab
new file mode 100644
index 00000000..86865de8
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/448572cbdd9280ab
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\nA00000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/457ee59d6e334bbf b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/457ee59d6e334bbf
new file mode 100644
index 00000000..22afdb3f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/457ee59d6e334bbf
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x0400%0\n\x020(\xfe 0+\b\x04.0z0\xfe00\b0\x02a0\xfe00 0\x02X \xfe0000\x040000\xfe0001\x020&\xfeX,10\x1700000+0000C00000\xb0000!0)\xff  000$00\x050000b\xff 00000*0\x00\xff! 00%&00\x040\"00\xff0!00900.\x040900\xff000000 7\x04b0z0\xff0010080&\x0400Cz\xff0011)000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/47d5db98828811f8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/47d5db98828811f8
new file mode 100644
index 00000000..d3169895
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/47d5db98828811f8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x067zaB80\x04\x040207\n\x029Y\xfe,X1'\x04!\"0%\xfe0, 1\x02,1\xfe00 0\x02)0\xfe00$0\x04,c1x\xfe0001\x02C1\xfe19!0\x17%89018B70C1&9002z0x910X\xff (007#0,\x0501!00\xff 018A02X\x00\xff0 902070\x040000\xff0!08$0!9\x04100Y\xff00\"0c02a\x040090\xff00000!7X\x04)102\xff0b207a19\x021*")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4c73658c689387da b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4c73658c689387da
new file mode 100644
index 00000000..cdba8748
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4c73658c689387da
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x060(8X0!\x04\x0420XC\n\x0298\xfe 010\x04000y\xfe\"001\x0200\xfe00a0\x02%1\xfe0121\x04\"Z21\xfe0191\x020x\xfe8#A1\x170'90B0%1007007000a711ZC\xff 00.10!1\x05000z2\xff 700\"10$\x00\xff!0091000\x047&A0\xff!1008071\x0407Z%\xff0\"0+0001\x040000\xff000Bb\"11\x04800*\xff81&2080B\x020(")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4d072526560b18d6 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4d072526560b18d6
new file mode 100644
index 00000000..b78b931b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4d072526560b18d6
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x060(%X09\x04\x04xZyb\n\x020X\xfe 01 \x04y000\xfe\"xz2\x02*0\xfe.8a&\x02C9\xfe0!)1\x041A2Y\xfe01C1\x020!\xfe8#A1\x170990b)%8&$Ay\"bA\"C17X9ZC\xff 00&z*'#\x05)Zzz9\xff 7 7\"10X\x00\xff!009(0$8\x04z (0\xff!1.0zc+1\x040.7%\xff0 '2'1*1\x04*,Y0\xff0$ZBA%11\x048C!*\xff88&1182B\x0209")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4f398d2a7c8af9a1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4f398d2a7c8af9a1
new file mode 100644
index 00000000..67c43e5a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/4f398d2a7c8af9a1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069!087Z\x04\x049X!z\n\x02BX\xfe,$.1\x04128B\xfe.Y1*\x02ZZ\xfe00 B\x029Y\xfe0a!8\x049Z#Y\xfe22Xc\x02Xx\xfeA#!b\x17cZz2BB#C#a%20%z$+110Y!,\xff .1*77'Z\x052x$11\xff yAC,a9\x80\x00\xff!bz2x092\x04&C2%\xff0\"82AX)B\x047)ZC\xff0'&#Y0\"0\x04A0b'\xff0,1y!a#8\x0400,A\xff0y8z0(\"c\x02%*")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/56744fc6937f542e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/56744fc6937f542e
new file mode 100644
index 00000000..b95079e8
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/56744fc6937f542e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0200\xfe 000\x040000\xfe 001\x0200\xfe000 \x0200\xfe0000\x0200\xfe0100\x0200\xfe0101\x040000\xfe0110\x0200\xfe1000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/65cf8cc1e8f9c65f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/65cf8cc1e8f9c65f
new file mode 100644
index 00000000..2f888f10
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/65cf8cc1e8f9c65f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06x!cc0 \x04\x04Cx$x\n\x02AZ\xfe cC1\x02X8\xfe0$&a\x02b0\xfe000,\x040 AX\xfe0009\x027B\xfe0z#0\x17c8'7*a& \"00z8.!00C0Z0C+\xff ##y*8,c\x05$0Z)Z\xff ,(a*18*\x00\xff0\"8YCC9a\x040Z22\xff0,!08c1#\x04z070\xff0x$YA,29\x028c")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6a3949d0b9311688 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6a3949d0b9311688
new file mode 100644
index 00000000..4170a60a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6a3949d0b9311688
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x03000\x04\x010\n\n0000000000\x12\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6a4ab0fa0d13490d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6a4ab0fa0d13490d
new file mode 100644
index 00000000..267b8987
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6a4ab0fa0d13490d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6dbbe5e90c0dc930 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6dbbe5e90c0dc930
new file mode 100644
index 00000000..f3a3a768
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6dbbe5e90c0dc930
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\xff\xff\xff\xff\xff\xff\xff\xff\xff\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6ec4473a0c3aeaaf b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6ec4473a0c3aeaaf
new file mode 100644
index 00000000..6b5053ab
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/6ec4473a0c3aeaaf
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06 008!Z\x04\x049X!Z\n\x02B2\xfe&bB1\x04128a\xfe.91C\x022Z\xfe00 9\x029c\xfe0a!8\x049Z0Y\xfe2BX$\x02X7\xfeA#18\x17cZz2B0#*#.%20%78'110Y!7\xff  1*87CZ\x052x$11\xff 0AY,0x2\x00\xff!)(2x092\x04AC2%\xff0\"82AX)B\x04(!Z0\xff0'&CY0\"0\x04A0bA\xff0,1y!ax*\x0420,A\xff0y8+0(7c\x02%a")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/79057b2e324f3c62 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/79057b2e324f3c62
new file mode 100644
index 00000000..16ef04f2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/79057b2e324f3c62
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0200\xfe 000\x040000\xfe 001\x0200\xfe0000\x0200\xfe0100\x0200\xfe0101\x040000\xfe0110\x0200\xfe0200\x1700000000000000000000000\xff 0000000\x0500000\xff 0010000\x00\xff 0011000\x040000\xff 1000000\x040000\xff00000000\x040000\xff10000000\x040000\xff11000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/7ca533961d9b7948 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/7ca533961d9b7948
new file mode 100644
index 00000000..f7918356
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/7ca533961d9b7948
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x062X7277\x04\x042a7B\n\xea010010028Y1B87CCB0920C11B8CC210270100010B2b82702810911108711011B11A90098109B17108ACX007ZB2x018BBa007a1Z78B80200020Y7c70bABb821127912100070879X17009C002192A782B9788011017Y2cA072190a0x2907A2711188B0B71CC0!7710202B02821A0A911B272A001By71\xff+8X02221\x04012Y\xffZ7098Y8A\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/7f0fcd4b0787437f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/7f0fcd4b0787437f
new file mode 100644
index 00000000..3f470127
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/7f0fcd4b0787437f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x040000\x04\x0200\n\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/8435cb5c017da26b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/8435cb5c017da26b
new file mode 100644
index 00000000..ac77af55
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/8435cb5c017da26b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0600Zy00\x04\x040000\n\x02#0\xfe (00\x020$\xfe00 0\x028B\xfe0000\x040000\xfe0001\x0200\xfec0y0\x1707 7C00b0001100%000000*\xff 000\x7f\xff\xff \x00\xff! 00000z\x040\"00\xff0!008000\x0400y'\xff0'000000\x04'700\xff00100,08\x040*00\xff00110000\x020a")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/96225db5793c6fe8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/96225db5793c6fe8
new file mode 100644
index 00000000..3c147ae3
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/96225db5793c6fe8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000002\x04\x041019\n\x0500001\xff#0797000\x00\xff07228721\x041172\xff0A011181\x0210")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/967009b556356ec6 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/967009b556356ec6
new file mode 100644
index 00000000..6fa634e2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/967009b556356ec6
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06B0&0*2\x04\x04B0*+\n\x0200\xfe 0+8\x04z7)0\xfe(0#0\x02aC\xfe0)20\x02+0\xfe000)\x04z#(0\xfe0001\x027,\xfe0010\x17m000C\"0Xa8A000#00!90000\xff  Z+0b0.\x05Z0&0\"\xff 0000c1Y\x00\xff0 17Xc!!\x0400b0\xff0!0B000\"\x04B90#\xff000b0+00\x04$0)0\xff0010xz0)\x0400Cx\xff0Xa7%Zb0\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/98484d8cc3497920 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/98484d8cc3497920
new file mode 100644
index 00000000..0bd70e59
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/98484d8cc3497920
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06*$0.Z0\x04\x0407C7\n\x029C\xfe(7BA\x048yx(\xfe0 A2\x02'A\xfe00 Z\x02,X\xfe000%\x04#C1*\xfe0001\x02*'\xfe00aA\x17'C(2c'7A*2y%XZ00Cz'# \"0\xff $)*0098\x050B2 c\xff\"xbY&x*'\x00\xff''C0290c\x04AA$a\xff0!1( c 8\x0400)C\xff0&00029c\x04\"0A0\xff0)!#C\x00\x00X\x04!X x\xff0,.9X!)0\x02$*")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/9c44f4cb90a81ea6 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/9c44f4cb90a81ea6
new file mode 100644
index 00000000..bef7cd94
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/9c44f4cb90a81ea6
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\a0000000\n\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/9db09a4f7f8257fe b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/9db09a4f7f8257fe
new file mode 100644
index 00000000..bfb8ee6c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/9db09a4f7f8257fe
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06100801\x04\x049XAC\n\x0202\xfe&201\x04128a\xfe.110\x021Z\xfe00 2\x0290\xfe00!8\x04020Y\xfe2Bc2\x02X1\xfeA819\x17c1A22790000207781110YAB\xff  7187CZ\x0587111\xff 0Ax2012\x00\xff!0928092\x04AC2Y\xff0\"82AXCB\x042!00\xff0'0CY070\x04A01A\xff0'11a7b9\x04202A\xff00880170\x028b")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a091a79e070d38bf b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a091a79e070d38bf
new file mode 100644
index 00000000..b26f7e3a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a091a79e070d38bf
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x040000\x04\x040000\n\x0500000\x12\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a359ce126fc762da b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a359ce126fc762da
new file mode 100644
index 00000000..e9e21aca
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a359ce126fc762da
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x061Y0290\x04\x042702\n\x0509718\xff aYZ01Y9\x05Zz180\xff%889021A\x00\xff&8#C1280\x042221\xff18199Ab0\x0270")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a850fb39a2b0422e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a850fb39a2b0422e
new file mode 100644
index 00000000..7005cc1b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/a850fb39a2b0422e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\xff00000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa2cbe0eae95d28e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa2cbe0eae95d28e
new file mode 100644
index 00000000..7adcfe9a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa2cbe0eae95d28e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x00\x0e@0000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa5880cd7521afa9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa5880cd7521afa9
new file mode 100644
index 00000000..92ae8e3f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa5880cd7521afa9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0200\xfe 000\x0200\xfe00 0\x0200\xfe0000\x040000\xfe0001\x0200\xfe0010\x1700000000000000000000000\xff  000000\x0500000\xff 0000000\x00\xff0 000000\x040000\xff0!000000\x040000\xff00000000\x040000\xff00100000\x040000\xff00110000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa7ba3fde0e15bca b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa7ba3fde0e15bca
new file mode 100644
index 00000000..89609f23
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/aa7ba3fde0e15bca
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\n\x010\x12\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ac04dacfcec38483 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ac04dacfcec38483
new file mode 100644
index 00000000..c6c0001a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ac04dacfcec38483
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\b 00000000000000000000000000000000\n\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ae4421304cda1446 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ae4421304cda1446
new file mode 100644
index 00000000..76752b9d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ae4421304cda1446
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0200\xfe 0+\b\x040000\xfe00\b0\x02a0\xfe00 0\x0200\xfe0000\x040000\xfe0001\x0200\xfe0010\x1700000+00000000000000000\xff  000000\x0500000\xff 00000*0\x00\xff0 000000\x040000\xff0!000000\x040Z00\xff00000000\x040000\xff00100800\x0400C0\xff00110000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b0946e37f2081a1a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b0946e37f2081a1a
new file mode 100644
index 00000000..4d65cb04
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b0946e37f2081a1a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0600&00b\x04\x0420$9\n\x02y8\xfe 010\x040B0)\xfe\"c01\x0200\xfe00 0\x027$\xfe0101\x041XC1\xfe0121\x0208\xfe7201\x17$080B8002178b10'7217cB1\xff 0021001\x05y0a2$\xff 009810Y\x00\xff!X0910b0\x047C#b\xff\"1008071\x04a7$7\xff0\"000000\x04y00)\xff000)00%1\x04\",00\xff81z20z00\x028x")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b102dbb33f2fd271 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b102dbb33f2fd271
new file mode 100644
index 00000000..d46b5f08
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b102dbb33f2fd271
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0200\xfe0000\x040000\xff00000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b46ad8d7f9c5829d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b46ad8d7f9c5829d
new file mode 100644
index 00000000..08df252d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b46ad8d7f9c5829d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\a0000000\x04\x040000\n\n0000000000\x12\a0000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b78ee1731b844122 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b78ee1731b844122
new file mode 100644
index 00000000..9b555b89
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b78ee1731b844122
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069*8X0X\x04\x042+%C\n\x0298\xfe 010\x04009y\xfe\"001\x0200\xfe00!$\x02,1\xfe012#\x04\"Z7B\xfe089!\x020x\xfe8#A1\x170b)0B '1z1 0070Aba711ZC\xff ,y.702(\x050B0zy\xff C00Z .(\x00\xff!009100#\x047&y\"\xff!Z0BXX,1\x04a7Z2\xff*0B8B001\x040y00\xff0)0BB\"zx\x04c00&\xff8z08!0!B\x020'")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b7b7841df09bb112 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b7b7841df09bb112
new file mode 100644
index 00000000..a2a2c439
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b7b7841df09bb112
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x1700000000000000000000000\x0eC0000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b83d09ccd5b73fea b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b83d09ccd5b73fea
new file mode 100644
index 00000000..4042aae3
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b83d09ccd5b73fea
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06100A00\x04\x04C0yA\n\x02*1\xfe BC1\x02X8\xfe00&7\x02)0\xfe000,\x04X 0C\xfe0001\x02'B\xfe0070\x1708'000&0\"0000Y000Y0Z080\xff  yyX0,Y\x05$0,)Z\xff 0(aY00*\x00\xff0\"8&0A9!\x04070Z\xff0,!0*C1#\x047000\xff00XY%109\x02\"+")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b84bf757d787fe9b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b84bf757d787fe9b
new file mode 100644
index 00000000..4779c994
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b84bf757d787fe9b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06$A971$\x04\x04&701\n\x02A7\xfe#z2X\x04 &b0\xfe0(0\"\x02Zz\xfe00 0\x02A,\xfe00*C\x04028A\xfe9X$B\x02&'\xfezc0!\x17YX!+17)b8A+A19+Ba7. c# \xff !ZY B!+\x05000&z\xff 0ZAz!2A\x00\xff0 B)Y0% \x041Z8#\xff0$Z&a%(7\x04c99%\xff0&BX.+0!\x049BZA\xff1.),270%\x04z'1'\xffBAax8!B0\x029!")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b9123ab9b3e4ff91 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b9123ab9b3e4ff91
new file mode 100644
index 00000000..2d2c4d58
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b9123ab9b3e4ff91
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0600& 0b\x04\x0420$9\n\x02y8\xfe 010\x040B0)\xfe\"c01\x020$\xfe0# 0\x027$\xfe0101\x041X)1\xfe0x2&\x0208\xfe7201\x17908zB80021&8b1!'7y17cB1\xff 0021b01\x05!0a2$\xff 009.10x\x00\xff!X0910(0\x047c#b\xff\"100807 \x04!7$2\xff&\"BB09&0\x04yCD)\xff800 \"0%1\x04,,00\xff88!20z00\x028B")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b9b2aa6e5fdc43db b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b9b2aa6e5fdc43db
new file mode 100644
index 00000000..768ba17d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/b9b2aa6e5fdc43db
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0500000\x12\x06000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/bdf3ec1de30126ef b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/bdf3ec1de30126ef
new file mode 100644
index 00000000..89b29d45
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/bdf3ec1de30126ef
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06b!a7b9\x04\x04!a&0\n\x02Y7\xfe+b%$\x049797\xfe0(\b8\x020Z\xfe00 $\x0219\xfe00%C\x040Y '\xfe20&.\x02\"2\xfecaXc\x17O1\"*7X0A0X1bb*CaaCZzcAa\xff !ZYZB!$\x0572011\xff AB&88AZ\x00\xff0 CAc07X\x04(Z0a\xff0$b2a1c#\x0401y%\xff0&BX*10a\x049$8X\xff00!07b8%\x04zZ*9\xffB98,\"117\x029B")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/c4c852200df1e85f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/c4c852200df1e85f
new file mode 100644
index 00000000..13b5ea08
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/c4c852200df1e85f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06700000\x04\x040207\n\x0297\xfe!110\x040000\xfe00\b1\x0271\xfe00 0\x0220\xfe0000\x040117\xfe0001\x02C0\xfe0010\x1710101817011820022020100\xff  007101\x0501100\xff 8102020\x00\xff0 002070\x040000\xff0!01200C\x041001\xff00\"07012\x040001\xff00000001\x048102\xff01207119\x0219")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/c965d851ace84557 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/c965d851ace84557
new file mode 100644
index 00000000..21cb688b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/c965d851ace84557
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\xff 0000000\x0500000\xff 1000000\x0500000\xff 1100000\x00\xff!0000000\x00\xff\"0000000\x00\xff\"0100000\x040000\xff00000000\x040000\xff10000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/cd10442dde3e823f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/cd10442dde3e823f
new file mode 100644
index 00000000..0c26b8d9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/cd10442dde3e823f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0200\x04\x010\n\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d085443cda8169d8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d085443cda8169d8
new file mode 100644
index 00000000..41a8171a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d085443cda8169d8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06001007\x04\x042009\n\x0298\xfe 010\x040000\xfe\"001\x0200\xfe00 0\x0271\xfe0101\x041721\xfe0191\x0201\xfe7201\x170090B000007807000271101\xff 0021001\x0500022\xff 0091101\x00\xff!0091000\x047810\xff\"1008071\x040707\xff0\"000000\x040000\xff00000011\x048000\xff01120800\x0201")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d47528653fde1d74 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d47528653fde1d74
new file mode 100644
index 00000000..ba063631
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d47528653fde1d74
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x010\x04\x00\x06\b00000000\n\x010")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d5367c6ac5d672a4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d5367c6ac5d672a4
new file mode 100644
index 00000000..feba7da9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d5367c6ac5d672a4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06b!a7b9\x04\x04!a&0\n\x02Y7\xfe+b%$\x049790\xfe0(\b8\x0201\xfe00 $\x0219\xfe00%C\x040Y '\xfe20&.\x02\"2\xfeca0c\x17Y1\"*7X0A0A1b**CaaCZzcAa\xff !ZYZB!C\x0572011\xff AZ&88AZ\x00\xff0 CAc07X\x040Z0a\xff0$b2a1c#\x0401y%\xff0&BX*10a\x049$8X\xff00!07b8%\x04zZ*9\xffB981\"017\x029X")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d7193e18a4464a24 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d7193e18a4464a24
new file mode 100644
index 00000000..0dd92664
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d7193e18a4464a24
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06 7!8XZ\x04\x049X'!\n\x02B0\xfe$bB1\x04+8AA\xfe.91Z\x022Y\xfe00 z\x021c\xfe0a!A\x04970Y\xfe28X'\x02x\"\xfeA#1*\x17c Z27y\"*\"0%2x%7X'C10ZC7\xff  178#C7\x052x(ya\xff +A9,0x2\x00\xff!$B27B%2\x04xC2y\xff$\"z.AB)B\x047x20\xff0'&zY0Z$\x04A0\"X\xff0,Yy!ax'\x0481&A\xff0b!cc(#c\x02%Y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d844a9ff718aa98a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d844a9ff718aa98a
new file mode 100644
index 00000000..9a057aca
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/d844a9ff718aa98a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0500000\x04\x040000\n\n0000000000\x12\x0500000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e0bc5623f1c646ce b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e0bc5623f1c646ce
new file mode 100644
index 00000000..a60ac85c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e0bc5623f1c646ce
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06b!a7b9\x04\x04!a&0\n\x02Y*\xfe+b%$\x049790\xfe0(\b8\x0201\xfe00 $\x0219\xfe00%z\x0400 '\xfe20C.\x02\"2\xfeca0c\x17Y1\"\"YX0A0A1bC*CaaCZzcAa\xff !ZYZB!C\x0572011\xff AZ&88AZ\x00\xff0 CAc07X\x040Z0a\xff0$b2a1c#\x0401y%\xff0&BX*10a\x049$8X\xff00!07b8%\x04z!*9\xffB981\"017\x029b")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e449bc8178945cd1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e449bc8178945cd1
new file mode 100644
index 00000000..34fb5886
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e449bc8178945cd1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x060y%07b\x04\x042BZ7\n\x028A\xfe 012\x040X.)\xfe!Y0.\x02*0\xfe00 X\x02,$\xfe01.$\x04a2CZ\xfe0A71\x02a8\xfe7201\x17088'BAB02978)1)xxYx,.0X\xff 0,2100,\x05Y0y2X\xff 80YZ10x\x00\xff!10,#270\x049CC!\xff&1!08(71\x04Bz$+\xff0\"c0c07A\x04a10)\xff2y2)08C0\x04Cc*a\xffx#X'Xz08\x028z")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e4a36b1c56afe537 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e4a36b1c56afe537
new file mode 100644
index 00000000..a48f539d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e4a36b1c56afe537
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e63091bf7392f567 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e63091bf7392f567
new file mode 100644
index 00000000..ef01d3d0
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e63091bf7392f567
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\a0000000\x04\x040000\n\a0000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e7e424defc97f182 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e7e424defc97f182
new file mode 100644
index 00000000..dfeb32f7
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/e7e424defc97f182
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x0200\x10\x0500000\xfe 000\x0200\xfe00 0\x0200\xfe0000\x040000\xfe0001\x0200\xfe0010\x1700000000000000000000000\xff  000000\x0500000\xff 0000000\x00\xff0 000000\x040000\xff0!000000\x040000\xff00000000\x040000\xff00100000\x040000\xff00110000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ee9fff4d163a33ee b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ee9fff4d163a33ee
new file mode 100644
index 00000000..38e666d4
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ee9fff4d163a33ee
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x03000\x04\x03000\n\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ef33f6ea5ed9996c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ef33f6ea5ed9996c
new file mode 100644
index 00000000..ae7d6b95
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ef33f6ea5ed9996c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06810009\x04\x041711\n\x048021\xfe)700\x0212\xfe2122\x041711\xff92080010\x0210")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ef427619415974c0 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ef427619415974c0
new file mode 100644
index 00000000..6e760be1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/ef427619415974c0
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x010\x04\x03000\n\x00\x12\x010")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/efdd9d2787b73b6b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/efdd9d2787b73b6b
new file mode 100644
index 00000000..b4f082ad
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/efdd9d2787b73b6b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x02000\x0500000\xfe 000\x0200\xfe00 0\x0200\xfe0000\x040000\xfe0001\x0200\xfe0010\x1700000000000000000000000\xff  000000\x0500000\xff 0000000\x00\xff0 000000\x040000\xff0!000000\x040000\xff00000000\x040000\xff00100000\x040000\xff00110000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/f7500170493f0140 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/f7500170493f0140
new file mode 100644
index 00000000..a855e629
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/f7500170493f0140
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06BC0).0\x04\x040y&0\n\x02,(\xfe)0+1\x04(*x0\xfe00\b0\x0271\xfe00 #\x02Z,\xfe00'C\x04-zc0\xfe0yY8\x029y\xfe8 10\x17&0009 0a01CCC,#0$X4!90)\xff  8z%'#!\x058x(a2\xff z2029X2\x00\xff! 0C8&09\x04b'AY\xff0,00&C0!\x04z2XB\xff00+0#CYb\x04bX00\xff0010ac1$\x04)&0Y\xff0b11)a0\"\x020Y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/fbf48a00c852c50e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/fbf48a00c852c50e
new file mode 100644
index 00000000..305c5cb5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalBlinding/fbf48a00c852c50e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x060000A0\x04\x040000\n\x02C0\xfe 0+\b\x040000\xfe00\b0\x02a0\xfe00 0\x0200\xfe0000\x040000\xfe0001\x02D0\xfe0010\x1700000+00000000000000000\xff  000000\x0500000\xff 00000*0\x00\xff0 000000\x040000\xff0!000c00\x040Z00\xff00000000\x040000\xff00100B00\x0400C9\xff00110000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0201d98a8c20dfbf b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0201d98a8c20dfbf
new file mode 100644
index 00000000..120cf3c5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0201d98a8c20dfbf
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0622881C\x04\x0490b9\xff0!0C1000\x04A200\xff8xZ0127A\x027y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/03216d379f1b38f8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/03216d379f1b38f8
new file mode 100644
index 00000000..002920b3
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/03216d379f1b38f8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\xff\xff\xff\xff\xff\xff\xff\xff\xff\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0acfbc8ae5ee73e1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0acfbc8ae5ee73e1
new file mode 100644
index 00000000..c01b9503
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0acfbc8ae5ee73e1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06Z9)0z8\x04\x04809y\xfe007x\x05(9B90\xfe00Z \x00\xfe2BaC\x04acZB\xfe8Y0c\x1790$19BA88YBC02 7 B22\"a2\xff B1B7'cy\x05Z1a9z\xff!2BzX9zY\x05072c \xff\"018A2xa\x050211X\xff%abbY# 0\x00\xff&X9x2x02\x00\xff1$A'2BB9\x00\xff82$72AX2\x04yB7b\xff9992098\"\x04 +0A\xffYZ2#AX 9\x0299")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0df6b389f1e8c3d2 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0df6b389f1e8c3d2
new file mode 100644
index 00000000..665ae010
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/0df6b389f1e8c3d2
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06Zz.+, \x04\x04 %a!\xfe\"90B\x0581A,b\xfe7#0X\x00\xfe77%C\x04\"BX9\xfe8ccb\x17X80Xb0'b%9,C$)Y\".0778CB\xff!'Z#9+#Y\x05(.bXA\xff!YBy7Y2)\x05'B!2B\xff\"7z)817a\x05A#*0%\xff\"b29CA2!\x00\xff'a17B70\"\x00\xff*Z#Z!0/)\x00\xff7''0A0C\x12\x04x819\xff80C00xAX\x0499ZA\xffb.%1*yc!\x0201")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1b2320e6944cc95a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1b2320e6944cc95a
new file mode 100644
index 00000000..4d4d4fb7
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1b2320e6944cc95a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06 20!71\x04\x0410B0\xfe\"201\x0519291\xfe0080\x00\xfe2A0C\x040021\xfe9,,7\x171C02.1020908102&1701000\xff!1A#0B01\x05B0100\xff!20189b1\x05'2011\xff\"911080y\x05C0100\xff%2022708\x00\xff'8A0297z\x00\xff1071(y00\x00\xff109Z1A2,\x04b!1 \xff902Z0900\x040009\xffXC1Zc817\x0209")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1b297120e7e3b6ff b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1b297120e7e3b6ff
new file mode 100644
index 00000000..cb497f93
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1b297120e7e3b6ff
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x062Ax\"88\x04\x04Z#y2\xfe\"06A\x05A8B#7\xfe'XY!\x00\xfe7%0Z\x04.970\xfe87XY\x17Z109 A#X&9A7'87x7C2&A77\xff!2y0a\"y!\x05x 8\xff\x7f\xff!822)'2)\x05YZ.00\xff\"(yy8$*\"\x059(0*1\xff\"778.A7Y\x00\xff'\"bb201b\x00\xff'&zCc1Ya\x00\xff7.9% !BB\x041x!.\xffACBBY2(1\x04%0Az\xffZY8C(c0*\x0221")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1c3cdb01157c0080 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1c3cdb01157c0080
new file mode 100644
index 00000000..d1c362e7
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/1c3cdb01157c0080
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069AxA08\x04\x04Zxyz\xfe\"'6A\x05Z8B07\xfe'$Y*\x00\xfe72BZ\x04A07x\xfe978A\x17(2191!2A&9A70#7#1022A71\xff!0\"1y2c!\x052!Z9Z\xff!8C70'2)\x05zZ.10\xff\"(A8822C\x05A(021\xff\"Yb1.A7X\x00\xff'\"bZ8zbb\x00\xff'97CY1Y7\x00\xff7X901!B%\x04bZc1\xffA12(Y2(1\x04!0&x\xffZZ81180*\x0221")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/25e4ba7ff105f1bc b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/25e4ba7ff105f1bc
new file mode 100644
index 00000000..a9aaea1d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/25e4ba7ff105f1bc
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06Z8A11A\x04\x04290Y\xff0$7Y1007\x048!01\xff99BaBB91\x0229")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/2f131f2d5d359034 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/2f131f2d5d359034
new file mode 100644
index 00000000..04c1f817
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/2f131f2d5d359034
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\xfe0000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/354145578b2b58a9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/354145578b2b58a9
new file mode 100644
index 00000000..a85b8ac2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/354145578b2b58a9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x060822y$\x04\x04z808\xfe\"79C\x05 c9zB\xfe'27\"\x00\xfe8Zx2\x04a002\xfeC972\x1709001(28B0ZC2CzA+8AB)B1\xff!! 97&29\x058Z1Z1\xff!X008B1'\x05(YYB2\xff\"01b8! \"\x05AA2+b\xff\"a99C8B2\x00\xff#xZ1779B\x00\xff&2AxB97B\x00\xff.1827BcB\x042A)B\xff98byX8YB\x04c9A&\xff9ZC1A1Cb\x0207")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/37bfe8f4a1e94415 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/37bfe8f4a1e94415
new file mode 100644
index 00000000..395336b8
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/37bfe8f4a1e94415
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x067*1Bax\x04\x04B9A0\xfe\",7B\x05X1A1C\xfe7#((\x00\xfe77XC\x04,z\"9\xfeXc$Q\x17A &a178B&c*7CAA .Y1)YC9\xff!'$.9!!X\x05XBC8B\xff!.%\"7X2)\x050B0Z0\xff\"*bc!1+y\x05x8#ba\xff\"x#z'$0!\x00\xff'C.77c,\"\x00\xff*%CB\"00x\x00\xff1''7A0CA\x04y8(A\xff77'A0ZX.\x0420&0\xffb2Az%Z c\x020y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/3d970ecb48d849c3 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/3d970ecb48d849c3
new file mode 100644
index 00000000..b5959114
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/3d970ecb48d849c3
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0691xA08\x04\x04Z0y2\xfe\"92A\x05Z8B07\xfe721\x02\x00\xfe721y\x04207x\xfe978A\x1722191&2819A70+7B1082A71\xff!021y2A8\x0520Z9$\xff!8870828\x05z2010\xff\"198822C\x05AC021\xff\"Y818A70\x00\xff'\"1Z8290\x00\xff'97C21Y0\x00\xff7X901!B*\x04bac1\xffA12022A1\x04002x\xffZZ81180X\x0221")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/40d4d8fd0e2d84d4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/40d4d8fd0e2d84d4
new file mode 100644
index 00000000..ec6d9950
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/40d4d8fd0e2d84d4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069Ax1*8\x04\x04Zxyz\xfe\"'6A\x05Z8B07\xfe'$Y*\x00\xfe72BZ\x04A07x\xfe978$\x17(2\"91!yA&9A70#7#102aA71\xff!2y0'\"c!\x05Y!Z9Z\xff!8C70)2)\x05zZ.00\xff\"(A882BC\x05\"z0Az\xff\"Yb1.A7X\x00\xff'\"bZ8(bb\x00\xff'97C\xcd1Y7\x00\xffA.901!B%\x04bZc1\xffA12(Y2(1\x04!2&x\xffZZ89180*\x022&")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/42379927c05a6f03 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/42379927c05a6f03
new file mode 100644
index 00000000..d5b58fb6
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/42379927c05a6f03
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06x2C171\x04\x041(BY\xfe*001\x0519291\xfe008!\x00\xfe2A07\x04$Y21\xfe87A*\x171)0(1102090+10,0Z70100'\xff!1A80B01\x0500z10\xff!2z18Xa1\x05B2011\xff\"011088A\x0500100\xff%7YAc000\x00\xff'8A%b27z\x00\xff1071b700\x00\xff1092112 \x040210\xff9027090 \x040C)0\xffX111x817\x020y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/480338f5187ab332 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/480338f5187ab332
new file mode 100644
index 00000000..a3acf52b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/480338f5187ab332
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\f!\x0300000000000000000000000000000001")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/5052a2b44ccddedb b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/5052a2b44ccddedb
new file mode 100644
index 00000000..9b2c9823
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/5052a2b44ccddedb
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x062Ax\"88\x04\x04Z#y2\xfe\"06/\x05AYX#7\xfe'XY!\x00\xfe7%0Z\x04.B70\xfe87XY\x17Z109 A#X&9A7b87x7C*&A77\xff!2y0a\"y!\x05x 8\xff\x7f\xff!822)'2)\x05YZ.00\xff\"('y8$ \"\x059(0*1\xff\"778.,7Y\x00\xff'\"bb801b\x00\xff'&zCc1Ya\x00\xff7.9% !BB\x041 !.\xffACBB12(1\x04%0Az\xffZY97(c0*\x0222")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/52a4fe5ee86d6c0a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/52a4fe5ee86d6c0a
new file mode 100644
index 00000000..c15a0845
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/52a4fe5ee86d6c0a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\x10\x04000 \xfe 000\x0500000\xfe0000\x00\xfe0001\x040000\xfe0010\x170000000000000\"000000000\xff 00)0000\x0500000\xff 0010000\x050b000\xff!00000\x1d0\x05000*0\xff\"0000000\x00\xff#0000000\x00\xff00000000\x00\xff10000700\x040C'0\xff10100000\x040000\xff101001.0\x0207")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/566c82df83e5093b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/566c82df83e5093b
new file mode 100644
index 00000000..02ef6691
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/566c82df83e5093b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06Y20171\x04\x0410B0\xfe\"001\x0519291\xfe0080\x00\xfe2A0C\x040021\xfe97A7\x1718011102090810201701000\xff!1A80B01\x0500100\xff!20182b1\x05Y2011\xff\"0110800\x0500100\xff%2022000\x00\xff'8A0027z\x00\xff10712700\x00\xff10921128\x040210\xff90270900\x040000\xffX111c817\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/5beeb25efab69809 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/5beeb25efab69809
new file mode 100644
index 00000000..11ade217
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/5beeb25efab69809
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0622b118\x04\x041A8#\xfe&087\x0588BCA\xfe1$x(\x00\xfe81B1\x04B9ax\xfea1Bb\x1787 09B1Y2X8%8Z22\"cc0C00\xff!$a19\"B1\x0501$#2\xff!2Z9A0y0\x05c7b08\xff\"7c08cza\x0527b11\xff%2x1A1yX\x00\xff'00x8Y7'\x00\xff'02117*Z\x00\xff2B82771Y\x041911\xff81 8b!9a\x040AaC\xffX02B08!1\x020Y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/604d2ebba10bb9d9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/604d2ebba10bb9d9
new file mode 100644
index 00000000..93e807fa
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/604d2ebba10bb9d9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x067*7 a1\x04\x04!%a0\xfe\"90B\x05X1A0b\xfe7#9X\x00\xfe777C\x04*BX9\xfe81$Q\x17XZ0Xb18bc9X$\")9\".00C8C1\xff!'2xZ+BY\x05127AA\xff!YBy7Y2)\x050B020\xff\"7b)81!a\x05A#00%\xff\"bz9B$2!\x00\xff'917B70\"\x00\xff*Z#Z!00x\x00\xff7''7A0C2\x04a81Y\xff80AA29XX\x04992A\xffba71yZAc\x0202")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/687fa5acebd2bfdd b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/687fa5acebd2bfdd
new file mode 100644
index 00000000..60aef8e8
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/687fa5acebd2bfdd
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069\"bA*y\x04\x04ZxX$\xfe\"!6A\x05Z870A\xfe'!)*\x00\xfe7xCy\x04Y0 x\xfe9AZ$\x17#A.1$ yA&*9a2(27#12(Z89\xff!'y%'\"c#\x05Y!'9Z\xff!8C(0)22\x05YZ.0 \xff\"(Azb&B!\x05\"ZCA1\xff\"8bBzA*0\x00\xff'\"(Z8(29\x00\xff'Y7Z+9C0\x00\xff7ZY0xZc%\x04bzc!\xffAz2(y2(1\x04!!&x\xffZ9 y180c\x0228")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/68856f7050b93298 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/68856f7050b93298
new file mode 100644
index 00000000..cc382cbf
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/68856f7050b93298
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x067Y 2cc\x04\x04#a%#\xfe&1a2\x05!$X\"a\xfe0#$%\x04A,8\"\xfe2b8y\x15cxC&Y007087,#%#0'B'YX\xff!%2*b81A\x05$+acb\xff\"b Y8&c!\x051y'8X\xff\"bCc2!&Z\x00\xff')2B1Z'&\x00\xff9Z8A1',!\x042B&x\xffCBcy&Ba \x04!z9%\xffbc0(,(C.\x020x")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/6a4ab0fa0d13490d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/6a4ab0fa0d13490d
new file mode 100644
index 00000000..267b8987
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/6a4ab0fa0d13490d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/6c7d66d5b7a086f0 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/6c7d66d5b7a086f0
new file mode 100644
index 00000000..17492efb
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/6c7d66d5b7a086f0
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x00\x00\x01\x00\x0f\x010\x110")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/74039246e6017660 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/74039246e6017660
new file mode 100644
index 00000000..8de0995e
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/74039246e6017660
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\xff00000000\xfd\x03\x160000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/796e6e3a1f485422 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/796e6e3a1f485422
new file mode 100644
index 00000000..f3980eda
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/796e6e3a1f485422
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x00\n\x040000\f!\x0300000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/79d671b0c95f837e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/79d671b0c95f837e
new file mode 100644
index 00000000..2265cf53
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/79d671b0c95f837e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\x10\x0200\x12\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/7af94e5e9827b1b2 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/7af94e5e9827b1b2
new file mode 100644
index 00000000..ad593f7e
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/7af94e5e9827b1b2
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x060C010B\x04\x0400Z07\x057072X\xff 1000090\x00\xff2178778z\x02A8")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/823ed12135ffe726 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/823ed12135ffe726
new file mode 100644
index 00000000..4ddcc703
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/823ed12135ffe726
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06 YZZ z\x04\x0420%C\xfe!1BA\x05Z$X,)\xfe0'z!\x04A,%9\xfeXx1B\x17y!B)Ab!12c2a9X$+z$YB0%0\xff!#2$ B1A\x05aBBA.\xff\"b0\"\"y21\x051cAx8\xff\"bC#%Y7C\x00\xff'9bXzZ18\x00\xff'Xb#c#ca\x047X(0\xffC\"1y0*Y \x04yZ9a\xffcY0B,7B#\x02B\"")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/86cc857db8fe1d71 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/86cc857db8fe1d71
new file mode 100644
index 00000000..43d44b93
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/86cc857db8fe1d71
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x062(B7\x002\x04\x04c\"8&\xfe0Y9#\x05.000A\xfe1%c \x00\xfe711c\x04809)\xfe8&\" \x17y)0c1XYYX17c%+&290CAB)0\xff!(2X0b(d\x05,XzbC\xff!b9,'9BA\x052X.aY\xff\"1YY1cZ8\x05x&Ybc\xff\"81YC*CY\x00\xff2xb822,z\x00\xff777Y77Bx\x00\xffBB.ABc9z\x04C7A$\xffC1$)z281\x04)8B+\xffbZ$x!\"C2\x02zY")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/87a4674978eab316 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/87a4674978eab316
new file mode 100644
index 00000000..609493b1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/87a4674978eab316
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06!*(100\x04\x04)Zyz\xfe\"86+\x05^8B07\xfe'cY*\x00\xfe(2B%\x04a0C!\xfe9(8A\x17(\"1!'!yA9YY$0X%1y0(2A81\xff!$11'zc!\x05xBZzZ\xff!zZB&!)z\x05z)yY\"\xff\"C,#*Y'+\x05'(02a\xff#a9aZ'7#\x00\xff'!yZ8bb*\x00\xff'97&yzc7\x00\xff(X901!B+\x04b*$2\xffA12yx\"(2\x04'yy)\xffaZb91099\x02,X")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/8e87bc6dcc232be7 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/8e87bc6dcc232be7
new file mode 100644
index 00000000..9de0f039
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/8e87bc6dcc232be7
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06YbCAx \x04\x049\xffy8\xfe290A\x05)0B07\xfe72%\x02\x00\xfe720A\x04(0zX\xfe9 82\x17z%#z1y2B19.y0+7B0082!c1\xff!0X1yYA!\x05X0Z9X\xff!88,#8y8\x05zb019\xff\"Aa8%y20\x05AyA27\xff\"Y*a(770\x00\xff'\"1Z82 b\x00\xff'92C%1B(\x00\xff)Xb0''B*\x04ba*1\xff912C#2A1\x04002x\xffZY811802\x0228")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9a17ab4bc8f97b4c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9a17ab4bc8f97b4c
new file mode 100644
index 00000000..6f11f6d6
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9a17ab4bc8f97b4c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x0400000\x040000\xfe 000\x0500000\xfe0000\x00\xfe0001\x040000\xfe0010\x1700000000000000000000000\xff 0000000\x0500000\xff 0010000\x0500000\xff!0000000\x0500000\xff\"0000000\x00\xff#0000000\x00\xff00000000\x00\xff10000000\x040000\xff10100000\x040000\xff10100100\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9cdeec6be6116ca8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9cdeec6be6116ca8
new file mode 100644
index 00000000..416cf658
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9cdeec6be6116ca8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069AxA*8\x04\x04Zxyz\xfe\"'6A\x05Z8B07\xfe'$Z*\x00\xfe72BZ\x04A07x\xfe978$\x17(A\"91!yA&9972'7b102aZx\x0e\xff!2y0'\"c!\x05Y!'9Z\xff!8C70)2)\x05xZ.00\xff\"(A882BC\x05\"(0A1\xff\"(b1.A7X\x00\xff'\"*Z8(b9\x00\xff'Y7CY1Y7\x00\xff7.901!B%\x04bZc1\xffA12(Y2(1\x04!0&x\xffZZ89180 \x0221")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9d704df45dca39c3 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9d704df45dca39c3
new file mode 100644
index 00000000..b4b8d9ef
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/9d704df45dca39c3
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06bCB892\x04\x04$Yy9\xfe\"BAb\x05b000Z\xfe1%87\x00\xfe71Yc\x04801y\xfe8ay+\x171C0cB0, X17BxA!9bAC#C)0\xff!00X00\"1\x05a2B0C\xff!197A78A\x052C.b7\xff\"1YxAc7b\x05x0c80\xff\"B1187AY\x00\xff$A8\"2281\x00\xff778&7Zc8\x00\xff7bAZ2'0A\x04C78$\xffC22aC281\x04Zx87\xffbABX!*C2\x022A")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a24d01dc320f4779 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a24d01dc320f4779
new file mode 100644
index 00000000..41f5b6a9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a24d01dc320f4779
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\t\x0500000\x10\x0200 \x02000\x0400001\x0200\xfe0000\x040000\xff 0000000\x0500000\xff 0001000\x00\xff00000000\x040000\xff00000010\x040000\xff00000100\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a39098a9394055d9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a39098a9394055d9
new file mode 100644
index 00000000..9f4401ee
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a39098a9394055d9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x00\x04\x040000\n\x040000\f!\x0200000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a8cefd5e71f3c507 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a8cefd5e71f3c507
new file mode 100644
index 00000000..7338b4c5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/a8cefd5e71f3c507
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x067B1X!x\x04\x04!870\xfe\"90B\x05X1A0b\xfe7#9A\x00\xfe777A\x04*BX9\xfe8128\x17XZ0Xb18bc9X$\"%77.00C8C8\xff!'2xZC91\x05177AA\xff!XB07Y.C\x050B020\xff\"7b08198\x05A#00c\xff\"bzaB020\x00\xff'917B70\"\x00\xff70%Zx01%\x00\xff70'8A0C2\x04a81Y\xff808A2808\x04992A\xffb871!ZAc\x020(")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/aa2cbe0eae95d28e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/aa2cbe0eae95d28e
new file mode 100644
index 00000000..7adcfe9a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/aa2cbe0eae95d28e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x00\x0e@0000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/aba90b8f84ca08bc b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/aba90b8f84ca08bc
new file mode 100644
index 00000000..cffe2152
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/aba90b8f84ca08bc
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06bCB892\x04\x04$Yy9\xfe\"BAb\x05b000Z\xfe1X87\x00\xfe71Yc\x04801(\xfe8a7+\x178C0YB0, X17YxA!9bAC#C)0\xff!00X00\"1\x05a2B0C\xff!197A78A\x052C.b7\xff\"1BxAc7b\x05x0c80\xff\"B1187AY\x00\xff$A8\"2281\x00\xff778&7Zc8\x00\xff7bAZ2'0A\x04Cy8$\xffC22aC281\x04Zx87\xffbABX!*C2\x022C")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/badf797dcd522e01 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/badf797dcd522e01
new file mode 100644
index 00000000..fd4ccd41
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/badf797dcd522e01
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\f!\x0200000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/bce6d51ff12769b1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/bce6d51ff12769b1
new file mode 100644
index 00000000..7d738ac2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/bce6d51ff12769b1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x069AxA*8\x04\x04Zxyz\xfe\"'6A\x05Z8B07\xfe'$Y*\x00\xfe72BZ\x04A07x\xfe978$\x17(2\"91!yA&9A70#7#102aA71\xff!2y0'\"c!\x05Y!Z9Z\xff!8C70)2)\x05zZ.00\xff\"(A882BC\x05\"(0A1\xff\"Yb1.A7X\x00\xff'\"bZ8(bb\x00\xff'97CY1Y7\x00\xff7.901!B%\x04bZc1\xffA12(Y2(1\x04!0&x\xffZZ89180*\x0221")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/c831abe4ddd7475b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/c831abe4ddd7475b
new file mode 100644
index 00000000..8516d253
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/c831abe4ddd7475b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x061CXa17\x04\x04A9Y0\xfe\"B\"9\x05222CZ\xfe0270\x00\xfe7710\x049778\xfe9Cc9\x1708B1!b2909y8ABC7x01AAc0\xff! 0B2A2Z\x059X0Y7\xff!.7Ax01A\x05'B0y0\xff\"!81071A\x0592178\xff\"CyzX010\x00\xff100891Z7\x00\xff170C720C\x00\xff1cy!9B7C\x04790X\xff2X1A7121\x0402X0\xff9080Ax71\x0208")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/cc1bb62c284e70dd b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/cc1bb62c284e70dd
new file mode 100644
index 00000000..90e67048
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/cc1bb62c284e70dd
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x03000\x04\x010\b 00000000000000000000000000000000\x12\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/cc7068b0d2201f12 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/cc7068b0d2201f12
new file mode 100644
index 00000000..28897437
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/cc7068b0d2201f12
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0691xA08\x04\x04Z0y2\xfe\"92A\x0578B07\xfe721y\x04207x\xfe978A\x172219122819A70x7B10A2A71\xff!021y2A8\x0520797\xff!8870828\x05z2010\xff\"198822C\x05AC021\xff\"Y818b70\x00\xff'\"1Z8299\x00\xff'97C21Y0\x00\xff7X9011B0\x04bac1\xffZ12022A1\x040020\xffZZ81180X\x0221")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/d6c2e1c53b45c571 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/d6c2e1c53b45c571
new file mode 100644
index 00000000..8885feac
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/d6c2e1c53b45c571
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06)1,2)c\x04\x04&x #\xfe!0a2\x05!$%c(\xfe%#\")\x04'Zb\"\xfe2'cy\x15cxC&1007087BbB1ca@'Y,\xff!z2*c81A\x05$\"ccA\xff\"8 Y880a\x051 X8b\xff$9!c2yy$\x00\xff9)YY12 &\x00\xff9c9A1'2!\x042B$X\xffCAa79Ba%\x04!b9%\xffbcc(,xCB\x027A")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e074b2111ea517e1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e074b2111ea517e1
new file mode 100644
index 00000000..61cd77bc
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e074b2111ea517e1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\x10\x00\xfe 000\x0500000\xfe0000\x040000\xfe0001\x1700000000000000000000000\xff 0000000\x0500000\xff 1000000\x0500000\xff 1100000\x00\xff!0000000\x00\xff00000000\x040000\xff10000000\x040000\xff10010000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e777823aa0a48543 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e777823aa0a48543
new file mode 100644
index 00000000..80756e21
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e777823aa0a48543
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06b0 !90\x04\x04y0000\x040000\xfe Y0!\x0500000\xfe0&00\x00\xfe000a\x040000\xfe0Z10\x170010020c(a008C000009000\xff 000y00$\x05*#800\xff 001%000\x05007)0\xff!B00000#\x05%0Y0!\xff\"800\"002\x00\xff#0!000Z0\x00\xff*0Z00)c9\x00\xff100Z.00&\x04z00a\xff10100000\x04*80b\xff1C100 00\x020'")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e7f74d67cccfcde4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e7f74d67cccfcde4
new file mode 100644
index 00000000..7a2e4959
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/e7f74d67cccfcde4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000 \x05000000\x0400001\x040000\xfe 000\x0500000\xfe0000\x00\xfe0001\x040000\xfe0010\x1700000000000000000000000\xff 0000000\x0500000\xff 0010000\x0500000\xff!0000000\x0500000\xff\"0000000\x00\xff000000 0\x00\xff00000000\x00\xff00001000\x040000\xff00100000\x040000\xff00100100\xfd000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/eb4324cc8c369aef b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/eb4324cc8c369aef
new file mode 100644
index 00000000..7f02b316
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/eb4324cc8c369aef
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\x10\x040000\xfe 000\x0500000\xfe0000\x00\xfe0001\x040000\xfe0010\x1700000000000000000000000\xff 0000000\x0500000\xff 0010000\x0500000\xff!0000000\x0500000\xff\"0000000\x00\xff#0000000\x00\xff00000000\x00\xff10000000\x040000\xff10100000\x040000\xff10100100\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/f9c4ba8cc03b0511 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/f9c4ba8cc03b0511
new file mode 100644
index 00000000..cc2f8e8a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadFinalNoBlinding/f9c4ba8cc03b0511
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\n\x040000\f!\x0300000000000000000000000000000000\x10\x00")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/05cd007541080ad9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/05cd007541080ad9
new file mode 100644
index 00000000..ff53c3ab
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/05cd007541080ad9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\xff 0000000\x0500000\xff 1000000\x0500000\xff 1100000\x00\xff!0000000\x00\xff\"0000000\x00\xff\"0010000\x040000\xff00000000\x040000\xff10000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/0632cb7c774b5893 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/0632cb7c774b5893
new file mode 100644
index 00000000..f6b49b64
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/0632cb7c774b5893
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\x12\x06000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1940766eeb44ca79 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1940766eeb44ca79
new file mode 100644
index 00000000..be6d5570
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1940766eeb44ca79
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n@0000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1b09003b13f34eab b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1b09003b13f34eab
new file mode 100644
index 00000000..cc1d8d8f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1b09003b13f34eab
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06a170BC1\x0422A7\xfe 820\x05YX290\xfe&A2A\x042807\xfe1119\x17A0Z2B001A70Z7\"18YXZ7C17\xff *000XAX\x05110A9\xff\"1Z A002\x00\xff#8788112\x048ab0\xff)XC02111\x04CC89\xffC01701A7\x0217")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1cc745e2d298c52c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1cc745e2d298c52c
new file mode 100644
index 00000000..93660c79
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/1cc745e2d298c52c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x041217\xff&1117279\x040C0x\xff0B007212\x0212")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/274dbeb5e6b6ca6b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/274dbeb5e6b6ca6b
new file mode 100644
index 00000000..181359a1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/274dbeb5e6b6ca6b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x010\x12\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/2c42f7b3556ebd6b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/2c42f7b3556ebd6b
new file mode 100644
index 00000000..dbbf7277
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/2c42f7b3556ebd6b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\x12\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/302819d9bc2eb310 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/302819d9bc2eb310
new file mode 100644
index 00000000..9732c301
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/302819d9bc2eb310
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\x12\x0500000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/37bc41b735f9f6a8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/37bc41b735f9f6a8
new file mode 100644
index 00000000..c7b9b26a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/37bc41b735f9f6a8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x010\x12\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3b90fec64d0d56fa b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3b90fec64d0d56fa
new file mode 100644
index 00000000..91471ac5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3b90fec64d0d56fa
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x040000\x0eD00000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3c04bb6d6855be7f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3c04bb6d6855be7f
new file mode 100644
index 00000000..fa7077bb
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3c04bb6d6855be7f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x06\b00000000\n\n0000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3c49578bc7c071fe b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3c49578bc7c071fe
new file mode 100644
index 00000000..c59138c4
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/3c49578bc7c071fe
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x010\x0eA00000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/5f94893e8aa070c2 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/5f94893e8aa070c2
new file mode 100644
index 00000000..c5a0f706
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/5f94893e8aa070c2
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x05B218C\xff 9890111\x041922\xff88999000\x0281")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/66ff883770597b79 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/66ff883770597b79
new file mode 100644
index 00000000..6716aac7
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/66ff883770597b79
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n0000000000000000000000000000000000000000000000000\xff 0000000\x00\xff00000000\xc9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\xff01000000\x040000\xff10000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/676f600e1dee7ff6 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/676f600e1dee7ff6
new file mode 100644
index 00000000..52056c02
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/676f600e1dee7ff6
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\x12\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6a4ab0fa0d13490d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6a4ab0fa0d13490d
new file mode 100644
index 00000000..267b8987
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6a4ab0fa0d13490d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6a706a39c1cf1fa4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6a706a39c1cf1fa4
new file mode 100644
index 00000000..c1ddc9a8
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6a706a39c1cf1fa4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x040000\n\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6d76bd75613fe9e7 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6d76bd75613fe9e7
new file mode 100644
index 00000000..3650df05
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/6d76bd75613fe9e7
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x1718101207Y88a7A0\"8002811\xff!0700010\x00\xff022081A2\x040yC2\xff0a201178\x040cc0\xffc1XbB8bC\x020B")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/808a9d1f9082a5f0 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/808a9d1f9082a5f0
new file mode 100644
index 00000000..cd608588
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/808a9d1f9082a5f0
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06000000\x10\x040000\x12\x0400000\xbc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001\b00000000\xfe 000\x0500000\xfe 001\x040000\xfe0000\x1700000000000000000000000\xff 0000000\x0500000\xff!0000000\x00\xff!0000001\x040000\xff00000000\x040000\xff00000001\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8706252ed04157b7 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8706252ed04157b7
new file mode 100644
index 00000000..026c76d6
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8706252ed04157b7
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\xfe0000\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8824542e0d2c5837 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8824542e0d2c5837
new file mode 100644
index 00000000..cbff3655
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8824542e0d2c5837
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06000000\xff000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8c1b8efc897a54e4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8c1b8efc897a54e4
new file mode 100644
index 00000000..1c09dcce
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/8c1b8efc897a54e4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06000000\x10\x040000\xfe 000\x0500000\xfe 001\x040000\xfe0000\x1700000000000000000000000\xff 0000000\x0500000\xff!0000000\x00\xff!0000001\x040000\xff00000000\x040000\xff00000001\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/a9475c4b5b659b18 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/a9475c4b5b659b18
new file mode 100644
index 00000000..678c2735
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/a9475c4b5b659b18
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\f!\x02010000000000000000qqqqqqq0000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/aa2cbe0eae95d28e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/aa2cbe0eae95d28e
new file mode 100644
index 00000000..7adcfe9a
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/aa2cbe0eae95d28e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x00\x0e@0000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ab28badab9ea762b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ab28badab9ea762b
new file mode 100644
index 00000000..9a0b88fc
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ab28badab9ea762b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06077aa81\x04b7CZ\xfe 827\x0509yb0\xfe&A09\x04yb0x\xfe(A#8\x17,80Yz&%17+7,(917\x000X910\"\xff AY0'(xB\x051AXb1\xff\"+902\"yA\x00\xff%a01a717\x041a!8\xff(BA1'2a2\x04#X,9\xff11ZaCB&C\x021c")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ab5718e3c5b3a59d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ab5718e3c5b3a59d
new file mode 100644
index 00000000..43025551
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ab5718e3c5b3a59d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\x0eD00000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/b027641b42eac051 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/b027641b42eac051
new file mode 100644
index 00000000..dfbe888e
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/b027641b42eac051
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\x12\a0000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/b69d6f37de9deb48 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/b69d6f37de9deb48
new file mode 100644
index 00000000..793adbee
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/b69d6f37de9deb48
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06acZ.Aa\xfe&!%2\x0588 9&\xfe&'xA\x04YC0A\xfe.1Z9\x1791.21ZZYC9200\"8c1xZZbC9\xff )09b8!C\x050cy20\xff\"2 1ZY7 \x00\xff\"xB!B&A0\x04Z171\xff),0cYz19\x04Cz72\xff09%0297Y\x020)")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/c874e79eff584871 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/c874e79eff584871
new file mode 100644
index 00000000..813c5e4c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/c874e79eff584871
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\xfd\x0100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/cc588487ea65505c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/cc588487ea65505c
new file mode 100644
index 00000000..5ee1636e
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/cc588487ea65505c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\xfe0 00\x0200\xfe0000\x0200\xfe0001\x0200\xfe0002\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/cf1bb2f77d0ece2f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/cf1bb2f77d0ece2f
new file mode 100644
index 00000000..a2efedb0
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/cf1bb2f77d0ece2f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\f!\x02\x10100000000\x100000000qqqqqqq0000200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d3459483e0c60158 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d3459483e0c60158
new file mode 100644
index 00000000..d9ce9675
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d3459483e0c60158
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x010\x12\x010")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d5e4d3153701d58b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d5e4d3153701d58b
new file mode 100644
index 00000000..f6ca12d7
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d5e4d3153701d58b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x00")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d67073da994f0c79 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d67073da994f0c79
new file mode 100644
index 00000000..3362d4fb
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/d67073da994f0c79
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\x10\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/dfa0887d57a2b2b8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/dfa0887d57a2b2b8
new file mode 100644
index 00000000..a95d5d9b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/dfa0887d57a2b2b8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x02B2\xfe 209\x0210\xfe2Y08\x03711")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e003311723f15fc4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e003311723f15fc4
new file mode 100644
index 00000000..837170fb
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e003311723f15fc4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200\xfe0000\x0200\xfe0001\x0200\xfe0002\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e4a36b1c56afe537 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e4a36b1c56afe537
new file mode 100644
index 00000000..a48f539d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e4a36b1c56afe537
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e9e68d48faa08f0b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e9e68d48faa08f0b
new file mode 100644
index 00000000..57baf68c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/e9e68d48faa08f0b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x048187\xff+c0'2102\x041092\xffA7102209\x0227")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ec1facb99d8d37c8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ec1facb99d8d37c8
new file mode 100644
index 00000000..d9841dba
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ec1facb99d8d37c8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\xfe 000\x0500000\xfe0000\x040000\xfe0001\x1700000000000000000000000\xff 0000000\x0500000\xff 0100000\b00000000\xff 0100001\x040000\xff00000000\x040000\xff00000001\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ec6503d260092fcd b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ec6503d260092fcd
new file mode 100644
index 00000000..5e369491
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ec6503d260092fcd
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x00\xff00000000\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ee0ec611e8b6962c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ee0ec611e8b6962c
new file mode 100644
index 00000000..df939412
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/ee0ec611e8b6962c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x06000000\xff00000000\x040000\xff\xff\xff\xff\xff\xff\xff\xff\xff\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/f0d04b26550a01ba b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/f0d04b26550a01ba
new file mode 100644
index 00000000..3c6b9b9f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/f0d04b26550a01ba
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\f!@00<000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/fb2b27f7eb3e7982 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/fb2b27f7eb3e7982
new file mode 100644
index 00000000..826e8ca6
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateBlinding/fb2b27f7eb3e7982
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\b 00000000000000000000000000000000\n\n0000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/00dd407021262fb6 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/00dd407021262fb6
new file mode 100644
index 00000000..209fcd4d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/00dd407021262fb6
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x040000\x04\x010\x06\b00000000\x12\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/026530565b64bdcc b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/026530565b64bdcc
new file mode 100644
index 00000000..1349ee42
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/026530565b64bdcc
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/02cf235f2755007a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/02cf235f2755007a
new file mode 100644
index 00000000..73326cb2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/02cf235f2755007a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0500000\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0a8ada4a78e7461a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0a8ada4a78e7461a
new file mode 100644
index 00000000..6cb992cd
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0a8ada4a78e7461a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\f!\x0200000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0c659c49effb6650 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0c659c49effb6650
new file mode 100644
index 00000000..fe259be1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0c659c49effb6650
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0200\x04\x0200\x06\b00000000\x12\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0fee83a0b05b4f8d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0fee83a0b05b4f8d
new file mode 100644
index 00000000..f234d3a7
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/0fee83a0b05b4f8d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x010\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/12b14b3800d5c3eb b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/12b14b3800d5c3eb
new file mode 100644
index 00000000..c21467d0
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/12b14b3800d5c3eb
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x00\xff 0000000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/1598a5a23ab02847 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/1598a5a23ab02847
new file mode 100644
index 00000000..3acb23aa
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/1598a5a23ab02847
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0500000\x04\x03000\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/1a1fd145ce39e14a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/1a1fd145ce39e14a
new file mode 100644
index 00000000..bc7bae0b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/1a1fd145ce39e14a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff 0000000\b00000000\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\n0000000000\xff00000100\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/2835c947fbf6667d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/2835c947fbf6667d
new file mode 100644
index 00000000..4968a354
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/2835c947fbf6667d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b000000000\x00\xff 0000000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/3b0cf6103758e82c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/3b0cf6103758e82c
new file mode 100644
index 00000000..d7388c0e
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/3b0cf6103758e82c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/3e21b74eede73d8b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/3e21b74eede73d8b
new file mode 100644
index 00000000..8b5e64ff
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/3e21b74eede73d8b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0200\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/40a28e94f62bcd3a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/40a28e94f62bcd3a
new file mode 100644
index 00000000..112b51b2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/40a28e94f62bcd3a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x06000000\xff0000000\x06\b00000000\xff0000000 \x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4530c52b6ca2aefc b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4530c52b6ca2aefc
new file mode 100644
index 00000000..9fb8618f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4530c52b6ca2aefc
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4599e6085a0fbe1b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4599e6085a0fbe1b
new file mode 100644
index 00000000..69a1bb64
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4599e6085a0fbe1b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff 0000000\x06000000\xff00000000\b00000000\xff00000100\xd00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\xff00000101\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4617073edcbeb4fc b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4617073edcbeb4fc
new file mode 100644
index 00000000..07764e4c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4617073edcbeb4fc
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x00\xff 0000000\x00\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4a229c5dede033d5 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4a229c5dede033d5
new file mode 100644
index 00000000..3e02c8e9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4a229c5dede033d5
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x00\x00\x02\x00\x04\x010\x06\b000000\x150")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4b75772de3e8bbc9 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4b75772de3e8bbc9
new file mode 100644
index 00000000..379b3679
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4b75772de3e8bbc9
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\f!\x03000000000000000000000000a0000800")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4dc01a9d89b69923 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4dc01a9d89b69923
new file mode 100644
index 00000000..5a9893cc
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4dc01a9d89b69923
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x00\xff 0000000\x00\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x00\xff00010000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4f739e81987c2662 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4f739e81987c2662
new file mode 100644
index 00000000..d4693276
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4f739e81987c2662
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4f94049f7f476546 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4f94049f7f476546
new file mode 100644
index 00000000..3e36d1d5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4f94049f7f476546
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x040000\x12\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4fd48d3d929413aa b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4fd48d3d929413aa
new file mode 100644
index 00000000..989a08c1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/4fd48d3d929413aa
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b000000000\x040000\xff 0000000\b00000000\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x06000000\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/5cff7b8eedea99b4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/5cff7b8eedea99b4
new file mode 100644
index 00000000..b54c11b9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/5cff7b8eedea99b4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x12\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/663e381fc4d6e827 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/663e381fc4d6e827
new file mode 100644
index 00000000..55c3dd51
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/663e381fc4d6e827
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10(0000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/6797d654d831927f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/6797d654d831927f
new file mode 100644
index 00000000..6dde2079
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/6797d654d831927f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b000000000\x0400001\x00\xff 0000000\x00\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/6a4ab0fa0d13490d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/6a4ab0fa0d13490d
new file mode 100644
index 00000000..267b8987
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/6a4ab0fa0d13490d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/71f09abccfdaa2a7 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/71f09abccfdaa2a7
new file mode 100644
index 00000000..b6f1a7bf
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/71f09abccfdaa2a7
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x040000\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7837cf1ae4e6f261 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7837cf1ae4e6f261
new file mode 100644
index 00000000..e9ef7be8
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7837cf1ae4e6f261
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7a44df02dea3657b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7a44df02dea3657b
new file mode 100644
index 00000000..2d357cae
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7a44df02dea3657b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000Z0\"\x04\x010\x06\b000,000a\xff!0x0000Y\x060000y!\xff00000000\b0000C009\xff000000A0\x00\xff0000010!\x00\xff00000117\b0000000 \xff00000200\bx7000>!0\xffb0000201\x04800Y")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7d71e11a0e19636a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7d71e11a0e19636a
new file mode 100644
index 00000000..6b9771ff
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/7d71e11a0e19636a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x03000\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/83384a8038af26cf b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/83384a8038af26cf
new file mode 100644
index 00000000..1a23f81c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/83384a8038af26cf
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x03\x03000\x04\x010\x06\b000000000\x040000\xff 0000000\b00000000\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x06000000\xff00000100\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/86fe422145271cbe b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/86fe422145271cbe
new file mode 100644
index 00000000..18a5b614
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/86fe422145271cbe
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x06000000\xfe0000\x12000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/87f38c680684da1a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/87f38c680684da1a
new file mode 100644
index 00000000..0415e41b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/87f38c680684da1a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b20710909\x04\x018\x06\b00100C12\xff#A000707\x06710210\xff(02000b1\b19007810\xff20020110\x00\xff72012710\b0BA09027\xff82199871\x040B0B")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/8c628ac501a61249 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/8c628ac501a61249
new file mode 100644
index 00000000..ebe0d665
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/8c628ac501a61249
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b000000000\x040000\xff 0000000\b00000000\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/8fcf822b2f12b18c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/8fcf822b2f12b18c
new file mode 100644
index 00000000..399b0fc4
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/8fcf822b2f12b18c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x04\x040000\n\x040000\f!\x0300000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/97f59ed3420cd57c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/97f59ed3420cd57c
new file mode 100644
index 00000000..476fde8b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/97f59ed3420cd57c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b02127AZ1\x04\x01B\x06\b0208a00\"\xff'7017B07\x06CX77C8\xff(b187277\bY0X2'19B\xff+C202Zz2\x00\xffAb80,727\x042A78")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9915e6a00fc69dc8 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9915e6a00fc69dc8
new file mode 100644
index 00000000..6ee12dcb
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9915e6a00fc69dc8
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff000000 0\x06000000\xff0000000\x06\b00000000\xff0000000 \x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9d4ddc1831a701e1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9d4ddc1831a701e1
new file mode 100644
index 00000000..42dea2f1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9d4ddc1831a701e1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff0000000 \x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9f7d097fa7559fd4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9f7d097fa7559fd4
new file mode 100644
index 00000000..6728900b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/9f7d097fa7559fd4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x00\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a245c1564eea7551 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a245c1564eea7551
new file mode 100644
index 00000000..a1d4b146
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a245c1564eea7551
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x0500000\x04\x0200\x06\b00000000\x12\x0500000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a4cfa21d19b94dc4 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a4cfa21d19b94dc4
new file mode 100644
index 00000000..bb19b581
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a4cfa21d19b94dc4
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\b(0000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a514a7cd2076b11f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a514a7cd2076b11f
new file mode 100644
index 00000000..68bb1ad4
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a514a7cd2076b11f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\a0000000\x04\x0200\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a7582ba98cb19d4c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a7582ba98cb19d4c
new file mode 100644
index 00000000..1204f6b9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a7582ba98cb19d4c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff 0000000\x00\xff 0001000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000101\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a7a720896d63c26f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a7a720896d63c26f
new file mode 100644
index 00000000..f17e63e1
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/a7a720896d63c26f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff0000000\x06\b00000000\xff0000000 \x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b45fc59b37afb979 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b45fc59b37afb979
new file mode 100644
index 00000000..5e7427d4
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b45fc59b37afb979
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff\xff\xff\xff\xff\xff\xff\xff\xff\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b703afcb1c284461 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b703afcb1c284461
new file mode 100644
index 00000000..9a068683
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b703afcb1c284461
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b09880191\x04\x017\x06\b09bABA11\xff,X0218Y800XXa2818AX1Yb2102BA707ZAb9271702A00980X70087101A\xff18120027\x0471BB")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b74d27f6407f32eb b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b74d27f6407f32eb
new file mode 100644
index 00000000..b132344f
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b74d27f6407f32eb
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x0200\x06\b00000000\x12\x06000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b7a40d243835143d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b7a40d243835143d
new file mode 100644
index 00000000..18baacd4
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/b7a40d243835143d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x03000\x04\x0200\x06\b00000000\x12\x03000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/bc18b385e2b0461d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/bc18b385e2b0461d
new file mode 100644
index 00000000..ce62a888
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/bc18b385e2b0461d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x12\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/bc73988c0c39269e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/bc73988c0c39269e
new file mode 100644
index 00000000..6b32a35d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/bc73988c0c39269e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x06\b00000000\n\x040000\f!\x0300000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/c75fe37b6681297e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/c75fe37b6681297e
new file mode 100644
index 00000000..3f5ca32b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/c75fe37b6681297e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff 0000000\x06000000\xff00000000\b00000000\xff00000100\b00000000\xff00000110\x00\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/c96354f5956b1b16 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/c96354f5956b1b16
new file mode 100644
index 00000000..525fce2d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/c96354f5956b1b16
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x00\x12\x06000000\xff0000000\x06\b00000000\xff0000000 \x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/cfc4d08bd767069f b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/cfc4d08bd767069f
new file mode 100644
index 00000000..9e3ef8f2
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/cfc4d08bd767069f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x0eA00000000000000000000000000000000000000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d3dd11e29c7dfc8d b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d3dd11e29c7dfc8d
new file mode 100644
index 00000000..bbc4558e
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d3dd11e29c7dfc8d
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x010\x04\x0200\x06\b\x00\x00\x00\x00\x00\x00\x00\x00")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d7fd54ebdfccb3a1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d7fd54ebdfccb3a1
new file mode 100644
index 00000000..26986bbf
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d7fd54ebdfccb3a1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xff 0000000\x06000000\xff00000000\b00000000\xff00000010\x00\xff00000100\x00\xff00000110\b00000000\xff00000200\b00000000\xff00000201\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d8721f454f91277e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d8721f454f91277e
new file mode 100644
index 00000000..a69087a5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/d8721f454f91277e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x000\x06000000\xff0000000\x06\b00000000\xff0000000 \x00\xff00000000\x040000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e3c8e991406d5383 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e3c8e991406d5383
new file mode 100644
index 00000000..7e4f8dcf
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e3c8e991406d5383
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\f!\x0300000000007000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e3ccdc36658f81ef b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e3ccdc36658f81ef
new file mode 100644
index 00000000..07061e6d
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e3ccdc36658f81ef
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xfe0000\x12000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e5b1d2c35b326dfb b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e5b1d2c35b326dfb
new file mode 100644
index 00000000..edcfbf05
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e5b1d2c35b326dfb
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x00\x00\x02\x00\x04\x010\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e687e5f5c7a3f93c b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e687e5f5c7a3f93c
new file mode 100644
index 00000000..2d10f9c9
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e687e5f5c7a3f93c
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e7d5662396fa4a12 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e7d5662396fa4a12
new file mode 100644
index 00000000..071bd6a5
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/e7d5662396fa4a12
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x010\x04\x0200\x06\b00000000\x12\x010")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/eec22846e337069b b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/eec22846e337069b
new file mode 100644
index 00000000..d52916a0
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/eec22846e337069b
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x040000\f!\x0200000000000000000000000000000010\x10\x100000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/f054cbcc3770851a b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/f054cbcc3770851a
new file mode 100644
index 00000000..f825a44b
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/f054cbcc3770851a
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\n\x880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\f!\x0300000000000000000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/f360a44af0ab6d1e b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/f360a44af0ab6d1e
new file mode 100644
index 00000000..ad58c810
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/f360a44af0ab6d1e
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\x06000000\x04\x040000\x06\b00000000\xfe0 00\x0500000\xfe0000\x040000\xfe0001\x1700000000000000000000000\xfe0100\x0200")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/fc8b064d4663c180 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/fc8b064d4663c180
new file mode 100644
index 00000000..eeb2fd22
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/fc8b064d4663c180
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\xfe000 \x06000000\xfe0000\x12000000000000000000")
diff --git a/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/fd591b34c60f63f1 b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/fd591b34c60f63f1
new file mode 100644
index 00000000..ccc3585c
--- /dev/null
+++ b/htlcswitch/hop/testdata/fuzz/FuzzPayloadIntermediateNoBlinding/fd591b34c60f63f1
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("\x02\b00000000\x04\x010\x06\b00000000\x10\x00\xfe0000\x12000000000000000000")