-
Notifications
You must be signed in to change notification settings - Fork 266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: combine contracts for l1 -> l2 and l2 -> l1 #726
Conversation
@@ -50,4 +50,21 @@ contract TokenPortal { | |||
// Send message to rollup | |||
return inbox.sendL2Message{value: msg.value}(actor, _deadline, contentHash, _secretHash); | |||
} | |||
|
|||
function withdraw(uint256 _amount, address _recipient) external returns (bytes32) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are we doing natspec stuff for this too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would probably be useful, but have not as strict when it was just a test contract and not a core
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
@@ -180,6 +180,50 @@ | |||
"returnTypes": [], | |||
"bytecode": "00000000d1000000130000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000300000009d0000009e0000009f000000a0000000a1000000a2000000a3000000a4000000a5000000a6000000a7000000a9000000aa000000ab000000ac000000ad000000ae000000af000000b0000000b1000000b2000000b3000000b4000000b5000000b6000000b7000000b8000000b9000000ba000000bb000000bc000000bd000000be000000bf000000c0000000c1000000c2000000c3000000c4000000c5000000c6000000c7000000c8000000c9000000ca000000cb000000cc000000cd000000c90000000001000000010000000000000000000000000000000000000000000000000000000000000000000001010000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000100000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001020000000200000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000200000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001030000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000003000000000000000000000000000000000000000000000000000000000000000000000000000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000014000000000000000000000000000000000000000000000000000000000000000000000400000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000001500000000000000000000000000000000000000000000000000000000000000000000010105000300000014000000fe00000015000000fe00000010000000fe00000002000000160000001700000007010000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011600000000000000000000000000000000000000000000000000000000000000000000000100000001002100000018000000190000001a0000001b0000001c0000001d0000001e0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000920100009981a34a4d509103a454726170a453746f7081a34d6f769281a85265676973746572cd027181a8436f6e7374616e74d9403030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030326481a64f7261636c6595a96765744e6f746573329181b052656769737465724d656d496e64657881a85265676973746572cd026a909181a541727261799281a8436f6e7374616e74d94030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303264219081a34d6f769281a85265676973746572cd027181a8436f6e7374616e74d9403030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030326481a34d6f769281a852656769737465720081a85265676973746572cd0271a843616c6c4261636b81a9426f6f7473747261709191cd026a010000000000000000000000000000000000000000000000000000000000000000000000000000000102010000000000010000000000000000000000000000000000000000000000000000000000000000000001190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023a00000039000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001390000003900000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000390000000000000000000000000000000000000000000000000000000000000000000000020100000000000100000000000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003c0000003b00000000010b00010000003b000000fc0000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000013c0000003c00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000003c000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000003a00000000000000000000000000000000000000000000000000000000000000000000013b00000010000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000001900000000000000000000000000000000000000000000000000000000000000000000013900000000000000000000000000000000000000000000000000000000000000000000023a000000000000000000000000000000000000000000000000000000000000000000000002010000000000010000000000000000000000000000000000000000000000000000000000000000000001290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000023e0000003d0000000000010000000100000000000000000000000000000000000000000000000000000000000000000000013d0000003d00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000003d0000000000000000000000000000000000000000000000000000000000000000000000020100000000000100000000000000000000000000000000000000000000000000000000000000000000013e000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000400000003f00000000010b00010000003f000000fc000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001400000004000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000003e00000000000000000000000000000000000000000000000000000000000000000000013f000000100000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000002900000000000000000000000000000000000000000000000000000000000000000000013d00000000000000000000000000000000000000000000000000000000000000000000023e000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000e00000000000000000000000000000000000000000000000000000000000000000000012800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000041000000000000000000000000000000000000000000000000000000000000000000000002000041000000420000000001000000010000000000000000000000000000000000000000000000000000000000000000000001410000004200000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004300000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001410000004300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000410000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000143000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000e00000000000000000000000000000000000000000000000000000000000000000000013800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000044000000000000000000000000000000000000000000000000000000000000000000000002000044000000450000000001000000010000000000000000000000000000000000000000000000000000000000000000000001440000004500000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004600000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001440000004600000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000440000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000000000000002010000000000010000000000000000000000000000000000000000000000000000000000000000000001390000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024800000047000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001470000004700000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000047000000000000000000000000000000000000000000000000000000000000000000000002010000000000010000000000000000000000000000000000000000000000000000000000000000000001480000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004a0000004900000000010b000100000049000000fc0000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014a0000004a00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004a000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004800000000000000000000000000000000000000000000000000000000000000000000014900000010000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000390000000000000000000000000000000000000000000000000000000000000000000001470000000000000000000000000000000000000000000000000000000000000000000002480000000000000000000000000000000000000000000000000000000000000000000000020100000000000100000000000000000000000000000000000000000000000000000000000000000000013d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024c0000004b0000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014b0000004b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004b0000000000000000000000000000000000000000000000000000000000000000000000020100000000000100000000000000000000000000000000000000000000000000000000000000000000014c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000004e0000004d00000000010b00010000004d000000fc0000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014e0000004e00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004e000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004c00000000000000000000000000000000000000000000000000000000000000000000014d00000010000000000000000000000000000000000000000000000000000000000000004e000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000003d00000000000000000000000000000000000000000000000000000000000000000000014b00000000000000000000000000000000000000000000000000000000000000000000024c000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000011000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000001b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004f00000000000000000000000000000000000000000000000000000000000000000000000200004f0000005000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014f0000005000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000051000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014f0000005100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004f000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000014700000051000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000011100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000001c00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000052000000000000000000000000000000000000000000000000000000000000000000000002000052000000530000000001000000010000000000000000000000000000000000000000000000000000000000000000000001520000005300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005400000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001520000005400000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005200000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000001470000005400000000000000000000000000000000000000000000000000000000000000000000000200001e0000005500000000010000000100000000000000000000000000000000000000000000000000000000000000000000011e0000005500000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000056000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000011e0000005600000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000001e000000000000000000000000000000000000000000000000000000000000000000000000010000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004700000056000000000000000000000000000000000000000000000000000000000000000000000156000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000011000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000002b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000057000000000000000000000000000000000000000000000000000000000000000000000002000057000000580000000001000000010000000000000000000000000000000000000000000000000000000000000000000001570000005800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005900000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001570000005900000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000057000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000014b00000059000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000011100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000002c00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005a00000000000000000000000000000000000000000000000000000000000000000000000200005a0000005b00000000010000000100000000000000000000000000000000000000000000000000000000000000000000015a0000005b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005c000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000015a0000005c00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005a000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000014b0000005c00000000000000000000000000000000000000000000000000000000000000000000000200002e0000005d00000000010000000100000000000000000000000000000000000000000000000000000000000000000000012e0000005d00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005e000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000012e0000005e00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000002e000000000000000000000000000000000000000000000000000000000000000000000000010000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000004b0000005e00000000000000000000000000000000000000000000000000000000000000000000015e0000000000000000000000000000000000000000000000000000000000000000000000020100000000000200000000000000000000000000000000000000000000000000000000000000000000011e00000000000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000600000005f00000000010b00010000005f0000004000000000000000010b000100000060000000be0000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000001e00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000002e0000000000000000000000000000000000000000000000000000000000000000000001cf000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000015f00000000000000000000000000000000000000000000000000000100000000000000006000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000cf0000000000000000000000000000000000000000000000000000000000000000000000020100000000000100000000000000000000000000000000000000000000000000000000000000000000010f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000620000006100000000010b0001000000610000004000000000000000010b000100000062000000be0000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000f0000000000000000000000000000000000000000000000000000000000000000000001610000000000000000000000000000000000000000000000000000010000000000000000620000000000000000000000000000000000000000000000000000000000000000000000020100000000000100000000000000000000000000000000000000000000000000000000000000000000015f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000640000006300000000010b0001000000630000004000000000000000010b000100000064000000be0000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000005f00000000000000000000000000000000000000000000000000000000000000000000016300000000000000000000000000000000000000000000000000000100000000000000006400000000000000000000000000000000000000000000000000000000000000000000000201000000000001000000000000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000660000006500000000010b0001000000650000004000000000000000010b000100000066000000be0000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000061000000000000000000000000000000000000000000000000000000000000000000000165000000000000000000000000000000000000000000000000000001000000000000000066000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000016300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000650000000000000000000000000000000000000000000000000000000000000000000001d0000000000000000000000000000000000000000000000000000001000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709043e1f593f00000016700000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000006800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000d00000000000000000000000000000000000000000000000000000000000000000000000020100000000000200000000000000000000000000000000000000000000000000000000000000000000016300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000065000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000670000006800000000010b00010000006800000040000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001670000006700000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000067000000000000000000000000000000000000000000000000000000000000000000000000000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000067000000000000000000000000000000000000000000000000000000000000000000000100000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000006900000000000000000000000000000000000000000000000000000000000000000000020105000700000069000000fe00000047000000fe0000001a000000fe0000001b000000fe0000001c000000fe0000001d000000fe0000001e000000fe000000020000006a0000006b00000000000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000006c0000000000000000000000000000000000000000000000000000000000000000000003010500040000006c000000fe0000006a000000fe00000016000000fe00000006000000fe000000020000006d0000006e00000007020000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011c00000000000000000000000000000000000000000000000000000000000000000000000100000000006f000000b60000009781a34a4d509103a454726170a453746f7081a64f7261636c6595ac6765745365637265744b65799281b052656769737465724d656d496e64657881a85265676973746572cd06ad81b052656769737465724d656d496e64657881a85265676973746572cd06ae909181ad5265676973746572496e646578cd06b39081a34d6f769281a852656769737465720081a85265676973746572cd06b3a843616c6c4261636b81a9426f6f7473747261709192cd06adcd06ae010000000001000000000000000000000000000000000000000000000000000000000000000000000147000000000000000000000000000000000000000000000000000000000000000000000000000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000007000000000000000000000000000000000000000000000000000000000000000000000050001000000010000000000000000000000000000000000000000000000000000000000000000000001470000006f00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000007100000000000000000000000000000000000000000000000000000000000000000000000105000300000070000000fe0000006d000000fe00000071000000fe00000002000000720000007300000007020000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011c000000000000000000000000000000000000000000000000000000000000000000000001000000000074000000b60000009781a34a4d509103a454726170a453746f7081a64f7261636c6595ac6765745365637265744b65799281b052656769737465724d656d496e64657881a85265676973746572cd06ad81b052656769737465724d656d496e64657881a85265676973746572cd06ae909181ad5265676973746572496e646578cd06b39081a34d6f769281a852656769737465720081a85265676973746572cd06b3a843616c6c4261636b81a9426f6f7473747261709192cd06adcd06ae01000000000100000000000000000000000000000000000000000000000000000000000000000000014700000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001470000007400000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000007500000000000000000000000000000000000000000000000000000000000000000000000105000300000070000000fe0000006a000000fe00000075000000fe00000002000000760000007700000007080000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011600000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000017600000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000014700000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011a00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011c00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011d00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011e000000000000000000000000000000000000000000000000000000000000000000000001000000000078000000890100009781a34a4d509103a454726170a453746f7081a64f7261636c6595b36e6f746966794e756c6c69666965644e6f74659881b052656769737465724d656d496e64657881a85265676973746572cd06eb81b052656769737465724d656d496e64657881a85265676973746572cd06ec81b052656769737465724d656d496e64657881a85265676973746572cd06ed81b052656769737465724d656d496e64657881a85265676973746572cd06ee81b052656769737465724d656d496e64657881a85265676973746572cd06ef81b052656769737465724d656d496e64657881a85265676973746572cd06f081b052656769737465724d656d496e64657881a85265676973746572cd06f181b052656769737465724d656d496e64657881a85265676973746572cd06f2909181ad5265676973746572496e646578cd06fd9081a34d6f769281a852656769737465720081a85265676973746572cd06fda843616c6c4261636b81a9426f6f7473747261709198cd06ebcd06eccd06edcd06eecd06efcd06f0cd06f1cd06f2010000000000000000000000000000000000000000000000000000000000000000000000000000000102000078000000790000000001000000010000000000000000000000000000000000000000000000000000000000000000000001780000007900000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000007a00000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001780000007a00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000078000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000017a00000000000000000000000000000000000000000000000000000000000000000000000105000700000069000000fe0000004b000000fe0000002a000000fe0000002b000000fe0000002c000000fe0000002d000000fe0000002e000000fe000000020000007b0000007c000000010500040000006c000000fe0000007b000000fe00000016000000fe00000006000000fe000000020000007d0000007e00000007020000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000000000000100000000007f000000b60000009781a34a4d509103a454726170a453746f7081a64f7261636c6595ac6765745365637265744b65799281b052656769737465724d656d496e64657881a85265676973746572cd06ad81b052656769737465724d656d496e64657881a85265676973746572cd06ae909181ad5265676973746572496e646578cd06b39081a34d6f769281a852656769737465720081a85265676973746572cd06b3a843616c6c4261636b81a9426f6f7473747261709192cd06adcd06ae01000000000100000000000000000000000000000000000000000000000000000000000000000000014b000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014b0000007f00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000008000000000000000000000000000000000000000000000000000000000000000000000000105000300000070000000fe0000007d000000fe00000080000000fe00000002000000810000008200000007020000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012c000000000000000000000000000000000000000000000000000000000000000000000001000000000083000000b60000009781a34a4d509103a454726170a453746f7081a64f7261636c6595ac6765745365637265744b65799281b052656769737465724d656d496e64657881a85265676973746572cd06ad81b052656769737465724d656d496e64657881a85265676973746572cd06ae909181ad5265676973746572496e646578cd06b39081a34d6f769281a852656769737465720081a85265676973746572cd06b3a843616c6c4261636b81a9426f6f7473747261709192cd06adcd06ae01000000000100000000000000000000000000000000000000000000000000000000000000000000014b000000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000014b0000008300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000008400000000000000000000000000000000000000000000000000000000000000000000000105000300000070000000fe0000007b000000fe00000084000000fe00000002000000850000008600000007080000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011600000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000018500000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000014b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012a00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012d00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000000000000001000000000087000000890100009781a34a4d509103a454726170a453746f7081a64f7261636c6595b36e6f746966794e756c6c69666965644e6f74659881b052656769737465724d656d496e64657881a85265676973746572cd06eb81b052656769737465724d656d496e64657881a85265676973746572cd06ec81b052656769737465724d656d496e64657881a85265676973746572cd06ed81b052656769737465724d656d496e64657881a85265676973746572cd06ee81b052656769737465724d656d496e64657881a85265676973746572cd06ef81b052656769737465724d656d496e64657881a85265676973746572cd06f081b052656769737465724d656d496e64657881a85265676973746572cd06f181b052656769737465724d656d496e64657881a85265676973746572cd06f2909181ad5265676973746572496e646578cd06fd9081a34d6f769281a852656769737465720081a85265676973746572cd06fda843616c6c4261636b81a9426f6f7473747261709198cd06ebcd06eccd06edcd06eecd06efcd06f0cd06f1cd06f2010000000000000000000000000000000000000000000000000000000000000000000000000000000102000087000000880000000001000000010000000000000000000000000000000000000000000000000000000000000000000001870000008800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000008900000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001870000008900000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000870000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000189000000000000000000000000000000000000000000000000000000000000000000000007000000000100000000008a000000740000009781a34a4d509103a454726170a453746f7081a64f7261636c6595ae67657452616e646f6d4669656c6490909181ad5265676973746572496e646578cd07cc9081a34d6f769281a852656769737465720081a85265676973746572cd07cca843616c6c4261636b81a9426f6f7473747261709190010000000000000000000000000000000000000000000000000000000000000000000000000000000107000000000100000000008b000000740000009781a34a4d509103a454726170a453746f7081a64f7261636c6595ae67657452616e646f6d4669656c6490909181ad5265676973746572496e646578cd07cc9081a34d6f769281a852656769737465720081a85265676973746572cd07cca843616c6c4261636b81a9426f6f747374726170919001000000000000000000000000000000000000000000000000000000000000000000000000000000010105000300000014000000fe00000015000000fe00000012000000fe000000020000008c0000008d0000000105000700000069000000fe00000015000000fe0000006c000000fe00000012000000fe00000013000000fe0000008b000000fe0000000f000000fe000000020000008e0000008f00000007090000000000000000000100000000000000000000000000000000000000000000000000000000000000000000018c00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011200000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011300000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011500000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000016c00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011200000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011300000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000018b00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000010f000000000000000000000000000000000000000000000000000000000000000000000001000000000090000000a90100009781a34a4d509103a454726170a453746f7081a64f7261636c6595b16e6f74696679437265617465644e6f74659981b052656769737465724d656d496e64657881a85265676973746572cd085781b052656769737465724d656d496e64657881a85265676973746572cd085881b052656769737465724d656d496e64657881a85265676973746572cd085981b052656769737465724d656d496e64657881a85265676973746572cd085a81b052656769737465724d656d496e64657881a85265676973746572cd085b81b052656769737465724d656d496e64657881a85265676973746572cd085c81b052656769737465724d656d496e64657881a85265676973746572cd085d81b052656769737465724d656d496e64657881a85265676973746572cd085e81b052656769737465724d656d496e64657881a85265676973746572cd085f909181ad5265676973746572496e646578cd086b9081a34d6f769281a852656769737465720081a85265676973746572cd086ba843616c6c4261636b81a9426f6f7473747261709199cd0857cd0858cd0859cd085acd085bcd085ccd085dcd085ecd085f010000000000000000000000000000000000000000000000000000000000000000000000000000000102000090000000910000000001000000010000000000000000000000000000000000000000000000000000000000000000000001900000009100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009200000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001900000009200000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000900000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000192000000000000000000000000000000000000000000000000000000000000000000000000000000000200000030644e72e131a029b85045b68181585d2833e84879b9709043e1f593f00000019300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000094000000000000000000000000000000000000000000000000000000fffffffffffffffc0201000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffc00000000000000000000000000000000000000000000000000000000000000010000000000000000930000009400000000010b00010000009400000040000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001930000009300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000930000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000f00000000000000000000000000000000000000000000000000000000000000000000011e0000000000000000000000000000000000000000000000000000000000000000000001d1000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000012e00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009500000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000d100000000000000000000000000000000000000000000000000000000000000000000000105000700000069000000fe00000015000000fe0000006c000000fe00000010000000fe00000011000000fe0000008a000000fe00000095000000fe00000002000000960000009700000007090000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011600000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011100000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011500000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000016c00000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000011100000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000018a000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000195000000000000000000000000000000000000000000000000000000000000000000000001000000000098000000a90100009781a34a4d509103a454726170a453746f7081a64f7261636c6595b16e6f74696679437265617465644e6f74659981b052656769737465724d656d496e64657881a85265676973746572cd085781b052656769737465724d656d496e64657881a85265676973746572cd085881b052656769737465724d656d496e64657881a85265676973746572cd085981b052656769737465724d656d496e64657881a85265676973746572cd085a81b052656769737465724d656d496e64657881a85265676973746572cd085b81b052656769737465724d656d496e64657881a85265676973746572cd085c81b052656769737465724d656d496e64657881a85265676973746572cd085d81b052656769737465724d656d496e64657881a85265676973746572cd085e81b052656769737465724d656d496e64657881a85265676973746572cd085f909181ad5265676973746572496e646578cd086b9081a34d6f769281a852656769737465720081a85265676973746572cd086ba843616c6c4261636b81a9426f6f7473747261709199cd0857cd0858cd0859cd085acd085bcd085ccd085dcd085ecd085f010000000000000000000000000000000000000000000000000000000000000000000000000000000102000098000000990000000001000000010000000000000000000000000000000000000000000000000000000000000000000001980000009900000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009a00000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000001980000009a00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f000000098000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000019a000000000000000000000000000000000000000000000000000000000000000000000000000000000200000030644e72e131a029b85045b68181585d2833e84879b9709043e1f593f00000019b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009c000000000000000000000000000000000000000000000000000000fffffffffffffffd0201000000000000000000000000000000000000000000000000000000000000000000fffffffffffffffd000000000000000000000000000000000000000000000000000000000000000100000000000000009b0000009c00000000010b00010000009c000000400000000000000000010000000100000000000000000000000000000000000000000000000000000000000000000000019b0000009b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010400000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009d000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010600000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009e000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010500000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000009f000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010200000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a1000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a2000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010f00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a3000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000011000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a4000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000011100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a5000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000011200000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a6000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000011300000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a7000000000000000000000000000000000000000000000000000000000000000000000000000000000100000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a800000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000a900000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000aa00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000ab000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000014700000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000ac000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000014b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000ad00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000ae00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000af00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b100000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b200000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b3000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000018e00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000019600000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b500000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b600000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b7000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000017600000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b8000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000018500000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000b900000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000ba00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000bb00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000bc00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000bd00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000be00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000bf00000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c100000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c200000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c300000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c400000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000001a800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c5000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010e00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c6000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010d00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c7000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010b00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c8000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010c00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000c9000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010700000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000ca000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010900000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000cb000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010800000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000cc000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000010a00000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000cd0000000000000000000000000000000000000000000000000000000000000000000000", | |||
"verificationKey": "0000000200000800000000740000000f00000003515f3109623eb3c25aa5b16a1a79fd558bac7a7ce62c4560a8c537c77ce80dd339128d1d37b6582ee9e6df9567efb64313471dfa18f520f9ce53161b50dbf7731bc5f900000003515f322bc4cce83a486a92c92fd59bd84e0f92595baa639fc2ed86b00ffa0dfded2a092a669a3bdb7a273a015eda494457cc7ed5236f26cee330c290d45a33b9daa94800000003515f332729426c008c085a81bd34d8ef12dd31e80130339ef99d50013a89e4558eee6d0fa4ffe2ee7b7b62eb92608b2251ac31396a718f9b34978888789042b790a30100000003515f342be6b6824a913eb7a57b03cb1ee7bfb4de02f2f65fe8a4e97baa7766ddb353a82a8a25c49dc63778cd9fe96173f12a2bc77f3682f4c4448f98f1df82c75234a100000003515f351f85760d6ab567465aadc2f180af9eae3800e6958fec96aef53fd8a7b195d7c000c6267a0dd5cfc22b3fe804f53e266069c0e36f51885baec1e7e67650c62e170000000c515f41524954484d455449430d9d0f8ece2aa12012fa21e6e5c859e97bd5704e5c122064a66051294bc5e04213f61f54a0ebdf6fee4d4a6ecf693478191de0c2899bcd8e86a636c8d3eff43400000003515f43224a99d02c86336737c8dd5b746c40d2be6aead8393889a76a18d664029096e90f7fe81adcc92a74350eada9622ac453f49ebac24a066a1f83b394df54dfa0130000000c515f46495845445f42415345060e8a013ed289c2f9fd7473b04f6594b138ddb4b4cf6b901622a14088f04b8d2c83ff74fce56e3d5573b99c7b26d85d5046ce0c6559506acb7a675e7713eb3a00000007515f4c4f4749430721a91cb8da4b917e054f72147e1760cfe0ef3d45090ac0f4961d84ec1996961a25e787b26bd8b50b1a99450f77a424a83513c2b33af268cd253b0587ff50c700000003515f4d05dbd8623b8652511e1eb38d38887a69eceb082f807514f09e127237c5213b401b9325b48c6c225968002318095f89d0ef9cf629b2b7f0172e03bc39aacf6ed800000007515f52414e474504b57a3805e41df328f5ca9aefa40fad5917391543b7b65c6476e60b8f72e9ad07c92f3b3e11c8feae96dedc4b14a6226ef3201244f37cfc1ee5b96781f48d2b000000075349474d415f3125001d1954a18571eaa007144c5a567bb0d2be4def08a8be918b8c05e3b27d312c59ed41e09e144eab5de77ca89a2fd783be702a47c951d3112e3de02ce6e47c000000075349474d415f3223994e6a23618e60fa01c449a7ab88378709197e186d48d604bfb6931ffb15ad11c5ec7a0700570f80088fd5198ab5d5c227f2ad2a455a6edeec024156bb7beb000000075349474d415f3300cda5845f23468a13275d18bddae27c6bb189cf9aa95b6a03a0cb6688c7e8d829639b45cf8607c525cc400b55ebf90205f2f378626dc3406cc59b2d1b474fba000000075349474d415f342d299e7928496ea2d37f10b43afd6a80c90a33b483090d18069ffa275eedb2fc2f82121e8de43dc036d99b478b6227ceef34248939987a19011f065d8b5cef5c0000000010000000000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f" | |||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this function is added, you can delete the entire rollup_native_asset_contact.json
file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, thought I had done that already, probably missed it
|
||
// NOTE: this tests is just a scaffold, it is awaiting functionality to come from the aztec-node around indexing messages in the contract | ||
describe('e2e_l1_to_l2_msg', () => { | ||
const sha256ToField = (buf: Buffer): Fr => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shall we stick this bad boy in foundation? (at some point)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, seems like a good idea
PublicClient<HttpTransport, Chain>, | ||
WalletClient<HttpTransport, Chain, Account> | ||
>; | ||
let tokenPortal: any; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
haha, fair enough making these any
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Linter started screaming and could not be bothered.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shipit
Description
Fixes #725. Combining the two cross-chain messages test into one test that can move funds in an out of the rollup from a portal.
Doing a test that deposit funds into the rollup and the withdraw some of them again.
Checklist: