From 36adf5720a38800b3ba037cc93f78abd5cbe9e4a Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 15 Jun 2023 09:24:45 +0200 Subject: [PATCH 1/7] Docs, Changelogs: Fix typos --- docs/CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst index d411a5125074..fe74d01a4f1e 100644 --- a/docs/CHANGES.rst +++ b/docs/CHANGES.rst @@ -25,7 +25,7 @@ Node ---- - Fixed a bug where the node could freeze when an old block was - requested during a store merge. (MR :gl:`!8952`)` + requested during a store merge. (MR :gl:`!8952`) Version 17.0-rc1 ================ @@ -204,7 +204,7 @@ Smart Rollup WASM Debugger - Automatically ``load inputs`` when ``step inbox`` is called. (MR :gl:`!8444`) - Added a command ``show function symbols`` to inspect the custom section - ``name`` of unstripped kernels (MR :gl:`!8522`) + ``name`` of unstripped kernels. (MR :gl:`!8522`) - Added a command ``profile`` that runs a full ``kernel_run`` and produces a flamegraph of the execution (MR :gl:`!8510`). -- GitLab From e231a497de2b74727b0abfe14d5961a0336fe7d5 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 21 Jun 2023 09:24:58 +0200 Subject: [PATCH 2/7] Docs: Update SNARK link --- docs/alpha/sapling.rst | 2 +- docs/nairobi/sapling.rst | 2 +- docs/oxford/sapling.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/alpha/sapling.rst b/docs/alpha/sapling.rst index 1b3e1ef259c2..c182cf9cb35f 100644 --- a/docs/alpha/sapling.rst +++ b/docs/alpha/sapling.rst @@ -100,7 +100,7 @@ that is needed to refer to a certain state of the shielded pool. In order to ensure the correctness of a transaction, given that there is information that we wish to remain secret, the spender must also generate proofs that various good properties are true. -Thanks to the use of `SNARKs `_ +Thanks to the use of `SNARKs `_ these proofs are very succinct in size, fast to verify and they don't reveal any private information. diff --git a/docs/nairobi/sapling.rst b/docs/nairobi/sapling.rst index 75919d3b8114..d2648791ebc3 100644 --- a/docs/nairobi/sapling.rst +++ b/docs/nairobi/sapling.rst @@ -100,7 +100,7 @@ that is needed to refer to a certain state of the shielded pool. In order to ensure the correctness of a transaction, given that there is information that we wish to remain secret, the spender must also generate proofs that various good properties are true. -Thanks to the use of `SNARKs `_ +Thanks to the use of `SNARKs `_ these proofs are very succinct in size, fast to verify and they don't reveal any private information. diff --git a/docs/oxford/sapling.rst b/docs/oxford/sapling.rst index 905ad4a86839..dd2abad9e2f0 100644 --- a/docs/oxford/sapling.rst +++ b/docs/oxford/sapling.rst @@ -100,7 +100,7 @@ that is needed to refer to a certain state of the shielded pool. In order to ensure the correctness of a transaction, given that there is information that we wish to remain secret, the spender must also generate proofs that various good properties are true. -Thanks to the use of `SNARKs `_ +Thanks to the use of `SNARKs `_ these proofs are very succinct in size, fast to verify and they don't reveal any private information. -- GitLab From 037d8b06e359fc34eed0ba57e0d30d1230daf825 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 21 Jun 2023 11:32:30 +0200 Subject: [PATCH 3/7] Docs: remove misplaced Tezt regression outputs --- ...0 - kernel should run e2e (kernel_e2e).out | 74 ------------------- ...0 - kernel should run e2e (kernel_e2e).out | 74 ------------------- 2 files changed, 148 deletions(-) delete mode 100644 docs/alpha/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out delete mode 100644 docs/nairobi/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out diff --git a/docs/alpha/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out b/docs/alpha/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out deleted file mode 100644 index 691d77f97ba5..000000000000 --- a/docs/alpha/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out +++ /dev/null @@ -1,74 +0,0 @@ - -./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind wasm_2_0_0 of type 'pair string (ticket string)' booting with 0061736d0100000001690f60037f7f7f017f60027f7f017f60027f7f0060057f7f7f7f7f017f60047f7f7f7f017f60017f0060000060077f7f7f7f7f7f7f0060037f7f7f0060067f7f7f7f7f7f017f60057f7f7f7f7f0060017f017f60017f017e60077f7f7f7f7f7f7f017f60037e7f7f017f029d010510726f6c6c75705f736166655f636f72650b77726974655f6465627567000210726f6c6c75705f736166655f636f72650973746f72655f686173000110726f6c6c75705f736166655f636f72650b73746f72655f7772697465000310726f6c6c75705f736166655f636f72650a73746f72655f6d6f7665000410726f6c6c75705f736166655f636f72650f72657665616c5f707265696d616765000003383705060500050708080202060200090a040b02010508080800080801020001010c080b0d01010a000a00090101000101010401010e0100000405017001121205030100110619037f01418080c0000b7f0041c79fc0000b7f0041d09fc0000b073304066d656d6f727902000b6b65726e656c5f6e65787400060a5f5f646174615f656e6403010b5f5f686561705f6261736503020917010041010b1105371f172928223618242b2f30313233390a82683702000b3101017f23808080800041106b2200248080808000108f80808000200041086a108980808000200041106a2480808080000b170041e080c08000410e418c81c08000109d80808000000bc00101037f23808080800041306b2203248080808000200341286a200110968080800020032802282104200341206a200110968080800041012105024002402000200420032802241091808080000e0401000100010b200341186a200110968080800020032802182105200341106a200110968080800020032802142101200341086a2002109680808000200328020821042003200210968080800020002005200120042003280204109380808000410321050b200341306a24808080800020050ba40402047f017e23808080800041d080016b2201248080808000419c81c080004111109080808000200141d8006a4200370300200141d0006a4200370300200141c8006a42003703002001420037034041002102200141c0006a210302400240024002400340200141c080016a200241d083c080006a2d00002002108b8080800020012d00c080010d0120012d00c180012104200141c080016a200241d183c080006a2d0000200241016a108b8080800020012d00c080010d01200320012d00c180012004410474723a0000200341016a2103200241026a220241c000470d000b200141356a2202200141c0006a41186a290000370000200141306a2203200141c0006a41136a2900003703002001410a6a20012d00423a0000200141086a41136a2003290300370000200141086a41186a2002290000370000200120012f01403b01082001200129004b2205370328200120053700132001200129004337000b200141c0006a41004180800110ba808080001a20014100360228200120004100200141086a200141c0006a41808001200141286a108a808080000240200128020022020d0041f581c080004123109080808000200041b482c0800041d082c0800010888080800041ff01714103460d034127210341d882c0800021020c020b200128020421030c010b41252103419084c0800021020b2002450d00200220031090808080000c010b41ad81c0800041101090808080000b200141d080016a2480808080000bf20401037f23808080800041e0006b220724808080800041bd81c08000411210908080800002400240200241034d0d00410f210241cf81c0800021050c010b02402001200320042005109480808000220820054d0d004120210241b083c0800021050c010b200741c0006a20042008108c80808000024020072d00400d00200741cc006a2802002103200741c8006a28020021090240024020072802440d002007200336024420072009360240200741286a200741c0006a108d80808000200728022c210520072802282102200741206a200741c0006a108d8080800020072802242104200741186a41b482c0800010968080800020072802182103200741106a41b482c0800010968080800020012003200728021420042002200510928080800010958080800041ff01714103470d01200741086a200741c0006a108d8080800020062006280200200728020c6a36020041ff82c08000411a109080808000410021050c030b2007200336023c2007200936023841de81c08000410f109080808000200741c0006a200741386a108e8080800020072802442103024002400240200728025022094120470d00200520086b2109200420086a2104200241016a210820072802402102034020034120490d02200741306a200120082002200420092006108a80808000200341606a2103200241206a210220072802302205450d000b200728023421020c050b200320094f0d010b410021050c030b418080c080004117200741d8006a41d080c0800041c080c0800010aa80808000000b41172102419983c0800021050c010b4108210241ed81c0800021050b2000200236020420002005360200200741e0006a2480808080000b850101017f0240024002400240200141bf7f6a41ff01714106490d002001419f7f6a41ff01714106490d01200141506a220341ff0171410a490d02200041086a2002360200200041046a200141ff0171360200200041013a00000f0b2000200141496a3a00010c020b2000200141a97f6a3a00010c010b200020033a00010b200041003a00000bc80201027f02400240024020020d000c010b024002400240024020012d000022030e020001040b2002417f6a22034104490d02200128000122024118742002410874418080fc07717220024108764180fe037120024118767272220241046a220420034b0d022002417c490d014104200441d884c08000109e80808000000b02402002417f6a22034104490d00200128000122024118742002410874418080fc07717220024108764180fe037120024118767272220241046a20034b0d002002411f710d002000410c6a2002360200200041086a200141056a360200200041046a4101360200200041003a00000f0b200041023a00010c030b2000410c6a2002360200200041086a200141056a360200200041046a4100360200200041003a00000f0b200041023a00010c010b200041026a20033a0000200020024100473a00010b200041013a00000b0c00200020012902003703000b3f01017f200041203602102000200128020022023602002000410c6a20012802042201411f713602002000200141607122013602042000200220016a3602080b02000b0c00200020011080808080000b0c00200120021081808080000b1200200120022003200420051082808080000b110020012002200320041083808080001a0b0e002001200220031084808080000b09004100410320001b0b0c00200020012902003703000b0d0020002802001a037f0c000b0b02000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341e485c0800036020820034183808080003602242003200341206a360218200320033602282003200341046a360220200341086a200210a080808000000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341e489c0800036020820034183808080003602242003200341206a3602182003200341046a36022820032003360220200341086a200210a080808000000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341848ac0800036020820034183808080003602242003200341206a3602182003200341046a36022820032003360220200341086a200210a080808000000bd80701067f20002802102103024002400240024002400240200028020822044101460d0020034101470d010b20034101470d03200120026a2105200041146a28020022060d0141002107200121080c020b2000280218200120022000411c6a28020028020c1180808080000021030c030b41002107200121080340200822032005460d020240024020032c00002208417f4c0d00200341016a21080c010b0240200841604f0d00200341026a21080c010b0240200841704f0d00200341036a21080c010b20032d0002413f7141067420032d0001413f71410c747220032d0003413f7172200841ff0171411274418080f0007172418080c400460d03200341046a21080b200720036b20086a21072006417f6a22060d000b0b20082005460d00024020082c00002203417f4a0d0020034160490d0020034170490d0020082d0002413f7141067420082d0001413f71410c747220082d0003413f7172200341ff0171411274418080f0007172418080c400460d010b02400240024020070d00410021080c010b024020072002490d00410021032002210820072002460d010c020b4100210320072108200120076a2c00004140480d010b20082107200121030b2007200220031b21022003200120031b21010b024020040d002000280218200120022000411c6a28020028020c118080808000000f0b2000410c6a28020021050240024020024110490d002001200210b48080800021080c010b024020020d00410021080c010b20024103712107024002402002417f6a41034f0d0041002108200121030c010b2002417c71210641002108200121030340200820032c000041bf7f4a6a200341016a2c000041bf7f4a6a200341026a2c000041bf7f4a6a200341036a2c000041bf7f4a6a2108200341046a21032006417c6a22060d000b0b2007450d000340200820032c000041bf7f4a6a2108200341016a21032007417f6a22070d000b0b0240200520084d0d0041002103200520086b22072106024002400240410020002d0020220820084103461b4103710e03020001020b41002106200721030c010b20074101762103200741016a41017621060b200341016a21032000411c6a28020021072000280204210820002802182100024003402003417f6a2203450d0120002008200728021011818080800000450d000b41010f0b410121032008418080c400460d01200020012002200728020c118080808000000d01410021030340024020062003470d0020062006490f0b200341016a210320002008200728021011818080800000450d000b2003417f6a2006490f0b2000280218200120022000411c6a28020028020c118080808000000f0b20030b5401017f23808080800041206b2203248080808000200341146a4100360200200341e884c08000360210200342013702042003200136021c200320003602182003200341186a3602002003200210a080808000000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341b88ac0800036020820034183808080003602242003200341206a3602182003200341046a36022820032003360220200341086a200210a080808000000b110020003502004101200110b8808080000b4c01017f23808080800041206b2202248080808000200241013a00182002200136021420022000360210200241a085c0800036020c200241e884c08000360208200241086a108780808000000bbd05010a7f23808080800041306b2203248080808000200341246a2001360200200341033a0028200342808080808004370308200320003602204100210420034100360218200341003602100240024002400240200228020822050d00200241146a2802002206450d0120022802002101200228021021002006417f6a41ffffffff017141016a2204210603400240200141046a2802002207450d00200328022020012802002007200328022428020c118080808000000d040b2000280200200341086a200041046a280200118180808000000d03200041086a2100200141086a21012006417f6a22060d000c020b0b2002410c6a2802002200450d00200041057421082000417f6a41ffffff3f7141016a2104200228020021014100210603400240200141046a2802002200450d00200328022020012802002000200328022428020c118080808000000d030b2003200520066a2200411c6a2d00003a00282003200041046a290200422089370308200041186a28020021092002280210210a4100210b41002107024002400240200041146a2802000e03010002010b2009410374210c41002107200a200c6a220c280204418480808000470d01200c28020028020021090b410121070b2003200936021420032007360210200041106a28020021070240024002402000410c6a2802000e03010002010b20074103742109200a20096a2209280204418480808000470d01200928020028020021070b4101210b0b2003200736021c2003200b360218200a20002802004103746a2200280200200341086a2000280204118180808000000d02200141086a21012008200641206a2206470d000b0b4100210020042002280204492201450d012003280220200228020020044103746a410020011b22012802002001280204200328022428020c11808080800000450d010b410121000b200341306a24808080800020000b8d0101047f23808080800041206b22022480808080004101210302402000200110a3808080000d002001411c6a2802002104200128021821052002411c6a4100360200200241e884c080003602182002420137020c200241ec84c0800036020820052004200241086a10a1808080000d00200041046a200110a38080800021030b200241206a24808080800020030bec0201037f2380808080004180016b220224808080800002400240024002400240200128020022034110710d0020034120710d0120003502004101200110b88080800021000c040b20002802002100410021030340200220036a41ff006a413041d7002000410f712204410a491b20046a3a00002003417f6a21032000410f4b21042000410476210020040d000b20034180016a22004181014f0d0120014101419887c080004102200220036a4180016a410020036b10ae8080800021000c030b20002802002100410021030340200220036a41ff006a413041372000410f712204410a491b20046a3a00002003417f6a21032000410f4b21042000410476210020040d000b20034180016a22004181014f0d0120014101419887c080004102200220036a4180016a410020036b10ae8080800021000c020b2000418001418887c08000109a80808000000b2000418001418887c08000109a80808000000b20024180016a24808080800020000b0c004281b8aa93f5f3e5ec140bd10302027f017e41f400210341022104024002400240024002400240024002400240200141776a0e1f08020505010505050505050505050505050505050505050505030505050504000b41dc002103200141dc00460d050c040b41f20021030c040b41ee0021030c030b20024180800471450d01412221030c020b200241800271450d00412721030c010b02402002410171450d00200110a680808000450d00200141017267410276410773ad4280808080d0008421050c020b0240024002400240200141808004490d002001418080084f0d01200141bb92c08000412a418f93c0800041c00141cf94c0800041b60310a7808080000d030c020b2001419c8dc08000412841ec8dc0800041a002418c90c0800041af0210a780808000450d010c020b200141e0ffff007141e0cd0a460d00200141c091756a41784b0d00200141feffff0071419ef00a460d00200141d0e2746a41714b0d002001418090746a41e0674b0d002001418080746a419d744b0d0020014180fe476a41caa4544b0d00200141f08338490d010b200141017267410276410773ad4280808080d0008421050c020b41012104200121030b0c010b41032104200121030b2000200336020420002004360200200041086a20053702000b810301057f2000410b74210141002102412021034120210402400240034002400240200341017620026a2203410274418499c080006a280200410b7422052001490d0020052001460d03200321040c010b200341016a21020b200420026b2103200420024b0d000c020b0b200341016a21020b0240024002402002411f4b0d002002410274210341c305210402402002411f460d002003418899c080006a28020041157621040b4100210102402002417f6a220520024b0d00200541204f0d022005410274418499c080006a28020041ffffff007121010b024020042003418499c080006a2802004115762202417f736a450d00200020016b2101200241c305200241c3054b1b21032004417f6a210541002104034020032002460d042004200241849ac080006a2d00006a220420014b0d012005200241016a2202470d000b200521020b20024101710f0b2002412041b098c08000109980808000000b2005412041d098c08000109980808000000b200341c30541c098c08000109980808000000b880301077f41012107024002402002450d00200120024101746a210820004180fe037141087621094100210a200041ff0171210b02400340200141026a210c200a20012d000122026a210d024020012d000022012009460d00200120094b0d03200d210a200c2101200c2008470d010c030b0240200d200a490d00200d20044b0d022003200a6a2101024003402002450d012002417f6a210220012d0000210a200141016a2101200a200b470d000b410021070c050b200d210a200c2101200c2008470d010c030b0b200a200d41fc8cc08000109e80808000000b200d200441fc8cc08000109b80808000000b2006450d00200520066a210b200041ffff037121014101210702400340200541016a210a0240024020052d00002202411874411875220d4100480d00200a21050c010b200a200b460d02200d41ff007141087420052d0001722102200541026a21050b200120026b22014100480d02200741017321072005200b470d000c020b0b41f484c08000412b418c8dc08000109d80808000000b20074101710b1400200120002802002000280204109c808080000b180020002802002001200028020428020c118180808000000b930101017f23808080800041c0006b22052480808080002005200136020c2005200036020820052003360214200520023602102005412c6a41023602002005413c6a4185808080003602002005420237021c200541f885c0800036021820054186808080003602342005200541306a3602282005200541106a3602382005200541086a360230200541186a200410a080808000000b890601097f024002402002450d002000280204210320002802002104200028020821050340024020052d0000450d00200441a086c080004104200328020c11808080800000450d0041010f0b410021062002210702400240024002400340200120066a21080240024002400240024020074108490d000240200841036a417c7120086b22000d00200741786a2109410021000c030b20072000200020074b1b21004100210a03402008200a6a2d0000410a460d052000200a41016a220a460d020c000b0b2007450d054100210a20082d0000410a460d0320074101460d054101210a20082d0001410a460d0320074102460d054102210a20082d0002410a460d0320074103460d054103210a20082d0003410a460d0320074104460d054104210a20082d0004410a460d0320074105460d054105210a20082d0005410a460d0320074106460d054106210a20082d0006410a470d050c030b2000200741786a22094b0d010b02400340200820006a220a280200220b417f73200b418a94a8d0007341fffdfb776a71200a41046a280200220a417f73200a418a94a8d0007341fffdfb776a7172418081828478710d01200041086a220020094d0d000b0b200020074d0d002000200741a089c08000109a80808000000b20002007460d02200020076b210b200820006a21084100210a024003402008200a6a2d0000410a460d01200b200a41016a220a6a0d000c040b0b2000200a6a210a0b0240200a20066a220041016a22062000490d0020022006490d00200120006a2d0000410a470d00200541013a0000200220064d0d0320062100200120066a2c000041bf7f4c0d040c050b200220066b2107200220064f0d000b0b200541003a0000200221060b2002210020022006460d010b200120024100200641c486c0800010ac80808000000b0240200420012000200328020c11808080800000450d0041010f0b02400240200220004b0d0020022000460d010c040b200120006a2c000041bf7f4c0d030b200120006a2101200220006b22020d000b0b41000f0b200120022000200241d486c0800010ac80808000000ba80a01057f23808080800041f0006b22052480808080002005200336020c20052002360208024002400240024002400240024002402001418102490d004180022106024020002c00800241bf7f4a0d0041ff01210620002c00ff0141bf7f4a0d0041fe01210620002c00fe0141bf7f4a0d0041fd0121060b20062001490d0120062001470d030b20052001360214200520003602104100210641e884c0800021070c010b20052006360214200520003602104105210641c88ac0800021070b2005200636021c20052007360218200220014b22060d01200320014b0d010240200220034b0d00024002402002450d00024020022001490d0020012002460d010c020b200020026a2c00004140480d010b200321020b20052002360220200121030240200220014f0d00200241016a220641002002417d6a2203200320024b1b2203490d04024020032006460d00200020066a200020036a22086b21060240200020026a22092c000041bf7f4c0d002006417f6a21070c010b20032002460d0002402009417f6a22022c000041bf7f4c0d002006417e6a21070c010b20082002460d0002402009417e6a22022c000041bf7f4c0d002006417d6a21070c010b20082002460d0002402009417d6a22022c000041bf7f4c0d002006417c6a21070c010b20082002460d002006417b6a21070b200720036a21030b02402003450d00024020032001490d0020032001460d010c070b200020036a2c000041bf7f4c0d060b20032001460d040240024002400240200020036a22022c00002201417f4a0d0020022d0001413f7121002001411f7121062001415f4b0d01200641067420007221020c020b2005200141ff0171360224410121010c020b200041067420022d0002413f717221000240200141704f0d0020002006410c747221020c010b200041067420022d0003413f71722006411274418080f00071722202418080c400460d060b20052002360224410121012002418001490d00410221012002418010490d0041034104200241808004491b21010b200520033602282005200120036a36022c200541306a41146a4105360200200541ec006a418680808000360200200541e4006a418680808000360200200541c8006a41146a418780808000360200200541d4006a41888080800036020020054205370234200541808cc08000360230200541838080800036024c2005200541c8006a3602402005200541186a3602682005200541106a3602602005200541286a3602582005200541246a3602502005200541206a360248200541306a200410a080808000000b200541e4006a418680808000360200200541c8006a41146a418680808000360200200541d4006a418380808000360200200541306a41146a410436020020054204370234200541ac8bc08000360230200541838080800036024c2005200541c8006a3602402005200541186a3602602005200541106a36025820052005410c6a3602502005200541086a360248200541306a200410a080808000000b2000200141002006200410ac80808000000b20052002200320061b360228200541306a41146a4103360200200541c8006a41146a418680808000360200200541d4006a41868080800036020020054203370234200541f08ac08000360230200541838080800036024c2005200541c8006a3602402005200541186a3602582005200541106a3602502005200541286a360248200541306a200410a080808000000b2003200641c48cc08000109e80808000000b41f484c08000412b2004109d80808000000b2000200120032001200410ac80808000000b950302057f027e23808080800041c0006b22032480808080000240024020002d0008450d0020002802042104410121050c010b2000280204210402402000280200220628020022074104710d0041012105200628021841e686c0800041ea86c0800020041b4102410120041b2006411c6a28020028020c118080808000000d0120012006200228020c1181808080000021050c010b024020040d000240200628021841e886c0800041022006411c6a28020028020c11808080800000450d0041012105410021040c020b200628020021070b41012105200341013a0017200341346a418886c08000360200200341106a200341176a36020020032007360218200320062902183703082006290208210820062902102109200320062d00203a00382003200628020436021c20032009370328200320083703202003200341086a3602302001200341186a200228020c118180808000000d00200328023041e486c080004102200328023428020c1180808080000021050b200020053a00082000200441016a360204200341c0006a24808080800020000b840801077f024002402001450d00412b418080c4002000280200220141017122061b2107200620056a21080c010b200541016a210820002802002101412d21070b0240024020014104710d00410021020c010b0240024020034110490d002002200310b48080800021060c010b024020030d00410021060c010b20034103712109024002402003417f6a41034f0d0041002106200221010c010b2003417c71210a41002106200221010340200620012c000041bf7f4a6a200141016a2c000041bf7f4a6a200141026a2c000041bf7f4a6a200141036a2c000041bf7f4a6a2106200141046a2101200a417c6a220a0d000b0b2009450d000340200620012c000041bf7f4a6a2106200141016a21012009417f6a22090d000b0b200620086a21080b0240024020002802080d0041012101200020072002200310b5808080000d012000280218200420052000411c6a28020028020c118080808000000f0b024002400240024002402000410c6a280200220620084d0d0020002d00004108710d0441002101200620086b22092108410120002d0020220620064103461b4103710e03030102030b41012101200020072002200310b5808080000d042000280218200420052000411c6a28020028020c118080808000000f0b41002108200921010c010b20094101762101200941016a41017621080b200141016a21012000411c6a2802002109200028020421062000280218210a024003402001417f6a2201450d01200a2006200928021011818080800000450d000b41010f0b410121012006418080c400460d01200020072002200310b5808080000d01200028021820042005200028021c28020c118080808000000d01200028021c2109200028021821004100210102400340024020082001470d00200821010c020b200141016a210120002006200928021011818080800000450d000b2001417f6a21010b200120084921010c010b2000280204210b2000413036020420002d0020210c41012101200041013a0020200020072002200310b5808080000d0041002101200620086b22092103024002400240410120002d0020220620064103461b4103710e03020001020b41002103200921010c010b20094101762101200941016a41017621030b200141016a21012000411c6a2802002109200028020421062000280218210a024003402001417f6a2201450d01200a2006200928021011818080800000450d000b41010f0b410121012006418080c400460d00200028021820042005200028021c28020c118080808000000d00200028021c21012000280218210a410021090240034020032009460d01200941016a2109200a2006200128021011818080800000450d000b410121012009417f6a2003490d010b2000200c3a00202000200b36020441000f0b20010b830201017f23808080800041106b22022480808080002002410036020c02400240024002402001418001490d002001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d410321010c030b200220013a000c410121010c020b20022001413f71418001723a000d2002200141067641c001723a000c410221010c010b20022001413f71418001723a000f2002200141127641f001723a000c20022001410676413f71418001723a000e20022001410c76413f71418001723a000d410421010b20002002410c6a200110ab808080002101200241106a24808080800020010b7101017f23808080800041206b220224808080800020022000360204200241086a41106a200141106a290200370300200241086a41086a200141086a29020037030020022001290200370308200241046a41e488c08000200241086a10a1808080002101200241206a24808080800020010b110020002802002001200210ab808080000b8a0201017f23808080800041106b2202248080808000200028020021002002410036020c02400240024002402001418001490d002001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d410321010c030b200220013a000c410121010c020b20022001413f71418001723a000d2002200141067641c001723a000c410221010c010b20022001413f71418001723a000f2002200141127641f001723a000c20022001410676413f71418001723a000e20022001410c76413f71418001723a000d410421010b20002002410c6a200110ab808080002101200241106a24808080800020010b7401017f23808080800041206b220224808080800020022000280200360204200241086a41106a200141106a290200370300200241086a41086a200141086a29020037030020022001290200370308200241046a41e488c08000200241086a10a1808080002101200241206a24808080800020010ba30801097f02400240200041036a417c71220220006b220320014b0d00200341044b0d00200120036b22044104490d0020044103712105410021064100210102402003450d00200341037121070240024020022000417f736a41034f0d0041002101200021020c010b2003417c71210841002101200021020340200120022c000041bf7f4a6a200241016a2c000041bf7f4a6a200241026a2c000041bf7f4a6a200241036a2c000041bf7f4a6a2101200241046a21022008417c6a22080d000b0b2007450d000340200120022c000041bf7f4a6a2101200241016a21022007417f6a22070d000b0b200020036a210002402005450d0020002004417c716a22022c000041bf7f4a210620054101460d00200620022c000141bf7f4a6a210620054102460d00200620022c000241bf7f4a6a21060b20044102762103200620016a21080340200021062003450d02200341c001200341c001491b220441037121052004410274210902400240200441fc0171220a41027422000d00410021020c010b200620006a2107410021022006210003402000410c6a2802002201417f73410776200141067672418182840871200041086a2802002201417f73410776200141067672418182840871200041046a2802002201417f7341077620014106767241818284087120002802002201417f7341077620014106767241818284087120026a6a6a6a2102200041106a22002007470d000b0b200620096a2100200320046b2103200241087641ff81fc0771200241ff81fc07716a418180046c41107620086a21082005450d000b2006200a4102746a2100200541ffffffff036a220441ffffffff0371220241016a2201410371210302400240200241034f0d00410021020c010b200141fcffffff077121014100210203402000410c6a2802002207417f73410776200741067672418182840871200041086a2802002207417f73410776200741067672418182840871200041046a2802002207417f7341077620074106767241818284087120002802002207417f7341077620074106767241818284087120026a6a6a6a2102200041106a21002001417c6a22010d000b0b02402003450d00200441818080807c6a2101034020002802002207417f7341077620074106767241818284087120026a2102200041046a21002001417f6a22010d000b0b200241087641ff81fc0771200241ff81fc07716a418180046c41107620086a0f0b024020010d0041000f0b20014103712102024002402001417f6a41034f0d00410021080c010b2001417c712101410021080340200820002c000041bf7f4a6a200041016a2c000041bf7f4a6a200041026a2c000041bf7f4a6a200041036a2c000041bf7f4a6a2108200041046a21002001417c6a22010d000b0b2002450d000340200820002c000041bf7f4a6a2108200041016a21002002417f6a22020d000b0b20080b5c01017f0240024002402001418080c400460d0041012104200028021820012000411c6a280200280210118180808000000d010b20020d01410021040b20040f0b2000280218200220032000411c6a28020028020c118080808000000b870401077f23808080800041106b22022480808080004101210302402001280218220441272001411c6a2802002802102205118180808000000d002002200028020041810210a5808080002002410c6a2d00002106200241086a28020021072002280200210102400240024020022802042208418080c400460d0003402001210041dc00210341012101024002400240024020000e0407010300070b200641ff01712100410021064103210141fd00210302400240024020000e06090504000102090b4102210641fb0021030c040b4103210141f5002103410321060c030b4104210641dc0021030c020b41002101200821030c010b4102410120071b2106413041d7002008200741027476410f712203410a491b20036a21032007417f6a410020071b21070b20042003200511818080800000450d000c020b0b03402001210041dc002103410121010240024020000e0404040100040b200641ff01712100410021064103210141fd002103024002400240024020000e06070403020100070b4104210641dc0021030c030b4103210141f5002103410321060c020b4102210641fb0021030c010b4102410120071b2106418080c40020074102747641017141307221032007417f6a410020071b21070b20042003200511818080800000450d000b0b410121030c010b2004412720051181808080000021030b200241106a24808080800020030b8e0201027f23808080800041106b22022480808080002002200128021841f098c0800041112001411c6a28020028020c118080808000003a000820022001360200200241003a0009200241003602042002200036020c20022002410c6a41e098c0800010ad808080001a20022d00082101024020022802042203450d00200141ff017121004101210120000d0020022802002100024020034101470d0020022d000941ff0171450d0020002d00004104710d0041012101200028021841eb86c0800041012000411c6a28020028020c118080808000000d010b200028021841ec86c0800041012000411c6a28020028020c1180808080000021010b200241106a248080808000200141ff01714100470be90203027f017e037f23808080800041306b2203248080808000412721040240024020004290ce005a0d00200021050c010b412721040340200341096a20046a2206417c6a200020004290ce008022054290ce007e7da7220741ffff037141e4006e2208410174419a87c080006a2f00003b00002006417e6a2007200841e4006c6b41ffff0371410174419a87c080006a2f00003b00002004417c6a2104200042ffc1d72f5621062005210020060d000b0b02402005a7220641e3004d0d00200341096a2004417e6a22046a2005a72206200641ffff037141e4006e220641e4006c6b41ffff0371410174419a87c080006a2f00003b00000b024002402006410a490d00200341096a2004417e6a22046a2006410174419a87c080006a2f00003b00000c010b200341096a2004417f6a22046a200641306a3a00000b2002200141e884c080004100200341096a20046a412720046b10ae808080002104200341306a24808080800020040b1200200141fc88c080004102109c808080000b0e0020002001200210bb808080000bb50101037f024002402002410f4b0d00200021030c010b2000410020006b41037122046a210502402004450d00200021030340200320013a0000200341016a22032005490d000b0b2005200220046b2204417c7122026a2103024020024101480d00200141ff017141818284086c2102034020052002360200200541046a22052003490d000b0b200441037121020b02402002450d00200320026a21050340200320013a0000200341016a22032005490d000b0b20000b0bd11f0100418080c0000bc71f47756172616e7465656420746f2062652065786163742e2f7573722f7372632f74657a6f735f726f6c6c75705f656e636f64696e672f7372632f6461632e72731700100029000000bc0000002b000000010000000000000001000000020000006578706c696369742070616e6963696e7374616c6c65725f6b65726e656c2f7372632f6c69622e72730000006e0010001b0000001c00000005000000494e5354414c4c494e47204b45524e454c494e5354414c4c4544204b45524e454c454e5452593a2072657665616c5f6c6f6f70544f4f204d414e59204c4556454c53476f742068617368657320706167654445434f44494e4753657474696e672072657665616c6564206b65726e656c20666f7220757067726164652f696e7374616c6c65722f6b65726e656c2f626f6f742e7761736d00180110001b0000002f6b65726e656c2f626f6f742e7761736d0000003c011000110000004641494c454420746f20696e7374616c6c206b65726e656c20696e204b45524e454c5f5041544877726f7465206b65726e656c207061676520746f2073746f72654641494c454420746f20777269746520636f6e74656e7452414e206f7574206f662062756666657220666f722066657463685f7061676531616361613939356566383462633234636338626235343564643938363038326662626563303731656431633365393935346162656135656463343431636364524f4f545f505245494d4147455f48415348206d7573742062652076616c6964204845582e74657a6f735f726f6c6c75705f656e636f64696e672f7372632f6461632e72730000003502100020000000a2000000150000002e2e0000680210000200000063616c6c656420604f7074696f6e3a3a756e77726170282960206f6e206120604e6f6e65602076616c7565000900000000000000010000000a000000696e646578206f7574206f6620626f756e64733a20746865206c656e20697320206275742074686520696e646578206973200000b002100020000000d002100012000000603a20006802100000000000f502100002000000090000000c000000040000000b0000000c0000000d000000202020206c6962726172792f636f72652f7372632f666d742f6275696c646572732e727324031000200000002f00000021000000240310002000000030000000120000002c0a2c20280a282c296c6962726172792f636f72652f7372632f666d742f6e756d2e72736d0310001b00000065000000140000003078303030313032303330343035303630373038303931303131313231333134313531363137313831393230323132323233323432353236323732383239333033313332333333343335333633373338333934303431343234333434343534363437343834393530353135323533353435353536353735383539363036313632363336343635363636373638363937303731373237333734373537363737373837393830383138323833383438353836383738383839393039313932393339343935393639373938393900000900000004000000040000000e0000000f0000001000000028296c6962726172792f636f72652f7372632f736c6963652f6d656d6368722e727300007e041000200000005b0000000500000072616e676520737461727420696e64657820206f7574206f662072616e676520666f7220736c696365206f66206c656e67746820b004100012000000c20410002200000072616e676520656e6420696e64657820f404100010000000c204100022000000736c69636520696e64657820737461727473206174202062757420656e6473206174200014051000160000002a0510000d0000005b2e2e2e5d6279746520696e64657820206973206f7574206f6620626f756e6473206f66206000004d0510000b0000005805100016000000f402100001000000626567696e203c3d20656e642028203c3d2029207768656e20736c6963696e6720600000880510000e00000096051000040000009a05100010000000f402100001000000206973206e6f742061206368617220626f756e646172793b20697420697320696e7369646520202862797465732029206f6620604d0510000b000000cc05100026000000f205100008000000fa05100006000000f4021000010000006c6962726172792f636f72652f7372632f7374722f6d6f642e727300280610001b000000f50000001d0000006c6962726172792f636f72652f7372632f756e69636f64652f7072696e7461626c652e727300000054061000250000000a0000001c00000054061000250000001a0000003600000000010305050606020706080709110a1c0b190c1a0d100e0d0f0410031212130916011704180119031a071b011c021f1620032b032d0b2e01300331023201a702a902aa04ab08fa02fb05fd02fe03ff09ad78798b8da23057588b8c901cdd0e0f4b4cfbfc2e2f3f5c5d5fe2848d8e9192a9b1babbc5c6c9cadee4e5ff00041112293134373a3b3d494a5d848e92a9b1b4babbc6cacecfe4e500040d0e11122931343a3b4546494a5e646584919b9dc9cecf0d11293a3b4549575b5c5e5f64658d91a9b4babbc5c9dfe4e5f00d11454964658084b2bcbebfd5d7f0f183858ba4a6bebfc5c7cecfdadb4898bdcdc6cecf494e4f57595e5f898e8fb1b6b7bfc1c6c7d71116175b5cf6f7feff806d71dedf0e1f6e6f1c1d5f7d7eaeaf7fbbbc16171e1f46474e4f585a5c5e7e7fb5c5d4d5dcf0f1f572738f747596262e2fa7afb7bfc7cfd7df9a409798308f1fd2d4ceff4e4f5a5b07080f10272feeef6e6f373d3f42459091536775c8c9d0d1d8d9e7feff00205f2282df048244081b04061181ac0e80ab051f09811b03190801042f043404070301070607110a500f1207550703041c0a090308030703020303030c0405030b06010e15054e071b0757070206160d500443032d03010411060f0c3a041d255f206d046a2580c80582b0031a0682fd03590716091809140c140c6a060a061a0659072b05460a2c040c040103310b2c041a060b0380ac060a062f314d0380a4083c030f033c0738082b0582ff1118082f112d03210f210f808c048297190b158894052f053b07020e180980be22740c80d61a0c0580ff0580df0cf29d033709815c1480b80880cb050a183b030a06380846080c06740b1e035a0459098083181c0a16094c04808a06aba40c170431a10481da26070c050580a61081f50701202a064c04808d0480be031b030f0d000601010301040205070702080809020a050b020e041001110212051311140115021702190d1c051d0824016a046b02af03bc02cf02d102d40cd509d602d702da01e005e102e704e802ee20f004f802fa02fb010c273b3e4e4f8f9e9e9f7b8b9396a2b2ba86b1060709363d3e56f3d0d1041418363756577faaaeafbd35e01287898e9e040d0e11122931343a4546494a4e4f64655cb6b71b1c07080a0b141736393aa8a9d8d909379091a8070a3b3e66698f926f5fbfeeef5a62f4fcff9a9b2e2f2728559da0a1a3a4a7a8adbabcc4060b0c151d3a3f4551a6a7cccda007191a22253e3fe7ecefffc5c604202325262833383a484a4c50535556585a5c5e606365666b73787d7f8aa4aaafb0c0d0aeaf6e6f935e227b0503042d036603012f2e80821d03310f1c0424091e052b0544040e2a80aa06240424042808340b4e43813709160a08183b45390363080930160521031b05014038044b052f040a070907402027040c0936033a051a07040c07504937330d33072e080a8126524e28082a161a261c1417094e042409440d19070a0648082709750b3f412a063b050a0651060105100305808b621e48080a80a65e22450b0a060d133a060a362c041780b93c64530c48090a46451b4808530d498107460a1d03474937030e080a0639070a81361980b7010f320d839b66750b80c48a4c630d842f8fd18247a1b98239072a045c06260a460a28051382b05b654b0439071140050b020e97f80884d62a09a2e781332d03110408818c89046b050d0309071092604709743c80f60a7308701546809a140c570919808781470385420f1584501f80e12b80d52d031a040281401f113a050184e080f7294c040a04028311444c3d80c23c06010455051b3402810e2c04640c560a80ae381d0d2c040907020e06809a83d80510030d03740c59070c04010f0c0438080a062808224e81540c1503050307091d030b05060a0a060808070980cb250a84066c6962726172792f636f72652f7372632f756e69636f64652f756e69636f64655f646174612e7273000000050c1000280000004b00000028000000050c1000280000005700000016000000050c100028000000520000003e0000000900000004000000040000001100000054727946726f6d536c6963654572726f720000000003000083042000910560005d13a0001217201f0c20601fef2ca02b2a30202c6fa6e02c02a8602d1efb602e00fe20369eff6036fd01e136010a2137240de137ab0e61392f18a139301ce147f31e214cf06ae14f4f6f21509dbca15000cf615165d1a15100da215200e0e15330e16155aee2a156d0e8e15620006e57f001ff5700700007002d0101010201020101480b30151001650702060202010423011e1b5b0b3a09090118040109010301052b033c082a180120370101010408040103070a021d013a0101010204080109010a021a010202390104020402020303011e0203010b0239010405010204011402160601013a0101020104080107030a021e013b0101010c01090128010301370101030503010407020b021d013a01020102010301050207020b021c02390201010204080109010a021d0148010401020301010801510102070c08620102090b064a021b0101010101370e01050102050b0124090166040106010202021902040310040d01020206010f01000300031d021e021e02400201070801020b09012d030101750222017603040209010603db0202013a010107010101010208060a0201301f310430070101050128090c0220040202010338010102030101033a0802029803010d0107040106010302c6400001c32100038d016020000669020004010a200250020001030104011902050197021a120d012608190b2e0330010204020227014306020202020c0108012f01330101030202050201012a020801ee010201040100010010101000020001e201950500030102050428030401a50200040002990b31047b01360f290102020a033104020207013d03240501083e010c0234090a0402015f03020101020601a0010308150239020101010116010e070305c308020301011701510102060101020101020102eb010204060201021b025508020101026a0101010206010165030204010500090102f5010a0201010401900402020401200a280602040801090602032e0d010200070106010152160207010201027a060301010201070101480203010101000200053b0700013f0451010002002e0217000101030405080802071e0494030037043208010e011605010f00070111020701020105000700013d0400076d07006080f000 --burn-cap 9999999 -Node is bootstrapped. -Estimated gas: 2981.423 units (will add 100 for safety) -Estimated storage: 24349 bytes added (will add 20 for safety) -Operation successfully injected in the node. -Operation hash is '[OPERATION_HASH]' -NOT waiting for the operation to be included. -Use command - octez-client wait for [OPERATION_HASH] to be included --confirmations 1 --branch [BLOCK_HASH] -and/or an external block explorer to make sure that it has been included. -This sequence of operations was run: - Manager signed operations: - From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.01849 - Expected counter: 1 - Gas limit: 3082 - Storage limit: 24369 bytes - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.01849 - payload fees(the block proposer) ....... +ꜩ0.01849 - Smart contract rollup origination: - Kind: wasm_2_0_0 - Parameter type: (pair string (ticket string)) - Boot sector Blake2B hash: 'ccd21882933d46881f84d301719454d781162b0b0d09b31d815949af4b776af9' - This smart contract rollup origination was successfully applied - Consumed gas: 2981.423 - Storage size: 24349 bytes - Address: [SC_ROLLUP_HASH] - Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ6.08725 - storage fees ........................... +ꜩ6.08725 - - -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/genesis_info' -{ "level": 2, - "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000003" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000006" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000006" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000009" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000009" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000012" diff --git a/docs/nairobi/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out b/docs/nairobi/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out deleted file mode 100644 index 691d77f97ba5..000000000000 --- a/docs/nairobi/Alpha- wasm_2_0_0 - kernel should run e2e (kernel_e2e).out +++ /dev/null @@ -1,74 +0,0 @@ - -./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind wasm_2_0_0 of type 'pair string (ticket string)' booting with 0061736d0100000001690f60037f7f7f017f60027f7f017f60027f7f0060057f7f7f7f7f017f60047f7f7f7f017f60017f0060000060077f7f7f7f7f7f7f0060037f7f7f0060067f7f7f7f7f7f017f60057f7f7f7f7f0060017f017f60017f017e60077f7f7f7f7f7f7f017f60037e7f7f017f029d010510726f6c6c75705f736166655f636f72650b77726974655f6465627567000210726f6c6c75705f736166655f636f72650973746f72655f686173000110726f6c6c75705f736166655f636f72650b73746f72655f7772697465000310726f6c6c75705f736166655f636f72650a73746f72655f6d6f7665000410726f6c6c75705f736166655f636f72650f72657665616c5f707265696d616765000003383705060500050708080202060200090a040b02010508080800080801020001010c080b0d01010a000a00090101000101010401010e0100000405017001121205030100110619037f01418080c0000b7f0041c79fc0000b7f0041d09fc0000b073304066d656d6f727902000b6b65726e656c5f6e65787400060a5f5f646174615f656e6403010b5f5f686561705f6261736503020917010041010b1105371f172928223618242b2f30313233390a82683702000b3101017f23808080800041106b2200248080808000108f80808000200041086a108980808000200041106a2480808080000b170041e080c08000410e418c81c08000109d80808000000bc00101037f23808080800041306b2203248080808000200341286a200110968080800020032802282104200341206a200110968080800041012105024002402000200420032802241091808080000e0401000100010b200341186a200110968080800020032802182105200341106a200110968080800020032802142101200341086a2002109680808000200328020821042003200210968080800020002005200120042003280204109380808000410321050b200341306a24808080800020050ba40402047f017e23808080800041d080016b2201248080808000419c81c080004111109080808000200141d8006a4200370300200141d0006a4200370300200141c8006a42003703002001420037034041002102200141c0006a210302400240024002400340200141c080016a200241d083c080006a2d00002002108b8080800020012d00c080010d0120012d00c180012104200141c080016a200241d183c080006a2d0000200241016a108b8080800020012d00c080010d01200320012d00c180012004410474723a0000200341016a2103200241026a220241c000470d000b200141356a2202200141c0006a41186a290000370000200141306a2203200141c0006a41136a2900003703002001410a6a20012d00423a0000200141086a41136a2003290300370000200141086a41186a2002290000370000200120012f01403b01082001200129004b2205370328200120053700132001200129004337000b200141c0006a41004180800110ba808080001a20014100360228200120004100200141086a200141c0006a41808001200141286a108a808080000240200128020022020d0041f581c080004123109080808000200041b482c0800041d082c0800010888080800041ff01714103460d034127210341d882c0800021020c020b200128020421030c010b41252103419084c0800021020b2002450d00200220031090808080000c010b41ad81c0800041101090808080000b200141d080016a2480808080000bf20401037f23808080800041e0006b220724808080800041bd81c08000411210908080800002400240200241034d0d00410f210241cf81c0800021050c010b02402001200320042005109480808000220820054d0d004120210241b083c0800021050c010b200741c0006a20042008108c80808000024020072d00400d00200741cc006a2802002103200741c8006a28020021090240024020072802440d002007200336024420072009360240200741286a200741c0006a108d80808000200728022c210520072802282102200741206a200741c0006a108d8080800020072802242104200741186a41b482c0800010968080800020072802182103200741106a41b482c0800010968080800020012003200728021420042002200510928080800010958080800041ff01714103470d01200741086a200741c0006a108d8080800020062006280200200728020c6a36020041ff82c08000411a109080808000410021050c030b2007200336023c2007200936023841de81c08000410f109080808000200741c0006a200741386a108e8080800020072802442103024002400240200728025022094120470d00200520086b2109200420086a2104200241016a210820072802402102034020034120490d02200741306a200120082002200420092006108a80808000200341606a2103200241206a210220072802302205450d000b200728023421020c050b200320094f0d010b410021050c030b418080c080004117200741d8006a41d080c0800041c080c0800010aa80808000000b41172102419983c0800021050c010b4108210241ed81c0800021050b2000200236020420002005360200200741e0006a2480808080000b850101017f0240024002400240200141bf7f6a41ff01714106490d002001419f7f6a41ff01714106490d01200141506a220341ff0171410a490d02200041086a2002360200200041046a200141ff0171360200200041013a00000f0b2000200141496a3a00010c020b2000200141a97f6a3a00010c010b200020033a00010b200041003a00000bc80201027f02400240024020020d000c010b024002400240024020012d000022030e020001040b2002417f6a22034104490d02200128000122024118742002410874418080fc07717220024108764180fe037120024118767272220241046a220420034b0d022002417c490d014104200441d884c08000109e80808000000b02402002417f6a22034104490d00200128000122024118742002410874418080fc07717220024108764180fe037120024118767272220241046a20034b0d002002411f710d002000410c6a2002360200200041086a200141056a360200200041046a4101360200200041003a00000f0b200041023a00010c030b2000410c6a2002360200200041086a200141056a360200200041046a4100360200200041003a00000f0b200041023a00010c010b200041026a20033a0000200020024100473a00010b200041013a00000b0c00200020012902003703000b3f01017f200041203602102000200128020022023602002000410c6a20012802042201411f713602002000200141607122013602042000200220016a3602080b02000b0c00200020011080808080000b0c00200120021081808080000b1200200120022003200420051082808080000b110020012002200320041083808080001a0b0e002001200220031084808080000b09004100410320001b0b0c00200020012902003703000b0d0020002802001a037f0c000b0b02000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341e485c0800036020820034183808080003602242003200341206a360218200320033602282003200341046a360220200341086a200210a080808000000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341e489c0800036020820034183808080003602242003200341206a3602182003200341046a36022820032003360220200341086a200210a080808000000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341848ac0800036020820034183808080003602242003200341206a3602182003200341046a36022820032003360220200341086a200210a080808000000bd80701067f20002802102103024002400240024002400240200028020822044101460d0020034101470d010b20034101470d03200120026a2105200041146a28020022060d0141002107200121080c020b2000280218200120022000411c6a28020028020c1180808080000021030c030b41002107200121080340200822032005460d020240024020032c00002208417f4c0d00200341016a21080c010b0240200841604f0d00200341026a21080c010b0240200841704f0d00200341036a21080c010b20032d0002413f7141067420032d0001413f71410c747220032d0003413f7172200841ff0171411274418080f0007172418080c400460d03200341046a21080b200720036b20086a21072006417f6a22060d000b0b20082005460d00024020082c00002203417f4a0d0020034160490d0020034170490d0020082d0002413f7141067420082d0001413f71410c747220082d0003413f7172200341ff0171411274418080f0007172418080c400460d010b02400240024020070d00410021080c010b024020072002490d00410021032002210820072002460d010c020b4100210320072108200120076a2c00004140480d010b20082107200121030b2007200220031b21022003200120031b21010b024020040d002000280218200120022000411c6a28020028020c118080808000000f0b2000410c6a28020021050240024020024110490d002001200210b48080800021080c010b024020020d00410021080c010b20024103712107024002402002417f6a41034f0d0041002108200121030c010b2002417c71210641002108200121030340200820032c000041bf7f4a6a200341016a2c000041bf7f4a6a200341026a2c000041bf7f4a6a200341036a2c000041bf7f4a6a2108200341046a21032006417c6a22060d000b0b2007450d000340200820032c000041bf7f4a6a2108200341016a21032007417f6a22070d000b0b0240200520084d0d0041002103200520086b22072106024002400240410020002d0020220820084103461b4103710e03020001020b41002106200721030c010b20074101762103200741016a41017621060b200341016a21032000411c6a28020021072000280204210820002802182100024003402003417f6a2203450d0120002008200728021011818080800000450d000b41010f0b410121032008418080c400460d01200020012002200728020c118080808000000d01410021030340024020062003470d0020062006490f0b200341016a210320002008200728021011818080800000450d000b2003417f6a2006490f0b2000280218200120022000411c6a28020028020c118080808000000f0b20030b5401017f23808080800041206b2203248080808000200341146a4100360200200341e884c08000360210200342013702042003200136021c200320003602182003200341186a3602002003200210a080808000000b810101017f23808080800041306b220324808080800020032001360204200320003602002003411c6a41023602002003412c6a4183808080003602002003420237020c200341b88ac0800036020820034183808080003602242003200341206a3602182003200341046a36022820032003360220200341086a200210a080808000000b110020003502004101200110b8808080000b4c01017f23808080800041206b2202248080808000200241013a00182002200136021420022000360210200241a085c0800036020c200241e884c08000360208200241086a108780808000000bbd05010a7f23808080800041306b2203248080808000200341246a2001360200200341033a0028200342808080808004370308200320003602204100210420034100360218200341003602100240024002400240200228020822050d00200241146a2802002206450d0120022802002101200228021021002006417f6a41ffffffff017141016a2204210603400240200141046a2802002207450d00200328022020012802002007200328022428020c118080808000000d040b2000280200200341086a200041046a280200118180808000000d03200041086a2100200141086a21012006417f6a22060d000c020b0b2002410c6a2802002200450d00200041057421082000417f6a41ffffff3f7141016a2104200228020021014100210603400240200141046a2802002200450d00200328022020012802002000200328022428020c118080808000000d030b2003200520066a2200411c6a2d00003a00282003200041046a290200422089370308200041186a28020021092002280210210a4100210b41002107024002400240200041146a2802000e03010002010b2009410374210c41002107200a200c6a220c280204418480808000470d01200c28020028020021090b410121070b2003200936021420032007360210200041106a28020021070240024002402000410c6a2802000e03010002010b20074103742109200a20096a2209280204418480808000470d01200928020028020021070b4101210b0b2003200736021c2003200b360218200a20002802004103746a2200280200200341086a2000280204118180808000000d02200141086a21012008200641206a2206470d000b0b4100210020042002280204492201450d012003280220200228020020044103746a410020011b22012802002001280204200328022428020c11808080800000450d010b410121000b200341306a24808080800020000b8d0101047f23808080800041206b22022480808080004101210302402000200110a3808080000d002001411c6a2802002104200128021821052002411c6a4100360200200241e884c080003602182002420137020c200241ec84c0800036020820052004200241086a10a1808080000d00200041046a200110a38080800021030b200241206a24808080800020030bec0201037f2380808080004180016b220224808080800002400240024002400240200128020022034110710d0020034120710d0120003502004101200110b88080800021000c040b20002802002100410021030340200220036a41ff006a413041d7002000410f712204410a491b20046a3a00002003417f6a21032000410f4b21042000410476210020040d000b20034180016a22004181014f0d0120014101419887c080004102200220036a4180016a410020036b10ae8080800021000c030b20002802002100410021030340200220036a41ff006a413041372000410f712204410a491b20046a3a00002003417f6a21032000410f4b21042000410476210020040d000b20034180016a22004181014f0d0120014101419887c080004102200220036a4180016a410020036b10ae8080800021000c020b2000418001418887c08000109a80808000000b2000418001418887c08000109a80808000000b20024180016a24808080800020000b0c004281b8aa93f5f3e5ec140bd10302027f017e41f400210341022104024002400240024002400240024002400240200141776a0e1f08020505010505050505050505050505050505050505050505030505050504000b41dc002103200141dc00460d050c040b41f20021030c040b41ee0021030c030b20024180800471450d01412221030c020b200241800271450d00412721030c010b02402002410171450d00200110a680808000450d00200141017267410276410773ad4280808080d0008421050c020b0240024002400240200141808004490d002001418080084f0d01200141bb92c08000412a418f93c0800041c00141cf94c0800041b60310a7808080000d030c020b2001419c8dc08000412841ec8dc0800041a002418c90c0800041af0210a780808000450d010c020b200141e0ffff007141e0cd0a460d00200141c091756a41784b0d00200141feffff0071419ef00a460d00200141d0e2746a41714b0d002001418090746a41e0674b0d002001418080746a419d744b0d0020014180fe476a41caa4544b0d00200141f08338490d010b200141017267410276410773ad4280808080d0008421050c020b41012104200121030b0c010b41032104200121030b2000200336020420002004360200200041086a20053702000b810301057f2000410b74210141002102412021034120210402400240034002400240200341017620026a2203410274418499c080006a280200410b7422052001490d0020052001460d03200321040c010b200341016a21020b200420026b2103200420024b0d000c020b0b200341016a21020b0240024002402002411f4b0d002002410274210341c305210402402002411f460d002003418899c080006a28020041157621040b4100210102402002417f6a220520024b0d00200541204f0d022005410274418499c080006a28020041ffffff007121010b024020042003418499c080006a2802004115762202417f736a450d00200020016b2101200241c305200241c3054b1b21032004417f6a210541002104034020032002460d042004200241849ac080006a2d00006a220420014b0d012005200241016a2202470d000b200521020b20024101710f0b2002412041b098c08000109980808000000b2005412041d098c08000109980808000000b200341c30541c098c08000109980808000000b880301077f41012107024002402002450d00200120024101746a210820004180fe037141087621094100210a200041ff0171210b02400340200141026a210c200a20012d000122026a210d024020012d000022012009460d00200120094b0d03200d210a200c2101200c2008470d010c030b0240200d200a490d00200d20044b0d022003200a6a2101024003402002450d012002417f6a210220012d0000210a200141016a2101200a200b470d000b410021070c050b200d210a200c2101200c2008470d010c030b0b200a200d41fc8cc08000109e80808000000b200d200441fc8cc08000109b80808000000b2006450d00200520066a210b200041ffff037121014101210702400340200541016a210a0240024020052d00002202411874411875220d4100480d00200a21050c010b200a200b460d02200d41ff007141087420052d0001722102200541026a21050b200120026b22014100480d02200741017321072005200b470d000c020b0b41f484c08000412b418c8dc08000109d80808000000b20074101710b1400200120002802002000280204109c808080000b180020002802002001200028020428020c118180808000000b930101017f23808080800041c0006b22052480808080002005200136020c2005200036020820052003360214200520023602102005412c6a41023602002005413c6a4185808080003602002005420237021c200541f885c0800036021820054186808080003602342005200541306a3602282005200541106a3602382005200541086a360230200541186a200410a080808000000b890601097f024002402002450d002000280204210320002802002104200028020821050340024020052d0000450d00200441a086c080004104200328020c11808080800000450d0041010f0b410021062002210702400240024002400340200120066a21080240024002400240024020074108490d000240200841036a417c7120086b22000d00200741786a2109410021000c030b20072000200020074b1b21004100210a03402008200a6a2d0000410a460d052000200a41016a220a460d020c000b0b2007450d054100210a20082d0000410a460d0320074101460d054101210a20082d0001410a460d0320074102460d054102210a20082d0002410a460d0320074103460d054103210a20082d0003410a460d0320074104460d054104210a20082d0004410a460d0320074105460d054105210a20082d0005410a460d0320074106460d054106210a20082d0006410a470d050c030b2000200741786a22094b0d010b02400340200820006a220a280200220b417f73200b418a94a8d0007341fffdfb776a71200a41046a280200220a417f73200a418a94a8d0007341fffdfb776a7172418081828478710d01200041086a220020094d0d000b0b200020074d0d002000200741a089c08000109a80808000000b20002007460d02200020076b210b200820006a21084100210a024003402008200a6a2d0000410a460d01200b200a41016a220a6a0d000c040b0b2000200a6a210a0b0240200a20066a220041016a22062000490d0020022006490d00200120006a2d0000410a470d00200541013a0000200220064d0d0320062100200120066a2c000041bf7f4c0d040c050b200220066b2107200220064f0d000b0b200541003a0000200221060b2002210020022006460d010b200120024100200641c486c0800010ac80808000000b0240200420012000200328020c11808080800000450d0041010f0b02400240200220004b0d0020022000460d010c040b200120006a2c000041bf7f4c0d030b200120006a2101200220006b22020d000b0b41000f0b200120022000200241d486c0800010ac80808000000ba80a01057f23808080800041f0006b22052480808080002005200336020c20052002360208024002400240024002400240024002402001418102490d004180022106024020002c00800241bf7f4a0d0041ff01210620002c00ff0141bf7f4a0d0041fe01210620002c00fe0141bf7f4a0d0041fd0121060b20062001490d0120062001470d030b20052001360214200520003602104100210641e884c0800021070c010b20052006360214200520003602104105210641c88ac0800021070b2005200636021c20052007360218200220014b22060d01200320014b0d010240200220034b0d00024002402002450d00024020022001490d0020012002460d010c020b200020026a2c00004140480d010b200321020b20052002360220200121030240200220014f0d00200241016a220641002002417d6a2203200320024b1b2203490d04024020032006460d00200020066a200020036a22086b21060240200020026a22092c000041bf7f4c0d002006417f6a21070c010b20032002460d0002402009417f6a22022c000041bf7f4c0d002006417e6a21070c010b20082002460d0002402009417e6a22022c000041bf7f4c0d002006417d6a21070c010b20082002460d0002402009417d6a22022c000041bf7f4c0d002006417c6a21070c010b20082002460d002006417b6a21070b200720036a21030b02402003450d00024020032001490d0020032001460d010c070b200020036a2c000041bf7f4c0d060b20032001460d040240024002400240200020036a22022c00002201417f4a0d0020022d0001413f7121002001411f7121062001415f4b0d01200641067420007221020c020b2005200141ff0171360224410121010c020b200041067420022d0002413f717221000240200141704f0d0020002006410c747221020c010b200041067420022d0003413f71722006411274418080f00071722202418080c400460d060b20052002360224410121012002418001490d00410221012002418010490d0041034104200241808004491b21010b200520033602282005200120036a36022c200541306a41146a4105360200200541ec006a418680808000360200200541e4006a418680808000360200200541c8006a41146a418780808000360200200541d4006a41888080800036020020054205370234200541808cc08000360230200541838080800036024c2005200541c8006a3602402005200541186a3602682005200541106a3602602005200541286a3602582005200541246a3602502005200541206a360248200541306a200410a080808000000b200541e4006a418680808000360200200541c8006a41146a418680808000360200200541d4006a418380808000360200200541306a41146a410436020020054204370234200541ac8bc08000360230200541838080800036024c2005200541c8006a3602402005200541186a3602602005200541106a36025820052005410c6a3602502005200541086a360248200541306a200410a080808000000b2000200141002006200410ac80808000000b20052002200320061b360228200541306a41146a4103360200200541c8006a41146a418680808000360200200541d4006a41868080800036020020054203370234200541f08ac08000360230200541838080800036024c2005200541c8006a3602402005200541186a3602582005200541106a3602502005200541286a360248200541306a200410a080808000000b2003200641c48cc08000109e80808000000b41f484c08000412b2004109d80808000000b2000200120032001200410ac80808000000b950302057f027e23808080800041c0006b22032480808080000240024020002d0008450d0020002802042104410121050c010b2000280204210402402000280200220628020022074104710d0041012105200628021841e686c0800041ea86c0800020041b4102410120041b2006411c6a28020028020c118080808000000d0120012006200228020c1181808080000021050c010b024020040d000240200628021841e886c0800041022006411c6a28020028020c11808080800000450d0041012105410021040c020b200628020021070b41012105200341013a0017200341346a418886c08000360200200341106a200341176a36020020032007360218200320062902183703082006290208210820062902102109200320062d00203a00382003200628020436021c20032009370328200320083703202003200341086a3602302001200341186a200228020c118180808000000d00200328023041e486c080004102200328023428020c1180808080000021050b200020053a00082000200441016a360204200341c0006a24808080800020000b840801077f024002402001450d00412b418080c4002000280200220141017122061b2107200620056a21080c010b200541016a210820002802002101412d21070b0240024020014104710d00410021020c010b0240024020034110490d002002200310b48080800021060c010b024020030d00410021060c010b20034103712109024002402003417f6a41034f0d0041002106200221010c010b2003417c71210a41002106200221010340200620012c000041bf7f4a6a200141016a2c000041bf7f4a6a200141026a2c000041bf7f4a6a200141036a2c000041bf7f4a6a2106200141046a2101200a417c6a220a0d000b0b2009450d000340200620012c000041bf7f4a6a2106200141016a21012009417f6a22090d000b0b200620086a21080b0240024020002802080d0041012101200020072002200310b5808080000d012000280218200420052000411c6a28020028020c118080808000000f0b024002400240024002402000410c6a280200220620084d0d0020002d00004108710d0441002101200620086b22092108410120002d0020220620064103461b4103710e03030102030b41012101200020072002200310b5808080000d042000280218200420052000411c6a28020028020c118080808000000f0b41002108200921010c010b20094101762101200941016a41017621080b200141016a21012000411c6a2802002109200028020421062000280218210a024003402001417f6a2201450d01200a2006200928021011818080800000450d000b41010f0b410121012006418080c400460d01200020072002200310b5808080000d01200028021820042005200028021c28020c118080808000000d01200028021c2109200028021821004100210102400340024020082001470d00200821010c020b200141016a210120002006200928021011818080800000450d000b2001417f6a21010b200120084921010c010b2000280204210b2000413036020420002d0020210c41012101200041013a0020200020072002200310b5808080000d0041002101200620086b22092103024002400240410120002d0020220620064103461b4103710e03020001020b41002103200921010c010b20094101762101200941016a41017621030b200141016a21012000411c6a2802002109200028020421062000280218210a024003402001417f6a2201450d01200a2006200928021011818080800000450d000b41010f0b410121012006418080c400460d00200028021820042005200028021c28020c118080808000000d00200028021c21012000280218210a410021090240034020032009460d01200941016a2109200a2006200128021011818080800000450d000b410121012009417f6a2003490d010b2000200c3a00202000200b36020441000f0b20010b830201017f23808080800041106b22022480808080002002410036020c02400240024002402001418001490d002001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d410321010c030b200220013a000c410121010c020b20022001413f71418001723a000d2002200141067641c001723a000c410221010c010b20022001413f71418001723a000f2002200141127641f001723a000c20022001410676413f71418001723a000e20022001410c76413f71418001723a000d410421010b20002002410c6a200110ab808080002101200241106a24808080800020010b7101017f23808080800041206b220224808080800020022000360204200241086a41106a200141106a290200370300200241086a41086a200141086a29020037030020022001290200370308200241046a41e488c08000200241086a10a1808080002101200241206a24808080800020010b110020002802002001200210ab808080000b8a0201017f23808080800041106b2202248080808000200028020021002002410036020c02400240024002402001418001490d002001418010490d012001418080044f0d0220022001413f71418001723a000e20022001410c7641e001723a000c20022001410676413f71418001723a000d410321010c030b200220013a000c410121010c020b20022001413f71418001723a000d2002200141067641c001723a000c410221010c010b20022001413f71418001723a000f2002200141127641f001723a000c20022001410676413f71418001723a000e20022001410c76413f71418001723a000d410421010b20002002410c6a200110ab808080002101200241106a24808080800020010b7401017f23808080800041206b220224808080800020022000280200360204200241086a41106a200141106a290200370300200241086a41086a200141086a29020037030020022001290200370308200241046a41e488c08000200241086a10a1808080002101200241206a24808080800020010ba30801097f02400240200041036a417c71220220006b220320014b0d00200341044b0d00200120036b22044104490d0020044103712105410021064100210102402003450d00200341037121070240024020022000417f736a41034f0d0041002101200021020c010b2003417c71210841002101200021020340200120022c000041bf7f4a6a200241016a2c000041bf7f4a6a200241026a2c000041bf7f4a6a200241036a2c000041bf7f4a6a2101200241046a21022008417c6a22080d000b0b2007450d000340200120022c000041bf7f4a6a2101200241016a21022007417f6a22070d000b0b200020036a210002402005450d0020002004417c716a22022c000041bf7f4a210620054101460d00200620022c000141bf7f4a6a210620054102460d00200620022c000241bf7f4a6a21060b20044102762103200620016a21080340200021062003450d02200341c001200341c001491b220441037121052004410274210902400240200441fc0171220a41027422000d00410021020c010b200620006a2107410021022006210003402000410c6a2802002201417f73410776200141067672418182840871200041086a2802002201417f73410776200141067672418182840871200041046a2802002201417f7341077620014106767241818284087120002802002201417f7341077620014106767241818284087120026a6a6a6a2102200041106a22002007470d000b0b200620096a2100200320046b2103200241087641ff81fc0771200241ff81fc07716a418180046c41107620086a21082005450d000b2006200a4102746a2100200541ffffffff036a220441ffffffff0371220241016a2201410371210302400240200241034f0d00410021020c010b200141fcffffff077121014100210203402000410c6a2802002207417f73410776200741067672418182840871200041086a2802002207417f73410776200741067672418182840871200041046a2802002207417f7341077620074106767241818284087120002802002207417f7341077620074106767241818284087120026a6a6a6a2102200041106a21002001417c6a22010d000b0b02402003450d00200441818080807c6a2101034020002802002207417f7341077620074106767241818284087120026a2102200041046a21002001417f6a22010d000b0b200241087641ff81fc0771200241ff81fc07716a418180046c41107620086a0f0b024020010d0041000f0b20014103712102024002402001417f6a41034f0d00410021080c010b2001417c712101410021080340200820002c000041bf7f4a6a200041016a2c000041bf7f4a6a200041026a2c000041bf7f4a6a200041036a2c000041bf7f4a6a2108200041046a21002001417c6a22010d000b0b2002450d000340200820002c000041bf7f4a6a2108200041016a21002002417f6a22020d000b0b20080b5c01017f0240024002402001418080c400460d0041012104200028021820012000411c6a280200280210118180808000000d010b20020d01410021040b20040f0b2000280218200220032000411c6a28020028020c118080808000000b870401077f23808080800041106b22022480808080004101210302402001280218220441272001411c6a2802002802102205118180808000000d002002200028020041810210a5808080002002410c6a2d00002106200241086a28020021072002280200210102400240024020022802042208418080c400460d0003402001210041dc00210341012101024002400240024020000e0407010300070b200641ff01712100410021064103210141fd00210302400240024020000e06090504000102090b4102210641fb0021030c040b4103210141f5002103410321060c030b4104210641dc0021030c020b41002101200821030c010b4102410120071b2106413041d7002008200741027476410f712203410a491b20036a21032007417f6a410020071b21070b20042003200511818080800000450d000c020b0b03402001210041dc002103410121010240024020000e0404040100040b200641ff01712100410021064103210141fd002103024002400240024020000e06070403020100070b4104210641dc0021030c030b4103210141f5002103410321060c020b4102210641fb0021030c010b4102410120071b2106418080c40020074102747641017141307221032007417f6a410020071b21070b20042003200511818080800000450d000b0b410121030c010b2004412720051181808080000021030b200241106a24808080800020030b8e0201027f23808080800041106b22022480808080002002200128021841f098c0800041112001411c6a28020028020c118080808000003a000820022001360200200241003a0009200241003602042002200036020c20022002410c6a41e098c0800010ad808080001a20022d00082101024020022802042203450d00200141ff017121004101210120000d0020022802002100024020034101470d0020022d000941ff0171450d0020002d00004104710d0041012101200028021841eb86c0800041012000411c6a28020028020c118080808000000d010b200028021841ec86c0800041012000411c6a28020028020c1180808080000021010b200241106a248080808000200141ff01714100470be90203027f017e037f23808080800041306b2203248080808000412721040240024020004290ce005a0d00200021050c010b412721040340200341096a20046a2206417c6a200020004290ce008022054290ce007e7da7220741ffff037141e4006e2208410174419a87c080006a2f00003b00002006417e6a2007200841e4006c6b41ffff0371410174419a87c080006a2f00003b00002004417c6a2104200042ffc1d72f5621062005210020060d000b0b02402005a7220641e3004d0d00200341096a2004417e6a22046a2005a72206200641ffff037141e4006e220641e4006c6b41ffff0371410174419a87c080006a2f00003b00000b024002402006410a490d00200341096a2004417e6a22046a2006410174419a87c080006a2f00003b00000c010b200341096a2004417f6a22046a200641306a3a00000b2002200141e884c080004100200341096a20046a412720046b10ae808080002104200341306a24808080800020040b1200200141fc88c080004102109c808080000b0e0020002001200210bb808080000bb50101037f024002402002410f4b0d00200021030c010b2000410020006b41037122046a210502402004450d00200021030340200320013a0000200341016a22032005490d000b0b2005200220046b2204417c7122026a2103024020024101480d00200141ff017141818284086c2102034020052002360200200541046a22052003490d000b0b200441037121020b02402002450d00200320026a21050340200320013a0000200341016a22032005490d000b0b20000b0bd11f0100418080c0000bc71f47756172616e7465656420746f2062652065786163742e2f7573722f7372632f74657a6f735f726f6c6c75705f656e636f64696e672f7372632f6461632e72731700100029000000bc0000002b000000010000000000000001000000020000006578706c696369742070616e6963696e7374616c6c65725f6b65726e656c2f7372632f6c69622e72730000006e0010001b0000001c00000005000000494e5354414c4c494e47204b45524e454c494e5354414c4c4544204b45524e454c454e5452593a2072657665616c5f6c6f6f70544f4f204d414e59204c4556454c53476f742068617368657320706167654445434f44494e4753657474696e672072657665616c6564206b65726e656c20666f7220757067726164652f696e7374616c6c65722f6b65726e656c2f626f6f742e7761736d00180110001b0000002f6b65726e656c2f626f6f742e7761736d0000003c011000110000004641494c454420746f20696e7374616c6c206b65726e656c20696e204b45524e454c5f5041544877726f7465206b65726e656c207061676520746f2073746f72654641494c454420746f20777269746520636f6e74656e7452414e206f7574206f662062756666657220666f722066657463685f7061676531616361613939356566383462633234636338626235343564643938363038326662626563303731656431633365393935346162656135656463343431636364524f4f545f505245494d4147455f48415348206d7573742062652076616c6964204845582e74657a6f735f726f6c6c75705f656e636f64696e672f7372632f6461632e72730000003502100020000000a2000000150000002e2e0000680210000200000063616c6c656420604f7074696f6e3a3a756e77726170282960206f6e206120604e6f6e65602076616c7565000900000000000000010000000a000000696e646578206f7574206f6620626f756e64733a20746865206c656e20697320206275742074686520696e646578206973200000b002100020000000d002100012000000603a20006802100000000000f502100002000000090000000c000000040000000b0000000c0000000d000000202020206c6962726172792f636f72652f7372632f666d742f6275696c646572732e727324031000200000002f00000021000000240310002000000030000000120000002c0a2c20280a282c296c6962726172792f636f72652f7372632f666d742f6e756d2e72736d0310001b00000065000000140000003078303030313032303330343035303630373038303931303131313231333134313531363137313831393230323132323233323432353236323732383239333033313332333333343335333633373338333934303431343234333434343534363437343834393530353135323533353435353536353735383539363036313632363336343635363636373638363937303731373237333734373537363737373837393830383138323833383438353836383738383839393039313932393339343935393639373938393900000900000004000000040000000e0000000f0000001000000028296c6962726172792f636f72652f7372632f736c6963652f6d656d6368722e727300007e041000200000005b0000000500000072616e676520737461727420696e64657820206f7574206f662072616e676520666f7220736c696365206f66206c656e67746820b004100012000000c20410002200000072616e676520656e6420696e64657820f404100010000000c204100022000000736c69636520696e64657820737461727473206174202062757420656e6473206174200014051000160000002a0510000d0000005b2e2e2e5d6279746520696e64657820206973206f7574206f6620626f756e6473206f66206000004d0510000b0000005805100016000000f402100001000000626567696e203c3d20656e642028203c3d2029207768656e20736c6963696e6720600000880510000e00000096051000040000009a05100010000000f402100001000000206973206e6f742061206368617220626f756e646172793b20697420697320696e7369646520202862797465732029206f6620604d0510000b000000cc05100026000000f205100008000000fa05100006000000f4021000010000006c6962726172792f636f72652f7372632f7374722f6d6f642e727300280610001b000000f50000001d0000006c6962726172792f636f72652f7372632f756e69636f64652f7072696e7461626c652e727300000054061000250000000a0000001c00000054061000250000001a0000003600000000010305050606020706080709110a1c0b190c1a0d100e0d0f0410031212130916011704180119031a071b011c021f1620032b032d0b2e01300331023201a702a902aa04ab08fa02fb05fd02fe03ff09ad78798b8da23057588b8c901cdd0e0f4b4cfbfc2e2f3f5c5d5fe2848d8e9192a9b1babbc5c6c9cadee4e5ff00041112293134373a3b3d494a5d848e92a9b1b4babbc6cacecfe4e500040d0e11122931343a3b4546494a5e646584919b9dc9cecf0d11293a3b4549575b5c5e5f64658d91a9b4babbc5c9dfe4e5f00d11454964658084b2bcbebfd5d7f0f183858ba4a6bebfc5c7cecfdadb4898bdcdc6cecf494e4f57595e5f898e8fb1b6b7bfc1c6c7d71116175b5cf6f7feff806d71dedf0e1f6e6f1c1d5f7d7eaeaf7fbbbc16171e1f46474e4f585a5c5e7e7fb5c5d4d5dcf0f1f572738f747596262e2fa7afb7bfc7cfd7df9a409798308f1fd2d4ceff4e4f5a5b07080f10272feeef6e6f373d3f42459091536775c8c9d0d1d8d9e7feff00205f2282df048244081b04061181ac0e80ab051f09811b03190801042f043404070301070607110a500f1207550703041c0a090308030703020303030c0405030b06010e15054e071b0757070206160d500443032d03010411060f0c3a041d255f206d046a2580c80582b0031a0682fd03590716091809140c140c6a060a061a0659072b05460a2c040c040103310b2c041a060b0380ac060a062f314d0380a4083c030f033c0738082b0582ff1118082f112d03210f210f808c048297190b158894052f053b07020e180980be22740c80d61a0c0580ff0580df0cf29d033709815c1480b80880cb050a183b030a06380846080c06740b1e035a0459098083181c0a16094c04808a06aba40c170431a10481da26070c050580a61081f50701202a064c04808d0480be031b030f0d000601010301040205070702080809020a050b020e041001110212051311140115021702190d1c051d0824016a046b02af03bc02cf02d102d40cd509d602d702da01e005e102e704e802ee20f004f802fa02fb010c273b3e4e4f8f9e9e9f7b8b9396a2b2ba86b1060709363d3e56f3d0d1041418363756577faaaeafbd35e01287898e9e040d0e11122931343a4546494a4e4f64655cb6b71b1c07080a0b141736393aa8a9d8d909379091a8070a3b3e66698f926f5fbfeeef5a62f4fcff9a9b2e2f2728559da0a1a3a4a7a8adbabcc4060b0c151d3a3f4551a6a7cccda007191a22253e3fe7ecefffc5c604202325262833383a484a4c50535556585a5c5e606365666b73787d7f8aa4aaafb0c0d0aeaf6e6f935e227b0503042d036603012f2e80821d03310f1c0424091e052b0544040e2a80aa06240424042808340b4e43813709160a08183b45390363080930160521031b05014038044b052f040a070907402027040c0936033a051a07040c07504937330d33072e080a8126524e28082a161a261c1417094e042409440d19070a0648082709750b3f412a063b050a0651060105100305808b621e48080a80a65e22450b0a060d133a060a362c041780b93c64530c48090a46451b4808530d498107460a1d03474937030e080a0639070a81361980b7010f320d839b66750b80c48a4c630d842f8fd18247a1b98239072a045c06260a460a28051382b05b654b0439071140050b020e97f80884d62a09a2e781332d03110408818c89046b050d0309071092604709743c80f60a7308701546809a140c570919808781470385420f1584501f80e12b80d52d031a040281401f113a050184e080f7294c040a04028311444c3d80c23c06010455051b3402810e2c04640c560a80ae381d0d2c040907020e06809a83d80510030d03740c59070c04010f0c0438080a062808224e81540c1503050307091d030b05060a0a060808070980cb250a84066c6962726172792f636f72652f7372632f756e69636f64652f756e69636f64655f646174612e7273000000050c1000280000004b00000028000000050c1000280000005700000016000000050c100028000000520000003e0000000900000004000000040000001100000054727946726f6d536c6963654572726f720000000003000083042000910560005d13a0001217201f0c20601fef2ca02b2a30202c6fa6e02c02a8602d1efb602e00fe20369eff6036fd01e136010a2137240de137ab0e61392f18a139301ce147f31e214cf06ae14f4f6f21509dbca15000cf615165d1a15100da215200e0e15330e16155aee2a156d0e8e15620006e57f001ff5700700007002d0101010201020101480b30151001650702060202010423011e1b5b0b3a09090118040109010301052b033c082a180120370101010408040103070a021d013a0101010204080109010a021a010202390104020402020303011e0203010b0239010405010204011402160601013a0101020104080107030a021e013b0101010c01090128010301370101030503010407020b021d013a01020102010301050207020b021c02390201010204080109010a021d0148010401020301010801510102070c08620102090b064a021b0101010101370e01050102050b0124090166040106010202021902040310040d01020206010f01000300031d021e021e02400201070801020b09012d030101750222017603040209010603db0202013a010107010101010208060a0201301f310430070101050128090c0220040202010338010102030101033a0802029803010d0107040106010302c6400001c32100038d016020000669020004010a200250020001030104011902050197021a120d012608190b2e0330010204020227014306020202020c0108012f01330101030202050201012a020801ee010201040100010010101000020001e201950500030102050428030401a50200040002990b31047b01360f290102020a033104020207013d03240501083e010c0234090a0402015f03020101020601a0010308150239020101010116010e070305c308020301011701510102060101020101020102eb010204060201021b025508020101026a0101010206010165030204010500090102f5010a0201010401900402020401200a280602040801090602032e0d010200070106010152160207010201027a060301010201070101480203010101000200053b0700013f0451010002002e0217000101030405080802071e0494030037043208010e011605010f00070111020701020105000700013d0400076d07006080f000 --burn-cap 9999999 -Node is bootstrapped. -Estimated gas: 2981.423 units (will add 100 for safety) -Estimated storage: 24349 bytes added (will add 20 for safety) -Operation successfully injected in the node. -Operation hash is '[OPERATION_HASH]' -NOT waiting for the operation to be included. -Use command - octez-client wait for [OPERATION_HASH] to be included --confirmations 1 --branch [BLOCK_HASH] -and/or an external block explorer to make sure that it has been included. -This sequence of operations was run: - Manager signed operations: - From: [PUBLIC_KEY_HASH] - Fee to the baker: ꜩ0.01849 - Expected counter: 1 - Gas limit: 3082 - Storage limit: 24369 bytes - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ0.01849 - payload fees(the block proposer) ....... +ꜩ0.01849 - Smart contract rollup origination: - Kind: wasm_2_0_0 - Parameter type: (pair string (ticket string)) - Boot sector Blake2B hash: 'ccd21882933d46881f84d301719454d781162b0b0d09b31d815949af4b776af9' - This smart contract rollup origination was successfully applied - Consumed gas: 2981.423 - Storage size: 24349 bytes - Address: [SC_ROLLUP_HASH] - Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH] - Balance updates: - [PUBLIC_KEY_HASH] ... -ꜩ6.08725 - storage fees ........................... +ꜩ6.08725 - - -./octez-client rpc get '/chains/main/blocks/head/context/sc_rollup/[SC_ROLLUP_HASH]/genesis_info' -{ "level": 2, - "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" } - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000003" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000006" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000006" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000009" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000009" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/state_hash -"[SC_ROLLUP_PVM_STATE_HASH]" - -./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks -"11000000012" -- GitLab From c42074502a5eb5a32805aa327b58cabf1db5abdc Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 29 Jun 2023 09:53:59 +0200 Subject: [PATCH 4/7] doc: more precise doc steps in protocol release checklist --- docs/developer/protocol_release_checklist.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/developer/protocol_release_checklist.rst b/docs/developer/protocol_release_checklist.rst index 6626b7191a19..84850a01e640 100644 --- a/docs/developer/protocol_release_checklist.rst +++ b/docs/developer/protocol_release_checklist.rst @@ -111,9 +111,14 @@ not reviewed thoroughly enough), they should be dropped. - **Release Artifacts are Created**: an MR on ``master`` is made with the result of the protocol snapshot (mostly automated by script :src:`scripts/snapshot_alpha_and_link.sh`) linked into the - node and client. The delegates must also be built in this branch. CI must be + node and client. + The few additional manual steps to be done on the documentation part are listed in meta-issue :gl:`#2170` (Section "Protocol snapshot"). + The delegates must also be built in this branch. CI must be run on this branch and pass. + **NB: Make sure NOT to merge this MR about the same day when a previous protocol gets activated.** It is recommended to avoid merging a snapshot for a new protocol within 1-2 days of another protocol's activation, due to significant interactions and interferences between the snapshotting process and that for upgrading the documentation site to reflect a protocol activation. + Note that the activation date cannot be modified, but is known at least two weeks in advance. + - **Test Network Preparation**: everything before the Spawn Test Network section of: https://gitlab.com/romain.nl/howtos/-/blob/master/HOWTO-launch-a-test-network.md @@ -168,6 +173,8 @@ the point of no return.** successful activation; it will be posted around the same time that news releases go out. +- **Doc Update Approved**: A documentation update reflecting the new active protocol and droping the documentation of the previous protocol has to be ready. Technically, an MR instantiating meta-issue :gl:`#2170` (Section "Protocol activation") for the new protocol has to be ready and must have sufficient approvals to be triggered right after activation. + **After Activation** A few hours after activation, when it is certain that everything has @@ -180,9 +187,7 @@ master branch, the ``proto_alpha`` directory is reset to the newly activated protocol and its associated daemons, with the exception of vanity nonce and migration that should be reverted. -Soon after the injection (the same or next day), the documentation has to -be shifted to reflect the new active protocol and to drop the documentation of -the previous protocol, see meta-issue :gl:`#2170`. Also, part +Soon after the activation (preferably on the same or next day), the MR updating the documentation to reflect the new active protocol (see above) has to be merged. Also, part of the code related to the old protocol can now be dropped, see :doc:`../developer/howto-freeze-protocols`. -- GitLab From 24e170220516fd4de4a24967776f111fe1690c4d Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Mon, 3 Jul 2023 10:51:31 +0200 Subject: [PATCH 5/7] Docs: fix indentation in user/logging --- docs/user/logging.rst | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/user/logging.rst b/docs/user/logging.rst index 88f214c7d28e..6c91e23bb4eb 100644 --- a/docs/user/logging.rst +++ b/docs/user/logging.rst @@ -78,21 +78,21 @@ Common options: sections. To exclude a specific section use the ``none`` filter, for example ``section-prefix=p2p:none``. To define a filter only for one specific section ``section-prefix=p2p:debug§ion-prefix=:none`` -- ``format=`` the output format used. Note that syslog output will ignore +- ``format=`` the output format used. Note that syslog output will ignore this option and use the syslog formatting. Possible values are: - ``one-per-line`` (the default): output JSON objects, one per line, - ``netstring``: use the Netstring format (cf. `Wikipedia `__) to separate JSON records, - - ``pp`` or ``pp-rfc5424`` to output the events pretty-printed, one per line, + - ``pp`` or ``pp-rfc5424`` to output the events pretty-printed, one per line, using a format compatible with `RFC-5424 `__ (or Syslog). - - ``pp-short`` to output the events pretty-printed in a shorter and more - user-friendly fashion. + - ``pp-short`` to output the events pretty-printed in a shorter and more + user-friendly fashion. -- ``color=true`` enables logs coloring. It only works on ttys, in conjunction with - ``format=pp-short``. +- ``color=true`` enables logs coloring. It only works on ttys, in conjunction with + ``format=pp-short``. Options available only for the ``file-descriptor-path://`` case: @@ -104,15 +104,15 @@ Options available only for the ``file-descriptor-path://`` case: - ``chmod=`` sets the access-rights of the file at creation time (default is ``0o600``, provided `Umask `__ allows it). -- ``daily-logs=`` sets up a rotation for log files, creating a file for - each day. The parameter is the number of days these logs should be kept, and - hence the number of files. The day of the year with format ["yyyymmdd"] is - added as a suffix to the filename, prefixed by a dash. We recomend not to put - your tezos logs in ``/var/log`` if you use this option, as you system would - use ``logrotate`` automatically. -- ``create-dirs=`` when ``true`` allows to create the directory where - the log files are stored and all its parents recursively if they don't - exist. +- ``daily-logs=`` sets up a rotation for log files, creating a file for + each day. The parameter is the number of days these logs should be kept, and + hence the number of files. The day of the year with format ["yyyymmdd"] is + added as a suffix to the filename, prefixed by a dash. We recomend not to put + your tezos logs in ``/var/log`` if you use this option, as you system would + use ``logrotate`` automatically. +- ``create-dirs=`` when ``true`` allows to create the directory where + the log files are stored and all its parents recursively if they don't + exist. Option available only for ``file-descriptor-syslog://`` case: @@ -138,7 +138,7 @@ Option available only for ``file-descriptor-syslog://`` case: - ``file-descriptor-path:///the/path/to/write.log?section-prefix=rpc:debug§ion-prefix=validator:debug§ion-prefix=:none"`` → Write only sections validator and rpc at debug level but exclude all other sections from the stream. -- ``"file-descriptor-path:///tmp/node-logs/node.log?daily-logs=5&create-dirs=true§ion-prefix=:info"`` +- ``"file-descriptor-path:///tmp/node-logs/node.log?daily-logs=5&create-dirs=true§ion-prefix=:info"`` sets up daily log files with a history of up to 5 days and verbosity level ``info`` for all logs. Files will be named ``node-19700101.log`` in an example of a file produced in 1970, January, the 1st. The log directory @@ -254,7 +254,7 @@ called; this should include *all* the regular ``octez-*`` binaries. to configuration JSON files (format above) to load (which themselves activate sinks). -- ``TEZOS_LOG`` and ``LWT_LOG`` (deprecated and has a lower priority) contain +- ``TEZOS_LOG`` and ``LWT_LOG`` (deprecated and has a lower priority) contain “rules” to configure the default ``file-descriptor-stdout`` sink. The rules are expressed with a DSL: @@ -291,7 +291,7 @@ In particular the fields: - ``"internal-events"`` contains a configuration of the sinks (format above). -- ``"log"`` is an object which defines the configuration of the default +- ``"log"`` is an object which defines the configuration of the default ``file-descriptor-stdout`` sink; one can redirect the output to a file, set the rules, and change the formatting template. The goal of this configuration field is to be simpler to express that ``internal-events`` for simpler @@ -308,7 +308,7 @@ configuration can be also be changed with the following options: - ``-v`` / ``-vv``: set the global log level to ``Info`` or ``Debug`` respectively. - ``--log-output``: set the output file. -- ``--log-coloring=``: enable or disable colors in the default stdout +- ``--log-coloring=``: enable or disable colors in the default stdout logs. The default value is ``true``. RPC ``/config/logging`` -- GitLab From 1e7e6c68e4b4c1cf1b5dc1536b44c76d57019270 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Mon, 3 Jul 2023 16:31:52 +0300 Subject: [PATCH 6/7] doc: describe suffixes of protocol-dep executables --- docs/introduction/howtouse.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/introduction/howtouse.rst b/docs/introduction/howtouse.rst index 6dace570dac1..7a5f88702348 100644 --- a/docs/introduction/howtouse.rst +++ b/docs/introduction/howtouse.rst @@ -29,7 +29,8 @@ After a successful compilation, you should have the following binaries: - ``octez-snoop``: a tool for modeling the performance of any piece of OCaml code, based on benchmarking (see :doc:`../developer/snoop`) The daemons other than the node are suffixed with the name of the protocol they are -bound to, and up to some version, also by its number. +bound to. +More precisely, the suffix consists of the first 8 characters of the protocol hash; except for protocol Alpha, for which the suffix is simply ``-alpha``. For instance, ``octez-baker-PtNairob`` is the baker for the Nairobi protocol, and ``octez-baker-alpha`` is the baker of the development protocol. -- GitLab From 64b735e569681fd271e642a7c130ea990e5ace12 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Tue, 4 Jul 2023 18:51:42 +0300 Subject: [PATCH 7/7] doc: fix doubled word in shell/cli-commands --- docs/shell/cli-commands.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/shell/cli-commands.rst b/docs/shell/cli-commands.rst index 050c4212e103..d7b8b7b0ae96 100644 --- a/docs/shell/cli-commands.rst +++ b/docs/shell/cli-commands.rst @@ -59,7 +59,7 @@ The command line of the Octez node is documented in Unix ``man`` format, as show The manual briefly shows the available node commands. Each command accepts its own set of options and arguments, that you can discover by running ``octez-node --help``. -For more details on the node invocation and configuration, see see :doc:`../user/node-configuration`. +For more details on the node invocation and configuration, see :doc:`../user/node-configuration`. .. include:: ../api/octez-node.txt -- GitLab