diff --git a/doc/deployable-lightning.lyx b/doc/deployable-lightning.lyx index 585f4eee0..4c8fcca42 100644 --- a/doc/deployable-lightning.lyx +++ b/doc/deployable-lightning.lyx @@ -907,6 +907,9 @@ reference "fig:Secret-Revelation-by" \end_inset . + Note that this requires the other party to provide an alternate key (denoted + here using A' and B'), otherwise there is no way to force the escape transactio +n to provide the secret. \end_layout \begin_layout Standard @@ -1169,6 +1172,22 @@ By using a dual anchor and escape transactions, channel establishment can Acknowlegments \end_layout +\begin_layout Standard +Thanks to mmeijeri on Reddit's r/Bitcoin for pointing out a flaw in escape + transactions reusing the same A and B keys as the commitment transaction +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +https://www.reddit.com/r/Bitcoin/comments/3dlxw4/reaching_the_ground_with_lightnin +g_lightning/ct80xpp +\end_layout + +\end_inset + +. +\end_layout + \begin_layout Standard Thanks to Joseph Poon for designing the escape/fast-escape dual-anchor method, as well as finding a flaw in my original formulation of the dual anchor @@ -1233,11 +1252,6 @@ Anchor Output Redeemscript The anchor output is a pay to script hash, with a redeemscript as follows: \end_layout -\begin_layout Description -OP_IF They put a non-zero here if they're supplying the secret -\end_layout - -\begin_deeper \begin_layout Description OP_HASH \begin_inset space ~ @@ -1247,24 +1261,43 @@ OP_HASH \begin_inset space ~ \end_inset -OP_EQUALVERIFY Check secret is correct. +OP_EQUAL If the secret is supplied, \end_layout -\end_deeper \begin_layout Description -OP_ENDIF +OP_IF \end_layout +\begin_deeper \begin_layout Description 2 \begin_inset space ~ \end_inset - + Should be signed by B's escape key. +\end_layout + +\end_deeper +\begin_layout Description +OP_ELSE +\end_layout + +\begin_deeper +\begin_layout Description +2 \begin_inset space ~ \end_inset - + Should be signed by B's commitment key. +\end_layout + +\end_deeper +\begin_layout Description +OP_ENDIF +\end_layout + +\begin_layout Description + \begin_inset space ~ \end_inset @@ -1293,7 +1326,7 @@ Escape Input Script \begin_inset space ~ \end_inset - + \begin_inset space ~ \end_inset @@ -1423,7 +1456,7 @@ This is identical to the normal escape input script. \begin_inset space ~ \end_inset - + \begin_inset space ~ \end_inset diff --git a/doc/deployable-lightning.pdf b/doc/deployable-lightning.pdf index 96d5bafe1..c30a4cf56 100644 Binary files a/doc/deployable-lightning.pdf and b/doc/deployable-lightning.pdf differ diff --git a/doc/dual-anchor-diag4.eps b/doc/dual-anchor-diag4.eps index 7162fdb4a..62696bfbf 100644 --- a/doc/dual-anchor-diag4.eps +++ b/doc/dual-anchor-diag4.eps @@ -1,10 +1,10 @@ %!PS-Adobe-3.0 EPSF-3.0 %%Creator: cairo 1.14.2 (http://cairographics.org) -%%CreationDate: Tue Jul 14 15:49:50 2015 +%%CreationDate: Sun Jul 19 13:19:35 2015 %%Pages: 1 %%DocumentData: Clean7Bit %%LanguageLevel: 2 -%%BoundingBox: 12 -1 552 434 +%%BoundingBox: 12 -1 555 434 %%EndComments %%BeginProlog save @@ -71,6 +71,7 @@ save 0 1 255 { Encoding exch /.notdef put } for Encoding 32 /space put Encoding 38 /ampersand put +Encoding 39 /quotesingle put Encoding 45 /hyphen put Encoding 65 /A put Encoding 66 /B put @@ -99,7 +100,7 @@ Encoding 114 /r put Encoding 115 /s put Encoding 116 /t put Encoding 120 /x put -/CharStrings 31 dict dup begin +/CharStrings 32 dict dup begin /.notdef 0 def /A 1 def /n 2 def @@ -124,19 +125,20 @@ Encoding 120 /x put /I 21 def /G 22 def /ampersand 23 def -/R 24 def -/hyphen 25 def -/O 26 def -/P 27 def -/underscore 28 def -/V 29 def -/M 30 def +/quotesingle 24 def +/R 25 def +/hyphen 26 def +/O 27 def +/P 28 def +/underscore 29 def +/V 30 def +/M 31 def end readonly def /sfnts [ -<0001000000090080000300106376742000691d3900001648000001fe6670676d7134766a0000 -1848000000ab676c7966ab10bf5d0000009c000015ac68656164026638f7000018f400000036 -686865610cb806700000192c00000024686d747895560ef9000019500000007c6c6f63610001 -3e90000019cc000000806d617870048c067100001a4c00000020707265703b07f10000001a6c +<0001000000090080000300106376742000691d390000169c000001fe6670676d7134766a0000 +189c000000ab676c7966a68d70050000009c0000160068656164026638f70000194800000036 +686865610cb806710000198000000024686d747897890fbe000019a4000000806c6f63610001 +528800001a24000000846d617870048d067100001aa800000020707265703b07f10000001ac8 0000056800020066fe96046605a400030007001a400c04fb0006fb0108057f0204002fc4d4ec 310010d4ecd4ec301311211125211121660400fc73031bfce5fe96070ef8f272062900020010 0000056805d50002000a00c2404100110100040504021105050401110a030a0011020003030a @@ -253,101 +255,103 @@ ee10c6111239111739111739304b5358071005ed0705ed111739071005ed111739071005ed11 0c9032a032b032395d005d010e011514163332363709013e0137330602070123270e01232200 353436372e0135343633321617152e0123220615141601f25b55d4a05fa649fe7b01fc3b4206 ba0c685d0117fc8f68e483f1fece86863032deb853a555579e4469833b032351a15892c23f40 -028ffdf859cb7284fefe7efee39359570113d780e1633f7d3ca2c52424b62f316f5833670002 -00c90000055405d50013001c00b14035090807030a0611030403051104040342060400150304 -15950914950d810b040506031109001c160e050a191904113f140a1c0c041d10fcec32fcc4ec -1117391139393931002f3cf4ecd4ec123912391239304b5358071005ed071005ed1117395922 -b2401e01015d40427a1301050005010502060307041500150114021603170425002501250226 -032706260726082609201e3601360246014602680575047505771388068807980698071f5d00 -5d011e01171323032e012b01112311212016151406011133323635342623038d417b3ecdd9bf -4a8b78dcca01c80100fc83fd89fe9295959202bc16907efe68017f9662fd8905d5d6d88dba02 -4ffdee87838385000001006401df027f028300030011b6009c020401000410dccc310010d4ec -301321152164021bfde50283a40000020073ffe305d905f0000b00170023401306951200950c -91128c1809190f33031915101810fcecfcec310010e4f4ec10ee300122001110003332001110 -002720001110002120001110000327dcfefd0103dcdc0101feffdc013a0178fe88fec6fec5fe -870179054cfeb8fee5fee6feb80148011a011b0148a4fe5bfe9efe9ffe5b01a40162016201a5 -0000000200c90000048d05d500080013003a40180195100095098112100a0802040005190d3f -11001c09041410fcec32fcec11173931002ff4ecd4ec30400b0f151f153f155f15af1505015d -011133323635342623252132041514042b0111230193fe8d9a9a8dfe3801c8fb0101fefffbfe -ca052ffdcf92878692a6e3dbdde2fda80001ffecfe1d0414feac0003000fb500a90100020410 -c4c43100d4ec30011521350414fbd8feac8f8f000000000100100000056805d5000600b74027 -04110506050311020306060503110403000100021101010042030401af000604030200050501 -0710d4c4173931002fec3239304b5358071005ed071008ed071008ed071005ed5922b2500801 -015d406200032a03470447055a037d038303070600070208040906150114021a041a052a0026 -01260229042905250620083800330133023c043c053706480045014502490449054706590056 -066602690469057a0076017602790479057506800898009706295d005d21013309013301024a -fdc6d301d901dad2fdc705d5fb1704e9fa2b000100c90000061f05d5000c00bf403403110708 -070211010208080702110302090a0901110a0a09420a070203080300af080b05090803020105 -0a061c043e0a1c00040d10fcecfcec11173931002f3cc4ec32111739304b5358071005ed0710 -08ed071008ed071005ed5922b2700e01015d405603070f080f09020a15021407130a26022607 -2007260a200a3407350a69027c027b07790a80028207820a90021604010b0313011b0323012c -032708280934013c035608590965086a097608790981018d0395019b03145d005d1321090121 -1123110123011123c9012d017d017f012dc5fe7fcbfe7fc405d5fc0803f8fa2b051ffc000400 -fae10000013500b800cb00cb00c100aa009c01a600b800660000007100cb00a002b200850075 -00b800c301cb0189022d00cb00a600f000d300aa008700cb03aa0400014a003300cb000000d9 -050200f4015400b4009c01390114013907060400044e04b4045204b804e704cd0037047304cd -04600473013303a2055605a60556053903c5021200c9001f00b801df007300ba03e9033303bc -0444040e00df03cd03aa00e503aa0404000000cb008f00a4007b00b80014016f007f027b0252 -008f00c705cd009a009a006f00cb00cd019e01d300f000ba018300d5009803040248009e01d5 -00c100cb00f600830354027f00000333026600d300c700a400cd008f009a0073040005d5010a -00fe022b00a400b4009c00000062009c0000001d032d05d505d505d505f0007f007b005400a4 -06b80614072301d300b800cb00a601c301ec069300a000d3035c037103db0185042304a80448 -008f0139011401390360008f05d5019a0614072306660179046004600460047b009c00000277 -046001aa00e904600762007b00c5007f027b000000b4025205cd006600bc00660077061000cd -013b01850389008f007b0000001d00cd074a042f009c009c0000077d006f0000006f0335006a -006f007b00ae00b2002d0396008f027b00f600830354063705f6008f009c04e10266008f018d -02f600cd03440029006604ee00730000140000960000b707060504030201002c2010b0022549 -64b040515820c859212d2cb002254964b040515820c859212d2c20100720b00050b00d7920b8 -ffff5058041b0559b0051cb0032508b0042523e120b00050b00d7920b8ffff5058041b0559b0 -051cb0032508e12d2c4b505820b0fd454459212d2cb002254560442d2c4b5358b00225b00225 -45445921212d2c45442d2cb00225b0022549b00525b005254960b0206368208a108a233a8a10 -653a2d00000100000002570afb6146a45f0f3cf5001f080000000000cef5cb7600000000cef5 -cb76f7d6fcae0d72095500000008000000010000000000010000076dfe1d00000de2f7d6fa51 -0d7200010000000000000000000000000000001f04cd006605790010051200ba046600710512 -00ba04e50071034a00ba028b0000057d00c90596007307cb00ba023900c10323003704e3fffa -04bc003b050e00c9042b006f04e7007b051400ba04ec007105140087025c00c906330073063d -0081058f00c902e30064064c007304d300c90400ffec0579001006e700c90000000000000044 -00000140000001b800000250000002c80000036c000003dc000003dc0000048c000005240000 -05e800000638000006b400000724000008a80000090800000a6800000b9400000c3400000d08 -00000e0000000e4800000ef0000011580000126c0000129800001324000013a4000013d00000 -14b0000015ac00010000001f0354002b0068000c000200100099000800000415021600080004 -b8028040fffbfe03fa1403f92503f83203f79603f60e03f5fe03f4fe03f32503f20e03f19603 -f02503ef8a4105effe03ee9603ed9603ecfa03ebfa03eafe03e93a03e84203e7fe03e63203e5 -e45305e59603e48a4105e45303e3e22f05e3fa03e22f03e1fe03e0fe03df3203de1403dd9603 -dcfe03db1203da7d03d9bb03d8fe03d68a4105d67d03d5d44705d57d03d44703d3d21b05d3fe -03d21b03d1fe03d0fe03cffe03cefe03cd9603cccb1e05ccfe03cb1e03ca3203c9fe03c68511 -05c61c03c51603c4fe03c3fe03c2fe03c1fe03c0fe03bffe03befe03bdfe03bcfe03bbfe03ba -1103b9862505b9fe03b8b7bb05b8fe03b7b65d05b7bb03b78004b6b52505b65d40ff03b64004 -b52503b4fe03b39603b2fe03b1fe03b0fe03affe03ae6403ad0e03acab2505ac6403abaa1205 -ab2503aa1203a98a4105a9fa03a8fe03a7fe03a6fe03a51203a4fe03a3a20e05a33203a20e03 -a16403a08a4105a096039ffe039e9d0c059efe039d0c039c9b19059c64039b9a10059b19039a -1003990a0398fe0397960d0597fe03960d03958a410595960394930e05942803930e0392fa03 -9190bb0591fe03908f5d0590bb039080048f8e25058f5d038f40048e25038dfe038c8b2e058c -fe038b2e038a8625058a410389880b05891403880b0387862505876403868511058625038511 -0384fe038382110583fe0382110381fe0380fe037ffe0340ff7e7d7d057efe037d7d037c6403 -7b5415057b25037afe0379fe03780e03770c03760a0375fe0374fa0373fa0372fa0371fa0370 -fe036ffe036efe036c21036bfe036a1142056a530369fe03687d036711420566fe0365fe0364 -fe0363fe0362fe03613a0360fa035e0c035dfe035bfe035afe0359580a0559fa03580a035716 -190557320356fe035554150555420354150353011005531803521403514a130551fe03500b03 -4ffe034e4d10054efe034d10034cfe034b4a13054bfe034a4910054a1303491d0d0549100348 -0d0347fe0346960345960344fe0343022d0543fa0342bb03414b0340fe033ffe033e3d12053e -14033d3c0f053d12033c3b0d053c40ff0f033b0d033afe0339fe033837140538fa0337361005 -37140336350b05361003350b03341e03330d0332310b0532fe03310b03302f0b05300d032f0b -032e2d09052e10032d09032c32032b2a25052b64032a2912052a250329120328272505284103 -27250326250b05260f03250b0324fe0323fe03220f03210110052112032064031ffa031e1d0d -051e64031d0d031c1142051cfe031bfa031a42031911420519fe031864031716190517fe0316 -01100516190315fe0314fe0313fe031211420512fe0311022d05114203107d030f64030efe03 -0d0c16050dfe030c0110050c16030bfe030a100309fe0308022d0508fe030714030664030401 -100504fe03401503022d0503fe0302011005022d0301100300fe0301b80164858d012b2b2b2b +028ffdf859cb7284fefe7efee39359570113d780e1633f7d3ca2c52424b62f316f5833670001 +00c503aa016f05d500030037400a0184008104000502040410fc4bb012544bb013545b58b900 +02ffc03859ec310010f4ec3001400d40055005600570059005a005065d01112311016faa05d5 +fdd5022b0000000200c90000055405d50013001c00b14035090807030a061103040305110404 +034206040015030415950914950d810b040506031109001c160e050a191904113f140a1c0c04 +1d10fcec32fcc4ec1117391139393931002f3cf4ecd4ec123912391239304b5358071005ed07 +1005ed1117395922b2401e01015d40427a130105000501050206030704150015011402160317 +0425002501250226032706260726082609201e36013602460146026805750475057713880688 +07980698071f5d005d011e01171323032e012b01112311212016151406011133323635342623 +038d417b3ecdd9bf4a8b78dcca01c80100fc83fd89fe9295959202bc16907efe68017f9662fd +8905d5d6d88dba024ffdee87838385000001006401df027f028300030011b6009c0204010004 +10dccc310010d4ec301321152164021bfde50283a40000020073ffe305d905f0000b00170023 +401306951200950c91128c1809190f33031915101810fcecfcec310010e4f4ec10ee30012200 +1110003332001110002720001110002120001110000327dcfefd0103dcdc0101feffdc013a01 +78fe88fec6fec5fe870179054cfeb8fee5fee6feb80148011a011b0148a4fe5bfe9efe9ffe5b +01a40162016201a50000000200c90000048d05d500080013003a40180195100095098112100a +0802040005190d3f11001c09041410fcec32fcec11173931002ff4ecd4ec30400b0f151f153f +155f15af1505015d011133323635342623252132041514042b0111230193fe8d9a9a8dfe3801 +c8fb0101fefffbfeca052ffdcf92878692a6e3dbdde2fda80001ffecfe1d0414feac0003000f +b500a90100020410c4c43100d4ec30011521350414fbd8feac8f8f0000000001001000000568 +05d5000600b7402704110506050311020306060503110403000100021101010042030401af00 +06040302000505010710d4c4173931002fec3239304b5358071005ed071008ed071008ed0710 +05ed5922b2500801015d406200032a03470447055a037d038303070600070208040906150114 +021a041a052a002601260229042905250620083800330133023c043c05370648004501450249 +0449054706590056066602690469057a0076017602790479057506800898009706295d005d21 +013309013301024afdc6d301d901dad2fdc705d5fb1704e9fa2b000100c90000061f05d5000c +00bf403403110708070211010208080702110302090a0901110a0a09420a070203080300af08 +0b050908030201050a061c043e0a1c00040d10fcecfcec11173931002f3cc4ec32111739304b +5358071005ed071008ed071008ed071005ed5922b2700e01015d405603070f080f09020a1502 +1407130a260226072007260a200a3407350a69027c027b07790a80028207820a90021604010b +0313011b0323012c032708280934013c035608590965086a097608790981018d0395019b0314 +5d005d13210901211123110123011123c9012d017d017f012dc5fe7fcbfe7fc405d5fc0803f8 +fa2b051ffc000400fae10000013500b800cb00cb00c100aa009c01a600b800660000007100cb +00a002b20085007500b800c301cb0189022d00cb00a600f000d300aa008700cb03aa0400014a +003300cb000000d9050200f4015400b4009c01390114013907060400044e04b4045204b804e7 +04cd0037047304cd04600473013303a2055605a60556053903c5021200c9001f00b801df0073 +00ba03e9033303bc0444040e00df03cd03aa00e503aa0404000000cb008f00a4007b00b80014 +016f007f027b0252008f00c705cd009a009a006f00cb00cd019e01d300f000ba018300d50098 +03040248009e01d500c100cb00f600830354027f00000333026600d300c700a400cd008f009a +0073040005d5010a00fe022b00a400b4009c00000062009c0000001d032d05d505d505d505f0 +007f007b005400a406b80614072301d300b800cb00a601c301ec069300a000d3035c037103db +0185042304a80448008f0139011401390360008f05d5019a0614072306660179046004600460 +047b009c00000277046001aa00e904600762007b00c5007f027b000000b4025205cd006600bc +00660077061000cd013b01850389008f007b0000001d00cd074a042f009c009c0000077d006f +0000006f0335006a006f007b00ae00b2002d0396008f027b00f600830354063705f6008f009c +04e10266008f018d02f600cd03440029006604ee00730000140000960000b707060504030201 +002c2010b002254964b040515820c859212d2cb002254964b040515820c859212d2c20100720 +b00050b00d7920b8ffff5058041b0559b0051cb0032508b0042523e120b00050b00d7920b8ff +ff5058041b0559b0051cb0032508e12d2c4b505820b0fd454459212d2cb002254560442d2c4b +5358b00225b0022545445921212d2c45442d2cb00225b0022549b00525b005254960b0206368 +208a108a233a8a10653a2d00000100000002570affffb8c85f0f3cf5001f080000000000cef5 +cb7600000000cef5cb76f7d6fcae0d72095500000008000000010000000000010000076dfe1d +00000de2f7d6fa510d7200010000000000000000000000000000002004cd0066057900100512 +00ba04660071051200ba04e50071034a00ba028b0000057d00c90596007307cb00ba023900c1 +0323003704e3fffa04bc003b050e00c9042b006f04e7007b051400ba04ec007105140087025c +00c906330073063d0081023300c5058f00c902e30064064c007304d300c90400ffec05790010 +06e700c9000000000000004400000140000001b800000250000002c80000036c000003dc0000 +03dc0000048c00000524000005e800000638000006b400000724000008a80000090800000a68 +00000b9400000c3400000d0800000e0000000e4800000ef000001158000011ac000012c00000 +12ec00001378000013f80000142400001504000016000001000000200354002b0068000c0002 +00100099000800000415021600080004b8028040fffbfe03fa1403f92503f83203f79603f60e +03f5fe03f4fe03f32503f20e03f19603f02503ef8a4105effe03ee9603ed9603ecfa03ebfa03 +eafe03e93a03e84203e7fe03e63203e5e45305e59603e48a4105e45303e3e22f05e3fa03e22f +03e1fe03e0fe03df3203de1403dd9603dcfe03db1203da7d03d9bb03d8fe03d68a4105d67d03 +d5d44705d57d03d44703d3d21b05d3fe03d21b03d1fe03d0fe03cffe03cefe03cd9603cccb1e +05ccfe03cb1e03ca3203c9fe03c6851105c61c03c51603c4fe03c3fe03c2fe03c1fe03c0fe03 +bffe03befe03bdfe03bcfe03bbfe03ba1103b9862505b9fe03b8b7bb05b8fe03b7b65d05b7bb +03b78004b6b52505b65d40ff03b64004b52503b4fe03b39603b2fe03b1fe03b0fe03affe03ae +6403ad0e03acab2505ac6403abaa1205ab2503aa1203a98a4105a9fa03a8fe03a7fe03a6fe03 +a51203a4fe03a3a20e05a33203a20e03a16403a08a4105a096039ffe039e9d0c059efe039d0c +039c9b19059c64039b9a10059b19039a1003990a0398fe0397960d0597fe03960d03958a4105 +95960394930e05942803930e0392fa039190bb0591fe03908f5d0590bb039080048f8e25058f +5d038f40048e25038dfe038c8b2e058cfe038b2e038a8625058a410389880b05891403880b03 +878625058764038685110586250385110384fe038382110583fe0382110381fe0380fe037ffe +0340ff7e7d7d057efe037d7d037c64037b5415057b25037afe0379fe03780e03770c03760a03 +75fe0374fa0373fa0372fa0371fa0370fe036ffe036efe036c21036bfe036a1142056a530369 +fe03687d036711420566fe0365fe0364fe0363fe0362fe03613a0360fa035e0c035dfe035bfe +035afe0359580a0559fa03580a035716190557320356fe035554150555420354150353011005 +531803521403514a130551fe03500b034ffe034e4d10054efe034d10034cfe034b4a13054bfe +034a4910054a1303491d0d05491003480d0347fe0346960345960344fe0343022d0543fa0342 +bb03414b0340fe033ffe033e3d12053e14033d3c0f053d12033c3b0d053c40ff0f033b0d033a +fe0339fe033837140538fa033736100537140336350b05361003350b03341e03330d0332310b +0532fe03310b03302f0b05300d032f0b032e2d09052e10032d09032c32032b2a25052b64032a +2912052a25032912032827250528410327250326250b05260f03250b0324fe0323fe03220f03 +210110052112032064031ffa031e1d0d051e64031d0d031c1142051cfe031bfa031a42031911 +420519fe031864031716190517fe031601100516190315fe0314fe0313fe031211420512fe03 +11022d05114203107d030f64030efe030d0c16050dfe030c0110050c16030bfe030a100309fe +0308022d0508fe030714030664030401100504fe03401503022d0503fe0302011005022d0301 +100300fe0301b80164858d012b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b002b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -2b2b2b2b2b2b2b2b2b002b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b 2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b -2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b1d00> +2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b1d00> ] def /f-0-0 currentdict end definefont pop %%EndResource @@ -466,9 +470,9 @@ fa030c32030b0a0d050b16030b80040a0d030a400409fe0308fe0307fe0306050a0506fe0305 %%EndSetup %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 12 -1 552 434 +%%PageBoundingBox: 12 -1 555 434 %%EndPageSetup -q 12 -1 540 435 rectclip q +q 12 -1 543 435 rectclip q 0 g BT 17.6 0 0 17.6 130.590635 355.418671 Tm @@ -624,8 +628,8 @@ BT 2.288086 -1.25 Td (OR)Tj /f-0-0 1 Tf --5.415039 -1.25 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)21(A)]TJ +-5.552734 -1.25 Td +[(SIGA & SIGB' & SEC)-3(RET)89(-)21(A)]TJ ET 2.4 w 1 J @@ -767,17 +771,17 @@ BT -3.569336 -1.25 Td [(RIMA)17(GE-)20(A & SIGB)]TJ -2.377081 7.679162 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)21(A)]TJ +[(SIGA & SIGB' & SEC)-3(RET)89(-)21(A)]TJ 32.565481 0.100846 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)35(B)]TJ +[(SIGA' & SIGB & SEC)-3(RET)89(-)35(B)]TJ -4.384188 5.279695 Td (SIGA & SIGB)Tj /f-1-0 1 Tf 2.288086 -1.25 Td (OR)Tj /f-0-0 1 Tf --5.40918 -1.25 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)35(B)]TJ +-5.546875 -1.25 Td +[(SIGA' & SIGB & SEC)-3(RET)89(-)35(B)]TJ ET 0.8 w q 1 0 0 -1 0 433.896301 cm diff --git a/doc/dual-anchor-diag4.svg b/doc/dual-anchor-diag4.svg index 8ff60a227..79fb03649 100644 --- a/doc/dual-anchor-diag4.svg +++ b/doc/dual-anchor-diag4.svg @@ -342,7 +342,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" - inkscape:cx="290.40653" + inkscape:cx="298.45411" inkscape:cy="276.72757" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -370,7 +370,7 @@ image/svg+xml - + @@ -532,7 +532,7 @@ x="241.40251" y="204.30637" style="font-weight:normal" - id="tspan6315">SIGA & SIGB & SECRET-A + id="tspan6315">SIGA & SIGB' & SECRET-A @@ -735,7 +735,7 @@ sodipodi:role="line" x="32.223354" y="246.30128" - id="tspan6319">SIGA & SIGB & SECRET-A + id="tspan6319">SIGA & SIGB' & SECRET-A SIGA & SIGB & SECRET-B + y="244.78859">SIGA' & SIGB & SECRET-B SIGA & SIGB & SECRET-BSIGA' & SIGB & SECRET-B +2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b +2b2b2b2b2b2b2b2b2b1d00> ] def /f-0-0 currentdict end definefont pop %%EndResource @@ -470,9 +475,9 @@ fa030c32030b0a0d050b16030b80040a0d030a400409fe0308fe0307fe0306050a0506fe0305 %%EndSetup %%Page: 1 1 %%BeginPageSetup -%%PageBoundingBox: 7 -1 559 434 +%%PageBoundingBox: 7 -1 562 434 %%EndPageSetup -q 7 -1 552 435 rectclip q +q 7 -1 555 435 rectclip q 0 g BT 17.6 0 0 17.6 130.590635 355.418671 Tm @@ -628,8 +633,8 @@ BT 2.288086 -1.25 Td (OR)Tj /f-0-0 1 Tf --5.415039 -1.25 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)21(A)]TJ +-5.552734 -1.25 Td +[(SIGA & SIGB' & SEC)-3(RET)89(-)21(A)]TJ ET 2.4 w 1 J @@ -771,17 +776,17 @@ BT -3.569336 -1.25 Td [(RIMA)17(GE-)20(A & SIGB)]TJ -2.377081 7.679162 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)21(A)]TJ +[(SIGA & SIGB' & SEC)-3(RET)89(-)21(A)]TJ 32.565481 0.100846 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)35(B)]TJ +[(SIGA' & SIGB & SEC)-3(RET)89(-)35(B)]TJ -4.384188 5.279695 Td (SIGA & SIGB)Tj /f-1-0 1 Tf 2.288086 -1.25 Td (OR)Tj /f-0-0 1 Tf --5.40918 -1.25 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)35(B)]TJ +-5.546875 -1.25 Td +[(SIGA' & SIGB & SEC)-3(RET)89(-)35(B)]TJ ET 0.8 w q 1 0 0 -1 0 433.896301 cm @@ -849,7 +854,7 @@ BT -3.505859 -1.25 Td [(SECRE)-3(T)91(-)35(B & SIGA)]TJ -1.430404 7.746507 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)21(A)]TJ +[(SIGA & SIGB' & SEC)-3(RET)89(-)21(A)]TJ ET 0.8 w q 1 0 0 -1 0 433.896301 cm @@ -890,7 +895,7 @@ BT -3.512695 -1.25 Td [(SECRE)-3(T)91(-)21(A & SIGB)]TJ -1.69294 7.746507 Td -[(SIGA & SIGB & SEC)-3(RET)90(-)35(B)]TJ +[(SIGA' & SIGB & SEC)-3(RET)89(-)35(B)]TJ ET 0.8 w 0 J diff --git a/doc/dual-anchor-final.svg b/doc/dual-anchor-final.svg index 94e23cb8e..9a8fe3ced 100644 --- a/doc/dual-anchor-final.svg +++ b/doc/dual-anchor-final.svg @@ -404,7 +404,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" - inkscape:cx="290.40653" + inkscape:cx="166.15777" inkscape:cy="276.72757" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -432,7 +432,7 @@ image/svg+xml - + @@ -594,7 +594,7 @@ x="241.40251" y="204.30637" style="font-weight:normal" - id="tspan6315">SIGA & SIGB & SECRET-A + id="tspan6315">SIGA & SIGB' & SECRET-A @@ -797,7 +797,7 @@ sodipodi:role="line" x="32.223354" y="246.30128" - id="tspan6319">SIGA & SIGB & SECRET-A + id="tspan6319">SIGA & SIGB' & SECRET-A SIGA & SIGB & SECRET-B + y="244.78859">SIGA' & SIGB & SECRET-B SIGA & SIGB & SECRET-BSIGA' & SIGB & SECRET-BSIGA & SIGB & SECRET-A + id="tspan6319-5">SIGA & SIGB' & SECRET-A SIGA & SIGB & SECRET-B + id="tspan6319-5-6">SIGA' & SIGB & SECRET-B