From 72d5b1710a24cfa4679edf7b84c3e336ae51bf9e Mon Sep 17 00:00:00 2001 From: Cody Wang Date: Wed, 28 Aug 2024 10:48:38 -0400 Subject: [PATCH] proposer deploy --- .../2024-08-21-update-batcher-proposer/.env | 2 +- .../foundry.toml | 3 +- .../11155111/run-1724856389.json | 113 ++++++++++++++++++ ...cherHash.sol => RollbackBatcherHash.s.sol} | 0 ...ackProposer.sol => RollbackProposer.s.sol} | 0 ...atcherHash.sol => UpdateBatcherHash.s.sol} | 0 ...pdateProposer.sol => UpdateProposer.s.sol} | 2 + 7 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 sepolia-alpha/2024-08-21-update-batcher-proposer/records/UpdateProposer.s.sol/11155111/run-1724856389.json rename sepolia-alpha/2024-08-21-update-batcher-proposer/script/{RollbackBatcherHash.sol => RollbackBatcherHash.s.sol} (100%) rename sepolia-alpha/2024-08-21-update-batcher-proposer/script/{RollbackProposer.sol => RollbackProposer.s.sol} (100%) rename sepolia-alpha/2024-08-21-update-batcher-proposer/script/{UpdateBatcherHash.sol => UpdateBatcherHash.s.sol} (100%) rename sepolia-alpha/2024-08-21-update-batcher-proposer/script/{UpdateProposer.sol => UpdateProposer.s.sol} (97%) diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/.env b/sepolia-alpha/2024-08-21-update-batcher-proposer/.env index dd85668a..9b6ae75b 100644 --- a/sepolia-alpha/2024-08-21-update-batcher-proposer/.env +++ b/sepolia-alpha/2024-08-21-update-batcher-proposer/.env @@ -1,4 +1,4 @@ -OP_COMMIT=9047beb54c66a5c572784efec8984f259302ec92 +OP_COMMIT=33f06d2d5e4034125df02264a5ffe84571bd0359 BASE_CONTRACTS_COMMIT=e961e8638874d571aa63a6e35507e3779131d1eb # Batcher diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/foundry.toml b/sepolia-alpha/2024-08-21-update-batcher-proposer/foundry.toml index 0d7a9ef9..1b5b564f 100644 --- a/sepolia-alpha/2024-08-21-update-batcher-proposer/foundry.toml +++ b/sepolia-alpha/2024-08-21-update-batcher-proposer/foundry.toml @@ -7,7 +7,8 @@ fs_permissions = [ {access = "read-write", path = "./"} ] optimizer = true optimizer_runs = 999999 solc_version = "0.8.15" -via-ir = true +# via-ir = true +ignored_error_codes = ["transient-storage", "code-size", "init-code-size", 5159] remappings = [ '@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock/', '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts', diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/records/UpdateProposer.s.sol/11155111/run-1724856389.json b/sepolia-alpha/2024-08-21-update-batcher-proposer/records/UpdateProposer.s.sol/11155111/run-1724856389.json new file mode 100644 index 00000000..973ae1c1 --- /dev/null +++ b/sepolia-alpha/2024-08-21-update-batcher-proposer/records/UpdateProposer.s.sol/11155111/run-1724856389.json @@ -0,0 +1,113 @@ +{ + "transactions": [ + { + "hash": "0xf2bcbc72291842ecb1c052a9373a7d75b83cc89bb90f0f41f5067446baa4dd54", + "transactionType": "CREATE", + "contractName": "PermissionedDisputeGame", + "contractAddress": "0x80dbd6bba7ec3fe68fe30ec4ab59a735e03b8c5e", + "function": null, + "arguments": [ + "1", + "0x0385c3f8ee78491001d92b90b07d0cf387b7b52ab9b83b4d87c994e92cf823ba", + "73", + "30", + "10800", + "302400", + "0xFF760A87E41144b336E29b6D4582427dEBdB6dee", + "0x9dc3d8500c295e95D5C4EBDeD3222a74fF19e524", + "0xfb17A817168BD4DFd48Fb6C9fd07B4409501e3E0", + "11763072", + "0xf99C2Da4822Af652fe1BF55F99713980efe5D261", + "0x9892742025C43cdBb22034Df7486E55aE4C476d4" + ], + "transaction": { + "from": "0xaf6e0e871f38c7b653700f7cbaedafaa2784d430", + "gas": "0x6a0241", + "value": "0x0", + "input": "0x6102006040523480156200001257600080fd5b50604051620067b4380380620067b4833981016040819052620000359162000468565b8b8b8b8b8b8b8b8b8b8b6200004d6001607e6200055b565b60ff168811156200007157604051633beff19960e11b815260040160405180910390fd5b6000198714806200008e5750876200008b88600162000581565b10155b15620000ad5760405163e62ccf3960e01b815260040160405180910390fd5b6002871015620000d05760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b038016846001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000119573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200013f91906200059c565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200017d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001a39190620005bc565b1115620001c35760405163b4e1243360e01b815260040160405180910390fd5b6000620001e4876001600160401b03166200040860201b62000d051760201c565b620001fa906001600160401b03166002620005d6565b90506000856001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200023d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200026391906200059c565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002a1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002c79190620005bc565b620002e6896001600160401b03166200040860201b62000d051760201c565b6001600160401b0316620002fb919062000581565b905060006200031683836200040b60201b620026401760201c565b90506001600160401b03811115620003415760405163235dfb2b60e21b815260040160405180910390fd5b62000360886001600160401b03166200040860201b62000d051760201c565b6001600160401b0316816001600160401b03161115620003935760405163235dfb2b60e21b815260040160405180910390fd5b50505063ffffffff9099166101205260809790975260a09590955260c0939093526001600160401b039182166101a0521660e0526001600160a01b03908116610100529081166101405290811661016052610180919091529182166101c052166101e05250620005f898505050505050505050565b90565b60008183116200041c57816200041e565b825b9392505050565b80516001600160401b03811681146200043d57600080fd5b919050565b6001600160a01b03811681146200045857600080fd5b50565b80516200043d8162000442565b6000806000806000806000806000806000806101808d8f0312156200048c57600080fd5b8c5163ffffffff81168114620004a157600080fd5b809c505060208d01519a5060408d0151995060608d01519850620004c860808e0162000425565b9750620004d860a08e0162000425565b9650620004e860c08e016200045b565b9550620004f860e08e016200045b565b9450620005096101008e016200045b565b93506101208d01519250620005226101408e016200045b565b9150620005336101608e016200045b565b90509295989b509295989b509295989b565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff84168082101562000578576200057862000545565b90039392505050565b6000821982111562000597576200059762000545565b500190565b600060208284031215620005af57600080fd5b81516200041e8162000442565b600060208284031215620005cf57600080fd5b5051919050565b6000816000190483118215151615620005f357620005f362000545565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a0516101c0516101e051615ffd620007b76000396000818161058301528181611b1501526120b50152600081816108ce01528181611ad601528181611ba4015261207601526000818161070401528181613059015281816130c401526130f7015260008181610a9a015261255301526000818161065c01528181611806015261367901526000818161053d015281816119c801528181612a2d0152818161351e0152613a7b015260008181610909015281816125e201526136380152600081816104ca015281816121b101528181612f58015261436b015260008181610aed01528181610fdc01528181611d7a01528181611dbc01528181612ec8015281816131270152613186015260008181610b20015281816123b001528181612d1101528181612e3701528181613095015281816141be0152818161466d0152818161476e015281816148430152818161511a0152615346015260008181610bc701528181611e8a01528181611f1001528181612dda01528181612f2c015281816140b401526141df0152600081816107cf015261427d0152615ffd6000f3fe6080604052600436106103085760003560e01c806370872aa51161019a578063c6f0308c116100e1578063ec5e63081161008a578063fa24f74311610064578063fa24f74314610b94578063fa315aa914610bb8578063fe2bbeb214610beb57600080fd5b8063ec5e630814610b11578063eff0f59214610b44578063f8f43ff614610b7457600080fd5b8063d6ae3cd5116100bb578063d6ae3cd514610a8b578063d8cc1a3c14610abe578063dabd396d14610ade57600080fd5b8063c6f0308c146109b3578063cf09e0d014610a3d578063d5d44d8014610a5e57600080fd5b8063a445ece611610143578063bcef3b551161011d578063bcef3b5514610933578063bd8da95614610973578063c395e1ca1461099357600080fd5b8063a445ece6146107f3578063a8e4fb90146108bf578063bbdc02db146108f257600080fd5b80638980e0cc116101745780638980e0cc1461076b5780638b85902b146107805780638d450a95146107c057600080fd5b806370872aa51461073b5780637b0f0adc146107505780638129fc1c1461076357600080fd5b80633fc8cef31161025e5780635c0cba33116102075780636361506d116101e15780636361506d146106b55780636b6716c0146106f55780636f0344091461072857600080fd5b80635c0cba331461064d578063609d33341461068057806360e274641461069557600080fd5b806354fd4d501161023857806354fd4d50146105a757806357da950e146105fd5780635a5fa2d91461062d57600080fd5b80633fc8cef31461052e578063472777c614610561578063534db0e21461057457600080fd5b80632810e1d6116102c057806337b1b2291161029a57806337b1b2291461047b5780633a768463146104bb5780633e3ac912146104ee57600080fd5b80632810e1d6146103f45780632ad69aeb1461040957806330dbe5701461042957600080fd5b806319effeb4116102f157806319effeb41461034f578063200d2ed21461039a57806325fc2ace146103d557600080fd5b8063019351301461030d57806303c2924d1461032f575b600080fd5b34801561031957600080fd5b5061032d61032836600461575c565b610c1b565b005b34801561033b57600080fd5b5061032d61034a3660046157b7565b610f3c565b34801561035b57600080fd5b5060005461037c9068010000000000000000900467ffffffffffffffff1681565b60405167ffffffffffffffff90911681526020015b60405180910390f35b3480156103a657600080fd5b506000546103c890700100000000000000000000000000000000900460ff1681565b6040516103919190615808565b3480156103e157600080fd5b506008545b604051908152602001610391565b34801561040057600080fd5b506103c86115e2565b34801561041557600080fd5b506103e66104243660046157b7565b611887565b34801561043557600080fd5b506001546104569073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff9091168152602001610391565b34801561048757600080fd5b50367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c90033560601c610456565b3480156104c757600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610456565b3480156104fa57600080fd5b5060005461051e907201000000000000000000000000000000000000900460ff1681565b6040519015158152602001610391565b34801561053a57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610456565b61032d61056f366004615849565b6118bd565b34801561058057600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610456565b3480156105b357600080fd5b506105f06040518060400160405280600581526020017f312e332e3000000000000000000000000000000000000000000000000000000081525081565b60405161039191906158e0565b34801561060957600080fd5b50600854600954610618919082565b60408051928352602083019190915201610391565b34801561063957600080fd5b506103e66106483660046158f3565b6118cf565b34801561065957600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610456565b34801561068c57600080fd5b506105f0611909565b3480156106a157600080fd5b5061032d6106b0366004615931565b611917565b3480156106c157600080fd5b50367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c9003603401356103e6565b34801561070157600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061037c565b61032d610736366004615963565b611abe565b34801561074757600080fd5b506009546103e6565b61032d61075e366004615849565b611b7f565b61032d611b8c565b34801561077757600080fd5b506002546103e6565b34801561078c57600080fd5b50367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c9003605401356103e6565b3480156107cc57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103e6565b3480156107ff57600080fd5b5061086b61080e3660046158f3565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046fffffffffffffffffffffffffffffffff169073ffffffffffffffffffffffffffffffffffffffff1684565b60408051941515855263ffffffff90931660208501526fffffffffffffffffffffffffffffffff9091169183019190915273ffffffffffffffffffffffffffffffffffffffff166060820152608001610391565b3480156108cb57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610456565b3480156108fe57600080fd5b5060405163ffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152602001610391565b34801561093f57600080fd5b50367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c9003601401356103e6565b34801561097f57600080fd5b5061037c61098e3660046158f3565b611c05565b34801561099f57600080fd5b506103e66109ae3660046159a2565b611de4565b3480156109bf57600080fd5b506109d36109ce3660046158f3565b611fc7565b6040805163ffffffff909816885273ffffffffffffffffffffffffffffffffffffffff968716602089015295909416948601949094526fffffffffffffffffffffffffffffffff9182166060860152608085015291821660a08401521660c082015260e001610391565b348015610a4957600080fd5b5060005461037c9067ffffffffffffffff1681565b348015610a6a57600080fd5b506103e6610a79366004615931565b60036020526000908152604090205481565b348015610a9757600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103e6565b348015610aca57600080fd5b5061032d610ad93660046159d4565b61205e565b348015610aea57600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061037c565b348015610b1d57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103e6565b348015610b5057600080fd5b5061051e610b5f3660046158f3565b60046020526000908152604090205460ff1681565b348015610b8057600080fd5b5061032d610b8f366004615849565b612123565b348015610ba057600080fd5b50610ba96125e0565b60405161039193929190615a5e565b348015610bc457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103e6565b348015610bf757600080fd5b5061051e610c063660046158f3565b60066020526000908152604090205460ff1681565b60008054700100000000000000000000000000000000900460ff166002811115610c4757610c476157d9565b14610c7e576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000547201000000000000000000000000000000000000900460ff1615610cd1576040517f0ea2e75200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610d08367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c90036014013590565b90565b610d1f610d1a36869003860186615ab2565b61265a565b14610d56576040517f9cc00b5b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b82606001358282604051610d6b929190615b3f565b604051809103902014610daa576040517fd81d583b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000610df3610dee84848080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152506126b692505050565b612723565b90506000610e1a82600881518110610e0d57610e0d615b4f565b60200260200101516128d9565b9050602081511115610e58576040517fd81d583b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b602081810151825190910360031b1c367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c9003605401358103610ecd576040517fb8ed883000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5050600180547fffffffffffffffffffffffff000000000000000000000000000000000000000016331790555050600080547fffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffff1672010000000000000000000000000000000000001790555050565b60008054700100000000000000000000000000000000900460ff166002811115610f6857610f686157d9565b14610f9f576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600060028381548110610fb457610fb4615b4f565b906000526020600020906005020190506000610fcf84611c05565b905067ffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000081169082161015611038576040517ff2440b5300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008481526006602052604090205460ff1615611081576040517ff1a9458100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600084815260056020526040902080548015801561109e57508515155b15611139578354640100000000900473ffffffffffffffffffffffffffffffffffffffff16600081156110d157816110ed565b600186015473ffffffffffffffffffffffffffffffffffffffff165b90506110f9818761298d565b50505060009485525050600660205250506040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046fffffffffffffffffffffffffffffffff16938101939093526001015473ffffffffffffffffffffffffffffffffffffffff1660608301526111dc576fffffffffffffffffffffffffffffffff60408201526001815260008690036111dc578195505b600086826020015163ffffffff166111f49190615bad565b905060008382116112055781611207565b835b602084015190915063ffffffff165b8181101561135357600086828154811061123257611232615b4f565b6000918252602080832090910154808352600690915260409091205490915060ff1661128a576040517f9a07664600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006002828154811061129f5761129f615b4f565b600091825260209091206005909102018054909150640100000000900473ffffffffffffffffffffffffffffffffffffffff161580156112fc5750600481015460408701516fffffffffffffffffffffffffffffffff9182169116115b1561133e57600181015473ffffffffffffffffffffffffffffffffffffffff16606087015260048101546fffffffffffffffffffffffffffffffff1660408701525b5050808061134b90615bc5565b915050611216565b5063ffffffff818116602085810191825260008c81526007909152604090819020865181549351928801517fffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000009094169015157fffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000ff161761010092909416918202939093177fffffffffffffffffffffff00000000000000000000000000000000ffffffffff16650100000000006fffffffffffffffffffffffffffffffff909316929092029190911782556060850151600190920180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff909316929092179091558490036115d757606083015160008a815260066020526040902080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00166001179055891580156114d357506000547201000000000000000000000000000000000000900460ff165b156115485760015473ffffffffffffffffffffffffffffffffffffffff166114fb818a61298d565b885473ffffffffffffffffffffffffffffffffffffffff909116640100000000027fffffffffffffffff0000000000000000000000000000000000000000ffffffff9091161788556115d5565b61158f73ffffffffffffffffffffffffffffffffffffffff82161561156d5781611589565b600189015473ffffffffffffffffffffffffffffffffffffffff165b8961298d565b87547fffffffffffffffff0000000000000000000000000000000000000000ffffffff1664010000000073ffffffffffffffffffffffffffffffffffffffff8316021788555b505b505050505050505050565b600080600054700100000000000000000000000000000000900460ff166002811115611610576116106157d9565b14611647576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff166116ab576040517f9a07664600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff1660026000815481106116d7576116d7615b4f565b6000918252602090912060059091020154640100000000900473ffffffffffffffffffffffffffffffffffffffff1614611712576001611715565b60025b6000805467ffffffffffffffff421668010000000000000000027fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff82168117835592935083927fffffffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffff167fffffffffffffffffffffffffffffff000000000000000000ffffffffffffffff909116177001000000000000000000000000000000008360028111156117c6576117c66157d9565b0217905560028111156117db576117db6157d9565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a27f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663838c2d1e6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561186c57600080fd5b505af1158015611880573d6000803e3d6000fd5b5050505090565b600560205281600052604060002081815481106118a357600080fd5b90600052602060002001600091509150505481565b905090565b6118ca8383836001611abe565b505050565b6000818152600760209081526040808320600590925282208054825461190090610100900463ffffffff1682615bfd565b95945050505050565b60606118b860546020612a8e565b73ffffffffffffffffffffffffffffffffffffffff811660009081526003602052604081208054908290559081900361197c576040517f17bfe5f700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040517ff3fef3a300000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8381166004830152602482018390527f0000000000000000000000000000000000000000000000000000000000000000169063f3fef3a390604401600060405180830381600087803b158015611a0c57600080fd5b505af1158015611a20573d6000803e3d6000fd5b5050505060008273ffffffffffffffffffffffffffffffffffffffff168260405160006040518083038185875af1925050503d8060008114611a7e576040519150601f19603f3d011682016040523d82523d6000602084013e611a83565b606091505b50509050806118ca576040517f83e6cc6b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161480611b3757503373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016145b611b6d576040517fd386ef3e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b611b7984848484612ae0565b50505050565b6118ca8383836000611abe565b3273ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614611bfb576040517fd386ef3e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b611c036135b9565b565b600080600054700100000000000000000000000000000000900460ff166002811115611c3357611c336157d9565b14611c6a576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600060028381548110611c7f57611c7f615b4f565b600091825260208220600590910201805490925063ffffffff90811614611cee57815460028054909163ffffffff16908110611cbd57611cbd615b4f565b906000526020600020906005020160040160109054906101000a90046fffffffffffffffffffffffffffffffff1690505b6004820154600090611d2690700100000000000000000000000000000000900467ffffffffffffffff165b67ffffffffffffffff1690565b611d3a9067ffffffffffffffff1642615bfd565b611d59611d19846fffffffffffffffffffffffffffffffff1660401c90565b67ffffffffffffffff16611d6d9190615bad565b905067ffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001667ffffffffffffffff168167ffffffffffffffff1611611dba5780611900565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b600080611e83836fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff1690507f0000000000000000000000000000000000000000000000000000000000000000811115611ee2576040517f56f57b2b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b642e90edd00062061a806311e1a3006000611efd8383615c43565b9050670de0b6b3a76400006000611f34827f0000000000000000000000000000000000000000000000000000000000000000615c57565b90506000611f52611f4d670de0b6b3a764000086615c57565b613b12565b90506000611f608484613d6d565b90506000611f6e8383613dbc565b90506000611f7b82613dea565b90506000611f9a82611f95670de0b6b3a76400008f615c57565b613fd2565b90506000611fa88b83613dbc565b9050611fb4818d615c57565b9f9e505050505050505050505050505050565b60028181548110611fd757600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff8416955064010000000090930473ffffffffffffffffffffffffffffffffffffffff908116949216926fffffffffffffffffffffffffffffffff91821692918082169170010000000000000000000000000000000090041687565b3373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614806120d757503373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016145b61210d576040517fd386ef3e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61211b868686868686614003565b505050505050565b60008054700100000000000000000000000000000000900460ff16600281111561214f5761214f6157d9565b14612186576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008060008061219586614632565b935093509350935060006121ab85858585614a3b565b905060007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801561221a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061223e9190615c94565b9050600189036123365773ffffffffffffffffffffffffffffffffffffffff81166352f0f3ad8a8461229a367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c90036034013590565b6040517fffffffff0000000000000000000000000000000000000000000000000000000060e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af115801561230c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123309190615cb1565b506115d7565b600289036123625773ffffffffffffffffffffffffffffffffffffffff81166352f0f3ad8a848961229a565b6003890361238e5773ffffffffffffffffffffffffffffffffffffffff81166352f0f3ad8a848761229a565b600489036125155760006123d46fffffffffffffffffffffffffffffffff85167f0000000000000000000000000000000000000000000000000000000000000000614af5565b6009546123e19190615bad565b6123ec906001615bad565b9050367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c900360540135811061245557367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c900360540135612457565b805b905073ffffffffffffffffffffffffffffffffffffffff82166352f0f3ad8b8560405160e084901b7fffffffff000000000000000000000000000000000000000000000000000000001681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af11580156124ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061250e9190615cb1565b50506115d7565b600589036125ae576040517f52f0f3ad000000000000000000000000000000000000000000000000000000008152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b6044820152600860648201526084810188905273ffffffffffffffffffffffffffffffffffffffff8216906352f0f3ad9060a4016122ed565b6040517fff137e6500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c9003601401356060612639611909565b9050909192565b600081831161264f5781612651565b825b90505b92915050565b60008160000151826020015183604001518460600151604051602001612699949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b60408051808201909152600080825260208201528151600003612705576040517f5ab458fb00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b6060600080600061273385614ba3565b91945092509050600181600181111561274e5761274e6157d9565b14612785576040517f4b9c6abe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b84516127918385615bad565b146127c8576040517f5c5537b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816127df5790505093506000835b86518110156128cd576000806128526040518060400160405280858c600001516128369190615bfd565b8152602001858c6020015161284b9190615bad565b9052614ba3565b50915091506040518060400160405280838361286e9190615bad565b8152602001848b602001516128839190615bad565b81525088858151811061289857612898615b4f565b60209081029190910101526128ae600185615bad565b93506128ba8183615bad565b6128c49084615bad565b9250505061280c565b50845250919392505050565b606060008060006128e985614ba3565b919450925090506000816001811115612904576129046157d9565b1461293b576040517f1ff9b2e400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6129458284615bad565b85511461297e576040517f5c5537b800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61190085602001518484615041565b600281015473ffffffffffffffffffffffffffffffffffffffff8316600090815260036020526040812080546fffffffffffffffffffffffffffffffff909316928392906129dc908490615bad565b90915550506040517f7eee288d00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff8481166004830152602482018390527f00000000000000000000000000000000000000000000000000000000000000001690637eee288d90604401600060405180830381600087803b158015612a7157600080fd5b505af1158015612a85573d6000803e3d6000fd5b50505050505050565b604051818152367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c90038284820160208401378260208301016000815260208101604052505092915050565b60008054700100000000000000000000000000000000900460ff166002811115612b0c57612b0c6157d9565b14612b43576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600060028481548110612b5857612b58615b4f565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff8116845273ffffffffffffffffffffffffffffffffffffffff64010000000090910481169484019490945260018101549093169082015260028201546fffffffffffffffffffffffffffffffff908116606083015260038301546080830181905260049093015480821660a084015270010000000000000000000000000000000090041660c082015291508514612c3f576040517f3014033200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60a0810151600083156fffffffffffffffffffffffffffffffff83161760011b90506000612cff826fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff169050861580612d3a5750612d377f00000000000000000000000000000000000000000000000000000000000000006002615bad565b81145b8015612d44575084155b15612d7b576040517fa42637bc00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000547201000000000000000000000000000000000000900460ff168015612da1575086155b15612dd8576040517f0ea2e75200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000811115612e32576040517f56f57b2b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b612e5d7f00000000000000000000000000000000000000000000000000000000000000006001615bad565b8103612e6f57612e6f868885886150d6565b34612e7983611de4565b14612eb0576040517f8620aa1900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000612ebb88611c05565b905067ffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000811690821603612f23576040517f3381d11400000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000612f5060017f0000000000000000000000000000000000000000000000000000000000000000615bfd565b830361308e577f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015612fc1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612fe59190615c94565b73ffffffffffffffffffffffffffffffffffffffff1663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa15801561302f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906130539190615cb1565b613087907f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff16615cca565b9050613121565b6130b960017f0000000000000000000000000000000000000000000000000000000000000000615bfd565b83036130f4576130877f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff166002615cf6565b507f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff165b613155817f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff16615d26565b67ffffffffffffffff166131708367ffffffffffffffff1690565b67ffffffffffffffff1611156131b7576131b4817f000000000000000000000000000000000000000000000000000000000000000067ffffffffffffffff16615d26565b91505b6000604083901b421760008a8152608087901b6fffffffffffffffffffffffffffffffff8d1617602052604081209192509060008181526004602052604090205490915060ff1615613235576040517f80497e3b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff168152602001600073ffffffffffffffffffffffffffffffffffffffff1681526020013373ffffffffffffffffffffffffffffffffffffffff168152602001346fffffffffffffffffffffffffffffffff1681526020018c8152602001886fffffffffffffffffffffffffffffffff168152602001846fffffffffffffffffffffffffffffffff16815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060408201518160010160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060608201518160020160006101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff1602179055506080820151816003015560a08201518160040160006101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff16021790555060c08201518160040160106101000a8154816fffffffffffffffffffffffffffffffff02191690836fffffffffffffffffffffffffffffffff1602179055505050600560008c815260200190815260200160002060016002805490506134cb9190615bfd565b81546001810183556000928352602083200155604080517fd0e30db0000000000000000000000000000000000000000000000000000000008152905173ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000169263d0e30db09234926004808301939282900301818588803b15801561356357600080fd5b505af1158015613577573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b60005471010000000000000000000000000000000000900460ff161561360b576040517f0dc149f000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6040517f7258a80700000000000000000000000000000000000000000000000000000000815263ffffffff7f0000000000000000000000000000000000000000000000000000000000000000166004820152600090819073ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001690637258a807906024016040805180830381865afa1580156136bf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906136e39190615d4f565b90925090508161371f576040517f6a6bc3b200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a1461375257639824bdab6000526004601cfd5b80367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c900360540135116137ec576040517ff40239db000000000000000000000000000000000000000000000000000000008152367ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81013560f01c90036014013560048201526024015b60405180910390fd5b6040805160e08101825263ffffffff8082526000602083018181527ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe369081013560f01c90038035606090811c868801908152346fffffffffffffffffffffffffffffffff81811693890193845260149094013560808901908152600160a08a0181815242871660c08c019081526002805493840181558a529a5160059092027f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace81018054995173ffffffffffffffffffffffffffffffffffffffff908116640100000000027fffffffffffffffff000000000000000000000000000000000000000000000000909b1694909c16939093179890981790915592517f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5acf87018054918a167fffffffffffffffffffffffff000000000000000000000000000000000000000090921691909117905592517f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad0860180549186167fffffffffffffffffffffffffffffffff0000000000000000000000000000000090921691909117905591517f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad185015551955182167001000000000000000000000000000000000295909116949094177f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ad29091015580547fffffffffffffffffffffffffffff00ffffffffffffffffffffffffffffffffff167101000000000000000000000000000000000017815583517fd0e30db000000000000000000000000000000000000000000000000000000000815293517f00000000000000000000000000000000000000000000000000000000000000009092169363d0e30db093926004828101939282900301818588803b158015613ac157600080fd5b505af1158015613ad5573d6000803e3d6000fd5b5050600080547fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000164267ffffffffffffffff161790555050505050565b6fffffffffffffffffffffffffffffffff811160071b81811c67ffffffffffffffff1060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b1760008213613b7157631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d7fffffffffffffffffffffffffffffffffffffff73c0c716a594e00d54e3c4cbc9018302821d7ffffffffffffffffffffffffffffffffffffffdc7b88c420e53a9890533129f6f01830290911d7fffffffffffffffffffffffffffffffffffffff465fda27eb4d63ded474e5f832019091027ffffffffffffffff5f6af8f7b3396644f18e157960000000000000000000000000105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a764000002158202613daa57637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b600081600019048311820215613dda5763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b60007ffffffffffffffffffffffffffffffffffffffffffffffffdc0d0570925a462d78213613e1857919050565b680755bf798b4a1bf1e58212613e365763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056b80000000000000000000000001901d6bb17217f7d1cf79abc9e3b39881029093037fffffffffffffffffffffffffffffffffffffffdbf3ccf1604d263450f02a550481018102606090811d6d0277594991cfc85f6e2461837cd9018202811d7fffffffffffffffffffffffffffffffffffffe5adedaa1cb095af9e4da10e363c018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d7ffffffffffffffffffffffffffffffffffffd38dc772608b0ae56cce01296c0eb018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084017ffffffffffffffffffffffffffffffffffffffe2c69812cf03b0763fd454a8f7e010290911d6e0587f503bb6ea29d25fcb7401964500190910279d835ebba824c98fb31b83b2ca45c000000000000000000000000010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b6000612651670de0b6b3a764000083613fea86613b12565b613ff49190615d73565b613ffe9190615e2f565b613dea565b60008054700100000000000000000000000000000000900460ff16600281111561402f5761402f6157d9565b14614066576040517f67fe195000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006002878154811061407b5761407b615b4f565b6000918252602082206005919091020160048101549092506fffffffffffffffffffffffffffffffff16908715821760011b90506140da7f00000000000000000000000000000000000000000000000000000000000000006001615bad565b614176826fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff16146141b0576040517f5f53dd9800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008089156142a7576142037f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000615bfd565b6001901b614222846fffffffffffffffffffffffffffffffff16615287565b6fffffffffffffffffffffffffffffffff1661423e9190615e97565b1561427b5761427261426360016fffffffffffffffffffffffffffffffff8716615eab565b865463ffffffff166000615326565b6003015461429d565b7f00000000000000000000000000000000000000000000000000000000000000005b91508490506142d1565b600385015491506142ce6142636fffffffffffffffffffffffffffffffff86166001615ed4565b90505b600882901b60088a8a6040516142e8929190615b3f565b6040518091039020901b14614329576040517f696550ff00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006143348c61540a565b90506000614343836003015490565b6040517fe14ced320000000000000000000000000000000000000000000000000000000081527f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff169063e14ced32906143bd908f908f908f908f908a90600401615f48565b6020604051808303816000875af11580156143dc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906144009190615cb1565b6004850154911491506000906002906144ab906fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b614547896fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b6145519190615f82565b61455b9190615fa5565b60ff16159050811515810361459c576040517ffb4e40dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8754640100000000900473ffffffffffffffffffffffffffffffffffffffff16156145f3576040517f9071e6af00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b505085547fffffffffffffffff0000000000000000000000000000000000000000ffffffff163364010000000002179095555050505050505050505050565b600080600080600085905060006002828154811061465257614652615b4f565b600091825260209091206004600590920201908101549091507f000000000000000000000000000000000000000000000000000000000000000090614729906fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff1611614763576040517fb34b5c2200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000815b60048301547f00000000000000000000000000000000000000000000000000000000000000009061482a906fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff16925082111561489f57825463ffffffff166148697f00000000000000000000000000000000000000000000000000000000000000006001615bad565b8303614873578391505b6002818154811061488657614886615b4f565b9060005260206000209060050201935080945050614767565b600481810154908401546fffffffffffffffffffffffffffffffff91821691166000816fffffffffffffffffffffffffffffffff166149086148f3856fffffffffffffffffffffffffffffffff1660011c90565b6fffffffffffffffffffffffffffffffff1690565b6fffffffffffffffffffffffffffffffff1614905080156149d7576000614940836fffffffffffffffffffffffffffffffff16615287565b6fffffffffffffffffffffffffffffffff1611156149ab57600061498261497a60016fffffffffffffffffffffffffffffffff8616615eab565b896001615326565b6003810154600490910154909c506fffffffffffffffffffffffffffffffff169a506149b19050565b6008549a505b600386015460048701549099506fffffffffffffffffffffffffffffffff169750614a2d565b60006149f961497a6fffffffffffffffffffffffffffffffff85166001615ed4565b6003808901546004808b015492840154930154909e506fffffffffffffffffffffffffffffffff9182169d50919b50169850505b505050505050509193509193565b60006fffffffffffffffffffffffffffffffff841615614aa85760408051602081018790526fffffffffffffffffffffffffffffffff8087169282019290925260608101859052908316608082015260a00160405160208183030381529060405280519060200120611900565b8282604051602001614ad69291909182526fffffffffffffffffffffffffffffffff16602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080614b82847e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003614be6576040517f5ab458fb00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6020840151805160001a607f8111614c0b57600060016000945094509450505061503a565b60b78111614d21576000614c20608083615bfd565b905080876000015111614c5f576040517f66c9448500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6001838101517fff00000000000000000000000000000000000000000000000000000000000000169082148015614cd757507f80000000000000000000000000000000000000000000000000000000000000007fff000000000000000000000000000000000000000000000000000000000000008216105b15614d0e576040517fbabb01dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b506001955093506000925061503a915050565b60bf8111614e7f576000614d3660b783615bfd565b905080876000015111614d75576040517f66c9448500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60018301517fff00000000000000000000000000000000000000000000000000000000000000166000819003614dd7576040517fbabb01dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600184015160088302610100031c60378111614e1f576040517fbabb01dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b614e298184615bad565b895111614e62576040517f66c9448500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b614e6d836001615bad565b975095506000945061503a9350505050565b60f78111614ee4576000614e9460c083615bfd565b905080876000015111614ed3576040517f66c9448500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60019550935084925061503a915050565b6000614ef160f783615bfd565b905080876000015111614f30576040517f66c9448500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60018301517fff00000000000000000000000000000000000000000000000000000000000000166000819003614f92576040517fbabb01dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600184015160088302610100031c60378111614fda576040517fbabb01dd00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b614fe48184615bad565b89511161501d576040517f66c9448500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b615028836001615bad565b975095506001945061503a9350505050565b9193909250565b60608167ffffffffffffffff81111561505c5761505c615a83565b6040519080825280601f01601f191660200182016040528015615086576020820181803683370190505b50905081156150cf57600061509b8486615bad565b90506020820160005b848110156150bc5782810151828201526020016150a4565b848111156150cb576000858301525b5050505b9392505050565b60006150f56fffffffffffffffffffffffffffffffff84166001615ed4565b9050600061510582866001615326565b9050600086901a83806151f1575061513e60027f0000000000000000000000000000000000000000000000000000000000000000615e97565b60048301546002906151e2906fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b6151ec9190615fa5565b60ff16145b156152495760ff81166001148061520b575060ff81166002145b615244576040517ff40239db000000000000000000000000000000000000000000000000000000008152600481018890526024016137e3565b612a85565b60ff811615612a85576040517ff40239db000000000000000000000000000000000000000000000000000000008152600481018890526024016137e3565b600080615314837e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b600160ff919091161b90920392915050565b6000808261536f5761536a6fffffffffffffffffffffffffffffffff86167f0000000000000000000000000000000000000000000000000000000000000000615439565b61538a565b61538a856fffffffffffffffffffffffffffffffff166155c5565b90506002848154811061539f5761539f615b4f565b906000526020600020906005020191505b60048201546fffffffffffffffffffffffffffffffff82811691161461540257815460028054909163ffffffff169081106153ed576153ed615b4f565b906000526020600020906005020191506153b0565b509392505050565b600080600080600061541b86614632565b935093509350935061542f84848484614a3b565b9695505050505050565b6000816154d8846fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff16116154ee5763b34b5c226000526004601cfd5b6154f7836155c5565b905081615596826fffffffffffffffffffffffffffffffff167e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff1611612654576126516155ac836001615bad565b6fffffffffffffffffffffffffffffffff83169061566a565b60008119600183011681615659827e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff169390931c8015179392505050565b6000806156f7847e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f7f07c4acdd0000000000000000000000000000000000000000000000000000000067ffffffffffffffff831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f84011261572557600080fd5b50813567ffffffffffffffff81111561573d57600080fd5b60208301915083602082850101111561575557600080fd5b9250929050565b600080600083850360a081121561577257600080fd5b608081121561578057600080fd5b50839250608084013567ffffffffffffffff81111561579e57600080fd5b6157aa86828701615713565b9497909650939450505050565b600080604083850312156157ca57600080fd5b50508035926020909101359150565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b6020810160038310615843577f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b91905290565b60008060006060848603121561585e57600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b8181101561589b5760208185018101518683018201520161587f565b818111156158ad576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b6020815260006126516020830184615875565b60006020828403121561590557600080fd5b5035919050565b73ffffffffffffffffffffffffffffffffffffffff8116811461592e57600080fd5b50565b60006020828403121561594357600080fd5b81356150cf8161590c565b8035801515811461595e57600080fd5b919050565b6000806000806080858703121561597957600080fd5b8435935060208501359250604085013591506159976060860161594e565b905092959194509250565b6000602082840312156159b457600080fd5b81356fffffffffffffffffffffffffffffffff811681146150cf57600080fd5b600080600080600080608087890312156159ed57600080fd5b863595506159fd6020880161594e565b9450604087013567ffffffffffffffff80821115615a1a57600080fd5b615a268a838b01615713565b90965094506060890135915080821115615a3f57600080fd5b50615a4c89828a01615713565b979a9699509497509295939492505050565b63ffffffff841681528260208201526060604082015260006119006060830184615875565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600060808284031215615ac457600080fd5b6040516080810181811067ffffffffffffffff82111715615b0e577f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008219821115615bc057615bc0615b7e565b500190565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203615bf657615bf6615b7e565b5060010190565b600082821015615c0f57615c0f615b7e565b500390565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082615c5257615c52615c14565b500490565b6000817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0483118215151615615c8f57615c8f615b7e565b500290565b600060208284031215615ca657600080fd5b81516150cf8161590c565b600060208284031215615cc357600080fd5b5051919050565b600067ffffffffffffffff808316818516808303821115615ced57615ced615b7e565b01949350505050565b600067ffffffffffffffff80831681851681830481118215151615615d1d57615d1d615b7e565b02949350505050565b600067ffffffffffffffff83811690831681811015615d4757615d47615b7e565b039392505050565b60008060408385031215615d6257600080fd5b505080516020909101519092909150565b60007f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600084136000841385830485118282161615615db457615db4615b7e565b7f80000000000000000000000000000000000000000000000000000000000000006000871286820588128184161615615def57615def615b7e565b60008712925087820587128484161615615e0b57615e0b615b7e565b87850587128184161615615e2157615e21615b7e565b505050929093029392505050565b600082615e3e57615e3e615c14565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff83147f800000000000000000000000000000000000000000000000000000000000000083141615615e9257615e92615b7e565b500590565b600082615ea657615ea6615c14565b500690565b60006fffffffffffffffffffffffffffffffff83811690831681811015615d4757615d47615b7e565b60006fffffffffffffffffffffffffffffffff808316818516808303821115615ced57615ced615b7e565b8183528181602085013750600060208284010152600060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f840116840101905092915050565b606081526000615f5c606083018789615eff565b8281036020840152615f6f818688615eff565b9150508260408301529695505050505050565b600060ff821660ff841680821015615f9c57615f9c615b7e565b90039392505050565b600060ff831680615fb857615fb8615c14565b8060ff8416069150509291505056fea2646970667358221220e8b96106d78f2f7838688804cd7a7c1b73cf9ac778dc3b912e31933126cd1a1364736f6c634300080f003300000000000000000000000000000000000000000000000000000000000000010385c3f8ee78491001d92b90b07d0cf387b7b52ab9b83b4d87c994e92cf823ba0000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000ff760a87e41144b336e29b6d4582427debdb6dee0000000000000000000000009dc3d8500c295e95d5c4ebded3222a74ff19e524000000000000000000000000fb17a817168bd4dfd48fb6c9fd07b4409501e3e00000000000000000000000000000000000000000000000000000000000b37d80000000000000000000000000f99c2da4822af652fe1bf55f99713980efe5d2610000000000000000000000009892742025c43cdbb22034df7486e55ae4c476d4", + "nonce": "0x13", + "chainId": "0xaa36a7" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x01d73b7f6be09d74e6db70e47d55590799b9f635a0c37bbc1858fbce84aa5e78", + "transactionType": "CALL", + "contractName": null, + "contractAddress": "0xe545ede9d1fadad12984c31467f56405884b9398", + "function": "setImplementation(uint32,address)", + "arguments": [ + "1", + "0x80dBD6bba7ec3fe68fE30EC4ab59a735E03B8c5e" + ], + "transaction": { + "from": "0xaf6e0e871f38c7b653700f7cbaedafaa2784d430", + "to": "0xe545ede9d1fadad12984c31467f56405884b9398", + "gas": "0xc0c5", + "value": "0x0", + "input": "0x14f6b1a3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000080dbd6bba7ec3fe68fe30ec4ab59a735e03b8c5e", + "nonce": "0x14", + "chainId": "0xaa36a7" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x15ca827", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xf2bcbc72291842ecb1c052a9373a7d75b83cc89bb90f0f41f5067446baa4dd54", + "transactionIndex": "0x4a", + "blockHash": "0xbdfb68fea540f2f95fbd30ae23113adf766843aedd1d28abc08fdee1db507983", + "blockNumber": "0x6486ad", + "gasUsed": "0x519229", + "effectiveGasPrice": "0xca4dbbb36", + "from": "0xaf6e0e871f38c7b653700f7cbaedafaa2784d430", + "to": null, + "contractAddress": "0x80dbd6bba7ec3fe68fe30ec4ab59a735e03b8c5e" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x15d33b7", + "logs": [ + { + "address": "0xe545ede9d1fadad12984c31467f56405884b9398", + "topics": [ + "0xff513d80e2c7fa487608f70a618dfbc0cf415699dc69588c747e8c71566c88de", + "0x00000000000000000000000080dbd6bba7ec3fe68fe30ec4ab59a735e03b8c5e", + "0x0000000000000000000000000000000000000000000000000000000000000001" + ], + "data": "0x", + "blockHash": "0xbdfb68fea540f2f95fbd30ae23113adf766843aedd1d28abc08fdee1db507983", + "blockNumber": "0x6486ad", + "transactionHash": "0x01d73b7f6be09d74e6db70e47d55590799b9f635a0c37bbc1858fbce84aa5e78", + "transactionIndex": "0x4b", + "logIndex": "0x80", + "removed": false + } + ], + "logsBloom": "0x00100000000000000000000000000000000100000000000000000080000000000000000000000000000000000000000000000000000000000000000000040000000000000400000000000080000000000000000000040000000000000010000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100", + "type": "0x2", + "transactionHash": "0x01d73b7f6be09d74e6db70e47d55590799b9f635a0c37bbc1858fbce84aa5e78", + "transactionIndex": "0x4b", + "blockHash": "0xbdfb68fea540f2f95fbd30ae23113adf766843aedd1d28abc08fdee1db507983", + "blockNumber": "0x6486ad", + "gasUsed": "0x8b90", + "effectiveGasPrice": "0xca4dbbb36", + "from": "0xaf6e0e871f38c7b653700f7cbaedafaa2784d430", + "to": "0xe545ede9d1fadad12984c31467f56405884b9398", + "contractAddress": null + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1724856389, + "chain": 11155111, + "commit": "2083b83" +} \ No newline at end of file diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackBatcherHash.sol b/sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackBatcherHash.s.sol similarity index 100% rename from sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackBatcherHash.sol rename to sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackBatcherHash.s.sol diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackProposer.sol b/sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackProposer.s.sol similarity index 100% rename from sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackProposer.sol rename to sepolia-alpha/2024-08-21-update-batcher-proposer/script/RollbackProposer.s.sol diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateBatcherHash.sol b/sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateBatcherHash.s.sol similarity index 100% rename from sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateBatcherHash.sol rename to sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateBatcherHash.s.sol diff --git a/sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateProposer.sol b/sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateProposer.s.sol similarity index 97% rename from sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateProposer.sol rename to sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateProposer.s.sol index b6c266d9..3dae746f 100644 --- a/sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateProposer.sol +++ b/sepolia-alpha/2024-08-21-update-batcher-proposer/script/UpdateProposer.s.sol @@ -19,6 +19,7 @@ contract UpdateProposer is Script { console.log("Current proposer: "); console.log(pdg.proposer()); + vm.startBroadcast(); PermissionedDisputeGame newPdgImpl = new PermissionedDisputeGame({ _gameType: pdg.gameType(), _absolutePrestate: pdg.absolutePrestate(), @@ -42,5 +43,6 @@ contract UpdateProposer is Script { require(newPdgImpl.proposer() == NEW_PROPOSER, "Deploy: proposer is incorrect"); console.log("Updated proposer to: "); console.log(NEW_PROPOSER); + vm.stopBroadcast(); } }