From ce3745f1b3eeb829a26a8c7f42949eb39421a96b Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Wed, 23 Apr 2025 13:19:14 -0400 Subject: [PATCH 01/27] initial setup --- mainnet/2025-04-23-upgrade-fault-proofs/.env | 18 ++ .../2025-04-23-upgrade-fault-proofs/Makefile | 101 ++++++++++ .../2025-04-23-upgrade-fault-proofs/README.md | 185 ++++++++++++++++++ .../addresses.json | 1 + .../foundry.toml | 20 ++ .../1/run-1745427555.json | 86 ++++++++ .../script/DeployDisputeGames.s.sol | 146 ++++++++++++++ .../script/UpgradeDGF.s.sol | 149 ++++++++++++++ 8 files changed, 706 insertions(+) create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/.env create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/Makefile create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/README.md create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/addresses.json create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/foundry.toml create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/.env b/mainnet/2025-04-23-upgrade-fault-proofs/.env new file mode 100644 index 00000000..399b7a28 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/.env @@ -0,0 +1,18 @@ +OP_COMMIT=c8b9f62736a7dad7e569719a84c406605f4472e6 +BASE_CONTRACTS_COMMIT=2d0adea2460e3419dbcd77ac48dd2efc9a9a375f + +ABSOLUTE_PRESTATE=0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6 + +# Sepolia Config +# SYSTEM_CONFIG=0xf272670eb55e895584501d564AfEB048bEd26194 +# OWNER_SAFE=0x0fe884546476dDd290eC46318785046ef68a0BA9 +# COORDINATOR_SAFE_ADDR=0x646132a1667ca7ad00d36616afba1a28116c770a +# SAFE_A=0x5dfEB066334B67355A15dc9b67317fD2a2e1f77f +# SAFE_B=0x6af0674791925f767060dd52f7fb20984e8639d8 +# LEDGER_ACCOUNT=1 + +# Mainnet Config +SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 +OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c +CB_SIGNER_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 +OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile new file mode 100644 index 00000000..accaa3cf --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -0,0 +1,101 @@ +include ../../Makefile +include ../.env +include .env + +ifndef LEDGER_ACCOUNT +override LEDGER_ACCOUNT = 0 +endif + +.PHONY: deploy +deploy: + forge script --rpc-url $(L1_RPC_URL) DeployDisputeGames \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv + +# Sepolia Commands +# .PHONY: sign-b +# sign-b: +# $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "sign(address)" $(SAFE_B) + +# .PHONY: approve-b +# approve-b: +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "approve(address,bytes)" $(SAFE_B) $(SIGNATURES) \ +# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + +# .PHONY: execute +# execute: +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "run()" --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + +# .PHONY: sign +# sign: +# $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "sign(address,address)" $(SAFE_A) $(COORDINATOR_SAFE_ADDR) + +# .PHONY: sign-nested-b +# sign-nested-b: +# $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "sign(address,address)" $(SAFE_B) $(COORDINATOR_SAFE_ADDR) + +# .PHONY: approve +# approve: +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "approveOnBehalfOfSignerSafe(address,address,bytes)" $(SAFE_A) $(COORDINATOR_SAFE_ADDR) $(SIGNATURES) \ +# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv + +# .PHONY: approve-nested-b +# approve-nested-b: +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "approveOnBehalfOfSignerSafe(address,address,bytes)" $(SAFE_B) $(COORDINATOR_SAFE_ADDR) $(SIGNATURES) \ +# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv + +# .PHONY: approve-coordinator +# approve-coordinator: +# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ +# --sig "approveOnBehalfOfIntermediateSafe(address)" $(COORDINATOR_SAFE_ADDR) \ +# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv + +## +# NestedMultisigBuilder commands +# The following commands can be used for tasks that utilize the NestedMultisigBuilder. +# Note that --ledger --hd-paths can be replaced with --private-key $(PRIVATE_KEY) +# in any command when using a local key. +# See more documentation on the various steps in NestedMultisigBuilder.sol. +## + +# Mainnet Commands +# This step is run by signers on the "children" safes +.PHONY: sign-cb +sign-cb: + $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "sign(address,address)" $(OWNER_SAFE) $(CB_SIGNER_SAFE_ADDR) + +.PHONY: sign-op +sign-op: + $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "sign(address,address)" $(OWNER_SAFE) $(OP_SIGNER_SAFE_ADDR) + +# This step is run once per "child" safe, and can be run by anyone (doesn't have to be a signer) +.PHONY: approve-cb +approve-cb: + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "approve(address,bytes)" $(CB_SIGNER_SAFE_ADDR) $(SIGNATURES) \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + +.PHONY: approve-op +approve-op: + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "approve(address,bytes)" $(OP_SIGNER_SAFE_ADDR) $(SIGNATURES) \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + +# This step is run once after all children safes have approved and can be run by anyone (doesn't have to be a signer) +.PHONY: execute +execute: + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "run()" --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md new file mode 100644 index 00000000..d2c824cb --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -0,0 +1,185 @@ +# Upgrade Fault Proofs + +Status: PENDING + +## Description + +This task contains two scripts. One for deploying new versions of the `FaultDisputeGame` and `PermissionedDisputeGame` contracts, and one for updating the `DisputeGameFactory` contract to reference the new dispute game contracts. + +## Procedure + +### 1. Update repo: + +```bash +cd contract-deployments +git pull +cd mainnet/2025-04-23-upgrade-fault-proofs +make deps +``` + +### 2. Setup Ledger + +Your Ledger needs to be connected and unlocked. The Ethereum +application needs to be opened on Ledger with the message "Application +is ready". + +### 3. Run relevant script(s) + +#### 3.1 Deploy new Dispute Game Implementations + +```bash +make deploy +``` + +This will output the new addresses of the `FaultDisputeGame` and `PermissionedDisputeGame` contracts to an `addresses.json` file. You will need to commit this file to the repo before signers can sign. + +#### 3.2 Sign the transaction + +Coinbase signer: + +```bash +make sign-cb +``` + +Op signer: + +```bash +make sign-op +``` + +You will see a "Simulation link" from the output. + +Paste this URL in your browser. A prompt may ask you to choose a +project, any project will do. You can create one if necessary. + +Click "Simulate Transaction". + +We will be performing 3 validations and extract the domain hash and message hash to approve on your Ledger: + +1. Validate integrity of the simulation. +2. Validate correctness of the state diff. +3. Validate and extract domain hash and message hash to approve. + +##### 3.2.1 Validate integrity of the simulation. + +Make sure you are on the "Overview" tab of the tenderly simulation, to +validate integrity of the simulation, we need to check the following: + +1. "Network": Check the network is Sepolia or Mainnet. +2. "Timestamp": Check the simulation is performed on a block with a + recent timestamp (i.e. close to when you run the script). +3. "Sender": Check the address shown is your signer account. If not see the derivation path Note above. + +##### 3.2.2. Validate correctness of the state diff. + +Now click on the "State" tab, and refer to the [State Validations](./VALIDATION.md) instructions for the transaction you are signing. +Once complete return to this document to complete the signing. + +##### 3.2.3. Extract the domain hash and the message hash to approve. + +Now that we have verified the transaction performs the right +operation, we need to extract the domain hash and the message hash to +approve. + +Go back to the "Overview" tab, and find the +`GnosisSafe.checkSignatures` call. This call's `data` parameter +contains both the domain hash and the message hash that will show up +in your Ledger. + +It will be a concatenation of `0x1901`, the domain hash, and the +message hash: `0x1901[domain hash][message hash]`. + +Note down this value. You will need to compare it with the ones +displayed on the Ledger screen at signing. + +Once the validations are done, it's time to actually sign the +transaction. + +> [!WARNING] +> This is the most security critical part of the playbook: make sure the +> domain hash and message hash in the following two places match: +> +> 1. On your Ledger screen. +> 2. In the Tenderly simulation. You should use the same Tenderly +> simulation as the one you used to verify the state diffs, instead +> of opening the new one printed in the console. +> +> There is no need to verify anything printed in the console. There is +> no need to open the new Tenderly simulation link either. + +After verification, sign the transaction. You will see the `Data`, +`Signer` and `Signature` printed in the console. Format should be +something like this: + +```shell +Data: +Signer:
+Signature: +``` + +Double check the signer address is the right one. + +##### 3.2.4 Send the output to Facilitator(s) + +Nothing has occurred onchain - these are offchain signatures which +will be collected by Facilitators for execution. Execution can occur +by anyone once a threshold of signatures are collected, so a +Facilitator will do the final execution for convenience. + +Share the `Data`, `Signer` and `Signature` with the Facilitator, and +congrats, you are done! + +### [For Facilitator ONLY] How to execute + +#### Execute the transaction + +1. IMPORTANT: Ensure op-challenger has been updated before executing. +1. Collect outputs from all participating signers. +1. Concatenate all signatures and export it as the `SIGNATURES` + environment variable, i.e. `export +SIGNATURES="[SIGNATURE1][SIGNATURE2]..."`. +1. Run the `make execute` or `make approve` command as described below to execute the transaction. + +For example, if the quorum is 2 and you get the following outputs: + +```shell +Data: 0xDEADBEEF +Signer: 0xC0FFEE01 +Signature: AAAA +``` + +```shell +Data: 0xDEADBEEF +Signer: 0xC0FFEE02 +Signature: BBBB +``` + +If on testnet, then you should run: + +Coinbase facilitator: + +```bash +SIGNATURES=AAAABBBB make execute +``` + +If on mainnet, then you should run: + +Coinbase facilitator: + +```bash +SIGNATURES=AAAABBBB make approve-cb +``` + +Optimism facilitator: + +```bash +SIGNATURES=AAAABBBB make approve-op +``` + +#### If on mainnet, execute the transaction + +Once the signatures have been submitted approving the transaction for all nested Safes run: + +```bash +make execute +``` diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json new file mode 100644 index 00000000..6c28e869 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json @@ -0,0 +1 @@ +{"faultDisputeGame": "0xb3f8cad97941510c66d78cdd3157d930fa4a7aee","permissionedDisputeGame": "0x4e0a38923fba12da162fe255642b095f86598c5b"} \ No newline at end of file diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/foundry.toml b/mainnet/2025-04-23-upgrade-fault-proofs/foundry.toml new file mode 100644 index 00000000..7a443d45 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/foundry.toml @@ -0,0 +1,20 @@ +[profile.default] +src = 'src' +out = 'out' +libs = ['lib'] +broadcast = 'records' +fs_permissions = [{ access = "read-write", path = "./" }] +optimizer = true +optimizer_runs = 200 +via-ir = false +remappings = [ + '@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock/', + '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts', + '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts', + '@rari-capital/solmate/=lib/solmate/', + '@base-contracts/=lib/base-contracts', + 'solady/=lib/solady/src/', + '@lib-keccak/=lib/lib-keccak/contracts/lib', +] + +# See more config options https://github.com/foundry-rs/foundry/tree/master/config diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json b/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json new file mode 100644 index 00000000..72bca369 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json @@ -0,0 +1,86 @@ +{ + "transactions": [ + { + "hash": "0x1c728a81c5c99fe071417ef4f35d804acf78661dcb517122df042305597b1a4b", + "transactionType": "CREATE", + "contractName": "FaultDisputeGame", + "contractAddress": "0xb3f8cad97941510c66d78cdd3157d930fa4a7aee", + "function": null, + "arguments": [ + "(0, 0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6, 73, 30, 10800, 302400, 0xaA59A0777648BC75cd10364083e878c1cCd6112a, 0xa2f2aC6F5aF72e494A227d79Db20473Cf7A1FFE8, 0x496286e5eE7758de84Dd17e6d2d97afC2ACE4cc7, 8453)" + ], + "transaction": { + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "gas": "0x52d19f", + "value": "0x0", + "input": "0x6101c06040523480156200001257600080fd5b50604051620052503803806200525083398101604081905262000035916200052d565b620000436001607e62000600565b60ff16816040015111156200006b57604051633beff19960e11b815260040160405180910390fd5b60001981606001511480620000955750604081015160608201516200009290600162000626565b10155b15620000b45760405163e62ccf3960e01b815260040160405180910390fd5b600281606001511015620000db5760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b0380168160c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000128573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200014e919062000641565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200018c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b2919062000661565b1115620001d25760405163b4e1243360e01b815260040160405180910390fd5b6000620001f782608001516001600160401b03166200048060201b62000baf1760201c565b6200020d906001600160401b031660026200067b565b905060008260c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000254573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027a919062000641565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002b8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002de919062000661565b6200030184608001516001600160401b03166200048060201b62000baf1760201c565b6001600160401b031662000316919062000626565b905060006200033183836200048360201b620030e01760201c565b90506001600160401b038111156200035c5760405163235dfb2b60e21b815260040160405180910390fd5b6200037f8460a001516001600160401b03166200048060201b62000baf1760201c565b6001600160401b0316816001600160401b03161115620003b25760405163235dfb2b60e21b815260040160405180910390fd5b63ffffffff8016620003d9856000015163ffffffff166200048060201b62000baf1760201c565b63ffffffff1603620003fe5760405163073ed16760e31b815260040160405180910390fd5b5050815163ffffffff1661012090815260208301516080908152604084015160a0908152606085015160c0908152918501516001600160401b039081166101a052908501511660e0908152908401516001600160a01b03908116610100908152918501518116610140529084015116610160529091015161018052506200069d565b90565b600081831162000494578162000496565b825b9392505050565b60405161014081016001600160401b0381118282101715620004cf57634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620004ea57600080fd5b919050565b80516001600160401b0381168114620004ea57600080fd5b6001600160a01b03811681146200051d57600080fd5b50565b8051620004ea8162000507565b600061014082840312156200054157600080fd5b6200054b6200049d565b6200055683620004d5565b81526020830151602082015260408301516040820152606083015160608201526200058460808401620004ef565b60808201526200059760a08401620004ef565b60a0820152620005aa60c0840162000520565b60c0820152620005bd60e0840162000520565b60e0820152610100620005d281850162000520565b90820152610120928301519281019290925250919050565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff8416808210156200061d576200061d620005ea565b90039392505050565b600082198211156200063c576200063c620005ea565b500190565b6000602082840312156200065457600080fd5b8151620004968162000507565b6000602082840312156200067457600080fd5b5051919050565b6000816000190483118215151615620006985762000698620005ea565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a051614a1862000838600039600081816106a701528181611a6401528181611ace0152611b000152600081816109bb015261303801526000818161062a01528181611fc60152818161206e015281816120e4015281816121fe0152612552015260008181610530015281816114e0015281816115aa01528181611e4a015261248a01526000818161084c0152818161252901526130a40152600081816104dc0152818161197d01528181612be50152612d9e015260008181610a0e01528181610d930152818161190601528181611b2f01528181611b8a015281816127320152612772015260008181610a41015281816117c30152818161188f01528181611a9f01528181612a8e01528181612f1f0152818161351e01528181613a4e01528181613b6901528181613bc70152613c12015260008181610ae80152818161184b01528181611951015281816127b60152818161282301528181612a270152612aaf01526000818161075c0152612b320152614a186000f3fe6080604052600436106102ff5760003560e01c806370872aa511610190578063c395e1ca116100dc578063dabd396d11610095578063f8f43ff61161006f578063f8f43ff614610a95578063fa24f74314610ab5578063fa315aa914610ad9578063fe2bbeb214610b0c57600080fd5b8063dabd396d146109ff578063ec5e630814610a32578063eff0f59214610a6557600080fd5b8063c395e1ca146108d8578063c6f0308c146108f8578063cf09e0d01461096c578063d5d44d801461098c578063d6ae3cd5146109ac578063d8cc1a3c146109df57600080fd5b80638d450a9511610149578063bbdc02db11610123578063bbdc02db14610835578063bcef3b5514610876578063bd8da9561461088b578063c0d8bb74146108ab57600080fd5b80638d450a951461074d57806399735e3214610780578063a445ece61461079557600080fd5b806370872aa5146106de578063786b844b146106f35780637b0f0adc146107085780638129fc1c1461071b5780638980e0cc146107235780638b85902b1461073857600080fd5b80633e3ac9121161024f5780635a5fa2d91161020857806360e27464116101e257806360e27464146106635780636361506d146106835780636b6716c0146106985780636f034409146106cb57600080fd5b80635a5fa2d9146105fb5780635c0cba331461061b578063609d33341461064e57600080fd5b80633e3ac912146105005780633fc8cef314610521578063472777c614610554578063529d6a8c1461056757806354fd4d501461059457806357da950e146105cb57600080fd5b806325fc2ace116102bc57806330dbe5701161029657806330dbe57014610466578063378dd48c1461049e57806337b1b229146104b85780633a768463146104cd57600080fd5b806325fc2ace146104125780632810e1d6146104315780632ad69aeb1461044657600080fd5b8063019351301461030457806303c2924d1461032657806319effeb414610346578063200d2ed21461038a578063222abf45146103b8578063250e69bd146103f8575b600080fd5b34801561031057600080fd5b5061032461031f3660046142f7565b610b3c565b005b34801561033257600080fd5b50610324610341366004614351565b610d1a565b34801561035257600080fd5b5060005461036d90600160401b90046001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b34801561039657600080fd5b506000546103ab90600160801b900460ff1681565b60405161038191906143aa565b3480156103c457600080fd5b506103e86103d33660046143d2565b600c6020526000908152604090205460ff1681565b6040519015158152602001610381565b34801561040457600080fd5b50600a546103e89060ff1681565b34801561041e57600080fd5b506008545b604051908152602001610381565b34801561043d57600080fd5b506103ab6111c5565b34801561045257600080fd5b50610423610461366004614351565b611345565b34801561047257600080fd5b50600154610486906001600160a01b031681565b6040516001600160a01b039091168152602001610381565b3480156104aa57600080fd5b50600d546103ab9060ff1681565b3480156104c457600080fd5b50610486611376565b3480156104d957600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610486565b34801561050c57600080fd5b506000546103e890600160901b900460ff1681565b34801561052d57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610486565b6103246105623660046143ef565b611387565b34801561057357600080fd5b506104236105823660046143d2565b60036020526000908152604090205481565b3480156105a057600080fd5b506040805180820190915260058152640312e352e360dc1b60208201525b6040516103819190614468565b3480156105d757600080fd5b506008546009546105e6919082565b60408051928352602083019190915201610381565b34801561060757600080fd5b5061042361061636600461447b565b611399565b34801561062757600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610486565b34801561065a57600080fd5b506105be6113d3565b34801561066f57600080fd5b5061032461067e3660046143d2565b6113e1565b34801561068f57600080fd5b5061042361167c565b3480156106a457600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061036d565b6103246106d93660046144a2565b611688565b3480156106ea57600080fd5b50600954610423565b3480156106ff57600080fd5b50610324611ef9565b6103246107163660046143ef565b6121c2565b6103246121cf565b34801561072f57600080fd5b50600254610423565b34801561074457600080fd5b506104236125e5565b34801561075957600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b34801561078c57600080fd5b506104236125f1565b3480156107a157600080fd5b506107f76107b036600461447b565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046001600160801b0316906001600160a01b031684565b60408051941515855263ffffffff90931660208501526001600160801b03909116918301919091526001600160a01b03166060820152608001610381565b34801561084157600080fd5b5060405163ffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152602001610381565b34801561088257600080fd5b506104236125fb565b34801561089757600080fd5b5061036d6108a636600461447b565b612607565b3480156108b757600080fd5b506104236108c63660046143d2565b600b6020526000908152604090205481565b3480156108e457600080fd5b506104236108f33660046144e3565b61279a565b34801561090457600080fd5b5061091861091336600461447b565b6128da565b6040805163ffffffff90981688526001600160a01b03968716602089015295909416948601949094526001600160801b039182166060860152608085015291821660a08401521660c082015260e001610381565b34801561097857600080fd5b5060005461036d906001600160401b031681565b34801561099857600080fd5b506104236109a73660046143d2565b61294d565b3480156109b857600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b3480156109eb57600080fd5b506103246109fa36600461450c565b6129a5565b348015610a0b57600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061036d565b348015610a3e57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b348015610a7157600080fd5b506103e8610a8036600461447b565b60046020526000908152604090205460ff1681565b348015610aa157600080fd5b50610324610ab03660046143ef565b612d36565b348015610ac157600080fd5b50610aca6130a2565b60405161038193929190614597565b348015610ae557600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b348015610b1857600080fd5b506103e8610b2736600461447b565b60066020526000908152604090205460ff1681565b60008054600160801b900460ff166002811115610b5b57610b5b614373565b14610b795760405163067fe19560e41b815260040160405180910390fd5b600054600160901b900460ff1615610ba45760405163075173a960e11b815260040160405180910390fd5b610bb2610baf6125fb565b90565b610bc9610bc4368690038601866145d2565b6130fa565b14610be757604051639cc00b5b60e01b815260040160405180910390fd5b82606001358282604051610bfc929190614645565b604051809103902014610c225760405163d81d583b60e01b815260040160405180910390fd5b6000610c6b610c6684848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061315692505050565b6131aa565b90506000610c9282600881518110610c8557610c85614655565b602002602001015161332e565b9050602081511115610cb75760405163d81d583b60e01b815260040160405180910390fd5b602081810151825190910360031b1c610cce6125e5565b8103610ced57604051630b8ed88360e41b815260040160405180910390fd5b5050600180546001600160a01b0319163317905550506000805460ff60901b1916600160901b1790555050565b60008054600160801b900460ff166002811115610d3957610d39614373565b14610d575760405163067fe19560e41b815260040160405180910390fd5b600060028381548110610d6c57610d6c614655565b906000526020600020906005020190506000610d8784612607565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082161015610dd65760405163f2440b5360e01b815260040160405180910390fd5b60008481526006602052604090205460ff1615610e065760405163f1a9458160e01b815260040160405180910390fd5b6000848152600560205260409020805480158015610e2357508515155b15610e85578354600160201b90046001600160a01b031660008115610e485781610e57565b60018601546001600160a01b03165b9050610e6381876133b0565b505050600094855250506006602052505060409020805460ff19166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046001600160801b031693810193909352600101546001600160a01b03166060830152610f09576001600160801b036040820152600181526000869003610f09578195505b600086826020015163ffffffff16610f219190614681565b90506000838211610f325781610f34565b835b602084015190915063ffffffff165b8181101561103a576000868281548110610f5f57610f5f614655565b6000918252602080832090910154808352600690915260409091205490915060ff16610f9e57604051634d03b32360e11b815260040160405180910390fd5b600060028281548110610fb357610fb3614655565b600091825260209091206005909102018054909150600160201b90046001600160a01b0316158015610ff95750600481015460408701516001600160801b039182169116115b156110255760018101546001600160a01b0316606087015260048101546001600160801b031660408701525b5050808061103290614699565b915050610f43565b5063ffffffff818116602085810191825260008c815260079091526040908190208651815493519288015164ffffffffff1990941690151564ffffffff00191617610100929094169182029390931774ffffffffffffffffffffffffffffffff00000000001916650100000000006001600160801b03909316929092029190911782556060850151600190920180546001600160a01b0319166001600160a01b03909316929092179091558490036111ba57606083015160008a8152600660205260409020805460ff19166001179055891580156111215750600054600160901b900460ff165b15611167576001546001600160a01b031661113c818a6133b0565b88546001600160a01b03909116600160201b02640100000000600160c01b03199091161788556111b8565b6111946001600160a01b0382161561117f578161118e565b60018901546001600160a01b03165b896133b0565b8754640100000000600160c01b031916600160201b6001600160a01b038316021788555b505b505050505050505050565b600080600054600160801b900460ff1660028111156111e6576111e6614373565b146112045760405163067fe19560e41b815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff1661124f57604051634d03b32360e11b815260040160405180910390fd5b60006001600160a01b0316600260008154811061126e5761126e614655565b6000918252602090912060059091020154600160201b90046001600160a01b03161461129b57600161129e565b60025b600080546001600160401b034216600160401b026fffffffffffffffff000000000000000019821681178355929350839260ff60801b191670ffffffffffffffffff00000000000000001990911617600160801b83600281111561130457611304614373565b02179055600281111561131957611319614373565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a290565b6005602052816000526040600020818154811061136157600080fd5b90600052602060002001600091509150505481565b600061138260006133f2565b905090565b6113948383836001611688565b505050565b600081815260076020908152604080832060059092528220805482546113ca90610100900463ffffffff16826146b2565b95945050505050565b606061138260546020613415565b6113e9611ef9565b60006002600d5460ff16600281111561140457611404614373565b0361142857506001600160a01b0381166000908152600b602052604090205461147e565b6001600d5460ff16600281111561144157611441614373565b0361146557506001600160a01b03811660009081526003602052604090205461147e565b6040516301e28f7d60e21b815260040160405180910390fd5b6001600160a01b0382166000908152600c602052604090205460ff16611542576001600160a01b038281166000818152600c602052604090819020805460ff1916600117905551637eee288d60e01b81526004810191909152602481018390527f000000000000000000000000000000000000000000000000000000000000000090911690637eee288d90604401600060405180830381600087803b15801561152657600080fd5b505af115801561153a573d6000803e3d6000fd5b505050505050565b80600003611563576040516317bfe5f760e01b815260040160405180910390fd5b6001600160a01b038281166000818152600b602090815260408083208390556003909152808220919091555163f3fef3a360e01b81526004810191909152602481018390527f00000000000000000000000000000000000000000000000000000000000000009091169063f3fef3a390604401600060405180830381600087803b1580156115f057600080fd5b505af1158015611604573d6000803e3d6000fd5b505050506000826001600160a01b03168260405160006040518083038185875af1925050503d8060008114611655576040519150601f19603f3d011682016040523d82523d6000602084013e61165a565b606091505b5050905080611394576040516383e6cc6b60e01b815260040160405180910390fd5b60006113826034613457565b60008054600160801b900460ff1660028111156116a7576116a7614373565b146116c55760405163067fe19560e41b815260040160405180910390fd5b6000600284815481106116da576116da614655565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff811684526001600160a01b03600160201b90910481169484019490945260018101549093169082015260028201546001600160801b03908116606083015260038301546080830181905260049093015480821660a0840152600160801b90041660c0820152915085146117845760405163180a019960e11b815260040160405180910390fd5b60a0810151600083156001600160801b0383161760011b905060006117b1826001600160801b0316613477565b60ff1690508615806117ec57506117e97f00000000000000000000000000000000000000000000000000000000000000006002614681565b81145b80156117f6575084155b15611814576040516329098def60e21b815260040160405180910390fd5b600054600160901b900460ff16801561182b575086155b156118495760405163075173a960e11b815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000081111561188a576040516356f57b2b60e01b815260040160405180910390fd5b6118b57f00000000000000000000000000000000000000000000000000000000000000006001614681565b81036118c7576118c7868885886134e3565b346118d18361279a565b146118ef57604051638620aa1960e01b815260040160405180910390fd5b60006118fa88612607565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082160361194857604051630ce0744560e21b815260040160405180910390fd5b600061197560017f00000000000000000000000000000000000000000000000000000000000000006146b2565b8303611a98577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156119d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119fd91906146c9565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015611a3a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a5e91906146e6565b611a91907f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166146ff565b9050611b29565b611ac360017f00000000000000000000000000000000000000000000000000000000000000006146b2565b8303611afd57611a917f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316600261472a565b507f00000000000000000000000000000000000000000000000000000000000000006001600160401b03165b611b5c817f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316614759565b6001600160401b0316611b75836001600160401b031690565b6001600160401b03161115611bba57611bb7817f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316614759565b91505b6000604083901b421760008a8152608087901b6001600160801b038d1617602052604081209192509060008181526004602052604090205490915060ff1615611c16576040516380497e3b60e01b815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff16815260200160006001600160a01b03168152602001336001600160a01b03168152602001346001600160801b031681526020018c8152602001886001600160801b03168152602001846001600160801b0316815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a8154816001600160a01b0302191690836001600160a01b0316021790555060408201518160010160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060608201518160020160006101000a8154816001600160801b0302191690836001600160801b031602179055506080820151816003015560a08201518160040160006101000a8154816001600160801b0302191690836001600160801b0316021790555060c08201518160040160106101000a8154816001600160801b0302191690836001600160801b031602179055505050600560008c81526020019081526020016000206001600280549050611e0d91906146b2565b81546001810183556000928352602080842090910191909155338252600b9052604081208054349290611e41908490614681565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b158015611ea357600080fd5b505af1158015611eb7573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b6002600d5460ff166002811115611f1257611f12614373565b1480611f3457506001600d5460ff166002811115611f3257611f32614373565b145b15611f3b57565b6000600d5460ff166002811115611f5457611f54614373565b14611f72576040516301e28f7d60e21b815260040160405180910390fd5b600054600160401b90046001600160401b03166001600160401b0316600003611fae57604051636082930560e11b815260040160405180910390fd5b604051630314d2b360e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630314d2b390602401602060405180830381865afa158015612015573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120399190614781565b90508061205957604051634851bd9b60e01b815260040160405180910390fd5b6040516317cf21a960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906317cf21a990602401600060405180830381600087803b1580156120ba57600080fd5b505af19250505080156120cb575060015b506040516324b5ce0b60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063496b9c1690602401602060405180830381865afa158015612133573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121579190614781565b9050801561217157600d805460ff1916600117905561217f565b600d805460ff191660021790555b600d546040517f9908eaac0645df9d0704d06adc9e07337c951de2f06b5f2836151d48d5e4722f916121b69160ff909116906143aa565b60405180910390a15050565b6113948383836000611688565b600054600160881b900460ff16156121f95760405162dc149f60e41b815260040160405180910390fd5b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d83ef2676040518163ffffffff1660e01b81526004016040805180830381865afa158015612259573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061227d919061479e565b9092509050816122a057604051633535e1d960e11b815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a146122d357639824bdab6000526004601cfd5b806122dc6125e5565b1161230e576122e96125fb565b60405163f40239db60e01b815260040161230591815260200190565b60405180910390fd5b6040805160e08101825263ffffffff8152600060208201526002918101612333611376565b6001600160a01b03168152602001346001600160801b031681526020016123586125fb565b815260016020820152604001426001600160801b0390811690915282546001808201855560009485526020808620855160059094020180549186015163ffffffff9094166001600160c01b031990921691909117600160201b6001600160a01b0394851602178155604085015191810180546001600160a01b031916929093169190911790915560608301516002820180546fffffffffffffffffffffffffffffffff19169184169190911790556080830151600382015560a083015160c090930151928216600160801b9390921692909202176004909101558054600160881b60ff60881b199091161781553490600b90612452611376565b6001600160a01b03166001600160a01b0316815260200190815260200160002060008282546124819190614681565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156124e357600080fd5b505af11580156124f7573d6000803e3d6000fd5b50506000805467ffffffffffffffff1916426001600160401b0316179055505060408051630f27ce5f60e21b815290517f000000000000000000000000000000000000000000000000000000000000000063ffffffff1692507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031691633c9f397c9160048083019260209291908290030181865afa1580156125a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906125c991906147c2565b600a805460ff191663ffffffff92909216929092141790555050565b60006113826054613457565b60006113826125e5565b60006113826014613457565b600080600054600160801b900460ff16600281111561262857612628614373565b146126465760405163067fe19560e41b815260040160405180910390fd5b60006002838154811061265b5761265b614655565b600091825260208220600590910201805490925063ffffffff908116146126c157815460028054909163ffffffff1690811061269957612699614655565b906000526020600020906005020160040160109054906101000a90046001600160801b031690505b60048201546000906126ea90600160801b90046001600160401b03165b6001600160401b031690565b6126fd906001600160401b0316426146b2565b6127136126de846001600160801b031660401c90565b6001600160401b03166127269190614681565b90506001600160401b037f0000000000000000000000000000000000000000000000000000000000000000166001600160401b0316816001600160401b03161161277057806113ca565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b6000806127af836001600160801b0316613477565b60ff1690507f00000000000000000000000000000000000000000000000000000000000000008111156127f5576040516356f57b2b60e01b815260040160405180910390fd5b642e90edd00062061a806311e1a300600061281083836147fe565b9050670de0b6b3a76400006000612847827f0000000000000000000000000000000000000000000000000000000000000000614812565b90506000612865612860670de0b6b3a764000086614812565b6135d8565b9050600061287384846137ee565b90506000612881838361383d565b9050600061288e8261386b565b905060006128ad826128a8670de0b6b3a76400008f614812565b6139e8565b905060006128bb8b8361383d565b90506128c7818d614812565b9f9e505050505050505050505050505050565b600281815481106128ea57600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff84169550600160201b9093046001600160a01b03908116949216926001600160801b03918216929180821691600160801b90041687565b60006002600d5460ff16600281111561296857612968614373565b0361298957506001600160a01b03166000908152600b602052604090205490565b506001600160a01b031660009081526003602052604090205490565b60008054600160801b900460ff1660028111156129c4576129c4614373565b146129e25760405163067fe19560e41b815260040160405180910390fd5b6000600287815481106129f7576129f7614655565b6000918252602082206005919091020160048101549092506001600160801b0316908715821760011b9050612a4d7f00000000000000000000000000000000000000000000000000000000000000006001614681565b612a5f826001600160801b0316613477565b60ff1614612a8057604051630bea7bb360e31b815260040160405180910390fd5b6000808915612b5c57612ad37f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006146b2565b6001901b612ae9846001600160801b0316613a19565b6001600160801b0316612afc9190614831565b15612b3057612b27612b1860016001600160801b038716614845565b865463ffffffff166000613a37565b60030154612b52565b7f00000000000000000000000000000000000000000000000000000000000000005b9150849050612b7d565b60038501549150612b7a612b186001600160801b0386166001614865565b90505b600882901b60088a8a604051612b94929190614645565b6040518091039020901b14612bbc5760405163696550ff60e01b815260040160405180910390fd5b6000612bc78c613b00565b90506000612bd6836003015490565b6040516370a6769960e11b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e14ced3290612c2a908f908f908f908f908a906004016148b0565b6020604051808303816000875af1158015612c49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c6d91906146e6565b600485015491149150600090600290612c8e906001600160801b0316613477565b612ca0896001600160801b0316613477565b612caa91906148ea565b612cb4919061490d565b60ff161590508115158103612cdc5760405163fb4e40dd60e01b815260040160405180910390fd5b8754600160201b90046001600160a01b031615612d0c57604051639071e6af60e01b815260040160405180910390fd5b50508554640100000000600160c01b03191633600160201b02179095555050505050505050505050565b60008054600160801b900460ff166002811115612d5557612d55614373565b14612d735760405163067fe19560e41b815260040160405180910390fd5b600080600080612d8286613b2f565b93509350935093506000612d9885858585613d9e565b905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015612dfa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e1e91906146c9565b905060018903612ec8576001600160a01b0381166352f0f3ad8a84612e44610baf61167c565b6040516001600160e01b031960e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af1158015612e9e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612ec291906146e6565b506111ba565b60028903612ee7576001600160a01b0381166352f0f3ad8a8489612e44565b60038903612f06576001600160a01b0381166352f0f3ad8a8487612e44565b60048903613013576000612f436001600160801b0385167f0000000000000000000000000000000000000000000000000000000000000000613e3d565b600954612f509190614681565b612f5b906001614681565b9050612f656125e5565b8110612f7857612f736125e5565b612f7a565b805b90506001600160a01b0382166352f0f3ad8b8560405160e084901b6001600160e01b03191681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af1158015612fe8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061300c91906146e6565b50506111ba565b60058903613086576040516352f0f3ad60e01b8152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b604482015260086064820152608481018890526001600160a01b038216906352f0f3ad9060a401612e7f565b604051600162ec819b60e01b0319815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000600060606130cf6125fb565b91506130d96113d3565b9050909192565b60008183116130ef57816130f1565b825b90505b92915050565b60008160000151826020015183604001518460600151604051602001613139949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6040805180820190915260008082526020820152815160000361318c57604051635ab458fb60e01b815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b606060008060006131ba85613e6a565b9194509250905060018160018111156131d5576131d5614373565b146131f3576040516325ce355f60e11b815260040160405180910390fd5b84516131ff8385614681565b1461321d57604051630b8aa6f760e31b815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816132345790505093506000835b8651811015613322576000806132a76040518060400160405280858c6000015161328b91906146b2565b8152602001858c602001516132a09190614681565b9052613e6a565b5091509150604051806040016040528083836132c39190614681565b8152602001848b602001516132d89190614681565b8152508885815181106132ed576132ed614655565b6020908102919091010152613303600185614681565b935061330f8183614681565b6133199084614681565b92505050613261565b50845250919392505050565b6060600080600061333e85613e6a565b91945092509050600081600181111561335957613359614373565b14613377576040516307fe6cb960e21b815260040160405180910390fd5b6133818284614681565b8551146133a157604051630b8aa6f760e31b815260040160405180910390fd5b6113ca85602001518484614160565b60028101546001600160a01b038316600090815260036020526040812080546001600160801b03909316929091906133e9908490614681565b90915550505050565b6000806134073660011981013560f01c900390565b929092013560601c92915050565b6060600061342b3660011981013560f01c900390565b905060405191508282528284820160208401378260208301016000815260208101604052505092915050565b60008061346c3660011981013560f01c900390565b929092013592915050565b7e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f6307c4acdd60e01b6001600160401b03831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60006134f96001600160801b0384166001614865565b9050600061350982866001613a37565b9050600086901a838061356b575061354260027f0000000000000000000000000000000000000000000000000000000000000000614831565b600483015460029061355c906001600160801b0316613477565b613566919061490d565b60ff16145b156135aa5760ff811660011480613585575060ff81166002145b6135a55760405163f40239db60e01b815260048101889052602401612305565b6135cf565b60ff8116156135cf5760405163f40239db60e01b815260048101889052602401612305565b50505050505050565b6001600160801b03811160071b81811c6001600160401b031060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b176000821361362d57631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d6c8c3f38e95a6b1ff2ab1c3b343619018302821d6d02384773bdf1ac5676facced60901901830290911d6cb9a025d814b29c212b8b1a07cd1901909102780a09507084cc699bb0e71ea869ffffffffffffffffffffffff190105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a76400000215820261382b57637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b60008160001904831182021561385b5763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b600068023f2fa8f6da5b9d2819821361388357919050565b680755bf798b4a1bf1e582126138a15763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056001605f1b01901d6bb17217f7d1cf79abc9e3b39881029093036c240c330e9fb2d9cbaf0fd5aafb1981018102606090811d6d0277594991cfc85f6e2461837cd9018202811d6d1a521255e34f6a5061b25ef1c9c319018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d6e02c72388d9f74f51a9331fed693f1419018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084016d01d3967ed30fc4f89c02bab5708119010290911d6e0587f503bb6ea29d25fcb740196450019091026d360d7aeea093263ecc6e0ecb291760621b010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b60006130f1670de0b6b3a764000083613a00866135d8565b613a0a919061492f565b613a1491906149b4565b61386b565b600080613a2583613477565b600160ff919091161b90920392915050565b60008082613a7757613a726001600160801b0386167f00000000000000000000000000000000000000000000000000000000000000006141f4565b613a89565b613a89856001600160801b0316614263565b905060028481548110613a9e57613a9e614655565b906000526020600020906005020191505b60048201546001600160801b03828116911614613af857815460028054909163ffffffff16908110613ae357613ae3614655565b90600052602060002090600502019150613aaf565b509392505050565b6000806000806000613b1186613b2f565b9350935093509350613b2584848484613d9e565b9695505050505050565b6000806000806000859050600060028281548110613b4f57613b4f614655565b6000918252602090912060059091020160048101549091507f000000000000000000000000000000000000000000000000000000000000000090613b9b906001600160801b0316613477565b60ff1611613bbc576040516359a5ae1160e11b815260040160405180910390fd5b6000815b60048301547f000000000000000000000000000000000000000000000000000000000000000090613bf9906001600160801b0316613477565b60ff169250821115613c6e57825463ffffffff16613c387f00000000000000000000000000000000000000000000000000000000000000006001614681565b8303613c42578391505b60028181548110613c5557613c55614655565b9060005260206000209060050201935080945050613bc0565b600481810154908401546001600160801b0391821691166000816001600160801b0316613cb3613ca7856001600160801b031660011c90565b6001600160801b031690565b6001600160801b03161490508015613d4c576000613cd9836001600160801b0316613a19565b6001600160801b03161115613d29576000613d09613d0160016001600160801b038616614845565b896001613a37565b6003810154600490910154909c506001600160801b03169a50613d2f9050565b6008549a505b600386015460048701549099506001600160801b03169750613d90565b6000613d65613d016001600160801b0385166001614865565b6003808901546004808b015492840154930154909e506001600160801b039182169d50919b50169850505b505050505050509193509193565b60006001600160801b03841615613df95760408051602081018790526001600160801b038087169282019290925260608101859052908316608082015260a001604051602081830303815290604052805190602001206113ca565b8282604051602001613e1e9291909182526001600160801b0316602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080613e4984613477565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003613e9457604051635ab458fb60e01b815260040160405180910390fd5b6020840151805160001a607f8111613eb9576000600160009450945094505050614159565b60b78111613f51576000613ece6080836146b2565b905080876000015111613ef4576040516366c9448560e01b815260040160405180910390fd5b6001838101516001600160f81b0319169082148015613f205750600160ff1b6001600160f81b03198216105b15613f3e5760405163babb01dd60e01b815260040160405180910390fd5b5060019550935060009250614159915050565b60bf8111614033576000613f6660b7836146b2565b905080876000015111613f8c576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b0319166000819003613fbd5760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c60378111613fec5760405163babb01dd60e01b815260040160405180910390fd5b613ff68184614681565b895111614016576040516366c9448560e01b815260040160405180910390fd5b614021836001614681565b97509550600094506141599350505050565b60f7811161407f57600061404860c0836146b2565b90508087600001511161406e576040516366c9448560e01b815260040160405180910390fd5b600195509350849250614159915050565b600061408c60f7836146b2565b9050808760000151116140b2576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b03191660008190036140e35760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c603781116141125760405163babb01dd60e01b815260040160405180910390fd5b61411c8184614681565b89511161413c576040516366c9448560e01b815260040160405180910390fd5b614147836001614681565b97509550600194506141599350505050565b9193909250565b6060816001600160401b0381111561417a5761417a6145bc565b6040519080825280601f01601f1916602001820160405280156141a4576020820181803683370190505b50905081156141ed5760006141b98486614681565b90506020820160005b848110156141da5782810151828201526020016141c2565b848111156141e9576000858301525b5050505b9392505050565b600081614209846001600160801b0316613477565b60ff161161421f5763b34b5c226000526004601cfd5b61422883614263565b90508161423d826001600160801b0316613477565b60ff16116130f4576130f1614253836001614681565b6001600160801b03831690614287565b6000811960018301168161427682613477565b60ff169390931c8015179392505050565b60008061429384613477565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f8401126142c157600080fd5b5081356001600160401b038111156142d857600080fd5b6020830191508360208285010111156142f057600080fd5b9250929050565b600080600083850360a081121561430d57600080fd5b608081121561431b57600080fd5b5083925060808401356001600160401b0381111561433857600080fd5b614344868287016142af565b9497909650939450505050565b6000806040838503121561436457600080fd5b50508035926020909101359150565b634e487b7160e01b600052602160045260246000fd5b600381106143a757634e487b7160e01b600052602160045260246000fd5b50565b602081016143b783614389565b91905290565b6001600160a01b03811681146143a757600080fd5b6000602082840312156143e457600080fd5b81356141ed816143bd565b60008060006060848603121561440457600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b8181101561444157602081850181015186830182015201614425565b81811115614453576000602083870101525b50601f01601f19169290920160200192915050565b6020815260006130f1602083018461441b565b60006020828403121561448d57600080fd5b5035919050565b80151581146143a757600080fd5b600080600080608085870312156144b857600080fd5b84359350602085013592506040850135915060608501356144d881614494565b939692955090935050565b6000602082840312156144f557600080fd5b81356001600160801b03811681146141ed57600080fd5b6000806000806000806080878903121561452557600080fd5b86359550602087013561453781614494565b945060408701356001600160401b038082111561455357600080fd5b61455f8a838b016142af565b9096509450606089013591508082111561457857600080fd5b5061458589828a016142af565b979a9699509497509295939492505050565b63ffffffff841681528260208201526060604082015260006113ca606083018461441b565b634e487b7160e01b600052604160045260246000fd5b6000608082840312156145e457600080fd5b604051608081018181106001600160401b038211171561461457634e487b7160e01b600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600082198211156146945761469461466b565b500190565b6000600182016146ab576146ab61466b565b5060010190565b6000828210156146c4576146c461466b565b500390565b6000602082840312156146db57600080fd5b81516141ed816143bd565b6000602082840312156146f857600080fd5b5051919050565b60006001600160401b038083168185168083038211156147215761472161466b565b01949350505050565b60006001600160401b03808316818516818304811182151516156147505761475061466b565b02949350505050565b60006001600160401b03838116908316818110156147795761477961466b565b039392505050565b60006020828403121561479357600080fd5b81516141ed81614494565b600080604083850312156147b157600080fd5b505080516020909101519092909150565b6000602082840312156147d457600080fd5b815163ffffffff811681146141ed57600080fd5b634e487b7160e01b600052601260045260246000fd5b60008261480d5761480d6147e8565b500490565b600081600019048311821515161561482c5761482c61466b565b500290565b600082614840576148406147e8565b500690565b60006001600160801b03838116908316818110156147795761477961466b565b60006001600160801b038083168185168083038211156147215761472161466b565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6060815260006148c4606083018789614887565b82810360208401526148d7818688614887565b9150508260408301529695505050505050565b600060ff821660ff8416808210156149045761490461466b565b90039392505050565b600060ff831680614920576149206147e8565b8060ff84160691505092915050565b60006001600160ff1b03818413828413808216868404861116156149555761495561466b565b600160ff1b60008712828116878305891216156149745761497461466b565b600087129250878205871284841616156149905761499061466b565b878505871281841616156149a6576149a661466b565b505050929093029392505050565b6000826149c3576149c36147e8565b600160ff1b8214600019841416156149dd576149dd61466b565b50059056fea2646970667358221220b40836bab1efb6bfb8d7c87f6d0be96a5361d175f1792d0f7ade32e849c6eaa364736f6c634300080f0033000000000000000000000000000000000000000000000000000000000000000003682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b60000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000aa59a0777648bc75cd10364083e878c1ccd6112a000000000000000000000000a2f2ac6f5af72e494a227d79db20473cf7a1ffe8000000000000000000000000496286e5ee7758de84dd17e6d2d97afc2ace4cc70000000000000000000000000000000000000000000000000000000000002105", + "nonce": "0x2", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0x0301698b4f90faad35fec84b09d6e23ba9f02e09e2450f8cf262be4f30c54a42", + "transactionType": "CREATE", + "contractName": "PermissionedDisputeGame", + "contractAddress": "0x4e0a38923fba12da162fe255642b095f86598c5b", + "function": null, + "arguments": [ + "(1, 0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6, 73, 30, 10800, 302400, 0xaA59A0777648BC75cd10364083e878c1cCd6112a, 0x3E8a0B63f57e975c268d610ece93da5f78c01321, 0x496286e5eE7758de84Dd17e6d2d97afC2ACE4cc7, 8453)", + "0x642229f238fb9dE03374Be34B0eD8D9De80752c5", + "0x8Ca1E12404d16373Aef756179B185F27b2994F3a" + ], + "transaction": { + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "gas": "0x550e3d", + "value": "0x0", + "input": "0x6102006040523480156200001257600080fd5b50604051620054da380380620054da83398101604081905262000035916200053b565b82620000446001607e6200064a565b60ff16816040015111156200006c57604051633beff19960e11b815260040160405180910390fd5b60001981606001511480620000965750604081015160608201516200009390600162000670565b10155b15620000b55760405163e62ccf3960e01b815260040160405180910390fd5b600281606001511015620000dc5760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b0380168160c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000129573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200014f91906200068b565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200018d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b39190620006ab565b1115620001d35760405163b4e1243360e01b815260040160405180910390fd5b6000620001f882608001516001600160401b03166200048e60201b62000c4b1760201c565b6200020e906001600160401b03166002620006c5565b905060008260c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000255573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027b91906200068b565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002b9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002df9190620006ab565b6200030284608001516001600160401b03166200048e60201b62000c4b1760201c565b6001600160401b031662000317919062000670565b905060006200033283836200049160201b620022cf1760201c565b90506001600160401b038111156200035d5760405163235dfb2b60e21b815260040160405180910390fd5b620003808460a001516001600160401b03166200048e60201b62000c4b1760201c565b6001600160401b0316816001600160401b03161115620003b35760405163235dfb2b60e21b815260040160405180910390fd5b63ffffffff8016620003da856000015163ffffffff166200048e60201b62000c4b1760201c565b63ffffffff1603620003ff5760405163073ed16760e31b815260040160405180910390fd5b5050815163ffffffff1661012090815260208301516080908152604084015160a0908152606085015160c0908152918501516001600160401b039081166101a052908501511660e0908152908401516001600160a01b03908116610100908152918501518116610140529084015181166101605292015161018052509182166101c052166101e05250620006e7565b90565b6000818311620004a25781620004a4565b825b9392505050565b60405161014081016001600160401b0381118282101715620004dd57634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620004f857600080fd5b919050565b80516001600160401b0381168114620004f857600080fd5b6001600160a01b03811681146200052b57600080fd5b50565b8051620004f88162000515565b60008060008385036101808112156200055357600080fd5b610140808212156200056457600080fd5b6200056e620004ab565b91506200057b86620004e3565b8252602086015160208301526040860151604083015260608601516060830152620005a960808701620004fd565b6080830152620005bc60a08701620004fd565b60a0830152620005cf60c087016200052e565b60c0830152620005e260e087016200052e565b60e0830152610100620005f78188016200052e565b8184015250610120808701518184015250819450620006188187016200052e565b935050506200062b61016085016200052e565b90509250925092565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff84168082101562000667576200066762000634565b90039392505050565b6000821982111562000686576200068662000634565b500190565b6000602082840312156200069e57600080fd5b8151620004a48162000515565b600060208284031215620006be57600080fd5b5051919050565b6000816000190483118215151615620006e257620006e262000634565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a0516101c0516101e051614c1f620008bb600039600081816105d9015281816117610152611ed80152600081816108ad0152818161172f01528181611a930152611ea601526000818161071001528181612a4201528181612aac0152612ade015260008181610a5701526122270152600081816106930152818161187f015281816119270152818161199d01528181612f06015261325a0152600081816105660152818161157c0152818161164601528181612e2801526131920152600081816108e801528181612293015261323101526000818161051201528181611f8d0152818161295b01526139da015260008181610aaa01528181610e2f01528181611c2801528181611c68015281816128e401528181612b0d0152612b68015260008181610add0152818161210e015281816127a10152818161286d01528181612a7d0152818161388301528181613b6501528181613bc301528181613c0e0152818161422b015261431a015260008181610b8401528181611cac01528181611d19015281816128290152818161292f0152818161381c01526138a40152600081816107c501526139270152614c1f6000f3fe6080604052600436106103355760003560e01c806370872aa5116101ab578063c0d8bb74116100f7578063dabd396d11610095578063f8f43ff61161006f578063f8f43ff614610b31578063fa24f74314610b51578063fa315aa914610b75578063fe2bbeb214610ba857600080fd5b8063dabd396d14610a9b578063ec5e630814610ace578063eff0f59214610b0157600080fd5b8063cf09e0d0116100d1578063cf09e0d014610a08578063d5d44d8014610a28578063d6ae3cd514610a48578063d8cc1a3c14610a7b57600080fd5b8063c0d8bb7414610947578063c395e1ca14610974578063c6f0308c1461099457600080fd5b80638d450a9511610164578063a8e4fb901161013e578063a8e4fb901461089e578063bbdc02db146108d1578063bcef3b5514610912578063bd8da9561461092757600080fd5b80638d450a95146107b657806399735e32146107e9578063a445ece6146107fe57600080fd5b806370872aa514610747578063786b844b1461075c5780637b0f0adc146107715780638129fc1c146107845780638980e0cc1461078c5780638b85902b146107a157600080fd5b80633e3ac912116102855780635a5fa2d91161022357806360e27464116101fd57806360e27464146106cc5780636361506d146106ec5780636b6716c0146107015780636f0344091461073457600080fd5b80635a5fa2d9146106645780635c0cba3314610684578063609d3334146106b757600080fd5b8063529d6a8c1161025f578063529d6a8c1461059d578063534db0e2146105ca57806354fd4d50146105fd57806357da950e1461063457600080fd5b80633e3ac912146105365780633fc8cef314610557578063472777c61461058a57600080fd5b806325fc2ace116102f257806330dbe570116102cc57806330dbe5701461049c578063378dd48c146104d457806337b1b229146104ee5780633a7684631461050357600080fd5b806325fc2ace146104485780632810e1d6146104675780632ad69aeb1461047c57600080fd5b8063019351301461033a57806303c2924d1461035c57806319effeb41461037c578063200d2ed2146103c0578063222abf45146103ee578063250e69bd1461042e575b600080fd5b34801561034657600080fd5b5061035a6103553660046144fe565b610bd8565b005b34801561036857600080fd5b5061035a610377366004614558565b610db6565b34801561038857600080fd5b506000546103a390600160401b90046001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b3480156103cc57600080fd5b506000546103e190600160801b900460ff1681565b6040516103b791906145b1565b3480156103fa57600080fd5b5061041e6104093660046145d9565b600c6020526000908152604090205460ff1681565b60405190151581526020016103b7565b34801561043a57600080fd5b50600a5461041e9060ff1681565b34801561045457600080fd5b506008545b6040519081526020016103b7565b34801561047357600080fd5b506103e1611261565b34801561048857600080fd5b50610459610497366004614558565b6113e1565b3480156104a857600080fd5b506001546104bc906001600160a01b031681565b6040516001600160a01b0390911681526020016103b7565b3480156104e057600080fd5b50600d546103e19060ff1681565b3480156104fa57600080fd5b506104bc611412565b34801561050f57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b34801561054257600080fd5b5060005461041e90600160901b900460ff1681565b34801561056357600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b61035a6105983660046145f6565b611423565b3480156105a957600080fd5b506104596105b83660046145d9565b60036020526000908152604090205481565b3480156105d657600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b34801561060957600080fd5b506040805180820190915260058152640312e352e360dc1b60208201525b6040516103b7919061466f565b34801561064057600080fd5b5060085460095461064f919082565b604080519283526020830191909152016103b7565b34801561067057600080fd5b5061045961067f366004614682565b611435565b34801561069057600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b3480156106c357600080fd5b5061062761146f565b3480156106d857600080fd5b5061035a6106e73660046145d9565b61147d565b3480156106f857600080fd5b50610459611718565b34801561070d57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103a3565b61035a6107423660046146a9565b611724565b34801561075357600080fd5b50600954610459565b34801561076857600080fd5b5061035a6117b2565b61035a61077f3660046145f6565b611a7b565b61035a611a88565b34801561079857600080fd5b50600254610459565b3480156107ad57600080fd5b50610459611adb565b3480156107c257600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b3480156107f557600080fd5b50610459611ae7565b34801561080a57600080fd5b50610860610819366004614682565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046001600160801b0316906001600160a01b031684565b60408051941515855263ffffffff90931660208501526001600160801b03909116918301919091526001600160a01b031660608201526080016103b7565b3480156108aa57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b3480156108dd57600080fd5b5060405163ffffffff7f00000000000000000000000000000000000000000000000000000000000000001681526020016103b7565b34801561091e57600080fd5b50610459611af1565b34801561093357600080fd5b506103a3610942366004614682565b611afd565b34801561095357600080fd5b506104596109623660046145d9565b600b6020526000908152604090205481565b34801561098057600080fd5b5061045961098f3660046146ea565b611c90565b3480156109a057600080fd5b506109b46109af366004614682565b611dd0565b6040805163ffffffff90981688526001600160a01b03968716602089015295909416948601949094526001600160801b039182166060860152608085015291821660a08401521660c082015260e0016103b7565b348015610a1457600080fd5b506000546103a3906001600160401b031681565b348015610a3457600080fd5b50610459610a433660046145d9565b611e43565b348015610a5457600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b348015610a8757600080fd5b5061035a610a96366004614713565b611e9b565b348015610aa757600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103a3565b348015610ada57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b348015610b0d57600080fd5b5061041e610b1c366004614682565b60046020526000908152604090205460ff1681565b348015610b3d57600080fd5b5061035a610b4c3660046145f6565b611f25565b348015610b5d57600080fd5b50610b66612291565b6040516103b79392919061479e565b348015610b8157600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b348015610bb457600080fd5b5061041e610bc3366004614682565b60066020526000908152604090205460ff1681565b60008054600160801b900460ff166002811115610bf757610bf761457a565b14610c155760405163067fe19560e41b815260040160405180910390fd5b600054600160901b900460ff1615610c405760405163075173a960e11b815260040160405180910390fd5b610c4e610c4b611af1565b90565b610c65610c60368690038601866147d9565b6122e9565b14610c8357604051639cc00b5b60e01b815260040160405180910390fd5b82606001358282604051610c9892919061484c565b604051809103902014610cbe5760405163d81d583b60e01b815260040160405180910390fd5b6000610d07610d0284848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061234592505050565b612399565b90506000610d2e82600881518110610d2157610d2161485c565b602002602001015161251d565b9050602081511115610d535760405163d81d583b60e01b815260040160405180910390fd5b602081810151825190910360031b1c610d6a611adb565b8103610d8957604051630b8ed88360e41b815260040160405180910390fd5b5050600180546001600160a01b0319163317905550506000805460ff60901b1916600160901b1790555050565b60008054600160801b900460ff166002811115610dd557610dd561457a565b14610df35760405163067fe19560e41b815260040160405180910390fd5b600060028381548110610e0857610e0861485c565b906000526020600020906005020190506000610e2384611afd565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082161015610e725760405163f2440b5360e01b815260040160405180910390fd5b60008481526006602052604090205460ff1615610ea25760405163f1a9458160e01b815260040160405180910390fd5b6000848152600560205260409020805480158015610ebf57508515155b15610f21578354600160201b90046001600160a01b031660008115610ee45781610ef3565b60018601546001600160a01b03165b9050610eff818761259f565b505050600094855250506006602052505060409020805460ff19166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046001600160801b031693810193909352600101546001600160a01b03166060830152610fa5576001600160801b036040820152600181526000869003610fa5578195505b600086826020015163ffffffff16610fbd9190614888565b90506000838211610fce5781610fd0565b835b602084015190915063ffffffff165b818110156110d6576000868281548110610ffb57610ffb61485c565b6000918252602080832090910154808352600690915260409091205490915060ff1661103a57604051634d03b32360e11b815260040160405180910390fd5b60006002828154811061104f5761104f61485c565b600091825260209091206005909102018054909150600160201b90046001600160a01b03161580156110955750600481015460408701516001600160801b039182169116115b156110c15760018101546001600160a01b0316606087015260048101546001600160801b031660408701525b505080806110ce906148a0565b915050610fdf565b5063ffffffff818116602085810191825260008c815260079091526040908190208651815493519288015164ffffffffff1990941690151564ffffffff00191617610100929094169182029390931774ffffffffffffffffffffffffffffffff00000000001916650100000000006001600160801b03909316929092029190911782556060850151600190920180546001600160a01b0319166001600160a01b039093169290921790915584900361125657606083015160008a8152600660205260409020805460ff19166001179055891580156111bd5750600054600160901b900460ff165b15611203576001546001600160a01b03166111d8818a61259f565b88546001600160a01b03909116600160201b02640100000000600160c01b0319909116178855611254565b6112306001600160a01b0382161561121b578161122a565b60018901546001600160a01b03165b8961259f565b8754640100000000600160c01b031916600160201b6001600160a01b038316021788555b505b505050505050505050565b600080600054600160801b900460ff1660028111156112825761128261457a565b146112a05760405163067fe19560e41b815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff166112eb57604051634d03b32360e11b815260040160405180910390fd5b60006001600160a01b0316600260008154811061130a5761130a61485c565b6000918252602090912060059091020154600160201b90046001600160a01b03161461133757600161133a565b60025b600080546001600160401b034216600160401b026fffffffffffffffff000000000000000019821681178355929350839260ff60801b191670ffffffffffffffffff00000000000000001990911617600160801b8360028111156113a0576113a061457a565b0217905560028111156113b5576113b561457a565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a290565b600560205281600052604060002081815481106113fd57600080fd5b90600052602060002001600091509150505481565b600061141e60006125e1565b905090565b6114308383836001611724565b505050565b6000818152600760209081526040808320600590925282208054825461146690610100900463ffffffff16826148b9565b95945050505050565b606061141e60546020612604565b6114856117b2565b60006002600d5460ff1660028111156114a0576114a061457a565b036114c457506001600160a01b0381166000908152600b602052604090205461151a565b6001600d5460ff1660028111156114dd576114dd61457a565b0361150157506001600160a01b03811660009081526003602052604090205461151a565b6040516301e28f7d60e21b815260040160405180910390fd5b6001600160a01b0382166000908152600c602052604090205460ff166115de576001600160a01b038281166000818152600c602052604090819020805460ff1916600117905551637eee288d60e01b81526004810191909152602481018390527f000000000000000000000000000000000000000000000000000000000000000090911690637eee288d90604401600060405180830381600087803b1580156115c257600080fd5b505af11580156115d6573d6000803e3d6000fd5b505050505050565b806000036115ff576040516317bfe5f760e01b815260040160405180910390fd5b6001600160a01b038281166000818152600b602090815260408083208390556003909152808220919091555163f3fef3a360e01b81526004810191909152602481018390527f00000000000000000000000000000000000000000000000000000000000000009091169063f3fef3a390604401600060405180830381600087803b15801561168c57600080fd5b505af11580156116a0573d6000803e3d6000fd5b505050506000826001600160a01b03168260405160006040518083038185875af1925050503d80600081146116f1576040519150601f19603f3d011682016040523d82523d6000602084013e6116f6565b606091505b5050905080611430576040516383e6cc6b60e01b815260040160405180910390fd5b600061141e6034612646565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614806117835750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b6117a0576040516369c3779f60e11b815260040160405180910390fd5b6117ac84848484612666565b50505050565b6002600d5460ff1660028111156117cb576117cb61457a565b14806117ed57506001600d5460ff1660028111156117eb576117eb61457a565b145b156117f457565b6000600d5460ff16600281111561180d5761180d61457a565b1461182b576040516301e28f7d60e21b815260040160405180910390fd5b600054600160401b90046001600160401b03166001600160401b031660000361186757604051636082930560e11b815260040160405180910390fd5b604051630314d2b360e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630314d2b390602401602060405180830381865afa1580156118ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118f291906148d0565b90508061191257604051634851bd9b60e01b815260040160405180910390fd5b6040516317cf21a960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906317cf21a990602401600060405180830381600087803b15801561197357600080fd5b505af1925050508015611984575060015b506040516324b5ce0b60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063496b9c1690602401602060405180830381865afa1580156119ec573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a1091906148d0565b90508015611a2a57600d805460ff19166001179055611a38565b600d805460ff191660021790555b600d546040517f9908eaac0645df9d0704d06adc9e07337c951de2f06b5f2836151d48d5e4722f91611a6f9160ff909116906145b1565b60405180910390a15050565b6114308383836000611724565b326001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614611ad1576040516369c3779f60e11b815260040160405180910390fd5b611ad9612ed7565b565b600061141e6054612646565b600061141e611adb565b600061141e6014612646565b600080600054600160801b900460ff166002811115611b1e57611b1e61457a565b14611b3c5760405163067fe19560e41b815260040160405180910390fd5b600060028381548110611b5157611b5161485c565b600091825260208220600590910201805490925063ffffffff90811614611bb757815460028054909163ffffffff16908110611b8f57611b8f61485c565b906000526020600020906005020160040160109054906101000a90046001600160801b031690505b6004820154600090611be090600160801b90046001600160401b03165b6001600160401b031690565b611bf3906001600160401b0316426148b9565b611c09611bd4846001600160801b031660401c90565b6001600160401b0316611c1c9190614888565b90506001600160401b037f0000000000000000000000000000000000000000000000000000000000000000166001600160401b0316816001600160401b031611611c665780611466565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b600080611ca5836001600160801b03166132ed565b60ff1690507f0000000000000000000000000000000000000000000000000000000000000000811115611ceb576040516356f57b2b60e01b815260040160405180910390fd5b642e90edd00062061a806311e1a3006000611d068383614903565b9050670de0b6b3a76400006000611d3d827f0000000000000000000000000000000000000000000000000000000000000000614917565b90506000611d5b611d56670de0b6b3a764000086614917565b613359565b90506000611d69848461356f565b90506000611d7783836135be565b90506000611d84826135ec565b90506000611da382611d9e670de0b6b3a76400008f614917565b613769565b90506000611db18b836135be565b9050611dbd818d614917565b9f9e505050505050505050505050505050565b60028181548110611de057600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff84169550600160201b9093046001600160a01b03908116949216926001600160801b03918216929180821691600160801b90041687565b60006002600d5460ff166002811115611e5e57611e5e61457a565b03611e7f57506001600160a01b03166000908152600b602052604090205490565b506001600160a01b031660009081526003602052604090205490565b336001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161480611efa5750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b611f17576040516369c3779f60e11b815260040160405180910390fd5b6115d686868686868661379a565b60008054600160801b900460ff166002811115611f4457611f4461457a565b14611f625760405163067fe19560e41b815260040160405180910390fd5b600080600080611f7186613b2b565b93509350935093506000611f8785858585613d9a565b905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611fe9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061200d9190614936565b9050600189036120b7576001600160a01b0381166352f0f3ad8a84612033610c4b611718565b6040516001600160e01b031960e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af115801561208d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120b19190614953565b50611256565b600289036120d6576001600160a01b0381166352f0f3ad8a8489612033565b600389036120f5576001600160a01b0381166352f0f3ad8a8487612033565b600489036122025760006121326001600160801b0385167f0000000000000000000000000000000000000000000000000000000000000000613e39565b60095461213f9190614888565b61214a906001614888565b9050612154611adb565b811061216757612162611adb565b612169565b805b90506001600160a01b0382166352f0f3ad8b8560405160e084901b6001600160e01b03191681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af11580156121d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121fb9190614953565b5050611256565b60058903612275576040516352f0f3ad60e01b8152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b604482015260086064820152608481018890526001600160a01b038216906352f0f3ad9060a40161206e565b604051600162ec819b60e01b0319815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000600060606122be611af1565b91506122c861146f565b9050909192565b60008183116122de57816122e0565b825b90505b92915050565b60008160000151826020015183604001518460600151604051602001612328949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6040805180820190915260008082526020820152815160000361237b57604051635ab458fb60e01b815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b606060008060006123a985613e66565b9194509250905060018160018111156123c4576123c461457a565b146123e2576040516325ce355f60e11b815260040160405180910390fd5b84516123ee8385614888565b1461240c57604051630b8aa6f760e31b815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816124235790505093506000835b8651811015612511576000806124966040518060400160405280858c6000015161247a91906148b9565b8152602001858c6020015161248f9190614888565b9052613e66565b5091509150604051806040016040528083836124b29190614888565b8152602001848b602001516124c79190614888565b8152508885815181106124dc576124dc61485c565b60209081029190910101526124f2600185614888565b93506124fe8183614888565b6125089084614888565b92505050612450565b50845250919392505050565b6060600080600061252d85613e66565b9194509250905060008160018111156125485761254861457a565b14612566576040516307fe6cb960e21b815260040160405180910390fd5b6125708284614888565b85511461259057604051630b8aa6f760e31b815260040160405180910390fd5b6114668560200151848461415c565b60028101546001600160a01b038316600090815260036020526040812080546001600160801b03909316929091906125d8908490614888565b90915550505050565b6000806125f63660011981013560f01c900390565b929092013560601c92915050565b6060600061261a3660011981013560f01c900390565b905060405191508282528284820160208401378260208301016000815260208101604052505092915050565b60008061265b3660011981013560f01c900390565b929092013592915050565b60008054600160801b900460ff1660028111156126855761268561457a565b146126a35760405163067fe19560e41b815260040160405180910390fd5b6000600284815481106126b8576126b861485c565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff811684526001600160a01b03600160201b90910481169484019490945260018101549093169082015260028201546001600160801b03908116606083015260038301546080830181905260049093015480821660a0840152600160801b90041660c0820152915085146127625760405163180a019960e11b815260040160405180910390fd5b60a0810151600083156001600160801b0383161760011b9050600061278f826001600160801b03166132ed565b60ff1690508615806127ca57506127c77f00000000000000000000000000000000000000000000000000000000000000006002614888565b81145b80156127d4575084155b156127f2576040516329098def60e21b815260040160405180910390fd5b600054600160901b900460ff168015612809575086155b156128275760405163075173a960e11b815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000811115612868576040516356f57b2b60e01b815260040160405180910390fd5b6128937f00000000000000000000000000000000000000000000000000000000000000006001614888565b81036128a5576128a5868885886141f0565b346128af83611c90565b146128cd57604051638620aa1960e01b815260040160405180910390fd5b60006128d888611afd565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082160361292657604051630ce0744560e21b815260040160405180910390fd5b600061295360017f00000000000000000000000000000000000000000000000000000000000000006148b9565b8303612a76577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156129b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129db9190614936565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015612a18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a3c9190614953565b612a6f907f00000000000000000000000000000000000000000000000000000000000000006001600160401b031661496c565b9050612b07565b612aa160017f00000000000000000000000000000000000000000000000000000000000000006148b9565b8303612adb57612a6f7f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166002614997565b507f00000000000000000000000000000000000000000000000000000000000000006001600160401b03165b612b3a817f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166149c6565b6001600160401b0316612b53836001600160401b031690565b6001600160401b03161115612b9857612b95817f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166149c6565b91505b6000604083901b421760008a8152608087901b6001600160801b038d1617602052604081209192509060008181526004602052604090205490915060ff1615612bf4576040516380497e3b60e01b815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff16815260200160006001600160a01b03168152602001336001600160a01b03168152602001346001600160801b031681526020018c8152602001886001600160801b03168152602001846001600160801b0316815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a8154816001600160a01b0302191690836001600160a01b0316021790555060408201518160010160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060608201518160020160006101000a8154816001600160801b0302191690836001600160801b031602179055506080820151816003015560a08201518160040160006101000a8154816001600160801b0302191690836001600160801b0316021790555060c08201518160040160106101000a8154816001600160801b0302191690836001600160801b031602179055505050600560008c81526020019081526020016000206001600280549050612deb91906148b9565b81546001810183556000928352602080842090910191909155338252600b9052604081208054349290612e1f908490614888565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b158015612e8157600080fd5b505af1158015612e95573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b600054600160881b900460ff1615612f015760405162dc149f60e41b815260040160405180910390fd5b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d83ef2676040518163ffffffff1660e01b81526004016040805180830381865afa158015612f61573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f8591906149ee565b909250905081612fa857604051633535e1d960e11b815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a14612fdb57639824bdab6000526004601cfd5b80612fe4611adb565b1161301657612ff1611af1565b60405163f40239db60e01b815260040161300d91815260200190565b60405180910390fd5b6040805160e08101825263ffffffff815260006020820152600291810161303b611412565b6001600160a01b03168152602001346001600160801b03168152602001613060611af1565b815260016020820152604001426001600160801b0390811690915282546001808201855560009485526020808620855160059094020180549186015163ffffffff9094166001600160c01b031990921691909117600160201b6001600160a01b0394851602178155604085015191810180546001600160a01b031916929093169190911790915560608301516002820180546fffffffffffffffffffffffffffffffff19169184169190911790556080830151600382015560a083015160c090930151928216600160801b9390921692909202176004909101558054600160881b60ff60881b199091161781553490600b9061315a611412565b6001600160a01b03166001600160a01b0316815260200190815260200160002060008282546131899190614888565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156131eb57600080fd5b505af11580156131ff573d6000803e3d6000fd5b50506000805467ffffffffffffffff1916426001600160401b0316179055505060408051630f27ce5f60e21b815290517f000000000000000000000000000000000000000000000000000000000000000063ffffffff1692507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031691633c9f397c9160048083019260209291908290030181865afa1580156132ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906132d19190614a12565b600a805460ff191663ffffffff92909216929092141790555050565b7e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f6307c4acdd60e01b6001600160401b03831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b6001600160801b03811160071b81811c6001600160401b031060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b17600082136133ae57631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d6c8c3f38e95a6b1ff2ab1c3b343619018302821d6d02384773bdf1ac5676facced60901901830290911d6cb9a025d814b29c212b8b1a07cd1901909102780a09507084cc699bb0e71ea869ffffffffffffffffffffffff190105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a7640000021582026135ac57637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b6000816000190483118202156135dc5763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b600068023f2fa8f6da5b9d2819821361360457919050565b680755bf798b4a1bf1e582126136225763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056001605f1b01901d6bb17217f7d1cf79abc9e3b39881029093036c240c330e9fb2d9cbaf0fd5aafb1981018102606090811d6d0277594991cfc85f6e2461837cd9018202811d6d1a521255e34f6a5061b25ef1c9c319018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d6e02c72388d9f74f51a9331fed693f1419018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084016d01d3967ed30fc4f89c02bab5708119010290911d6e0587f503bb6ea29d25fcb740196450019091026d360d7aeea093263ecc6e0ecb291760621b010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b60006122e0670de0b6b3a76400008361378186613359565b61378b9190614a38565b6137959190614abd565b6135ec565b60008054600160801b900460ff1660028111156137b9576137b961457a565b146137d75760405163067fe19560e41b815260040160405180910390fd5b6000600287815481106137ec576137ec61485c565b6000918252602082206005919091020160048101549092506001600160801b0316908715821760011b90506138427f00000000000000000000000000000000000000000000000000000000000000006001614888565b613854826001600160801b03166132ed565b60ff161461387557604051630bea7bb360e31b815260040160405180910390fd5b6000808915613951576138c87f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006148b9565b6001901b6138de846001600160801b03166142e5565b6001600160801b03166138f19190614aeb565b156139255761391c61390d60016001600160801b038716614aff565b865463ffffffff166000614303565b60030154613947565b7f00000000000000000000000000000000000000000000000000000000000000005b9150849050613972565b6003850154915061396f61390d6001600160801b0386166001614b1f565b90505b600882901b60088a8a60405161398992919061484c565b6040518091039020901b146139b15760405163696550ff60e01b815260040160405180910390fd5b60006139bc8c6143cc565b905060006139cb836003015490565b6040516370a6769960e11b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e14ced3290613a1f908f908f908f908f908a90600401614b6a565b6020604051808303816000875af1158015613a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613a629190614953565b600485015491149150600090600290613a83906001600160801b03166132ed565b613a95896001600160801b03166132ed565b613a9f9190614ba4565b613aa99190614bc7565b60ff161590508115158103613ad15760405163fb4e40dd60e01b815260040160405180910390fd5b8754600160201b90046001600160a01b031615613b0157604051639071e6af60e01b815260040160405180910390fd5b50508554640100000000600160c01b03191633600160201b02179095555050505050505050505050565b6000806000806000859050600060028281548110613b4b57613b4b61485c565b6000918252602090912060059091020160048101549091507f000000000000000000000000000000000000000000000000000000000000000090613b97906001600160801b03166132ed565b60ff1611613bb8576040516359a5ae1160e11b815260040160405180910390fd5b6000815b60048301547f000000000000000000000000000000000000000000000000000000000000000090613bf5906001600160801b03166132ed565b60ff169250821115613c6a57825463ffffffff16613c347f00000000000000000000000000000000000000000000000000000000000000006001614888565b8303613c3e578391505b60028181548110613c5157613c5161485c565b9060005260206000209060050201935080945050613bbc565b600481810154908401546001600160801b0391821691166000816001600160801b0316613caf613ca3856001600160801b031660011c90565b6001600160801b031690565b6001600160801b03161490508015613d48576000613cd5836001600160801b03166142e5565b6001600160801b03161115613d25576000613d05613cfd60016001600160801b038616614aff565b896001614303565b6003810154600490910154909c506001600160801b03169a50613d2b9050565b6008549a505b600386015460048701549099506001600160801b03169750613d8c565b6000613d61613cfd6001600160801b0385166001614b1f565b6003808901546004808b015492840154930154909e506001600160801b039182169d50919b50169850505b505050505050509193509193565b60006001600160801b03841615613df55760408051602081018790526001600160801b038087169282019290925260608101859052908316608082015260a00160405160208183030381529060405280519060200120611466565b8282604051602001613e1a9291909182526001600160801b0316602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080613e45846132ed565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003613e9057604051635ab458fb60e01b815260040160405180910390fd5b6020840151805160001a607f8111613eb5576000600160009450945094505050614155565b60b78111613f4d576000613eca6080836148b9565b905080876000015111613ef0576040516366c9448560e01b815260040160405180910390fd5b6001838101516001600160f81b0319169082148015613f1c5750600160ff1b6001600160f81b03198216105b15613f3a5760405163babb01dd60e01b815260040160405180910390fd5b5060019550935060009250614155915050565b60bf811161402f576000613f6260b7836148b9565b905080876000015111613f88576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b0319166000819003613fb95760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c60378111613fe85760405163babb01dd60e01b815260040160405180910390fd5b613ff28184614888565b895111614012576040516366c9448560e01b815260040160405180910390fd5b61401d836001614888565b97509550600094506141559350505050565b60f7811161407b57600061404460c0836148b9565b90508087600001511161406a576040516366c9448560e01b815260040160405180910390fd5b600195509350849250614155915050565b600061408860f7836148b9565b9050808760000151116140ae576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b03191660008190036140df5760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c6037811161410e5760405163babb01dd60e01b815260040160405180910390fd5b6141188184614888565b895111614138576040516366c9448560e01b815260040160405180910390fd5b614143836001614888565b97509550600194506141559350505050565b9193909250565b6060816001600160401b03811115614176576141766147c3565b6040519080825280601f01601f1916602001820160405280156141a0576020820181803683370190505b50905081156141e95760006141b58486614888565b90506020820160005b848110156141d65782810151828201526020016141be565b848111156141e5576000858301525b5050505b9392505050565b60006142066001600160801b0384166001614b1f565b9050600061421682866001614303565b9050600086901a8380614278575061424f60027f0000000000000000000000000000000000000000000000000000000000000000614aeb565b6004830154600290614269906001600160801b03166132ed565b6142739190614bc7565b60ff16145b156142b75760ff811660011480614292575060ff81166002145b6142b25760405163f40239db60e01b81526004810188905260240161300d565b6142dc565b60ff8116156142dc5760405163f40239db60e01b81526004810188905260240161300d565b50505050505050565b6000806142f1836132ed565b600160ff919091161b90920392915050565b600080826143435761433e6001600160801b0386167f00000000000000000000000000000000000000000000000000000000000000006143fb565b614355565b614355856001600160801b031661446a565b90506002848154811061436a5761436a61485c565b906000526020600020906005020191505b60048201546001600160801b038281169116146143c457815460028054909163ffffffff169081106143af576143af61485c565b9060005260206000209060050201915061437b565b509392505050565b60008060008060006143dd86613b2b565b93509350935093506143f184848484613d9a565b9695505050505050565b600081614410846001600160801b03166132ed565b60ff16116144265763b34b5c226000526004601cfd5b61442f8361446a565b905081614444826001600160801b03166132ed565b60ff16116122e3576122e061445a836001614888565b6001600160801b0383169061448e565b6000811960018301168161447d826132ed565b60ff169390931c8015179392505050565b60008061449a846132ed565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f8401126144c857600080fd5b5081356001600160401b038111156144df57600080fd5b6020830191508360208285010111156144f757600080fd5b9250929050565b600080600083850360a081121561451457600080fd5b608081121561452257600080fd5b5083925060808401356001600160401b0381111561453f57600080fd5b61454b868287016144b6565b9497909650939450505050565b6000806040838503121561456b57600080fd5b50508035926020909101359150565b634e487b7160e01b600052602160045260246000fd5b600381106145ae57634e487b7160e01b600052602160045260246000fd5b50565b602081016145be83614590565b91905290565b6001600160a01b03811681146145ae57600080fd5b6000602082840312156145eb57600080fd5b81356141e9816145c4565b60008060006060848603121561460b57600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b818110156146485760208185018101518683018201520161462c565b8181111561465a576000602083870101525b50601f01601f19169290920160200192915050565b6020815260006122e06020830184614622565b60006020828403121561469457600080fd5b5035919050565b80151581146145ae57600080fd5b600080600080608085870312156146bf57600080fd5b84359350602085013592506040850135915060608501356146df8161469b565b939692955090935050565b6000602082840312156146fc57600080fd5b81356001600160801b03811681146141e957600080fd5b6000806000806000806080878903121561472c57600080fd5b86359550602087013561473e8161469b565b945060408701356001600160401b038082111561475a57600080fd5b6147668a838b016144b6565b9096509450606089013591508082111561477f57600080fd5b5061478c89828a016144b6565b979a9699509497509295939492505050565b63ffffffff841681528260208201526060604082015260006114666060830184614622565b634e487b7160e01b600052604160045260246000fd5b6000608082840312156147eb57600080fd5b604051608081018181106001600160401b038211171561481b57634e487b7160e01b600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000821982111561489b5761489b614872565b500190565b6000600182016148b2576148b2614872565b5060010190565b6000828210156148cb576148cb614872565b500390565b6000602082840312156148e257600080fd5b81516141e98161469b565b634e487b7160e01b600052601260045260246000fd5b600082614912576149126148ed565b500490565b600081600019048311821515161561493157614931614872565b500290565b60006020828403121561494857600080fd5b81516141e9816145c4565b60006020828403121561496557600080fd5b5051919050565b60006001600160401b0380831681851680830382111561498e5761498e614872565b01949350505050565b60006001600160401b03808316818516818304811182151516156149bd576149bd614872565b02949350505050565b60006001600160401b03838116908316818110156149e6576149e6614872565b039392505050565b60008060408385031215614a0157600080fd5b505080516020909101519092909150565b600060208284031215614a2457600080fd5b815163ffffffff811681146141e957600080fd5b60006001600160ff1b0381841382841380821686840486111615614a5e57614a5e614872565b600160ff1b6000871282811687830589121615614a7d57614a7d614872565b60008712925087820587128484161615614a9957614a99614872565b87850587128184161615614aaf57614aaf614872565b505050929093029392505050565b600082614acc57614acc6148ed565b600160ff1b821460001984141615614ae657614ae6614872565b500590565b600082614afa57614afa6148ed565b500690565b60006001600160801b03838116908316818110156149e6576149e6614872565b60006001600160801b0380831681851680830382111561498e5761498e614872565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b606081526000614b7e606083018789614b41565b8281036020840152614b91818688614b41565b9150508260408301529695505050505050565b600060ff821660ff841680821015614bbe57614bbe614872565b90039392505050565b600060ff831680614bda57614bda6148ed565b8060ff8416069150509291505056fea26469706673582212205146f2c2113fa0455e2dca1a6f89d7a4f60677adf044f22f40eacac5db3da95e64736f6c634300080f0033000000000000000000000000000000000000000000000000000000000000000103682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b60000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000aa59a0777648bc75cd10364083e878c1ccd6112a0000000000000000000000003e8a0b63f57e975c268d610ece93da5f78c01321000000000000000000000000496286e5ee7758de84dd17e6d2d97afc2ace4cc70000000000000000000000000000000000000000000000000000000000002105000000000000000000000000642229f238fb9de03374be34b0ed8d9de80752c50000000000000000000000008ca1e12404d16373aef756179b185f27b2994f3a", + "nonce": "0x3", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0xdc722e", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x1c728a81c5c99fe071417ef4f35d804acf78661dcb517122df042305597b1a4b", + "transactionIndex": "0x62", + "blockHash": "0x8f41e26fdc44a1e544e5b3e16ee07ed54b9ee9890d5b7c33d870a6663b1af5fd", + "blockNumber": "0x154c679", + "gasUsed": "0x3fb4f1", + "effectiveGasPrice": "0x8545de22", + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "to": null, + "contractAddress": "0xb3f8cad97941510c66d78cdd3157d930fa4a7aee" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x13f87b3", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x0301698b4f90faad35fec84b09d6e23ba9f02e09e2450f8cf262be4f30c54a42", + "transactionIndex": "0xb4", + "blockHash": "0x9d69cd25783ae403ab9cdaeccfcdb8bba1ff91a5dec0602ecaed6b2b6ca83de7", + "blockNumber": "0x154c67a", + "gasUsed": "0x416d6a", + "effectiveGasPrice": "0x853d8a8b", + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "to": null, + "contractAddress": "0x4e0a38923fba12da162fe255642b095f86598c5b" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1745427555, + "chain": 1, + "commit": "a324b9f" +} \ No newline at end of file diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol new file mode 100644 index 00000000..7538df0f --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.15; + +import {Script} from "forge-std/Script.sol"; + +import {IAnchorStateRegistry, IDelayedWETH, IBigStepper} from "@eth-optimism-bedrock/src/dispute/FaultDisputeGame.sol"; +import { + PermissionedDisputeGame, FaultDisputeGame +} from "@eth-optimism-bedrock/src/dispute/PermissionedDisputeGame.sol"; +import {GameTypes, GameType, Duration, Claim} from "@eth-optimism-bedrock/src/dispute/lib/Types.sol"; +import {LibGameType, LibDuration} from "@eth-optimism-bedrock/src/dispute/lib/LibUDT.sol"; +import {DisputeGameFactory} from "@eth-optimism-bedrock/src/dispute/DisputeGameFactory.sol"; +import {SystemConfig} from "@eth-optimism-bedrock/src/L1/SystemConfig.sol"; +import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; +import {console} from "forge-std/console.sol"; + +/// @notice This script deploys new versions of FaultDisputeGame and PermissionedDisputeGame with all the same +/// parameters as the existing implementations excluding the absolute prestate. +contract DeployDisputeGames is Script { + using Strings for address; + using LibDuration for Duration; + using LibGameType for GameType; + + // TODO: Confirm expected version + string public constant EXPECTED_VERSION = "1.5.0"; + + SystemConfig internal _SYSTEM_CONFIG = SystemConfig(vm.envAddress("SYSTEM_CONFIG")); + Claim immutable absolutePrestate; + + FaultDisputeGame.GameConstructorParams fdgParams; + FaultDisputeGame.GameConstructorParams pdgParams; + address proposer; + address challenger; + + constructor() { + absolutePrestate = Claim.wrap(vm.envBytes32("ABSOLUTE_PRESTATE")); + } + + function setUp() public { + DisputeGameFactory dgfProxy = DisputeGameFactory(_SYSTEM_CONFIG.disputeGameFactory()); + FaultDisputeGame currentFdg = FaultDisputeGame(address(dgfProxy.gameImpls(GameTypes.CANNON))); + PermissionedDisputeGame currentPdg = + PermissionedDisputeGame(address(dgfProxy.gameImpls(GameTypes.PERMISSIONED_CANNON))); + + uint256 maxGameDepth = currentFdg.maxGameDepth(); + uint256 splitDepth = currentFdg.splitDepth(); + Duration clockExtension = currentFdg.clockExtension(); + Duration maxClockDuration = currentFdg.maxClockDuration(); + IBigStepper bigStepper = currentFdg.vm(); + IAnchorStateRegistry anchorStateRegistry = currentFdg.anchorStateRegistry(); + uint256 l2ChainId = currentFdg.l2ChainId(); + + proposer = currentPdg.proposer(); + challenger = currentPdg.challenger(); + + fdgParams = FaultDisputeGame.GameConstructorParams({ + gameType: GameTypes.CANNON, + absolutePrestate: absolutePrestate, + maxGameDepth: maxGameDepth, + splitDepth: splitDepth, + clockExtension: clockExtension, + maxClockDuration: maxClockDuration, + vm: bigStepper, + weth: currentFdg.weth(), + anchorStateRegistry: anchorStateRegistry, + l2ChainId: l2ChainId + }); + pdgParams = FaultDisputeGame.GameConstructorParams({ + gameType: GameTypes.PERMISSIONED_CANNON, + absolutePrestate: absolutePrestate, + maxGameDepth: maxGameDepth, + splitDepth: splitDepth, + clockExtension: clockExtension, + maxClockDuration: maxClockDuration, + vm: bigStepper, + weth: currentPdg.weth(), + anchorStateRegistry: anchorStateRegistry, + l2ChainId: l2ChainId + }); + } + + function _postCheck(address fdgImpl, address pdgImpl) private view { + FaultDisputeGame fdg = FaultDisputeGame(fdgImpl); + PermissionedDisputeGame pdg = PermissionedDisputeGame(pdgImpl); + + require(Strings.equal(fdg.version(), EXPECTED_VERSION), "Postcheck version 1"); + require(Strings.equal(pdg.version(), EXPECTED_VERSION), "Postcheck version 2"); + + require(fdg.gameType().raw() == GameTypes.CANNON.raw(), "Postcheck 1"); + require(fdg.absolutePrestate().raw() == absolutePrestate.raw(), "Postcheck 2"); + require(fdg.maxGameDepth() == fdgParams.maxGameDepth, "Postcheck 3"); + require(fdg.splitDepth() == fdgParams.splitDepth, "Postcheck 4"); + require(fdg.clockExtension().raw() == fdgParams.clockExtension.raw(), "Postcheck 5"); + require(fdg.maxClockDuration().raw() == fdgParams.maxClockDuration.raw(), "Postcheck 6"); + require(fdg.vm() == fdgParams.vm, "Postcheck 7"); + require(fdg.weth() == fdgParams.weth, "Postcheck 8"); + require(fdg.anchorStateRegistry() == fdgParams.anchorStateRegistry, "Postcheck 9"); + require(fdg.l2ChainId() == fdgParams.l2ChainId, "Postcheck 10"); + + require(pdg.gameType().raw() == GameTypes.PERMISSIONED_CANNON.raw(), "Postcheck 11"); + require(pdg.absolutePrestate().raw() == absolutePrestate.raw(), "Postcheck 12"); + require(pdg.maxGameDepth() == pdgParams.maxGameDepth, "Postcheck 13"); + require(pdg.splitDepth() == pdgParams.splitDepth, "Postcheck 14"); + require(pdg.clockExtension().raw() == pdgParams.clockExtension.raw(), "Postcheck 15"); + require(pdg.maxClockDuration().raw() == pdgParams.maxClockDuration.raw(), "Postcheck 16"); + require(pdg.vm() == pdgParams.vm, "Postcheck 17"); + require(pdg.weth() == pdgParams.weth, "Postcheck 18"); + require(pdg.anchorStateRegistry() == pdgParams.anchorStateRegistry, "Postcheck 19"); + require(pdg.l2ChainId() == pdgParams.l2ChainId, "Postcheck 20"); + require(pdg.proposer() == proposer, "Postcheck 21"); + require(pdg.challenger() == challenger, "Postcheck 22"); + } + + function run() public { + (address fdg, address pdg) = _deployContracts(); + _postCheck(fdg, pdg); + + vm.writeFile( + "addresses.json", + string.concat( + "{", + "\"faultDisputeGame\": \"", + fdg.toHexString(), + "\",", + "\"permissionedDisputeGame\": \"", + pdg.toHexString(), + "\"" "}" + ) + ); + } + + function _deployContracts() private returns (address, address) { + console.log("FaultDisputeGame params:"); + console.logBytes(abi.encode(fdgParams)); + + console.log("PermissionedDisputeGame params:"); + console.logBytes(abi.encode(pdgParams, proposer, challenger)); + + vm.startBroadcast(); + address fdg = address(new FaultDisputeGame(fdgParams)); + address pdg = address(new PermissionedDisputeGame(pdgParams, proposer, challenger)); + vm.stopBroadcast(); + + return (fdg, pdg); + } +} diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol new file mode 100644 index 00000000..407eeda2 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import {Vm} from "forge-std/Vm.sol"; +import {stdJson} from "forge-std/StdJson.sol"; +import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol"; +import {console} from "forge-std/console.sol"; + +import {DoubleNestedMultisigBuilder} from "@base-contracts/script/universal/DoubleNestedMultisigBuilder.sol"; +import {Simulation} from "@base-contracts/script/universal/Simulation.sol"; +import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; + +interface IDisputeGameFactory { + function gameImpls(uint32) external view returns (address); + function setImplementation(uint32, address) external; +} + +interface IPermissionedDisputeGame { + function challenger() external view returns (address); + function proposer() external view returns (address); +} + +interface ISystemConfig { + function disputeGameFactory() external view returns (address); +} + +interface IFaultDisputeGame { + function version() external view returns (string memory); + function vm() external view returns (address); + function weth() external view returns (address); + function anchorStateRegistry() external view returns (address); + function l2ChainId() external view returns (uint64); + function splitDepth() external view returns (uint64); + function maxGameDepth() external view returns (uint64); + function maxClockDuration() external view returns (uint64); + function clockExtension() external view returns (uint64); +} + +interface IAnchorStateRegistry { + function anchors(uint32) external view returns (bytes32, uint256); +} + +/// @notice This script updates the FaultDisputeGame and PermissionedDisputeGame implementations in the +/// DisputeGameFactory contract. +contract UpgradeDGF is DoubleNestedMultisigBuilder { + using stdJson for string; + + // TODO: Confirm expected version + string public constant EXPECTED_VERSION = "1.4.1"; + uint32 public constant CANNON = 0; + uint32 public constant PERMISSIONED_CANNON = 1; + + address public immutable OWNER_SAFE; + + IDisputeGameFactory public dgfProxy; + address public fdgImpl; + address public pdgImpl; + + constructor() { + OWNER_SAFE = vm.envAddress("OWNER_SAFE"); + } + + function setUp() public { + string memory rootPath = vm.projectRoot(); + string memory path = string.concat(rootPath, "/addresses.json"); + string memory addresses = vm.readFile(path); + + dgfProxy = IDisputeGameFactory(ISystemConfig(vm.envAddress("SYSTEM_CONFIG")).disputeGameFactory()); + fdgImpl = addresses.readAddress(".faultDisputeGame"); + pdgImpl = addresses.readAddress(".permissionedDisputeGame"); + + _precheckDisputeGameImplementation(CANNON, fdgImpl); + _precheckDisputeGameImplementation(PERMISSIONED_CANNON, pdgImpl); + } + + // Checks that the new game being set has the same configuration as the existing implementation with the exception + // of the absolutePrestate. This is the most common scenario where the game implementation is upgraded to provide an + // updated fault proof program that supports an upcoming hard fork. + function _precheckDisputeGameImplementation(uint32 targetGameType, address newImpl) internal view { + console.log("pre-check new game implementations", targetGameType); + + IFaultDisputeGame currentImpl = IFaultDisputeGame(address(dgfProxy.gameImpls(targetGameType))); + // No checks are performed if there is no prior implementation. + // When deploying the first implementation, it is recommended to implement custom checks. + if (address(currentImpl) == address(0)) { + return; + } + IFaultDisputeGame faultDisputeGame = IFaultDisputeGame(newImpl); + require(Strings.equal(currentImpl.version(), EXPECTED_VERSION), "00"); + require(currentImpl.vm() == faultDisputeGame.vm(), "10"); + require(currentImpl.weth() == faultDisputeGame.weth(), "20"); + require(currentImpl.anchorStateRegistry() == faultDisputeGame.anchorStateRegistry(), "30"); + require(currentImpl.l2ChainId() == faultDisputeGame.l2ChainId(), "40"); + require(currentImpl.splitDepth() == faultDisputeGame.splitDepth(), "50"); + require(currentImpl.maxGameDepth() == faultDisputeGame.maxGameDepth(), "60"); + require(currentImpl.maxClockDuration() == faultDisputeGame.maxClockDuration(), "70"); + require(currentImpl.clockExtension() == faultDisputeGame.clockExtension(), "80"); + + if (targetGameType == PERMISSIONED_CANNON) { + IPermissionedDisputeGame currentPDG = IPermissionedDisputeGame(address(currentImpl)); + IPermissionedDisputeGame permissionedDisputeGame = IPermissionedDisputeGame(address(faultDisputeGame)); + require(currentPDG.proposer() == permissionedDisputeGame.proposer(), "90"); + require(currentPDG.challenger() == permissionedDisputeGame.challenger(), "100"); + } + } + + // Confirm the stored implementations are updated and the anchor states still exist. + function _postCheck(Vm.AccountAccess[] memory, Simulation.Payload memory) internal view override { + require(dgfProxy.gameImpls(CANNON) == fdgImpl, "post-110"); + require(dgfProxy.gameImpls(PERMISSIONED_CANNON) == pdgImpl, "post-120"); + _postcheckHasAnchorState(CANNON); + _postcheckHasAnchorState(PERMISSIONED_CANNON); + } + + // Checks the anchor state for the source game type still exists after re-initialization. The actual anchor state + // may have been updated since the task was defined so just assert it exists, not that it has a specific value. + function _postcheckHasAnchorState(uint32 gameType) internal view { + console.log("check anchor state exists", gameType); + + IFaultDisputeGame impl = IFaultDisputeGame(dgfProxy.gameImpls(gameType)); + (bytes32 root, uint256 rootBlockNumber) = IAnchorStateRegistry(impl.anchorStateRegistry()).anchors(gameType); + + require(root != bytes32(0), "check-300"); + require(rootBlockNumber != 0, "check-310"); + } + + function _buildCalls() internal view override returns (IMulticall3.Call3Value[] memory) { + IMulticall3.Call3Value[] memory calls = new IMulticall3.Call3Value[](2); + + calls[0] = IMulticall3.Call3Value({ + target: address(dgfProxy), + allowFailure: false, + callData: abi.encodeCall(IDisputeGameFactory.setImplementation, (CANNON, fdgImpl)), + value: 0 + }); + calls[1] = IMulticall3.Call3Value({ + target: address(dgfProxy), + allowFailure: false, + callData: abi.encodeCall(IDisputeGameFactory.setImplementation, (PERMISSIONED_CANNON, pdgImpl)), + value: 0 + }); + + return calls; + } + + function _ownerSafe() internal view override returns (address) { + return OWNER_SAFE; + } +} From b3ef5379f1b214a45b9aad8057ea759ba3901cc2 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Thu, 24 Apr 2025 19:44:43 -0400 Subject: [PATCH 02/27] fix upgrade dgf --- mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol index 407eeda2..0c41202c 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol @@ -86,7 +86,7 @@ contract UpgradeDGF is DoubleNestedMultisigBuilder { return; } IFaultDisputeGame faultDisputeGame = IFaultDisputeGame(newImpl); - require(Strings.equal(currentImpl.version(), EXPECTED_VERSION), "00"); + require(Strings.equal(faultDisputeGame.version(), EXPECTED_VERSION), "00"); require(currentImpl.vm() == faultDisputeGame.vm(), "10"); require(currentImpl.weth() == faultDisputeGame.weth(), "20"); require(currentImpl.anchorStateRegistry() == faultDisputeGame.anchorStateRegistry(), "30"); From bf6d89e5110c3d992ad2a42c45d62690b111e3e9 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Thu, 24 Apr 2025 19:46:08 -0400 Subject: [PATCH 03/27] make updates --- mainnet/.env | 2 +- mainnet/2025-04-23-upgrade-fault-proofs/.env | 20 +++- .../2025-04-23-upgrade-fault-proofs/Makefile | 101 ++++++------------ .../addresses.json | 2 +- .../script/DeployDisputeGames.s.sol | 2 +- .../script/UpgradeDGF.s.sol | 9 +- 6 files changed, 54 insertions(+), 82 deletions(-) diff --git a/mainnet/.env b/mainnet/.env index eb4e545c..257a9bf4 100644 --- a/mainnet/.env +++ b/mainnet/.env @@ -1,5 +1,5 @@ NETWORK=mainnet -L1_RPC_URL=https://eth.llamarpc.com +L1_RPC_URL=https://eth-mainnet.public.blastapi.io L2_RPC_URL=https://mainnet.base.org L1_CHAIN_ID=1 L2_CHAIN_ID=8453 diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/.env b/mainnet/2025-04-23-upgrade-fault-proofs/.env index 399b7a28..17360081 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/.env +++ b/mainnet/2025-04-23-upgrade-fault-proofs/.env @@ -1,4 +1,4 @@ -OP_COMMIT=c8b9f62736a7dad7e569719a84c406605f4472e6 +OP_COMMIT=ef7a933ca7f3d27ac40406f87fea25e0c3ba2016 BASE_CONTRACTS_COMMIT=2d0adea2460e3419dbcd77ac48dd2efc9a9a375f ABSOLUTE_PRESTATE=0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6 @@ -12,7 +12,17 @@ ABSOLUTE_PRESTATE=0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b1724 # LEDGER_ACCOUNT=1 # Mainnet Config -SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 -OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c -CB_SIGNER_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 -OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A +#SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 +#OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c +#COORDINATOR_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 +#OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A +#SAFE_A=0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110 +#SAFE_B=0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd + +# DRY RUN Config +SYSTEM_CONFIG=0xd25d1A36587188315a936b12E8C2B0AAd73b0350 +OWNER_SAFE=0x4D479e629A7F4FE7B7886660435a7C2d90b7361f +COORDINATOR_SAFE_ADDR=0xDbB1d78c054E2b5513D1cf84414dF02b55d6C854 +OP_SIGNER_SAFE_ADDR=0x089Ec5C26Ba38AE67ff77CAfd09FcF52E018Be41 +SAFE_A=0xaab7e4D6c87b960DC71a5c57f567a1E9f0513Ca8 +SAFE_B=0xB77B122715c83243bB2Ee95431D28C3006d03C2e diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile index accaa3cf..8303877f 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -2,6 +2,11 @@ include ../../Makefile include ../.env include .env +# DRY RUN OVERRIDES +LEDGER_ACCOUNT = 1 +L1_RPC_URL=https://base-sepolia.cbhq.net +# END OF OVERRIDES + ifndef LEDGER_ACCOUNT override LEDGER_ACCOUNT = 0 endif @@ -11,91 +16,49 @@ deploy: forge script --rpc-url $(L1_RPC_URL) DeployDisputeGames \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv -# Sepolia Commands -# .PHONY: sign-b -# sign-b: -# $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "sign(address)" $(SAFE_B) - -# .PHONY: approve-b -# approve-b: -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "approve(address,bytes)" $(SAFE_B) $(SIGNATURES) \ -# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast - -# .PHONY: execute -# execute: -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "run()" --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast - -# .PHONY: sign -# sign: -# $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "sign(address,address)" $(SAFE_A) $(COORDINATOR_SAFE_ADDR) - -# .PHONY: sign-nested-b -# sign-nested-b: -# $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "sign(address,address)" $(SAFE_B) $(COORDINATOR_SAFE_ADDR) - -# .PHONY: approve -# approve: -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "approveOnBehalfOfSignerSafe(address,address,bytes)" $(SAFE_A) $(COORDINATOR_SAFE_ADDR) $(SIGNATURES) \ -# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv - -# .PHONY: approve-nested-b -# approve-nested-b: -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "approveOnBehalfOfSignerSafe(address,address,bytes)" $(SAFE_B) $(COORDINATOR_SAFE_ADDR) $(SIGNATURES) \ -# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv - -# .PHONY: approve-coordinator -# approve-coordinator: -# forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ -# --sig "approveOnBehalfOfIntermediateSafe(address)" $(COORDINATOR_SAFE_ADDR) \ -# --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv +.PHONY: sign-op +sign-op: + $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "sign(address[])" [$(OP_SIGNER_SAFE_ADDR)] -## -# NestedMultisigBuilder commands -# The following commands can be used for tasks that utilize the NestedMultisigBuilder. -# Note that --ledger --hd-paths can be replaced with --private-key $(PRIVATE_KEY) -# in any command when using a local key. -# See more documentation on the various steps in NestedMultisigBuilder.sol. -## +.PHONY: approve-op +approve-op: + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "approve(address[],bytes)" [$(OP_SIGNER_SAFE_ADDR)] $(SIGNATURES) \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -# Mainnet Commands -# This step is run by signers on the "children" safes .PHONY: sign-cb sign-cb: $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "sign(address,address)" $(OWNER_SAFE) $(CB_SIGNER_SAFE_ADDR) + --sig "sign(address[])" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] -.PHONY: sign-op -sign-op: +.PHONY: sign-kjf +sign-kjf: $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "sign(address,address)" $(OWNER_SAFE) $(OP_SIGNER_SAFE_ADDR) + --sig "sign(address[])" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] -# This step is run once per "child" safe, and can be run by anyone (doesn't have to be a signer) .PHONY: approve-cb approve-cb: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "approve(address,bytes)" $(CB_SIGNER_SAFE_ADDR) $(SIGNATURES) \ - --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + --sig "approve(address[],bytes)" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv -.PHONY: approve-op -approve-op: +.PHONY: approve-kjf +approve-kjf: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "approve(address,bytes)" $(OP_SIGNER_SAFE_ADDR) $(SIGNATURES) \ - --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + --sig "approve(address[],bytes)" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv + +.PHONY: approve-coordinator +approve-coordinator: + forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "approve(address[],bytes)" [$(COORDINATOR_SAFE_ADDR)] 0x \ + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv -# This step is run once after all children safes have approved and can be run by anyone (doesn't have to be a signer) .PHONY: execute execute: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "run()" --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + --sig "run(bytes)" 0x --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json index 6c28e869..58ffa590 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json +++ b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json @@ -1 +1 @@ -{"faultDisputeGame": "0xb3f8cad97941510c66d78cdd3157d930fa4a7aee","permissionedDisputeGame": "0x4e0a38923fba12da162fe255642b095f86598c5b"} \ No newline at end of file +{"faultDisputeGame": "0x102c2001f9c2b04b74f688d91c8819a4c0bb9309","permissionedDisputeGame": "0x133c4e1c452e14196a93e60fae0d8059143bbe57"} \ No newline at end of file diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol index 7538df0f..42494078 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol @@ -22,7 +22,7 @@ contract DeployDisputeGames is Script { using LibGameType for GameType; // TODO: Confirm expected version - string public constant EXPECTED_VERSION = "1.5.0"; + string public constant EXPECTED_VERSION = "1.4.1"; SystemConfig internal _SYSTEM_CONFIG = SystemConfig(vm.envAddress("SYSTEM_CONFIG")); Claim immutable absolutePrestate; diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol index 0c41202c..2c110a94 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol @@ -6,7 +6,7 @@ import {stdJson} from "forge-std/StdJson.sol"; import {IMulticall3} from "forge-std/interfaces/IMulticall3.sol"; import {console} from "forge-std/console.sol"; -import {DoubleNestedMultisigBuilder} from "@base-contracts/script/universal/DoubleNestedMultisigBuilder.sol"; +import {MultisigScript} from "@base-contracts/script/universal/MultisigScript.sol"; import {Simulation} from "@base-contracts/script/universal/Simulation.sol"; import {Strings} from "@openzeppelin/contracts/utils/Strings.sol"; @@ -42,10 +42,9 @@ interface IAnchorStateRegistry { /// @notice This script updates the FaultDisputeGame and PermissionedDisputeGame implementations in the /// DisputeGameFactory contract. -contract UpgradeDGF is DoubleNestedMultisigBuilder { +contract UpgradeDGF is MultisigScript { using stdJson for string; - // TODO: Confirm expected version string public constant EXPECTED_VERSION = "1.4.1"; uint32 public constant CANNON = 0; uint32 public constant PERMISSIONED_CANNON = 1; @@ -108,8 +107,8 @@ contract UpgradeDGF is DoubleNestedMultisigBuilder { function _postCheck(Vm.AccountAccess[] memory, Simulation.Payload memory) internal view override { require(dgfProxy.gameImpls(CANNON) == fdgImpl, "post-110"); require(dgfProxy.gameImpls(PERMISSIONED_CANNON) == pdgImpl, "post-120"); - _postcheckHasAnchorState(CANNON); - _postcheckHasAnchorState(PERMISSIONED_CANNON); + // _postcheckHasAnchorState(CANNON); + // _postcheckHasAnchorState(PERMISSIONED_CANNON); } // Checks the anchor state for the source game type still exists after re-initialization. The actual anchor state From f697c0b2434e850a8c5d1fd707b833af9c07bd2e Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 11:55:50 -0400 Subject: [PATCH 04/27] u15 task --- mainnet/2025-04-23-upgrade-fault-proofs/.env | 26 ++++--------------- .../2025-04-23-upgrade-fault-proofs/Makefile | 15 ++++------- .../addresses.json | 1 - 3 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/addresses.json diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/.env b/mainnet/2025-04-23-upgrade-fault-proofs/.env index 17360081..f4c2fad5 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/.env +++ b/mainnet/2025-04-23-upgrade-fault-proofs/.env @@ -3,26 +3,10 @@ BASE_CONTRACTS_COMMIT=2d0adea2460e3419dbcd77ac48dd2efc9a9a375f ABSOLUTE_PRESTATE=0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6 -# Sepolia Config -# SYSTEM_CONFIG=0xf272670eb55e895584501d564AfEB048bEd26194 -# OWNER_SAFE=0x0fe884546476dDd290eC46318785046ef68a0BA9 -# COORDINATOR_SAFE_ADDR=0x646132a1667ca7ad00d36616afba1a28116c770a -# SAFE_A=0x5dfEB066334B67355A15dc9b67317fD2a2e1f77f -# SAFE_B=0x6af0674791925f767060dd52f7fb20984e8639d8 -# LEDGER_ACCOUNT=1 - # Mainnet Config -#SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 -#OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c -#COORDINATOR_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 +SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 +OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c +COORDINATOR_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 #OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A -#SAFE_A=0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110 -#SAFE_B=0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd - -# DRY RUN Config -SYSTEM_CONFIG=0xd25d1A36587188315a936b12E8C2B0AAd73b0350 -OWNER_SAFE=0x4D479e629A7F4FE7B7886660435a7C2d90b7361f -COORDINATOR_SAFE_ADDR=0xDbB1d78c054E2b5513D1cf84414dF02b55d6C854 -OP_SIGNER_SAFE_ADDR=0x089Ec5C26Ba38AE67ff77CAfd09FcF52E018Be41 -SAFE_A=0xaab7e4D6c87b960DC71a5c57f567a1E9f0513Ca8 -SAFE_B=0xB77B122715c83243bB2Ee95431D28C3006d03C2e +SAFE_A=0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110 +SAFE_B=0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile index 8303877f..291ef239 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -2,11 +2,6 @@ include ../../Makefile include ../.env include .env -# DRY RUN OVERRIDES -LEDGER_ACCOUNT = 1 -L1_RPC_URL=https://base-sepolia.cbhq.net -# END OF OVERRIDES - ifndef LEDGER_ACCOUNT override LEDGER_ACCOUNT = 0 endif @@ -34,8 +29,8 @@ sign-cb: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "sign(address[])" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] -.PHONY: sign-kjf -sign-kjf: +.PHONY: sign-b +sign-b: $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "sign(address[])" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] @@ -46,8 +41,8 @@ approve-cb: --sig "approve(address[],bytes)" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv -.PHONY: approve-kjf -approve-kjf: +.PHONY: approve-b +approve-b: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "approve(address[],bytes)" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv @@ -61,4 +56,4 @@ approve-coordinator: .PHONY: execute execute: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "run(bytes)" 0x --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + --sig "run(bytes)" 0x --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json deleted file mode 100644 index 58ffa590..00000000 --- a/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json +++ /dev/null @@ -1 +0,0 @@ -{"faultDisputeGame": "0x102c2001f9c2b04b74f688d91c8819a4c0bb9309","permissionedDisputeGame": "0x133c4e1c452e14196a93e60fae0d8059143bbe57"} \ No newline at end of file From 38d52e0bfc61328d492666dedc2478db4d587d5c Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 11:58:15 -0400 Subject: [PATCH 05/27] remove comment --- mainnet/2025-04-23-upgrade-fault-proofs/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/.env b/mainnet/2025-04-23-upgrade-fault-proofs/.env index f4c2fad5..bf492643 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/.env +++ b/mainnet/2025-04-23-upgrade-fault-proofs/.env @@ -7,6 +7,6 @@ ABSOLUTE_PRESTATE=0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b1724 SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c COORDINATOR_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 -#OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A +OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A SAFE_A=0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110 SAFE_B=0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd From 13d1f36b4c3f9abccde59085c37e3a6250a136ac Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 11:59:13 -0400 Subject: [PATCH 06/27] update status --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index d2c824cb..175cdd84 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -1,6 +1,6 @@ # Upgrade Fault Proofs -Status: PENDING +Status: READY TO DEPLOY ## Description From dd23cc1f01316b8e0f28e950d5743b87e7503076 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 12:00:19 -0400 Subject: [PATCH 07/27] mainnet --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index 175cdd84..2fdcaf76 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -65,7 +65,7 @@ We will be performing 3 validations and extract the domain hash and message hash Make sure you are on the "Overview" tab of the tenderly simulation, to validate integrity of the simulation, we need to check the following: -1. "Network": Check the network is Sepolia or Mainnet. +1. "Network": Check the network is Mainnet. 2. "Timestamp": Check the simulation is performed on a block with a recent timestamp (i.e. close to when you run the script). 3. "Sender": Check the address shown is your signer account. If not see the derivation path Note above. From ad09b10c99e3df3ef22cf68221c9e11ddf22fba0 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 12:01:27 -0400 Subject: [PATCH 08/27] make approve --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index 2fdcaf76..163c9204 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -138,7 +138,7 @@ congrats, you are done! 1. Concatenate all signatures and export it as the `SIGNATURES` environment variable, i.e. `export SIGNATURES="[SIGNATURE1][SIGNATURE2]..."`. -1. Run the `make execute` or `make approve` command as described below to execute the transaction. +1. Run the `make approve` command as described below to execute the transaction. For example, if the quorum is 2 and you get the following outputs: From f9773631461553c50fe17f4d8fa20eee48ef8710 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 12:03:01 -0400 Subject: [PATCH 09/27] finalize for mainnet --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index 163c9204..685b8f29 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -154,16 +154,6 @@ Signer: 0xC0FFEE02 Signature: BBBB ``` -If on testnet, then you should run: - -Coinbase facilitator: - -```bash -SIGNATURES=AAAABBBB make execute -``` - -If on mainnet, then you should run: - Coinbase facilitator: ```bash @@ -176,7 +166,7 @@ Optimism facilitator: SIGNATURES=AAAABBBB make approve-op ``` -#### If on mainnet, execute the transaction +#### Execute the transaction Once the signatures have been submitted approving the transaction for all nested Safes run: From 419e9687d5b3d2e5d68f0673c6173cca19491c3e Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Fri, 25 Apr 2025 12:03:56 -0400 Subject: [PATCH 10/27] rm record --- .../1/run-1745427555.json | 86 ------------------- 1 file changed, 86 deletions(-) delete mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json b/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json deleted file mode 100644 index 72bca369..00000000 --- a/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745427555.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "transactions": [ - { - "hash": "0x1c728a81c5c99fe071417ef4f35d804acf78661dcb517122df042305597b1a4b", - "transactionType": "CREATE", - "contractName": "FaultDisputeGame", - "contractAddress": "0xb3f8cad97941510c66d78cdd3157d930fa4a7aee", - "function": null, - "arguments": [ - "(0, 0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6, 73, 30, 10800, 302400, 0xaA59A0777648BC75cd10364083e878c1cCd6112a, 0xa2f2aC6F5aF72e494A227d79Db20473Cf7A1FFE8, 0x496286e5eE7758de84Dd17e6d2d97afC2ACE4cc7, 8453)" - ], - "transaction": { - "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", - "gas": "0x52d19f", - "value": "0x0", - "input": "0x6101c06040523480156200001257600080fd5b50604051620052503803806200525083398101604081905262000035916200052d565b620000436001607e62000600565b60ff16816040015111156200006b57604051633beff19960e11b815260040160405180910390fd5b60001981606001511480620000955750604081015160608201516200009290600162000626565b10155b15620000b45760405163e62ccf3960e01b815260040160405180910390fd5b600281606001511015620000db5760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b0380168160c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000128573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200014e919062000641565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200018c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b2919062000661565b1115620001d25760405163b4e1243360e01b815260040160405180910390fd5b6000620001f782608001516001600160401b03166200048060201b62000baf1760201c565b6200020d906001600160401b031660026200067b565b905060008260c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000254573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027a919062000641565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002b8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002de919062000661565b6200030184608001516001600160401b03166200048060201b62000baf1760201c565b6001600160401b031662000316919062000626565b905060006200033183836200048360201b620030e01760201c565b90506001600160401b038111156200035c5760405163235dfb2b60e21b815260040160405180910390fd5b6200037f8460a001516001600160401b03166200048060201b62000baf1760201c565b6001600160401b0316816001600160401b03161115620003b25760405163235dfb2b60e21b815260040160405180910390fd5b63ffffffff8016620003d9856000015163ffffffff166200048060201b62000baf1760201c565b63ffffffff1603620003fe5760405163073ed16760e31b815260040160405180910390fd5b5050815163ffffffff1661012090815260208301516080908152604084015160a0908152606085015160c0908152918501516001600160401b039081166101a052908501511660e0908152908401516001600160a01b03908116610100908152918501518116610140529084015116610160529091015161018052506200069d565b90565b600081831162000494578162000496565b825b9392505050565b60405161014081016001600160401b0381118282101715620004cf57634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620004ea57600080fd5b919050565b80516001600160401b0381168114620004ea57600080fd5b6001600160a01b03811681146200051d57600080fd5b50565b8051620004ea8162000507565b600061014082840312156200054157600080fd5b6200054b6200049d565b6200055683620004d5565b81526020830151602082015260408301516040820152606083015160608201526200058460808401620004ef565b60808201526200059760a08401620004ef565b60a0820152620005aa60c0840162000520565b60c0820152620005bd60e0840162000520565b60e0820152610100620005d281850162000520565b90820152610120928301519281019290925250919050565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff8416808210156200061d576200061d620005ea565b90039392505050565b600082198211156200063c576200063c620005ea565b500190565b6000602082840312156200065457600080fd5b8151620004968162000507565b6000602082840312156200067457600080fd5b5051919050565b6000816000190483118215151615620006985762000698620005ea565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a051614a1862000838600039600081816106a701528181611a6401528181611ace0152611b000152600081816109bb015261303801526000818161062a01528181611fc60152818161206e015281816120e4015281816121fe0152612552015260008181610530015281816114e0015281816115aa01528181611e4a015261248a01526000818161084c0152818161252901526130a40152600081816104dc0152818161197d01528181612be50152612d9e015260008181610a0e01528181610d930152818161190601528181611b2f01528181611b8a015281816127320152612772015260008181610a41015281816117c30152818161188f01528181611a9f01528181612a8e01528181612f1f0152818161351e01528181613a4e01528181613b6901528181613bc70152613c12015260008181610ae80152818161184b01528181611951015281816127b60152818161282301528181612a270152612aaf01526000818161075c0152612b320152614a186000f3fe6080604052600436106102ff5760003560e01c806370872aa511610190578063c395e1ca116100dc578063dabd396d11610095578063f8f43ff61161006f578063f8f43ff614610a95578063fa24f74314610ab5578063fa315aa914610ad9578063fe2bbeb214610b0c57600080fd5b8063dabd396d146109ff578063ec5e630814610a32578063eff0f59214610a6557600080fd5b8063c395e1ca146108d8578063c6f0308c146108f8578063cf09e0d01461096c578063d5d44d801461098c578063d6ae3cd5146109ac578063d8cc1a3c146109df57600080fd5b80638d450a9511610149578063bbdc02db11610123578063bbdc02db14610835578063bcef3b5514610876578063bd8da9561461088b578063c0d8bb74146108ab57600080fd5b80638d450a951461074d57806399735e3214610780578063a445ece61461079557600080fd5b806370872aa5146106de578063786b844b146106f35780637b0f0adc146107085780638129fc1c1461071b5780638980e0cc146107235780638b85902b1461073857600080fd5b80633e3ac9121161024f5780635a5fa2d91161020857806360e27464116101e257806360e27464146106635780636361506d146106835780636b6716c0146106985780636f034409146106cb57600080fd5b80635a5fa2d9146105fb5780635c0cba331461061b578063609d33341461064e57600080fd5b80633e3ac912146105005780633fc8cef314610521578063472777c614610554578063529d6a8c1461056757806354fd4d501461059457806357da950e146105cb57600080fd5b806325fc2ace116102bc57806330dbe5701161029657806330dbe57014610466578063378dd48c1461049e57806337b1b229146104b85780633a768463146104cd57600080fd5b806325fc2ace146104125780632810e1d6146104315780632ad69aeb1461044657600080fd5b8063019351301461030457806303c2924d1461032657806319effeb414610346578063200d2ed21461038a578063222abf45146103b8578063250e69bd146103f8575b600080fd5b34801561031057600080fd5b5061032461031f3660046142f7565b610b3c565b005b34801561033257600080fd5b50610324610341366004614351565b610d1a565b34801561035257600080fd5b5060005461036d90600160401b90046001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b34801561039657600080fd5b506000546103ab90600160801b900460ff1681565b60405161038191906143aa565b3480156103c457600080fd5b506103e86103d33660046143d2565b600c6020526000908152604090205460ff1681565b6040519015158152602001610381565b34801561040457600080fd5b50600a546103e89060ff1681565b34801561041e57600080fd5b506008545b604051908152602001610381565b34801561043d57600080fd5b506103ab6111c5565b34801561045257600080fd5b50610423610461366004614351565b611345565b34801561047257600080fd5b50600154610486906001600160a01b031681565b6040516001600160a01b039091168152602001610381565b3480156104aa57600080fd5b50600d546103ab9060ff1681565b3480156104c457600080fd5b50610486611376565b3480156104d957600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610486565b34801561050c57600080fd5b506000546103e890600160901b900460ff1681565b34801561052d57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610486565b6103246105623660046143ef565b611387565b34801561057357600080fd5b506104236105823660046143d2565b60036020526000908152604090205481565b3480156105a057600080fd5b506040805180820190915260058152640312e352e360dc1b60208201525b6040516103819190614468565b3480156105d757600080fd5b506008546009546105e6919082565b60408051928352602083019190915201610381565b34801561060757600080fd5b5061042361061636600461447b565b611399565b34801561062757600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610486565b34801561065a57600080fd5b506105be6113d3565b34801561066f57600080fd5b5061032461067e3660046143d2565b6113e1565b34801561068f57600080fd5b5061042361167c565b3480156106a457600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061036d565b6103246106d93660046144a2565b611688565b3480156106ea57600080fd5b50600954610423565b3480156106ff57600080fd5b50610324611ef9565b6103246107163660046143ef565b6121c2565b6103246121cf565b34801561072f57600080fd5b50600254610423565b34801561074457600080fd5b506104236125e5565b34801561075957600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b34801561078c57600080fd5b506104236125f1565b3480156107a157600080fd5b506107f76107b036600461447b565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046001600160801b0316906001600160a01b031684565b60408051941515855263ffffffff90931660208501526001600160801b03909116918301919091526001600160a01b03166060820152608001610381565b34801561084157600080fd5b5060405163ffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152602001610381565b34801561088257600080fd5b506104236125fb565b34801561089757600080fd5b5061036d6108a636600461447b565b612607565b3480156108b757600080fd5b506104236108c63660046143d2565b600b6020526000908152604090205481565b3480156108e457600080fd5b506104236108f33660046144e3565b61279a565b34801561090457600080fd5b5061091861091336600461447b565b6128da565b6040805163ffffffff90981688526001600160a01b03968716602089015295909416948601949094526001600160801b039182166060860152608085015291821660a08401521660c082015260e001610381565b34801561097857600080fd5b5060005461036d906001600160401b031681565b34801561099857600080fd5b506104236109a73660046143d2565b61294d565b3480156109b857600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b3480156109eb57600080fd5b506103246109fa36600461450c565b6129a5565b348015610a0b57600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061036d565b348015610a3e57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b348015610a7157600080fd5b506103e8610a8036600461447b565b60046020526000908152604090205460ff1681565b348015610aa157600080fd5b50610324610ab03660046143ef565b612d36565b348015610ac157600080fd5b50610aca6130a2565b60405161038193929190614597565b348015610ae557600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610423565b348015610b1857600080fd5b506103e8610b2736600461447b565b60066020526000908152604090205460ff1681565b60008054600160801b900460ff166002811115610b5b57610b5b614373565b14610b795760405163067fe19560e41b815260040160405180910390fd5b600054600160901b900460ff1615610ba45760405163075173a960e11b815260040160405180910390fd5b610bb2610baf6125fb565b90565b610bc9610bc4368690038601866145d2565b6130fa565b14610be757604051639cc00b5b60e01b815260040160405180910390fd5b82606001358282604051610bfc929190614645565b604051809103902014610c225760405163d81d583b60e01b815260040160405180910390fd5b6000610c6b610c6684848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061315692505050565b6131aa565b90506000610c9282600881518110610c8557610c85614655565b602002602001015161332e565b9050602081511115610cb75760405163d81d583b60e01b815260040160405180910390fd5b602081810151825190910360031b1c610cce6125e5565b8103610ced57604051630b8ed88360e41b815260040160405180910390fd5b5050600180546001600160a01b0319163317905550506000805460ff60901b1916600160901b1790555050565b60008054600160801b900460ff166002811115610d3957610d39614373565b14610d575760405163067fe19560e41b815260040160405180910390fd5b600060028381548110610d6c57610d6c614655565b906000526020600020906005020190506000610d8784612607565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082161015610dd65760405163f2440b5360e01b815260040160405180910390fd5b60008481526006602052604090205460ff1615610e065760405163f1a9458160e01b815260040160405180910390fd5b6000848152600560205260409020805480158015610e2357508515155b15610e85578354600160201b90046001600160a01b031660008115610e485781610e57565b60018601546001600160a01b03165b9050610e6381876133b0565b505050600094855250506006602052505060409020805460ff19166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046001600160801b031693810193909352600101546001600160a01b03166060830152610f09576001600160801b036040820152600181526000869003610f09578195505b600086826020015163ffffffff16610f219190614681565b90506000838211610f325781610f34565b835b602084015190915063ffffffff165b8181101561103a576000868281548110610f5f57610f5f614655565b6000918252602080832090910154808352600690915260409091205490915060ff16610f9e57604051634d03b32360e11b815260040160405180910390fd5b600060028281548110610fb357610fb3614655565b600091825260209091206005909102018054909150600160201b90046001600160a01b0316158015610ff95750600481015460408701516001600160801b039182169116115b156110255760018101546001600160a01b0316606087015260048101546001600160801b031660408701525b5050808061103290614699565b915050610f43565b5063ffffffff818116602085810191825260008c815260079091526040908190208651815493519288015164ffffffffff1990941690151564ffffffff00191617610100929094169182029390931774ffffffffffffffffffffffffffffffff00000000001916650100000000006001600160801b03909316929092029190911782556060850151600190920180546001600160a01b0319166001600160a01b03909316929092179091558490036111ba57606083015160008a8152600660205260409020805460ff19166001179055891580156111215750600054600160901b900460ff165b15611167576001546001600160a01b031661113c818a6133b0565b88546001600160a01b03909116600160201b02640100000000600160c01b03199091161788556111b8565b6111946001600160a01b0382161561117f578161118e565b60018901546001600160a01b03165b896133b0565b8754640100000000600160c01b031916600160201b6001600160a01b038316021788555b505b505050505050505050565b600080600054600160801b900460ff1660028111156111e6576111e6614373565b146112045760405163067fe19560e41b815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff1661124f57604051634d03b32360e11b815260040160405180910390fd5b60006001600160a01b0316600260008154811061126e5761126e614655565b6000918252602090912060059091020154600160201b90046001600160a01b03161461129b57600161129e565b60025b600080546001600160401b034216600160401b026fffffffffffffffff000000000000000019821681178355929350839260ff60801b191670ffffffffffffffffff00000000000000001990911617600160801b83600281111561130457611304614373565b02179055600281111561131957611319614373565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a290565b6005602052816000526040600020818154811061136157600080fd5b90600052602060002001600091509150505481565b600061138260006133f2565b905090565b6113948383836001611688565b505050565b600081815260076020908152604080832060059092528220805482546113ca90610100900463ffffffff16826146b2565b95945050505050565b606061138260546020613415565b6113e9611ef9565b60006002600d5460ff16600281111561140457611404614373565b0361142857506001600160a01b0381166000908152600b602052604090205461147e565b6001600d5460ff16600281111561144157611441614373565b0361146557506001600160a01b03811660009081526003602052604090205461147e565b6040516301e28f7d60e21b815260040160405180910390fd5b6001600160a01b0382166000908152600c602052604090205460ff16611542576001600160a01b038281166000818152600c602052604090819020805460ff1916600117905551637eee288d60e01b81526004810191909152602481018390527f000000000000000000000000000000000000000000000000000000000000000090911690637eee288d90604401600060405180830381600087803b15801561152657600080fd5b505af115801561153a573d6000803e3d6000fd5b505050505050565b80600003611563576040516317bfe5f760e01b815260040160405180910390fd5b6001600160a01b038281166000818152600b602090815260408083208390556003909152808220919091555163f3fef3a360e01b81526004810191909152602481018390527f00000000000000000000000000000000000000000000000000000000000000009091169063f3fef3a390604401600060405180830381600087803b1580156115f057600080fd5b505af1158015611604573d6000803e3d6000fd5b505050506000826001600160a01b03168260405160006040518083038185875af1925050503d8060008114611655576040519150601f19603f3d011682016040523d82523d6000602084013e61165a565b606091505b5050905080611394576040516383e6cc6b60e01b815260040160405180910390fd5b60006113826034613457565b60008054600160801b900460ff1660028111156116a7576116a7614373565b146116c55760405163067fe19560e41b815260040160405180910390fd5b6000600284815481106116da576116da614655565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff811684526001600160a01b03600160201b90910481169484019490945260018101549093169082015260028201546001600160801b03908116606083015260038301546080830181905260049093015480821660a0840152600160801b90041660c0820152915085146117845760405163180a019960e11b815260040160405180910390fd5b60a0810151600083156001600160801b0383161760011b905060006117b1826001600160801b0316613477565b60ff1690508615806117ec57506117e97f00000000000000000000000000000000000000000000000000000000000000006002614681565b81145b80156117f6575084155b15611814576040516329098def60e21b815260040160405180910390fd5b600054600160901b900460ff16801561182b575086155b156118495760405163075173a960e11b815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000081111561188a576040516356f57b2b60e01b815260040160405180910390fd5b6118b57f00000000000000000000000000000000000000000000000000000000000000006001614681565b81036118c7576118c7868885886134e3565b346118d18361279a565b146118ef57604051638620aa1960e01b815260040160405180910390fd5b60006118fa88612607565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082160361194857604051630ce0744560e21b815260040160405180910390fd5b600061197560017f00000000000000000000000000000000000000000000000000000000000000006146b2565b8303611a98577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156119d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119fd91906146c9565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015611a3a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a5e91906146e6565b611a91907f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166146ff565b9050611b29565b611ac360017f00000000000000000000000000000000000000000000000000000000000000006146b2565b8303611afd57611a917f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316600261472a565b507f00000000000000000000000000000000000000000000000000000000000000006001600160401b03165b611b5c817f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316614759565b6001600160401b0316611b75836001600160401b031690565b6001600160401b03161115611bba57611bb7817f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316614759565b91505b6000604083901b421760008a8152608087901b6001600160801b038d1617602052604081209192509060008181526004602052604090205490915060ff1615611c16576040516380497e3b60e01b815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff16815260200160006001600160a01b03168152602001336001600160a01b03168152602001346001600160801b031681526020018c8152602001886001600160801b03168152602001846001600160801b0316815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a8154816001600160a01b0302191690836001600160a01b0316021790555060408201518160010160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060608201518160020160006101000a8154816001600160801b0302191690836001600160801b031602179055506080820151816003015560a08201518160040160006101000a8154816001600160801b0302191690836001600160801b0316021790555060c08201518160040160106101000a8154816001600160801b0302191690836001600160801b031602179055505050600560008c81526020019081526020016000206001600280549050611e0d91906146b2565b81546001810183556000928352602080842090910191909155338252600b9052604081208054349290611e41908490614681565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b158015611ea357600080fd5b505af1158015611eb7573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b6002600d5460ff166002811115611f1257611f12614373565b1480611f3457506001600d5460ff166002811115611f3257611f32614373565b145b15611f3b57565b6000600d5460ff166002811115611f5457611f54614373565b14611f72576040516301e28f7d60e21b815260040160405180910390fd5b600054600160401b90046001600160401b03166001600160401b0316600003611fae57604051636082930560e11b815260040160405180910390fd5b604051630314d2b360e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630314d2b390602401602060405180830381865afa158015612015573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120399190614781565b90508061205957604051634851bd9b60e01b815260040160405180910390fd5b6040516317cf21a960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906317cf21a990602401600060405180830381600087803b1580156120ba57600080fd5b505af19250505080156120cb575060015b506040516324b5ce0b60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063496b9c1690602401602060405180830381865afa158015612133573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121579190614781565b9050801561217157600d805460ff1916600117905561217f565b600d805460ff191660021790555b600d546040517f9908eaac0645df9d0704d06adc9e07337c951de2f06b5f2836151d48d5e4722f916121b69160ff909116906143aa565b60405180910390a15050565b6113948383836000611688565b600054600160881b900460ff16156121f95760405162dc149f60e41b815260040160405180910390fd5b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d83ef2676040518163ffffffff1660e01b81526004016040805180830381865afa158015612259573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061227d919061479e565b9092509050816122a057604051633535e1d960e11b815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a146122d357639824bdab6000526004601cfd5b806122dc6125e5565b1161230e576122e96125fb565b60405163f40239db60e01b815260040161230591815260200190565b60405180910390fd5b6040805160e08101825263ffffffff8152600060208201526002918101612333611376565b6001600160a01b03168152602001346001600160801b031681526020016123586125fb565b815260016020820152604001426001600160801b0390811690915282546001808201855560009485526020808620855160059094020180549186015163ffffffff9094166001600160c01b031990921691909117600160201b6001600160a01b0394851602178155604085015191810180546001600160a01b031916929093169190911790915560608301516002820180546fffffffffffffffffffffffffffffffff19169184169190911790556080830151600382015560a083015160c090930151928216600160801b9390921692909202176004909101558054600160881b60ff60881b199091161781553490600b90612452611376565b6001600160a01b03166001600160a01b0316815260200190815260200160002060008282546124819190614681565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156124e357600080fd5b505af11580156124f7573d6000803e3d6000fd5b50506000805467ffffffffffffffff1916426001600160401b0316179055505060408051630f27ce5f60e21b815290517f000000000000000000000000000000000000000000000000000000000000000063ffffffff1692507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031691633c9f397c9160048083019260209291908290030181865afa1580156125a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906125c991906147c2565b600a805460ff191663ffffffff92909216929092141790555050565b60006113826054613457565b60006113826125e5565b60006113826014613457565b600080600054600160801b900460ff16600281111561262857612628614373565b146126465760405163067fe19560e41b815260040160405180910390fd5b60006002838154811061265b5761265b614655565b600091825260208220600590910201805490925063ffffffff908116146126c157815460028054909163ffffffff1690811061269957612699614655565b906000526020600020906005020160040160109054906101000a90046001600160801b031690505b60048201546000906126ea90600160801b90046001600160401b03165b6001600160401b031690565b6126fd906001600160401b0316426146b2565b6127136126de846001600160801b031660401c90565b6001600160401b03166127269190614681565b90506001600160401b037f0000000000000000000000000000000000000000000000000000000000000000166001600160401b0316816001600160401b03161161277057806113ca565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b6000806127af836001600160801b0316613477565b60ff1690507f00000000000000000000000000000000000000000000000000000000000000008111156127f5576040516356f57b2b60e01b815260040160405180910390fd5b642e90edd00062061a806311e1a300600061281083836147fe565b9050670de0b6b3a76400006000612847827f0000000000000000000000000000000000000000000000000000000000000000614812565b90506000612865612860670de0b6b3a764000086614812565b6135d8565b9050600061287384846137ee565b90506000612881838361383d565b9050600061288e8261386b565b905060006128ad826128a8670de0b6b3a76400008f614812565b6139e8565b905060006128bb8b8361383d565b90506128c7818d614812565b9f9e505050505050505050505050505050565b600281815481106128ea57600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff84169550600160201b9093046001600160a01b03908116949216926001600160801b03918216929180821691600160801b90041687565b60006002600d5460ff16600281111561296857612968614373565b0361298957506001600160a01b03166000908152600b602052604090205490565b506001600160a01b031660009081526003602052604090205490565b60008054600160801b900460ff1660028111156129c4576129c4614373565b146129e25760405163067fe19560e41b815260040160405180910390fd5b6000600287815481106129f7576129f7614655565b6000918252602082206005919091020160048101549092506001600160801b0316908715821760011b9050612a4d7f00000000000000000000000000000000000000000000000000000000000000006001614681565b612a5f826001600160801b0316613477565b60ff1614612a8057604051630bea7bb360e31b815260040160405180910390fd5b6000808915612b5c57612ad37f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006146b2565b6001901b612ae9846001600160801b0316613a19565b6001600160801b0316612afc9190614831565b15612b3057612b27612b1860016001600160801b038716614845565b865463ffffffff166000613a37565b60030154612b52565b7f00000000000000000000000000000000000000000000000000000000000000005b9150849050612b7d565b60038501549150612b7a612b186001600160801b0386166001614865565b90505b600882901b60088a8a604051612b94929190614645565b6040518091039020901b14612bbc5760405163696550ff60e01b815260040160405180910390fd5b6000612bc78c613b00565b90506000612bd6836003015490565b6040516370a6769960e11b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e14ced3290612c2a908f908f908f908f908a906004016148b0565b6020604051808303816000875af1158015612c49573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c6d91906146e6565b600485015491149150600090600290612c8e906001600160801b0316613477565b612ca0896001600160801b0316613477565b612caa91906148ea565b612cb4919061490d565b60ff161590508115158103612cdc5760405163fb4e40dd60e01b815260040160405180910390fd5b8754600160201b90046001600160a01b031615612d0c57604051639071e6af60e01b815260040160405180910390fd5b50508554640100000000600160c01b03191633600160201b02179095555050505050505050505050565b60008054600160801b900460ff166002811115612d5557612d55614373565b14612d735760405163067fe19560e41b815260040160405180910390fd5b600080600080612d8286613b2f565b93509350935093506000612d9885858585613d9e565b905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015612dfa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e1e91906146c9565b905060018903612ec8576001600160a01b0381166352f0f3ad8a84612e44610baf61167c565b6040516001600160e01b031960e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af1158015612e9e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612ec291906146e6565b506111ba565b60028903612ee7576001600160a01b0381166352f0f3ad8a8489612e44565b60038903612f06576001600160a01b0381166352f0f3ad8a8487612e44565b60048903613013576000612f436001600160801b0385167f0000000000000000000000000000000000000000000000000000000000000000613e3d565b600954612f509190614681565b612f5b906001614681565b9050612f656125e5565b8110612f7857612f736125e5565b612f7a565b805b90506001600160a01b0382166352f0f3ad8b8560405160e084901b6001600160e01b03191681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af1158015612fe8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061300c91906146e6565b50506111ba565b60058903613086576040516352f0f3ad60e01b8152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b604482015260086064820152608481018890526001600160a01b038216906352f0f3ad9060a401612e7f565b604051600162ec819b60e01b0319815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000600060606130cf6125fb565b91506130d96113d3565b9050909192565b60008183116130ef57816130f1565b825b90505b92915050565b60008160000151826020015183604001518460600151604051602001613139949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6040805180820190915260008082526020820152815160000361318c57604051635ab458fb60e01b815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b606060008060006131ba85613e6a565b9194509250905060018160018111156131d5576131d5614373565b146131f3576040516325ce355f60e11b815260040160405180910390fd5b84516131ff8385614681565b1461321d57604051630b8aa6f760e31b815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816132345790505093506000835b8651811015613322576000806132a76040518060400160405280858c6000015161328b91906146b2565b8152602001858c602001516132a09190614681565b9052613e6a565b5091509150604051806040016040528083836132c39190614681565b8152602001848b602001516132d89190614681565b8152508885815181106132ed576132ed614655565b6020908102919091010152613303600185614681565b935061330f8183614681565b6133199084614681565b92505050613261565b50845250919392505050565b6060600080600061333e85613e6a565b91945092509050600081600181111561335957613359614373565b14613377576040516307fe6cb960e21b815260040160405180910390fd5b6133818284614681565b8551146133a157604051630b8aa6f760e31b815260040160405180910390fd5b6113ca85602001518484614160565b60028101546001600160a01b038316600090815260036020526040812080546001600160801b03909316929091906133e9908490614681565b90915550505050565b6000806134073660011981013560f01c900390565b929092013560601c92915050565b6060600061342b3660011981013560f01c900390565b905060405191508282528284820160208401378260208301016000815260208101604052505092915050565b60008061346c3660011981013560f01c900390565b929092013592915050565b7e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f6307c4acdd60e01b6001600160401b03831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60006134f96001600160801b0384166001614865565b9050600061350982866001613a37565b9050600086901a838061356b575061354260027f0000000000000000000000000000000000000000000000000000000000000000614831565b600483015460029061355c906001600160801b0316613477565b613566919061490d565b60ff16145b156135aa5760ff811660011480613585575060ff81166002145b6135a55760405163f40239db60e01b815260048101889052602401612305565b6135cf565b60ff8116156135cf5760405163f40239db60e01b815260048101889052602401612305565b50505050505050565b6001600160801b03811160071b81811c6001600160401b031060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b176000821361362d57631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d6c8c3f38e95a6b1ff2ab1c3b343619018302821d6d02384773bdf1ac5676facced60901901830290911d6cb9a025d814b29c212b8b1a07cd1901909102780a09507084cc699bb0e71ea869ffffffffffffffffffffffff190105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a76400000215820261382b57637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b60008160001904831182021561385b5763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b600068023f2fa8f6da5b9d2819821361388357919050565b680755bf798b4a1bf1e582126138a15763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056001605f1b01901d6bb17217f7d1cf79abc9e3b39881029093036c240c330e9fb2d9cbaf0fd5aafb1981018102606090811d6d0277594991cfc85f6e2461837cd9018202811d6d1a521255e34f6a5061b25ef1c9c319018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d6e02c72388d9f74f51a9331fed693f1419018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084016d01d3967ed30fc4f89c02bab5708119010290911d6e0587f503bb6ea29d25fcb740196450019091026d360d7aeea093263ecc6e0ecb291760621b010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b60006130f1670de0b6b3a764000083613a00866135d8565b613a0a919061492f565b613a1491906149b4565b61386b565b600080613a2583613477565b600160ff919091161b90920392915050565b60008082613a7757613a726001600160801b0386167f00000000000000000000000000000000000000000000000000000000000000006141f4565b613a89565b613a89856001600160801b0316614263565b905060028481548110613a9e57613a9e614655565b906000526020600020906005020191505b60048201546001600160801b03828116911614613af857815460028054909163ffffffff16908110613ae357613ae3614655565b90600052602060002090600502019150613aaf565b509392505050565b6000806000806000613b1186613b2f565b9350935093509350613b2584848484613d9e565b9695505050505050565b6000806000806000859050600060028281548110613b4f57613b4f614655565b6000918252602090912060059091020160048101549091507f000000000000000000000000000000000000000000000000000000000000000090613b9b906001600160801b0316613477565b60ff1611613bbc576040516359a5ae1160e11b815260040160405180910390fd5b6000815b60048301547f000000000000000000000000000000000000000000000000000000000000000090613bf9906001600160801b0316613477565b60ff169250821115613c6e57825463ffffffff16613c387f00000000000000000000000000000000000000000000000000000000000000006001614681565b8303613c42578391505b60028181548110613c5557613c55614655565b9060005260206000209060050201935080945050613bc0565b600481810154908401546001600160801b0391821691166000816001600160801b0316613cb3613ca7856001600160801b031660011c90565b6001600160801b031690565b6001600160801b03161490508015613d4c576000613cd9836001600160801b0316613a19565b6001600160801b03161115613d29576000613d09613d0160016001600160801b038616614845565b896001613a37565b6003810154600490910154909c506001600160801b03169a50613d2f9050565b6008549a505b600386015460048701549099506001600160801b03169750613d90565b6000613d65613d016001600160801b0385166001614865565b6003808901546004808b015492840154930154909e506001600160801b039182169d50919b50169850505b505050505050509193509193565b60006001600160801b03841615613df95760408051602081018790526001600160801b038087169282019290925260608101859052908316608082015260a001604051602081830303815290604052805190602001206113ca565b8282604051602001613e1e9291909182526001600160801b0316602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080613e4984613477565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003613e9457604051635ab458fb60e01b815260040160405180910390fd5b6020840151805160001a607f8111613eb9576000600160009450945094505050614159565b60b78111613f51576000613ece6080836146b2565b905080876000015111613ef4576040516366c9448560e01b815260040160405180910390fd5b6001838101516001600160f81b0319169082148015613f205750600160ff1b6001600160f81b03198216105b15613f3e5760405163babb01dd60e01b815260040160405180910390fd5b5060019550935060009250614159915050565b60bf8111614033576000613f6660b7836146b2565b905080876000015111613f8c576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b0319166000819003613fbd5760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c60378111613fec5760405163babb01dd60e01b815260040160405180910390fd5b613ff68184614681565b895111614016576040516366c9448560e01b815260040160405180910390fd5b614021836001614681565b97509550600094506141599350505050565b60f7811161407f57600061404860c0836146b2565b90508087600001511161406e576040516366c9448560e01b815260040160405180910390fd5b600195509350849250614159915050565b600061408c60f7836146b2565b9050808760000151116140b2576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b03191660008190036140e35760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c603781116141125760405163babb01dd60e01b815260040160405180910390fd5b61411c8184614681565b89511161413c576040516366c9448560e01b815260040160405180910390fd5b614147836001614681565b97509550600194506141599350505050565b9193909250565b6060816001600160401b0381111561417a5761417a6145bc565b6040519080825280601f01601f1916602001820160405280156141a4576020820181803683370190505b50905081156141ed5760006141b98486614681565b90506020820160005b848110156141da5782810151828201526020016141c2565b848111156141e9576000858301525b5050505b9392505050565b600081614209846001600160801b0316613477565b60ff161161421f5763b34b5c226000526004601cfd5b61422883614263565b90508161423d826001600160801b0316613477565b60ff16116130f4576130f1614253836001614681565b6001600160801b03831690614287565b6000811960018301168161427682613477565b60ff169390931c8015179392505050565b60008061429384613477565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f8401126142c157600080fd5b5081356001600160401b038111156142d857600080fd5b6020830191508360208285010111156142f057600080fd5b9250929050565b600080600083850360a081121561430d57600080fd5b608081121561431b57600080fd5b5083925060808401356001600160401b0381111561433857600080fd5b614344868287016142af565b9497909650939450505050565b6000806040838503121561436457600080fd5b50508035926020909101359150565b634e487b7160e01b600052602160045260246000fd5b600381106143a757634e487b7160e01b600052602160045260246000fd5b50565b602081016143b783614389565b91905290565b6001600160a01b03811681146143a757600080fd5b6000602082840312156143e457600080fd5b81356141ed816143bd565b60008060006060848603121561440457600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b8181101561444157602081850181015186830182015201614425565b81811115614453576000602083870101525b50601f01601f19169290920160200192915050565b6020815260006130f1602083018461441b565b60006020828403121561448d57600080fd5b5035919050565b80151581146143a757600080fd5b600080600080608085870312156144b857600080fd5b84359350602085013592506040850135915060608501356144d881614494565b939692955090935050565b6000602082840312156144f557600080fd5b81356001600160801b03811681146141ed57600080fd5b6000806000806000806080878903121561452557600080fd5b86359550602087013561453781614494565b945060408701356001600160401b038082111561455357600080fd5b61455f8a838b016142af565b9096509450606089013591508082111561457857600080fd5b5061458589828a016142af565b979a9699509497509295939492505050565b63ffffffff841681528260208201526060604082015260006113ca606083018461441b565b634e487b7160e01b600052604160045260246000fd5b6000608082840312156145e457600080fd5b604051608081018181106001600160401b038211171561461457634e487b7160e01b600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b600082198211156146945761469461466b565b500190565b6000600182016146ab576146ab61466b565b5060010190565b6000828210156146c4576146c461466b565b500390565b6000602082840312156146db57600080fd5b81516141ed816143bd565b6000602082840312156146f857600080fd5b5051919050565b60006001600160401b038083168185168083038211156147215761472161466b565b01949350505050565b60006001600160401b03808316818516818304811182151516156147505761475061466b565b02949350505050565b60006001600160401b03838116908316818110156147795761477961466b565b039392505050565b60006020828403121561479357600080fd5b81516141ed81614494565b600080604083850312156147b157600080fd5b505080516020909101519092909150565b6000602082840312156147d457600080fd5b815163ffffffff811681146141ed57600080fd5b634e487b7160e01b600052601260045260246000fd5b60008261480d5761480d6147e8565b500490565b600081600019048311821515161561482c5761482c61466b565b500290565b600082614840576148406147e8565b500690565b60006001600160801b03838116908316818110156147795761477961466b565b60006001600160801b038083168185168083038211156147215761472161466b565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6060815260006148c4606083018789614887565b82810360208401526148d7818688614887565b9150508260408301529695505050505050565b600060ff821660ff8416808210156149045761490461466b565b90039392505050565b600060ff831680614920576149206147e8565b8060ff84160691505092915050565b60006001600160ff1b03818413828413808216868404861116156149555761495561466b565b600160ff1b60008712828116878305891216156149745761497461466b565b600087129250878205871284841616156149905761499061466b565b878505871281841616156149a6576149a661466b565b505050929093029392505050565b6000826149c3576149c36147e8565b600160ff1b8214600019841416156149dd576149dd61466b565b50059056fea2646970667358221220b40836bab1efb6bfb8d7c87f6d0be96a5361d175f1792d0f7ade32e849c6eaa364736f6c634300080f0033000000000000000000000000000000000000000000000000000000000000000003682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b60000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000aa59a0777648bc75cd10364083e878c1ccd6112a000000000000000000000000a2f2ac6f5af72e494a227d79db20473cf7a1ffe8000000000000000000000000496286e5ee7758de84dd17e6d2d97afc2ace4cc70000000000000000000000000000000000000000000000000000000000002105", - "nonce": "0x2", - "chainId": "0x1" - }, - "additionalContracts": [], - "isFixedGasLimit": false - }, - { - "hash": "0x0301698b4f90faad35fec84b09d6e23ba9f02e09e2450f8cf262be4f30c54a42", - "transactionType": "CREATE", - "contractName": "PermissionedDisputeGame", - "contractAddress": "0x4e0a38923fba12da162fe255642b095f86598c5b", - "function": null, - "arguments": [ - "(1, 0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6, 73, 30, 10800, 302400, 0xaA59A0777648BC75cd10364083e878c1cCd6112a, 0x3E8a0B63f57e975c268d610ece93da5f78c01321, 0x496286e5eE7758de84Dd17e6d2d97afC2ACE4cc7, 8453)", - "0x642229f238fb9dE03374Be34B0eD8D9De80752c5", - "0x8Ca1E12404d16373Aef756179B185F27b2994F3a" - ], - "transaction": { - "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", - "gas": "0x550e3d", - "value": "0x0", - "input": "0x6102006040523480156200001257600080fd5b50604051620054da380380620054da83398101604081905262000035916200053b565b82620000446001607e6200064a565b60ff16816040015111156200006c57604051633beff19960e11b815260040160405180910390fd5b60001981606001511480620000965750604081015160608201516200009390600162000670565b10155b15620000b55760405163e62ccf3960e01b815260040160405180910390fd5b600281606001511015620000dc5760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b0380168160c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000129573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200014f91906200068b565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200018d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b39190620006ab565b1115620001d35760405163b4e1243360e01b815260040160405180910390fd5b6000620001f882608001516001600160401b03166200048e60201b62000c4b1760201c565b6200020e906001600160401b03166002620006c5565b905060008260c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000255573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027b91906200068b565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002b9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002df9190620006ab565b6200030284608001516001600160401b03166200048e60201b62000c4b1760201c565b6001600160401b031662000317919062000670565b905060006200033283836200049160201b620022cf1760201c565b90506001600160401b038111156200035d5760405163235dfb2b60e21b815260040160405180910390fd5b620003808460a001516001600160401b03166200048e60201b62000c4b1760201c565b6001600160401b0316816001600160401b03161115620003b35760405163235dfb2b60e21b815260040160405180910390fd5b63ffffffff8016620003da856000015163ffffffff166200048e60201b62000c4b1760201c565b63ffffffff1603620003ff5760405163073ed16760e31b815260040160405180910390fd5b5050815163ffffffff1661012090815260208301516080908152604084015160a0908152606085015160c0908152918501516001600160401b039081166101a052908501511660e0908152908401516001600160a01b03908116610100908152918501518116610140529084015181166101605292015161018052509182166101c052166101e05250620006e7565b90565b6000818311620004a25781620004a4565b825b9392505050565b60405161014081016001600160401b0381118282101715620004dd57634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620004f857600080fd5b919050565b80516001600160401b0381168114620004f857600080fd5b6001600160a01b03811681146200052b57600080fd5b50565b8051620004f88162000515565b60008060008385036101808112156200055357600080fd5b610140808212156200056457600080fd5b6200056e620004ab565b91506200057b86620004e3565b8252602086015160208301526040860151604083015260608601516060830152620005a960808701620004fd565b6080830152620005bc60a08701620004fd565b60a0830152620005cf60c087016200052e565b60c0830152620005e260e087016200052e565b60e0830152610100620005f78188016200052e565b8184015250610120808701518184015250819450620006188187016200052e565b935050506200062b61016085016200052e565b90509250925092565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff84168082101562000667576200066762000634565b90039392505050565b6000821982111562000686576200068662000634565b500190565b6000602082840312156200069e57600080fd5b8151620004a48162000515565b600060208284031215620006be57600080fd5b5051919050565b6000816000190483118215151615620006e257620006e262000634565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a0516101c0516101e051614c1f620008bb600039600081816105d9015281816117610152611ed80152600081816108ad0152818161172f01528181611a930152611ea601526000818161071001528181612a4201528181612aac0152612ade015260008181610a5701526122270152600081816106930152818161187f015281816119270152818161199d01528181612f06015261325a0152600081816105660152818161157c0152818161164601528181612e2801526131920152600081816108e801528181612293015261323101526000818161051201528181611f8d0152818161295b01526139da015260008181610aaa01528181610e2f01528181611c2801528181611c68015281816128e401528181612b0d0152612b68015260008181610add0152818161210e015281816127a10152818161286d01528181612a7d0152818161388301528181613b6501528181613bc301528181613c0e0152818161422b015261431a015260008181610b8401528181611cac01528181611d19015281816128290152818161292f0152818161381c01526138a40152600081816107c501526139270152614c1f6000f3fe6080604052600436106103355760003560e01c806370872aa5116101ab578063c0d8bb74116100f7578063dabd396d11610095578063f8f43ff61161006f578063f8f43ff614610b31578063fa24f74314610b51578063fa315aa914610b75578063fe2bbeb214610ba857600080fd5b8063dabd396d14610a9b578063ec5e630814610ace578063eff0f59214610b0157600080fd5b8063cf09e0d0116100d1578063cf09e0d014610a08578063d5d44d8014610a28578063d6ae3cd514610a48578063d8cc1a3c14610a7b57600080fd5b8063c0d8bb7414610947578063c395e1ca14610974578063c6f0308c1461099457600080fd5b80638d450a9511610164578063a8e4fb901161013e578063a8e4fb901461089e578063bbdc02db146108d1578063bcef3b5514610912578063bd8da9561461092757600080fd5b80638d450a95146107b657806399735e32146107e9578063a445ece6146107fe57600080fd5b806370872aa514610747578063786b844b1461075c5780637b0f0adc146107715780638129fc1c146107845780638980e0cc1461078c5780638b85902b146107a157600080fd5b80633e3ac912116102855780635a5fa2d91161022357806360e27464116101fd57806360e27464146106cc5780636361506d146106ec5780636b6716c0146107015780636f0344091461073457600080fd5b80635a5fa2d9146106645780635c0cba3314610684578063609d3334146106b757600080fd5b8063529d6a8c1161025f578063529d6a8c1461059d578063534db0e2146105ca57806354fd4d50146105fd57806357da950e1461063457600080fd5b80633e3ac912146105365780633fc8cef314610557578063472777c61461058a57600080fd5b806325fc2ace116102f257806330dbe570116102cc57806330dbe5701461049c578063378dd48c146104d457806337b1b229146104ee5780633a7684631461050357600080fd5b806325fc2ace146104485780632810e1d6146104675780632ad69aeb1461047c57600080fd5b8063019351301461033a57806303c2924d1461035c57806319effeb41461037c578063200d2ed2146103c0578063222abf45146103ee578063250e69bd1461042e575b600080fd5b34801561034657600080fd5b5061035a6103553660046144fe565b610bd8565b005b34801561036857600080fd5b5061035a610377366004614558565b610db6565b34801561038857600080fd5b506000546103a390600160401b90046001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b3480156103cc57600080fd5b506000546103e190600160801b900460ff1681565b6040516103b791906145b1565b3480156103fa57600080fd5b5061041e6104093660046145d9565b600c6020526000908152604090205460ff1681565b60405190151581526020016103b7565b34801561043a57600080fd5b50600a5461041e9060ff1681565b34801561045457600080fd5b506008545b6040519081526020016103b7565b34801561047357600080fd5b506103e1611261565b34801561048857600080fd5b50610459610497366004614558565b6113e1565b3480156104a857600080fd5b506001546104bc906001600160a01b031681565b6040516001600160a01b0390911681526020016103b7565b3480156104e057600080fd5b50600d546103e19060ff1681565b3480156104fa57600080fd5b506104bc611412565b34801561050f57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b34801561054257600080fd5b5060005461041e90600160901b900460ff1681565b34801561056357600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b61035a6105983660046145f6565b611423565b3480156105a957600080fd5b506104596105b83660046145d9565b60036020526000908152604090205481565b3480156105d657600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b34801561060957600080fd5b506040805180820190915260058152640312e352e360dc1b60208201525b6040516103b7919061466f565b34801561064057600080fd5b5060085460095461064f919082565b604080519283526020830191909152016103b7565b34801561067057600080fd5b5061045961067f366004614682565b611435565b34801561069057600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b3480156106c357600080fd5b5061062761146f565b3480156106d857600080fd5b5061035a6106e73660046145d9565b61147d565b3480156106f857600080fd5b50610459611718565b34801561070d57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103a3565b61035a6107423660046146a9565b611724565b34801561075357600080fd5b50600954610459565b34801561076857600080fd5b5061035a6117b2565b61035a61077f3660046145f6565b611a7b565b61035a611a88565b34801561079857600080fd5b50600254610459565b3480156107ad57600080fd5b50610459611adb565b3480156107c257600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b3480156107f557600080fd5b50610459611ae7565b34801561080a57600080fd5b50610860610819366004614682565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046001600160801b0316906001600160a01b031684565b60408051941515855263ffffffff90931660208501526001600160801b03909116918301919091526001600160a01b031660608201526080016103b7565b3480156108aa57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104bc565b3480156108dd57600080fd5b5060405163ffffffff7f00000000000000000000000000000000000000000000000000000000000000001681526020016103b7565b34801561091e57600080fd5b50610459611af1565b34801561093357600080fd5b506103a3610942366004614682565b611afd565b34801561095357600080fd5b506104596109623660046145d9565b600b6020526000908152604090205481565b34801561098057600080fd5b5061045961098f3660046146ea565b611c90565b3480156109a057600080fd5b506109b46109af366004614682565b611dd0565b6040805163ffffffff90981688526001600160a01b03968716602089015295909416948601949094526001600160801b039182166060860152608085015291821660a08401521660c082015260e0016103b7565b348015610a1457600080fd5b506000546103a3906001600160401b031681565b348015610a3457600080fd5b50610459610a433660046145d9565b611e43565b348015610a5457600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b348015610a8757600080fd5b5061035a610a96366004614713565b611e9b565b348015610aa757600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006103a3565b348015610ada57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b348015610b0d57600080fd5b5061041e610b1c366004614682565b60046020526000908152604090205460ff1681565b348015610b3d57600080fd5b5061035a610b4c3660046145f6565b611f25565b348015610b5d57600080fd5b50610b66612291565b6040516103b79392919061479e565b348015610b8157600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610459565b348015610bb457600080fd5b5061041e610bc3366004614682565b60066020526000908152604090205460ff1681565b60008054600160801b900460ff166002811115610bf757610bf761457a565b14610c155760405163067fe19560e41b815260040160405180910390fd5b600054600160901b900460ff1615610c405760405163075173a960e11b815260040160405180910390fd5b610c4e610c4b611af1565b90565b610c65610c60368690038601866147d9565b6122e9565b14610c8357604051639cc00b5b60e01b815260040160405180910390fd5b82606001358282604051610c9892919061484c565b604051809103902014610cbe5760405163d81d583b60e01b815260040160405180910390fd5b6000610d07610d0284848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061234592505050565b612399565b90506000610d2e82600881518110610d2157610d2161485c565b602002602001015161251d565b9050602081511115610d535760405163d81d583b60e01b815260040160405180910390fd5b602081810151825190910360031b1c610d6a611adb565b8103610d8957604051630b8ed88360e41b815260040160405180910390fd5b5050600180546001600160a01b0319163317905550506000805460ff60901b1916600160901b1790555050565b60008054600160801b900460ff166002811115610dd557610dd561457a565b14610df35760405163067fe19560e41b815260040160405180910390fd5b600060028381548110610e0857610e0861485c565b906000526020600020906005020190506000610e2384611afd565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082161015610e725760405163f2440b5360e01b815260040160405180910390fd5b60008481526006602052604090205460ff1615610ea25760405163f1a9458160e01b815260040160405180910390fd5b6000848152600560205260409020805480158015610ebf57508515155b15610f21578354600160201b90046001600160a01b031660008115610ee45781610ef3565b60018601546001600160a01b03165b9050610eff818761259f565b505050600094855250506006602052505060409020805460ff19166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046001600160801b031693810193909352600101546001600160a01b03166060830152610fa5576001600160801b036040820152600181526000869003610fa5578195505b600086826020015163ffffffff16610fbd9190614888565b90506000838211610fce5781610fd0565b835b602084015190915063ffffffff165b818110156110d6576000868281548110610ffb57610ffb61485c565b6000918252602080832090910154808352600690915260409091205490915060ff1661103a57604051634d03b32360e11b815260040160405180910390fd5b60006002828154811061104f5761104f61485c565b600091825260209091206005909102018054909150600160201b90046001600160a01b03161580156110955750600481015460408701516001600160801b039182169116115b156110c15760018101546001600160a01b0316606087015260048101546001600160801b031660408701525b505080806110ce906148a0565b915050610fdf565b5063ffffffff818116602085810191825260008c815260079091526040908190208651815493519288015164ffffffffff1990941690151564ffffffff00191617610100929094169182029390931774ffffffffffffffffffffffffffffffff00000000001916650100000000006001600160801b03909316929092029190911782556060850151600190920180546001600160a01b0319166001600160a01b039093169290921790915584900361125657606083015160008a8152600660205260409020805460ff19166001179055891580156111bd5750600054600160901b900460ff165b15611203576001546001600160a01b03166111d8818a61259f565b88546001600160a01b03909116600160201b02640100000000600160c01b0319909116178855611254565b6112306001600160a01b0382161561121b578161122a565b60018901546001600160a01b03165b8961259f565b8754640100000000600160c01b031916600160201b6001600160a01b038316021788555b505b505050505050505050565b600080600054600160801b900460ff1660028111156112825761128261457a565b146112a05760405163067fe19560e41b815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff166112eb57604051634d03b32360e11b815260040160405180910390fd5b60006001600160a01b0316600260008154811061130a5761130a61485c565b6000918252602090912060059091020154600160201b90046001600160a01b03161461133757600161133a565b60025b600080546001600160401b034216600160401b026fffffffffffffffff000000000000000019821681178355929350839260ff60801b191670ffffffffffffffffff00000000000000001990911617600160801b8360028111156113a0576113a061457a565b0217905560028111156113b5576113b561457a565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a290565b600560205281600052604060002081815481106113fd57600080fd5b90600052602060002001600091509150505481565b600061141e60006125e1565b905090565b6114308383836001611724565b505050565b6000818152600760209081526040808320600590925282208054825461146690610100900463ffffffff16826148b9565b95945050505050565b606061141e60546020612604565b6114856117b2565b60006002600d5460ff1660028111156114a0576114a061457a565b036114c457506001600160a01b0381166000908152600b602052604090205461151a565b6001600d5460ff1660028111156114dd576114dd61457a565b0361150157506001600160a01b03811660009081526003602052604090205461151a565b6040516301e28f7d60e21b815260040160405180910390fd5b6001600160a01b0382166000908152600c602052604090205460ff166115de576001600160a01b038281166000818152600c602052604090819020805460ff1916600117905551637eee288d60e01b81526004810191909152602481018390527f000000000000000000000000000000000000000000000000000000000000000090911690637eee288d90604401600060405180830381600087803b1580156115c257600080fd5b505af11580156115d6573d6000803e3d6000fd5b505050505050565b806000036115ff576040516317bfe5f760e01b815260040160405180910390fd5b6001600160a01b038281166000818152600b602090815260408083208390556003909152808220919091555163f3fef3a360e01b81526004810191909152602481018390527f00000000000000000000000000000000000000000000000000000000000000009091169063f3fef3a390604401600060405180830381600087803b15801561168c57600080fd5b505af11580156116a0573d6000803e3d6000fd5b505050506000826001600160a01b03168260405160006040518083038185875af1925050503d80600081146116f1576040519150601f19603f3d011682016040523d82523d6000602084013e6116f6565b606091505b5050905080611430576040516383e6cc6b60e01b815260040160405180910390fd5b600061141e6034612646565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614806117835750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b6117a0576040516369c3779f60e11b815260040160405180910390fd5b6117ac84848484612666565b50505050565b6002600d5460ff1660028111156117cb576117cb61457a565b14806117ed57506001600d5460ff1660028111156117eb576117eb61457a565b145b156117f457565b6000600d5460ff16600281111561180d5761180d61457a565b1461182b576040516301e28f7d60e21b815260040160405180910390fd5b600054600160401b90046001600160401b03166001600160401b031660000361186757604051636082930560e11b815260040160405180910390fd5b604051630314d2b360e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630314d2b390602401602060405180830381865afa1580156118ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118f291906148d0565b90508061191257604051634851bd9b60e01b815260040160405180910390fd5b6040516317cf21a960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906317cf21a990602401600060405180830381600087803b15801561197357600080fd5b505af1925050508015611984575060015b506040516324b5ce0b60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063496b9c1690602401602060405180830381865afa1580156119ec573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a1091906148d0565b90508015611a2a57600d805460ff19166001179055611a38565b600d805460ff191660021790555b600d546040517f9908eaac0645df9d0704d06adc9e07337c951de2f06b5f2836151d48d5e4722f91611a6f9160ff909116906145b1565b60405180910390a15050565b6114308383836000611724565b326001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614611ad1576040516369c3779f60e11b815260040160405180910390fd5b611ad9612ed7565b565b600061141e6054612646565b600061141e611adb565b600061141e6014612646565b600080600054600160801b900460ff166002811115611b1e57611b1e61457a565b14611b3c5760405163067fe19560e41b815260040160405180910390fd5b600060028381548110611b5157611b5161485c565b600091825260208220600590910201805490925063ffffffff90811614611bb757815460028054909163ffffffff16908110611b8f57611b8f61485c565b906000526020600020906005020160040160109054906101000a90046001600160801b031690505b6004820154600090611be090600160801b90046001600160401b03165b6001600160401b031690565b611bf3906001600160401b0316426148b9565b611c09611bd4846001600160801b031660401c90565b6001600160401b0316611c1c9190614888565b90506001600160401b037f0000000000000000000000000000000000000000000000000000000000000000166001600160401b0316816001600160401b031611611c665780611466565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b600080611ca5836001600160801b03166132ed565b60ff1690507f0000000000000000000000000000000000000000000000000000000000000000811115611ceb576040516356f57b2b60e01b815260040160405180910390fd5b642e90edd00062061a806311e1a3006000611d068383614903565b9050670de0b6b3a76400006000611d3d827f0000000000000000000000000000000000000000000000000000000000000000614917565b90506000611d5b611d56670de0b6b3a764000086614917565b613359565b90506000611d69848461356f565b90506000611d7783836135be565b90506000611d84826135ec565b90506000611da382611d9e670de0b6b3a76400008f614917565b613769565b90506000611db18b836135be565b9050611dbd818d614917565b9f9e505050505050505050505050505050565b60028181548110611de057600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff84169550600160201b9093046001600160a01b03908116949216926001600160801b03918216929180821691600160801b90041687565b60006002600d5460ff166002811115611e5e57611e5e61457a565b03611e7f57506001600160a01b03166000908152600b602052604090205490565b506001600160a01b031660009081526003602052604090205490565b336001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161480611efa5750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b611f17576040516369c3779f60e11b815260040160405180910390fd5b6115d686868686868661379a565b60008054600160801b900460ff166002811115611f4457611f4461457a565b14611f625760405163067fe19560e41b815260040160405180910390fd5b600080600080611f7186613b2b565b93509350935093506000611f8785858585613d9a565b905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611fe9573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061200d9190614936565b9050600189036120b7576001600160a01b0381166352f0f3ad8a84612033610c4b611718565b6040516001600160e01b031960e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af115801561208d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120b19190614953565b50611256565b600289036120d6576001600160a01b0381166352f0f3ad8a8489612033565b600389036120f5576001600160a01b0381166352f0f3ad8a8487612033565b600489036122025760006121326001600160801b0385167f0000000000000000000000000000000000000000000000000000000000000000613e39565b60095461213f9190614888565b61214a906001614888565b9050612154611adb565b811061216757612162611adb565b612169565b805b90506001600160a01b0382166352f0f3ad8b8560405160e084901b6001600160e01b03191681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af11580156121d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121fb9190614953565b5050611256565b60058903612275576040516352f0f3ad60e01b8152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b604482015260086064820152608481018890526001600160a01b038216906352f0f3ad9060a40161206e565b604051600162ec819b60e01b0319815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000600060606122be611af1565b91506122c861146f565b9050909192565b60008183116122de57816122e0565b825b90505b92915050565b60008160000151826020015183604001518460600151604051602001612328949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6040805180820190915260008082526020820152815160000361237b57604051635ab458fb60e01b815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b606060008060006123a985613e66565b9194509250905060018160018111156123c4576123c461457a565b146123e2576040516325ce355f60e11b815260040160405180910390fd5b84516123ee8385614888565b1461240c57604051630b8aa6f760e31b815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816124235790505093506000835b8651811015612511576000806124966040518060400160405280858c6000015161247a91906148b9565b8152602001858c6020015161248f9190614888565b9052613e66565b5091509150604051806040016040528083836124b29190614888565b8152602001848b602001516124c79190614888565b8152508885815181106124dc576124dc61485c565b60209081029190910101526124f2600185614888565b93506124fe8183614888565b6125089084614888565b92505050612450565b50845250919392505050565b6060600080600061252d85613e66565b9194509250905060008160018111156125485761254861457a565b14612566576040516307fe6cb960e21b815260040160405180910390fd5b6125708284614888565b85511461259057604051630b8aa6f760e31b815260040160405180910390fd5b6114668560200151848461415c565b60028101546001600160a01b038316600090815260036020526040812080546001600160801b03909316929091906125d8908490614888565b90915550505050565b6000806125f63660011981013560f01c900390565b929092013560601c92915050565b6060600061261a3660011981013560f01c900390565b905060405191508282528284820160208401378260208301016000815260208101604052505092915050565b60008061265b3660011981013560f01c900390565b929092013592915050565b60008054600160801b900460ff1660028111156126855761268561457a565b146126a35760405163067fe19560e41b815260040160405180910390fd5b6000600284815481106126b8576126b861485c565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff811684526001600160a01b03600160201b90910481169484019490945260018101549093169082015260028201546001600160801b03908116606083015260038301546080830181905260049093015480821660a0840152600160801b90041660c0820152915085146127625760405163180a019960e11b815260040160405180910390fd5b60a0810151600083156001600160801b0383161760011b9050600061278f826001600160801b03166132ed565b60ff1690508615806127ca57506127c77f00000000000000000000000000000000000000000000000000000000000000006002614888565b81145b80156127d4575084155b156127f2576040516329098def60e21b815260040160405180910390fd5b600054600160901b900460ff168015612809575086155b156128275760405163075173a960e11b815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000811115612868576040516356f57b2b60e01b815260040160405180910390fd5b6128937f00000000000000000000000000000000000000000000000000000000000000006001614888565b81036128a5576128a5868885886141f0565b346128af83611c90565b146128cd57604051638620aa1960e01b815260040160405180910390fd5b60006128d888611afd565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082160361292657604051630ce0744560e21b815260040160405180910390fd5b600061295360017f00000000000000000000000000000000000000000000000000000000000000006148b9565b8303612a76577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156129b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129db9190614936565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015612a18573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a3c9190614953565b612a6f907f00000000000000000000000000000000000000000000000000000000000000006001600160401b031661496c565b9050612b07565b612aa160017f00000000000000000000000000000000000000000000000000000000000000006148b9565b8303612adb57612a6f7f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166002614997565b507f00000000000000000000000000000000000000000000000000000000000000006001600160401b03165b612b3a817f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166149c6565b6001600160401b0316612b53836001600160401b031690565b6001600160401b03161115612b9857612b95817f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166149c6565b91505b6000604083901b421760008a8152608087901b6001600160801b038d1617602052604081209192509060008181526004602052604090205490915060ff1615612bf4576040516380497e3b60e01b815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff16815260200160006001600160a01b03168152602001336001600160a01b03168152602001346001600160801b031681526020018c8152602001886001600160801b03168152602001846001600160801b0316815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a8154816001600160a01b0302191690836001600160a01b0316021790555060408201518160010160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060608201518160020160006101000a8154816001600160801b0302191690836001600160801b031602179055506080820151816003015560a08201518160040160006101000a8154816001600160801b0302191690836001600160801b0316021790555060c08201518160040160106101000a8154816001600160801b0302191690836001600160801b031602179055505050600560008c81526020019081526020016000206001600280549050612deb91906148b9565b81546001810183556000928352602080842090910191909155338252600b9052604081208054349290612e1f908490614888565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b158015612e8157600080fd5b505af1158015612e95573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b600054600160881b900460ff1615612f015760405162dc149f60e41b815260040160405180910390fd5b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d83ef2676040518163ffffffff1660e01b81526004016040805180830381865afa158015612f61573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f8591906149ee565b909250905081612fa857604051633535e1d960e11b815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a14612fdb57639824bdab6000526004601cfd5b80612fe4611adb565b1161301657612ff1611af1565b60405163f40239db60e01b815260040161300d91815260200190565b60405180910390fd5b6040805160e08101825263ffffffff815260006020820152600291810161303b611412565b6001600160a01b03168152602001346001600160801b03168152602001613060611af1565b815260016020820152604001426001600160801b0390811690915282546001808201855560009485526020808620855160059094020180549186015163ffffffff9094166001600160c01b031990921691909117600160201b6001600160a01b0394851602178155604085015191810180546001600160a01b031916929093169190911790915560608301516002820180546fffffffffffffffffffffffffffffffff19169184169190911790556080830151600382015560a083015160c090930151928216600160801b9390921692909202176004909101558054600160881b60ff60881b199091161781553490600b9061315a611412565b6001600160a01b03166001600160a01b0316815260200190815260200160002060008282546131899190614888565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156131eb57600080fd5b505af11580156131ff573d6000803e3d6000fd5b50506000805467ffffffffffffffff1916426001600160401b0316179055505060408051630f27ce5f60e21b815290517f000000000000000000000000000000000000000000000000000000000000000063ffffffff1692507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031691633c9f397c9160048083019260209291908290030181865afa1580156132ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906132d19190614a12565b600a805460ff191663ffffffff92909216929092141790555050565b7e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f6307c4acdd60e01b6001600160401b03831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b6001600160801b03811160071b81811c6001600160401b031060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b17600082136133ae57631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d6c8c3f38e95a6b1ff2ab1c3b343619018302821d6d02384773bdf1ac5676facced60901901830290911d6cb9a025d814b29c212b8b1a07cd1901909102780a09507084cc699bb0e71ea869ffffffffffffffffffffffff190105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a7640000021582026135ac57637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b6000816000190483118202156135dc5763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b600068023f2fa8f6da5b9d2819821361360457919050565b680755bf798b4a1bf1e582126136225763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056001605f1b01901d6bb17217f7d1cf79abc9e3b39881029093036c240c330e9fb2d9cbaf0fd5aafb1981018102606090811d6d0277594991cfc85f6e2461837cd9018202811d6d1a521255e34f6a5061b25ef1c9c319018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d6e02c72388d9f74f51a9331fed693f1419018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084016d01d3967ed30fc4f89c02bab5708119010290911d6e0587f503bb6ea29d25fcb740196450019091026d360d7aeea093263ecc6e0ecb291760621b010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b60006122e0670de0b6b3a76400008361378186613359565b61378b9190614a38565b6137959190614abd565b6135ec565b60008054600160801b900460ff1660028111156137b9576137b961457a565b146137d75760405163067fe19560e41b815260040160405180910390fd5b6000600287815481106137ec576137ec61485c565b6000918252602082206005919091020160048101549092506001600160801b0316908715821760011b90506138427f00000000000000000000000000000000000000000000000000000000000000006001614888565b613854826001600160801b03166132ed565b60ff161461387557604051630bea7bb360e31b815260040160405180910390fd5b6000808915613951576138c87f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000006148b9565b6001901b6138de846001600160801b03166142e5565b6001600160801b03166138f19190614aeb565b156139255761391c61390d60016001600160801b038716614aff565b865463ffffffff166000614303565b60030154613947565b7f00000000000000000000000000000000000000000000000000000000000000005b9150849050613972565b6003850154915061396f61390d6001600160801b0386166001614b1f565b90505b600882901b60088a8a60405161398992919061484c565b6040518091039020901b146139b15760405163696550ff60e01b815260040160405180910390fd5b60006139bc8c6143cc565b905060006139cb836003015490565b6040516370a6769960e11b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e14ced3290613a1f908f908f908f908f908a90600401614b6a565b6020604051808303816000875af1158015613a3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613a629190614953565b600485015491149150600090600290613a83906001600160801b03166132ed565b613a95896001600160801b03166132ed565b613a9f9190614ba4565b613aa99190614bc7565b60ff161590508115158103613ad15760405163fb4e40dd60e01b815260040160405180910390fd5b8754600160201b90046001600160a01b031615613b0157604051639071e6af60e01b815260040160405180910390fd5b50508554640100000000600160c01b03191633600160201b02179095555050505050505050505050565b6000806000806000859050600060028281548110613b4b57613b4b61485c565b6000918252602090912060059091020160048101549091507f000000000000000000000000000000000000000000000000000000000000000090613b97906001600160801b03166132ed565b60ff1611613bb8576040516359a5ae1160e11b815260040160405180910390fd5b6000815b60048301547f000000000000000000000000000000000000000000000000000000000000000090613bf5906001600160801b03166132ed565b60ff169250821115613c6a57825463ffffffff16613c347f00000000000000000000000000000000000000000000000000000000000000006001614888565b8303613c3e578391505b60028181548110613c5157613c5161485c565b9060005260206000209060050201935080945050613bbc565b600481810154908401546001600160801b0391821691166000816001600160801b0316613caf613ca3856001600160801b031660011c90565b6001600160801b031690565b6001600160801b03161490508015613d48576000613cd5836001600160801b03166142e5565b6001600160801b03161115613d25576000613d05613cfd60016001600160801b038616614aff565b896001614303565b6003810154600490910154909c506001600160801b03169a50613d2b9050565b6008549a505b600386015460048701549099506001600160801b03169750613d8c565b6000613d61613cfd6001600160801b0385166001614b1f565b6003808901546004808b015492840154930154909e506001600160801b039182169d50919b50169850505b505050505050509193509193565b60006001600160801b03841615613df55760408051602081018790526001600160801b038087169282019290925260608101859052908316608082015260a00160405160208183030381529060405280519060200120611466565b8282604051602001613e1a9291909182526001600160801b0316602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080613e45846132ed565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003613e9057604051635ab458fb60e01b815260040160405180910390fd5b6020840151805160001a607f8111613eb5576000600160009450945094505050614155565b60b78111613f4d576000613eca6080836148b9565b905080876000015111613ef0576040516366c9448560e01b815260040160405180910390fd5b6001838101516001600160f81b0319169082148015613f1c5750600160ff1b6001600160f81b03198216105b15613f3a5760405163babb01dd60e01b815260040160405180910390fd5b5060019550935060009250614155915050565b60bf811161402f576000613f6260b7836148b9565b905080876000015111613f88576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b0319166000819003613fb95760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c60378111613fe85760405163babb01dd60e01b815260040160405180910390fd5b613ff28184614888565b895111614012576040516366c9448560e01b815260040160405180910390fd5b61401d836001614888565b97509550600094506141559350505050565b60f7811161407b57600061404460c0836148b9565b90508087600001511161406a576040516366c9448560e01b815260040160405180910390fd5b600195509350849250614155915050565b600061408860f7836148b9565b9050808760000151116140ae576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b03191660008190036140df5760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c6037811161410e5760405163babb01dd60e01b815260040160405180910390fd5b6141188184614888565b895111614138576040516366c9448560e01b815260040160405180910390fd5b614143836001614888565b97509550600194506141559350505050565b9193909250565b6060816001600160401b03811115614176576141766147c3565b6040519080825280601f01601f1916602001820160405280156141a0576020820181803683370190505b50905081156141e95760006141b58486614888565b90506020820160005b848110156141d65782810151828201526020016141be565b848111156141e5576000858301525b5050505b9392505050565b60006142066001600160801b0384166001614b1f565b9050600061421682866001614303565b9050600086901a8380614278575061424f60027f0000000000000000000000000000000000000000000000000000000000000000614aeb565b6004830154600290614269906001600160801b03166132ed565b6142739190614bc7565b60ff16145b156142b75760ff811660011480614292575060ff81166002145b6142b25760405163f40239db60e01b81526004810188905260240161300d565b6142dc565b60ff8116156142dc5760405163f40239db60e01b81526004810188905260240161300d565b50505050505050565b6000806142f1836132ed565b600160ff919091161b90920392915050565b600080826143435761433e6001600160801b0386167f00000000000000000000000000000000000000000000000000000000000000006143fb565b614355565b614355856001600160801b031661446a565b90506002848154811061436a5761436a61485c565b906000526020600020906005020191505b60048201546001600160801b038281169116146143c457815460028054909163ffffffff169081106143af576143af61485c565b9060005260206000209060050201915061437b565b509392505050565b60008060008060006143dd86613b2b565b93509350935093506143f184848484613d9a565b9695505050505050565b600081614410846001600160801b03166132ed565b60ff16116144265763b34b5c226000526004601cfd5b61442f8361446a565b905081614444826001600160801b03166132ed565b60ff16116122e3576122e061445a836001614888565b6001600160801b0383169061448e565b6000811960018301168161447d826132ed565b60ff169390931c8015179392505050565b60008061449a846132ed565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f8401126144c857600080fd5b5081356001600160401b038111156144df57600080fd5b6020830191508360208285010111156144f757600080fd5b9250929050565b600080600083850360a081121561451457600080fd5b608081121561452257600080fd5b5083925060808401356001600160401b0381111561453f57600080fd5b61454b868287016144b6565b9497909650939450505050565b6000806040838503121561456b57600080fd5b50508035926020909101359150565b634e487b7160e01b600052602160045260246000fd5b600381106145ae57634e487b7160e01b600052602160045260246000fd5b50565b602081016145be83614590565b91905290565b6001600160a01b03811681146145ae57600080fd5b6000602082840312156145eb57600080fd5b81356141e9816145c4565b60008060006060848603121561460b57600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b818110156146485760208185018101518683018201520161462c565b8181111561465a576000602083870101525b50601f01601f19169290920160200192915050565b6020815260006122e06020830184614622565b60006020828403121561469457600080fd5b5035919050565b80151581146145ae57600080fd5b600080600080608085870312156146bf57600080fd5b84359350602085013592506040850135915060608501356146df8161469b565b939692955090935050565b6000602082840312156146fc57600080fd5b81356001600160801b03811681146141e957600080fd5b6000806000806000806080878903121561472c57600080fd5b86359550602087013561473e8161469b565b945060408701356001600160401b038082111561475a57600080fd5b6147668a838b016144b6565b9096509450606089013591508082111561477f57600080fd5b5061478c89828a016144b6565b979a9699509497509295939492505050565b63ffffffff841681528260208201526060604082015260006114666060830184614622565b634e487b7160e01b600052604160045260246000fd5b6000608082840312156147eb57600080fd5b604051608081018181106001600160401b038211171561481b57634e487b7160e01b600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000821982111561489b5761489b614872565b500190565b6000600182016148b2576148b2614872565b5060010190565b6000828210156148cb576148cb614872565b500390565b6000602082840312156148e257600080fd5b81516141e98161469b565b634e487b7160e01b600052601260045260246000fd5b600082614912576149126148ed565b500490565b600081600019048311821515161561493157614931614872565b500290565b60006020828403121561494857600080fd5b81516141e9816145c4565b60006020828403121561496557600080fd5b5051919050565b60006001600160401b0380831681851680830382111561498e5761498e614872565b01949350505050565b60006001600160401b03808316818516818304811182151516156149bd576149bd614872565b02949350505050565b60006001600160401b03838116908316818110156149e6576149e6614872565b039392505050565b60008060408385031215614a0157600080fd5b505080516020909101519092909150565b600060208284031215614a2457600080fd5b815163ffffffff811681146141e957600080fd5b60006001600160ff1b0381841382841380821686840486111615614a5e57614a5e614872565b600160ff1b6000871282811687830589121615614a7d57614a7d614872565b60008712925087820587128484161615614a9957614a99614872565b87850587128184161615614aaf57614aaf614872565b505050929093029392505050565b600082614acc57614acc6148ed565b600160ff1b821460001984141615614ae657614ae6614872565b500590565b600082614afa57614afa6148ed565b500690565b60006001600160801b03838116908316818110156149e6576149e6614872565b60006001600160801b0380831681851680830382111561498e5761498e614872565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b606081526000614b7e606083018789614b41565b8281036020840152614b91818688614b41565b9150508260408301529695505050505050565b600060ff821660ff841680821015614bbe57614bbe614872565b90039392505050565b600060ff831680614bda57614bda6148ed565b8060ff8416069150509291505056fea26469706673582212205146f2c2113fa0455e2dca1a6f89d7a4f60677adf044f22f40eacac5db3da95e64736f6c634300080f0033000000000000000000000000000000000000000000000000000000000000000103682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b60000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000aa59a0777648bc75cd10364083e878c1ccd6112a0000000000000000000000003e8a0b63f57e975c268d610ece93da5f78c01321000000000000000000000000496286e5ee7758de84dd17e6d2d97afc2ace4cc70000000000000000000000000000000000000000000000000000000000002105000000000000000000000000642229f238fb9de03374be34b0ed8d9de80752c50000000000000000000000008ca1e12404d16373aef756179b185f27b2994f3a", - "nonce": "0x3", - "chainId": "0x1" - }, - "additionalContracts": [], - "isFixedGasLimit": false - } - ], - "receipts": [ - { - "status": "0x1", - "cumulativeGasUsed": "0xdc722e", - "logs": [], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "type": "0x2", - "transactionHash": "0x1c728a81c5c99fe071417ef4f35d804acf78661dcb517122df042305597b1a4b", - "transactionIndex": "0x62", - "blockHash": "0x8f41e26fdc44a1e544e5b3e16ee07ed54b9ee9890d5b7c33d870a6663b1af5fd", - "blockNumber": "0x154c679", - "gasUsed": "0x3fb4f1", - "effectiveGasPrice": "0x8545de22", - "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", - "to": null, - "contractAddress": "0xb3f8cad97941510c66d78cdd3157d930fa4a7aee" - }, - { - "status": "0x1", - "cumulativeGasUsed": "0x13f87b3", - "logs": [], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "type": "0x2", - "transactionHash": "0x0301698b4f90faad35fec84b09d6e23ba9f02e09e2450f8cf262be4f30c54a42", - "transactionIndex": "0xb4", - "blockHash": "0x9d69cd25783ae403ab9cdaeccfcdb8bba1ff91a5dec0602ecaed6b2b6ca83de7", - "blockNumber": "0x154c67a", - "gasUsed": "0x416d6a", - "effectiveGasPrice": "0x853d8a8b", - "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", - "to": null, - "contractAddress": "0x4e0a38923fba12da162fe255642b095f86598c5b" - } - ], - "libraries": [], - "pending": [], - "returns": {}, - "timestamp": 1745427555, - "chain": 1, - "commit": "a324b9f" -} \ No newline at end of file From 6df436dfd73f0c3f935c1fe8dd191d1841115d5a Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 10:21:11 -0400 Subject: [PATCH 11/27] remove commented out code --- .../2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol index 2c110a94..c03e6ec6 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol @@ -107,8 +107,8 @@ contract UpgradeDGF is MultisigScript { function _postCheck(Vm.AccountAccess[] memory, Simulation.Payload memory) internal view override { require(dgfProxy.gameImpls(CANNON) == fdgImpl, "post-110"); require(dgfProxy.gameImpls(PERMISSIONED_CANNON) == pdgImpl, "post-120"); - // _postcheckHasAnchorState(CANNON); - // _postcheckHasAnchorState(PERMISSIONED_CANNON); + _postcheckHasAnchorState(CANNON); + _postcheckHasAnchorState(PERMISSIONED_CANNON); } // Checks the anchor state for the source game type still exists after re-initialization. The actual anchor state From 50b780063b1dae54fbdcb10c06e5d0011ea9e2be Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 10:23:35 -0400 Subject: [PATCH 12/27] add verbose mode and move system config as local variable in setUp() --- mainnet/2025-04-23-upgrade-fault-proofs/Makefile | 2 +- .../script/DeployDisputeGames.s.sol | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile index 291ef239..7afd0a14 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -21,7 +21,7 @@ sign-op: approve-op: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "approve(address[],bytes)" [$(OP_SIGNER_SAFE_ADDR)] $(SIGNATURES) \ - --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast + --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv .PHONY: sign-cb sign-cb: diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol index 42494078..2ba05c75 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol @@ -21,10 +21,8 @@ contract DeployDisputeGames is Script { using LibDuration for Duration; using LibGameType for GameType; - // TODO: Confirm expected version string public constant EXPECTED_VERSION = "1.4.1"; - SystemConfig internal _SYSTEM_CONFIG = SystemConfig(vm.envAddress("SYSTEM_CONFIG")); Claim immutable absolutePrestate; FaultDisputeGame.GameConstructorParams fdgParams; @@ -37,7 +35,8 @@ contract DeployDisputeGames is Script { } function setUp() public { - DisputeGameFactory dgfProxy = DisputeGameFactory(_SYSTEM_CONFIG.disputeGameFactory()); + SystemConfig systemConfig = SystemConfig(vm.envAddress("SYSTEM_CONFIG")); + DisputeGameFactory dgfProxy = DisputeGameFactory(systemConfig.disputeGameFactory()); FaultDisputeGame currentFdg = FaultDisputeGame(address(dgfProxy.gameImpls(GameTypes.CANNON))); PermissionedDisputeGame currentPdg = PermissionedDisputeGame(address(dgfProxy.gameImpls(GameTypes.PERMISSIONED_CANNON))); From 2e86b94d0ef3c38f1fbfd7e1816757cd5b44977d Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 10:27:26 -0400 Subject: [PATCH 13/27] move system_config to constructor for upgradedgf --- .../2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol index c03e6ec6..d24c88ee 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/UpgradeDGF.s.sol @@ -50,6 +50,7 @@ contract UpgradeDGF is MultisigScript { uint32 public constant PERMISSIONED_CANNON = 1; address public immutable OWNER_SAFE; + address public immutable SYSTEM_CONFIG; IDisputeGameFactory public dgfProxy; address public fdgImpl; @@ -57,6 +58,7 @@ contract UpgradeDGF is MultisigScript { constructor() { OWNER_SAFE = vm.envAddress("OWNER_SAFE"); + SYSTEM_CONFIG = vm.envAddress("SYSTEM_CONFIG"); } function setUp() public { @@ -64,7 +66,7 @@ contract UpgradeDGF is MultisigScript { string memory path = string.concat(rootPath, "/addresses.json"); string memory addresses = vm.readFile(path); - dgfProxy = IDisputeGameFactory(ISystemConfig(vm.envAddress("SYSTEM_CONFIG")).disputeGameFactory()); + dgfProxy = IDisputeGameFactory(ISystemConfig(SYSTEM_CONFIG).disputeGameFactory()); fdgImpl = addresses.readAddress(".faultDisputeGame"); pdgImpl = addresses.readAddress(".permissionedDisputeGame"); From c6a3d053866a4963cab6e00123ed569a0bc287b4 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 10:58:16 -0400 Subject: [PATCH 14/27] move env variable read to constructor --- .../script/DeployDisputeGames.s.sol | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol index 2ba05c75..5084574c 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol +++ b/mainnet/2025-04-23-upgrade-fault-proofs/script/DeployDisputeGames.s.sol @@ -24,6 +24,7 @@ contract DeployDisputeGames is Script { string public constant EXPECTED_VERSION = "1.4.1"; Claim immutable absolutePrestate; + SystemConfig immutable systemConfig; FaultDisputeGame.GameConstructorParams fdgParams; FaultDisputeGame.GameConstructorParams pdgParams; @@ -32,10 +33,10 @@ contract DeployDisputeGames is Script { constructor() { absolutePrestate = Claim.wrap(vm.envBytes32("ABSOLUTE_PRESTATE")); + systemConfig = SystemConfig(vm.envAddress("SYSTEM_CONFIG")); } function setUp() public { - SystemConfig systemConfig = SystemConfig(vm.envAddress("SYSTEM_CONFIG")); DisputeGameFactory dgfProxy = DisputeGameFactory(systemConfig.disputeGameFactory()); FaultDisputeGame currentFdg = FaultDisputeGame(address(dgfProxy.gameImpls(GameTypes.CANNON))); PermissionedDisputeGame currentPdg = From ccfc49e4e23b4ad7f71887f9482450be7ab70870 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 16:57:17 -0400 Subject: [PATCH 15/27] add addresses.json --- mainnet/2025-04-23-upgrade-fault-proofs/addresses.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/addresses.json diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json new file mode 100644 index 00000000..78ec7132 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/addresses.json @@ -0,0 +1 @@ +{"faultDisputeGame": "0xab91fb6cef84199145133f75cbd96b8a31f184ed","permissionedDisputeGame": "0x7344da3a618b86cda67f8260c0cc2027d99f5b49"} \ No newline at end of file From e677fcd0b2a44f5f2cb95e0254de0244f014bc52 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 16:57:30 -0400 Subject: [PATCH 16/27] add deployment records --- .../1/run-1745860191.json | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745860191.json diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745860191.json b/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745860191.json new file mode 100644 index 00000000..42f82192 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/records/DeployDisputeGames.s.sol/1/run-1745860191.json @@ -0,0 +1,86 @@ +{ + "transactions": [ + { + "hash": "0x0d255db3c8490310d1e4559f5b3333d16875be63f94fac356388f61b0563980a", + "transactionType": "CREATE", + "contractName": "FaultDisputeGame", + "contractAddress": "0xab91fb6cef84199145133f75cbd96b8a31f184ed", + "function": null, + "arguments": [ + "(0, 0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6, 73, 30, 10800, 302400, 0xF027F4A985560fb13324e943edf55ad6F1d15Dc1, 0xa2f2aC6F5aF72e494A227d79Db20473Cf7A1FFE8, 0x496286e5eE7758de84Dd17e6d2d97afC2ACE4cc7, 8453)" + ], + "transaction": { + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "gas": "0x529235", + "value": "0x0", + "input": "0x6101c06040523480156200001257600080fd5b50604051620052163803806200521683398101604081905262000035916200052d565b620000436001607e62000600565b60ff16816040015111156200006b57604051633beff19960e11b815260040160405180910390fd5b60001981606001511480620000955750604081015160608201516200009290600162000626565b10155b15620000b45760405163e62ccf3960e01b815260040160405180910390fd5b600281606001511015620000db5760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b0380168160c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000128573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200014e919062000641565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200018c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b2919062000661565b1115620001d25760405163b4e1243360e01b815260040160405180910390fd5b6000620001f782608001516001600160401b03166200048060201b62000b7f1760201c565b6200020d906001600160401b031660026200067b565b905060008260c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000254573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027a919062000641565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002b8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002de919062000661565b6200030184608001516001600160401b03166200048060201b62000b7f1760201c565b6001600160401b031662000316919062000626565b905060006200033183836200048360201b620030a61760201c565b90506001600160401b038111156200035c5760405163235dfb2b60e21b815260040160405180910390fd5b6200037f8460a001516001600160401b03166200048060201b62000b7f1760201c565b6001600160401b0316816001600160401b03161115620003b25760405163235dfb2b60e21b815260040160405180910390fd5b63ffffffff8016620003d9856000015163ffffffff166200048060201b62000b7f1760201c565b63ffffffff1603620003fe5760405163073ed16760e31b815260040160405180910390fd5b5050815163ffffffff1661012090815260208301516080908152604084015160a0908152606085015160c0908152918501516001600160401b039081166101a052908501511660e0908152908401516001600160a01b03908116610100908152918501518116610140529084015116610160529091015161018052506200069d565b90565b600081831162000494578162000496565b825b9392505050565b60405161014081016001600160401b0381118282101715620004cf57634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620004ea57600080fd5b919050565b80516001600160401b0381168114620004ea57600080fd5b6001600160a01b03811681146200051d57600080fd5b50565b8051620004ea8162000507565b600061014082840312156200054157600080fd5b6200054b6200049d565b6200055683620004d5565b81526020830151602082015260408301516040820152606083015160608201526200058460808401620004ef565b60808201526200059760a08401620004ef565b60a0820152620005aa60c0840162000520565b60c0820152620005bd60e0840162000520565b60e0820152610100620005d281850162000520565b90820152610120928301519281019290925250919050565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff8416808210156200061d576200061d620005ea565b90039392505050565b600082198211156200063c576200063c620005ea565b500190565b6000602082840312156200065457600080fd5b8151620004968162000507565b6000602082840312156200067457600080fd5b5051919050565b6000816000190483118215151615620006985762000698620005ea565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a0516149de620008386000396000818161068c01528181611a3401528181611a9e0152611ad001526000818161098b0152612ffe01526000818161060f01528181611f960152818161203e015281816120b4015281816121ce0152612522015260008181610515015281816114b00152818161157a01528181611e1a015261245a01526000818161081c015281816124f9015261306a0152600081816104c10152818161194d01528181612bab0152612d640152600081816109de01528181610d63015281816118d601528181611aff01528181611b5a015281816126f80152612738015260008181610a11015281816117930152818161185f01528181611a6f01528181612a5401528181612ee5015281816134e401528181613a1401528181613b2f01528181613b8d0152613bd8015260008181610ab80152818161181b015281816119210152818161277c015281816127e9015281816129ed0152612a750152600081816107410152612af801526149de6000f3fe6080604052600436106102e45760003560e01c80636f03440911610190578063c395e1ca116100dc578063dabd396d11610095578063f8f43ff61161006f578063f8f43ff614610a65578063fa24f74314610a85578063fa315aa914610aa9578063fe2bbeb214610adc57600080fd5b8063dabd396d146109cf578063ec5e630814610a02578063eff0f59214610a3557600080fd5b8063c395e1ca146108a8578063c6f0308c146108c8578063cf09e0d01461093c578063d5d44d801461095c578063d6ae3cd51461097c578063d8cc1a3c146109af57600080fd5b80638b85902b11610149578063bbdc02db11610123578063bbdc02db14610805578063bcef3b5514610846578063bd8da9561461085b578063c0d8bb741461087b57600080fd5b80638b85902b1461071d5780638d450a9514610732578063a445ece61461076557600080fd5b80636f034409146106b057806370872aa5146106c3578063786b844b146106d85780637b0f0adc146106ed5780638129fc1c146107005780638980e0cc1461070857600080fd5b80633a7684631161024f57806357da950e11610208578063609d3334116101e2578063609d33341461063357806360e27464146106485780636361506d146106685780636b6716c01461067d57600080fd5b806357da950e146105b05780635a5fa2d9146105e05780635c0cba331461060057600080fd5b80633a768463146104b25780633e3ac912146104e55780633fc8cef314610506578063472777c614610539578063529d6a8c1461054c57806354fd4d501461057957600080fd5b806325fc2ace116102a157806325fc2ace146103f75780632810e1d6146104165780632ad69aeb1461042b57806330dbe5701461044b578063378dd48c1461048357806337b1b2291461049d57600080fd5b806301935130146102e957806303c2924d1461030b57806319effeb41461032b578063200d2ed21461036f578063222abf451461039d578063250e69bd146103dd575b600080fd5b3480156102f557600080fd5b506103096103043660046142bd565b610b0c565b005b34801561031757600080fd5b50610309610326366004614317565b610cea565b34801561033757600080fd5b5060005461035290600160401b90046001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b34801561037b57600080fd5b5060005461039090600160801b900460ff1681565b6040516103669190614370565b3480156103a957600080fd5b506103cd6103b8366004614398565b600c6020526000908152604090205460ff1681565b6040519015158152602001610366565b3480156103e957600080fd5b50600a546103cd9060ff1681565b34801561040357600080fd5b506008545b604051908152602001610366565b34801561042257600080fd5b50610390611195565b34801561043757600080fd5b50610408610446366004614317565b611315565b34801561045757600080fd5b5060015461046b906001600160a01b031681565b6040516001600160a01b039091168152602001610366565b34801561048f57600080fd5b50600d546103909060ff1681565b3480156104a957600080fd5b5061046b611346565b3480156104be57600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061046b565b3480156104f157600080fd5b506000546103cd90600160901b900460ff1681565b34801561051257600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061046b565b6103096105473660046143b5565b611357565b34801561055857600080fd5b50610408610567366004614398565b60036020526000908152604090205481565b34801561058557600080fd5b50604080518082019091526005815264312e342e3160d81b60208201525b604051610366919061442e565b3480156105bc57600080fd5b506008546009546105cb919082565b60408051928352602083019190915201610366565b3480156105ec57600080fd5b506104086105fb366004614441565b611369565b34801561060c57600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061046b565b34801561063f57600080fd5b506105a36113a3565b34801561065457600080fd5b50610309610663366004614398565b6113b1565b34801561067457600080fd5b5061040861164c565b34801561068957600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610352565b6103096106be366004614468565b611658565b3480156106cf57600080fd5b50600954610408565b3480156106e457600080fd5b50610309611ec9565b6103096106fb3660046143b5565b612192565b61030961219f565b34801561071457600080fd5b50600254610408565b34801561072957600080fd5b506104086125b5565b34801561073e57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610408565b34801561077157600080fd5b506107c7610780366004614441565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046001600160801b0316906001600160a01b031684565b60408051941515855263ffffffff90931660208501526001600160801b03909116918301919091526001600160a01b03166060820152608001610366565b34801561081157600080fd5b5060405163ffffffff7f0000000000000000000000000000000000000000000000000000000000000000168152602001610366565b34801561085257600080fd5b506104086125c1565b34801561086757600080fd5b50610352610876366004614441565b6125cd565b34801561088757600080fd5b50610408610896366004614398565b600b6020526000908152604090205481565b3480156108b457600080fd5b506104086108c33660046144a9565b612760565b3480156108d457600080fd5b506108e86108e3366004614441565b6128a0565b6040805163ffffffff90981688526001600160a01b03968716602089015295909416948601949094526001600160801b039182166060860152608085015291821660a08401521660c082015260e001610366565b34801561094857600080fd5b50600054610352906001600160401b031681565b34801561096857600080fd5b50610408610977366004614398565b612913565b34801561098857600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610408565b3480156109bb57600080fd5b506103096109ca3660046144d2565b61296b565b3480156109db57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610352565b348015610a0e57600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610408565b348015610a4157600080fd5b506103cd610a50366004614441565b60046020526000908152604090205460ff1681565b348015610a7157600080fd5b50610309610a803660046143b5565b612cfc565b348015610a9157600080fd5b50610a9a613068565b6040516103669392919061455d565b348015610ab557600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610408565b348015610ae857600080fd5b506103cd610af7366004614441565b60066020526000908152604090205460ff1681565b60008054600160801b900460ff166002811115610b2b57610b2b614339565b14610b495760405163067fe19560e41b815260040160405180910390fd5b600054600160901b900460ff1615610b745760405163075173a960e11b815260040160405180910390fd5b610b82610b7f6125c1565b90565b610b99610b9436869003860186614598565b6130c0565b14610bb757604051639cc00b5b60e01b815260040160405180910390fd5b82606001358282604051610bcc92919061460b565b604051809103902014610bf25760405163d81d583b60e01b815260040160405180910390fd5b6000610c3b610c3684848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061311c92505050565b613170565b90506000610c6282600881518110610c5557610c5561461b565b60200260200101516132f4565b9050602081511115610c875760405163d81d583b60e01b815260040160405180910390fd5b602081810151825190910360031b1c610c9e6125b5565b8103610cbd57604051630b8ed88360e41b815260040160405180910390fd5b5050600180546001600160a01b0319163317905550506000805460ff60901b1916600160901b1790555050565b60008054600160801b900460ff166002811115610d0957610d09614339565b14610d275760405163067fe19560e41b815260040160405180910390fd5b600060028381548110610d3c57610d3c61461b565b906000526020600020906005020190506000610d57846125cd565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082161015610da65760405163f2440b5360e01b815260040160405180910390fd5b60008481526006602052604090205460ff1615610dd65760405163f1a9458160e01b815260040160405180910390fd5b6000848152600560205260409020805480158015610df357508515155b15610e55578354600160201b90046001600160a01b031660008115610e185781610e27565b60018601546001600160a01b03165b9050610e338187613376565b505050600094855250506006602052505060409020805460ff19166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046001600160801b031693810193909352600101546001600160a01b03166060830152610ed9576001600160801b036040820152600181526000869003610ed9578195505b600086826020015163ffffffff16610ef19190614647565b90506000838211610f025781610f04565b835b602084015190915063ffffffff165b8181101561100a576000868281548110610f2f57610f2f61461b565b6000918252602080832090910154808352600690915260409091205490915060ff16610f6e57604051634d03b32360e11b815260040160405180910390fd5b600060028281548110610f8357610f8361461b565b600091825260209091206005909102018054909150600160201b90046001600160a01b0316158015610fc95750600481015460408701516001600160801b039182169116115b15610ff55760018101546001600160a01b0316606087015260048101546001600160801b031660408701525b505080806110029061465f565b915050610f13565b5063ffffffff818116602085810191825260008c815260079091526040908190208651815493519288015164ffffffffff1990941690151564ffffffff00191617610100929094169182029390931774ffffffffffffffffffffffffffffffff00000000001916650100000000006001600160801b03909316929092029190911782556060850151600190920180546001600160a01b0319166001600160a01b039093169290921790915584900361118a57606083015160008a8152600660205260409020805460ff19166001179055891580156110f15750600054600160901b900460ff165b15611137576001546001600160a01b031661110c818a613376565b88546001600160a01b03909116600160201b02640100000000600160c01b0319909116178855611188565b6111646001600160a01b0382161561114f578161115e565b60018901546001600160a01b03165b89613376565b8754640100000000600160c01b031916600160201b6001600160a01b038316021788555b505b505050505050505050565b600080600054600160801b900460ff1660028111156111b6576111b6614339565b146111d45760405163067fe19560e41b815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff1661121f57604051634d03b32360e11b815260040160405180910390fd5b60006001600160a01b0316600260008154811061123e5761123e61461b565b6000918252602090912060059091020154600160201b90046001600160a01b03161461126b57600161126e565b60025b600080546001600160401b034216600160401b026fffffffffffffffff000000000000000019821681178355929350839260ff60801b191670ffffffffffffffffff00000000000000001990911617600160801b8360028111156112d4576112d4614339565b0217905560028111156112e9576112e9614339565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a290565b6005602052816000526040600020818154811061133157600080fd5b90600052602060002001600091509150505481565b600061135260006133b8565b905090565b6113648383836001611658565b505050565b6000818152600760209081526040808320600590925282208054825461139a90610100900463ffffffff1682614678565b95945050505050565b6060611352605460206133db565b6113b9611ec9565b60006002600d5460ff1660028111156113d4576113d4614339565b036113f857506001600160a01b0381166000908152600b602052604090205461144e565b6001600d5460ff16600281111561141157611411614339565b0361143557506001600160a01b03811660009081526003602052604090205461144e565b6040516301e28f7d60e21b815260040160405180910390fd5b6001600160a01b0382166000908152600c602052604090205460ff16611512576001600160a01b038281166000818152600c602052604090819020805460ff1916600117905551637eee288d60e01b81526004810191909152602481018390527f000000000000000000000000000000000000000000000000000000000000000090911690637eee288d90604401600060405180830381600087803b1580156114f657600080fd5b505af115801561150a573d6000803e3d6000fd5b505050505050565b80600003611533576040516317bfe5f760e01b815260040160405180910390fd5b6001600160a01b038281166000818152600b602090815260408083208390556003909152808220919091555163f3fef3a360e01b81526004810191909152602481018390527f00000000000000000000000000000000000000000000000000000000000000009091169063f3fef3a390604401600060405180830381600087803b1580156115c057600080fd5b505af11580156115d4573d6000803e3d6000fd5b505050506000826001600160a01b03168260405160006040518083038185875af1925050503d8060008114611625576040519150601f19603f3d011682016040523d82523d6000602084013e61162a565b606091505b5050905080611364576040516383e6cc6b60e01b815260040160405180910390fd5b6000611352603461341d565b60008054600160801b900460ff16600281111561167757611677614339565b146116955760405163067fe19560e41b815260040160405180910390fd5b6000600284815481106116aa576116aa61461b565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff811684526001600160a01b03600160201b90910481169484019490945260018101549093169082015260028201546001600160801b03908116606083015260038301546080830181905260049093015480821660a0840152600160801b90041660c0820152915085146117545760405163180a019960e11b815260040160405180910390fd5b60a0810151600083156001600160801b0383161760011b90506000611781826001600160801b031661343d565b60ff1690508615806117bc57506117b97f00000000000000000000000000000000000000000000000000000000000000006002614647565b81145b80156117c6575084155b156117e4576040516329098def60e21b815260040160405180910390fd5b600054600160901b900460ff1680156117fb575086155b156118195760405163075173a960e11b815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000081111561185a576040516356f57b2b60e01b815260040160405180910390fd5b6118857f00000000000000000000000000000000000000000000000000000000000000006001614647565b810361189757611897868885886134a9565b346118a183612760565b146118bf57604051638620aa1960e01b815260040160405180910390fd5b60006118ca886125cd565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082160361191857604051630ce0744560e21b815260040160405180910390fd5b600061194560017f0000000000000000000000000000000000000000000000000000000000000000614678565b8303611a68577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156119a9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119cd919061468f565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015611a0a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a2e91906146ac565b611a61907f00000000000000000000000000000000000000000000000000000000000000006001600160401b03166146c5565b9050611af9565b611a9360017f0000000000000000000000000000000000000000000000000000000000000000614678565b8303611acd57611a617f00000000000000000000000000000000000000000000000000000000000000006001600160401b031660026146f0565b507f00000000000000000000000000000000000000000000000000000000000000006001600160401b03165b611b2c817f00000000000000000000000000000000000000000000000000000000000000006001600160401b031661471f565b6001600160401b0316611b45836001600160401b031690565b6001600160401b03161115611b8a57611b87817f00000000000000000000000000000000000000000000000000000000000000006001600160401b031661471f565b91505b6000604083901b421760008a8152608087901b6001600160801b038d1617602052604081209192509060008181526004602052604090205490915060ff1615611be6576040516380497e3b60e01b815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff16815260200160006001600160a01b03168152602001336001600160a01b03168152602001346001600160801b031681526020018c8152602001886001600160801b03168152602001846001600160801b0316815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a8154816001600160a01b0302191690836001600160a01b0316021790555060408201518160010160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060608201518160020160006101000a8154816001600160801b0302191690836001600160801b031602179055506080820151816003015560a08201518160040160006101000a8154816001600160801b0302191690836001600160801b0316021790555060c08201518160040160106101000a8154816001600160801b0302191690836001600160801b031602179055505050600560008c81526020019081526020016000206001600280549050611ddd9190614678565b81546001810183556000928352602080842090910191909155338252600b9052604081208054349290611e11908490614647565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b158015611e7357600080fd5b505af1158015611e87573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b6002600d5460ff166002811115611ee257611ee2614339565b1480611f0457506001600d5460ff166002811115611f0257611f02614339565b145b15611f0b57565b6000600d5460ff166002811115611f2457611f24614339565b14611f42576040516301e28f7d60e21b815260040160405180910390fd5b600054600160401b90046001600160401b03166001600160401b0316600003611f7e57604051636082930560e11b815260040160405180910390fd5b604051630314d2b360e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630314d2b390602401602060405180830381865afa158015611fe5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120099190614747565b90508061202957604051634851bd9b60e01b815260040160405180910390fd5b6040516317cf21a960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906317cf21a990602401600060405180830381600087803b15801561208a57600080fd5b505af192505050801561209b575060015b506040516324b5ce0b60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063496b9c1690602401602060405180830381865afa158015612103573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121279190614747565b9050801561214157600d805460ff1916600117905561214f565b600d805460ff191660021790555b600d546040517f9908eaac0645df9d0704d06adc9e07337c951de2f06b5f2836151d48d5e4722f916121869160ff90911690614370565b60405180910390a15050565b6113648383836000611658565b600054600160881b900460ff16156121c95760405162dc149f60e41b815260040160405180910390fd5b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d83ef2676040518163ffffffff1660e01b81526004016040805180830381865afa158015612229573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061224d9190614764565b90925090508161227057604051633535e1d960e11b815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a146122a357639824bdab6000526004601cfd5b806122ac6125b5565b116122de576122b96125c1565b60405163f40239db60e01b81526004016122d591815260200190565b60405180910390fd5b6040805160e08101825263ffffffff8152600060208201526002918101612303611346565b6001600160a01b03168152602001346001600160801b031681526020016123286125c1565b815260016020820152604001426001600160801b0390811690915282546001808201855560009485526020808620855160059094020180549186015163ffffffff9094166001600160c01b031990921691909117600160201b6001600160a01b0394851602178155604085015191810180546001600160a01b031916929093169190911790915560608301516002820180546fffffffffffffffffffffffffffffffff19169184169190911790556080830151600382015560a083015160c090930151928216600160801b9390921692909202176004909101558054600160881b60ff60881b199091161781553490600b90612422611346565b6001600160a01b03166001600160a01b0316815260200190815260200160002060008282546124519190614647565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156124b357600080fd5b505af11580156124c7573d6000803e3d6000fd5b50506000805467ffffffffffffffff1916426001600160401b0316179055505060408051630f27ce5f60e21b815290517f000000000000000000000000000000000000000000000000000000000000000063ffffffff1692507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031691633c9f397c9160048083019260209291908290030181865afa158015612575573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906125999190614788565b600a805460ff191663ffffffff92909216929092141790555050565b6000611352605461341d565b6000611352601461341d565b600080600054600160801b900460ff1660028111156125ee576125ee614339565b1461260c5760405163067fe19560e41b815260040160405180910390fd5b6000600283815481106126215761262161461b565b600091825260208220600590910201805490925063ffffffff9081161461268757815460028054909163ffffffff1690811061265f5761265f61461b565b906000526020600020906005020160040160109054906101000a90046001600160801b031690505b60048201546000906126b090600160801b90046001600160401b03165b6001600160401b031690565b6126c3906001600160401b031642614678565b6126d96126a4846001600160801b031660401c90565b6001600160401b03166126ec9190614647565b90506001600160401b037f0000000000000000000000000000000000000000000000000000000000000000166001600160401b0316816001600160401b031611612736578061139a565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b600080612775836001600160801b031661343d565b60ff1690507f00000000000000000000000000000000000000000000000000000000000000008111156127bb576040516356f57b2b60e01b815260040160405180910390fd5b642e90edd00062061a806311e1a30060006127d683836147c4565b9050670de0b6b3a7640000600061280d827f00000000000000000000000000000000000000000000000000000000000000006147d8565b9050600061282b612826670de0b6b3a7640000866147d8565b61359e565b9050600061283984846137b4565b905060006128478383613803565b9050600061285482613831565b905060006128738261286e670de0b6b3a76400008f6147d8565b6139ae565b905060006128818b83613803565b905061288d818d6147d8565b9f9e505050505050505050505050505050565b600281815481106128b057600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff84169550600160201b9093046001600160a01b03908116949216926001600160801b03918216929180821691600160801b90041687565b60006002600d5460ff16600281111561292e5761292e614339565b0361294f57506001600160a01b03166000908152600b602052604090205490565b506001600160a01b031660009081526003602052604090205490565b60008054600160801b900460ff16600281111561298a5761298a614339565b146129a85760405163067fe19560e41b815260040160405180910390fd5b6000600287815481106129bd576129bd61461b565b6000918252602082206005919091020160048101549092506001600160801b0316908715821760011b9050612a137f00000000000000000000000000000000000000000000000000000000000000006001614647565b612a25826001600160801b031661343d565b60ff1614612a4657604051630bea7bb360e31b815260040160405180910390fd5b6000808915612b2257612a997f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000614678565b6001901b612aaf846001600160801b03166139df565b6001600160801b0316612ac291906147f7565b15612af657612aed612ade60016001600160801b03871661480b565b865463ffffffff1660006139fd565b60030154612b18565b7f00000000000000000000000000000000000000000000000000000000000000005b9150849050612b43565b60038501549150612b40612ade6001600160801b038616600161482b565b90505b600882901b60088a8a604051612b5a92919061460b565b6040518091039020901b14612b825760405163696550ff60e01b815260040160405180910390fd5b6000612b8d8c613ac6565b90506000612b9c836003015490565b6040516370a6769960e11b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e14ced3290612bf0908f908f908f908f908a90600401614876565b6020604051808303816000875af1158015612c0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c3391906146ac565b600485015491149150600090600290612c54906001600160801b031661343d565b612c66896001600160801b031661343d565b612c7091906148b0565b612c7a91906148d3565b60ff161590508115158103612ca25760405163fb4e40dd60e01b815260040160405180910390fd5b8754600160201b90046001600160a01b031615612cd257604051639071e6af60e01b815260040160405180910390fd5b50508554640100000000600160c01b03191633600160201b02179095555050505050505050505050565b60008054600160801b900460ff166002811115612d1b57612d1b614339565b14612d395760405163067fe19560e41b815260040160405180910390fd5b600080600080612d4886613af5565b93509350935093506000612d5e85858585613d64565b905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015612dc0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612de4919061468f565b905060018903612e8e576001600160a01b0381166352f0f3ad8a84612e0a610b7f61164c565b6040516001600160e01b031960e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af1158015612e64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e8891906146ac565b5061118a565b60028903612ead576001600160a01b0381166352f0f3ad8a8489612e0a565b60038903612ecc576001600160a01b0381166352f0f3ad8a8487612e0a565b60048903612fd9576000612f096001600160801b0385167f0000000000000000000000000000000000000000000000000000000000000000613e03565b600954612f169190614647565b612f21906001614647565b9050612f2b6125b5565b8110612f3e57612f396125b5565b612f40565b805b90506001600160a01b0382166352f0f3ad8b8560405160e084901b6001600160e01b03191681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af1158015612fae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612fd291906146ac565b505061118a565b6005890361304c576040516352f0f3ad60e01b8152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b604482015260086064820152608481018890526001600160a01b038216906352f0f3ad9060a401612e45565b604051600162ec819b60e01b0319815260040160405180910390fd5b7f0000000000000000000000000000000000000000000000000000000000000000600060606130956125c1565b915061309f6113a3565b9050909192565b60008183116130b557816130b7565b825b90505b92915050565b600081600001518260200151836040015184606001516040516020016130ff949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6040805180820190915260008082526020820152815160000361315257604051635ab458fb60e01b815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b6060600080600061318085613e30565b91945092509050600181600181111561319b5761319b614339565b146131b9576040516325ce355f60e11b815260040160405180910390fd5b84516131c58385614647565b146131e357604051630b8aa6f760e31b815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816131fa5790505093506000835b86518110156132e85760008061326d6040518060400160405280858c600001516132519190614678565b8152602001858c602001516132669190614647565b9052613e30565b5091509150604051806040016040528083836132899190614647565b8152602001848b6020015161329e9190614647565b8152508885815181106132b3576132b361461b565b60209081029190910101526132c9600185614647565b93506132d58183614647565b6132df9084614647565b92505050613227565b50845250919392505050565b6060600080600061330485613e30565b91945092509050600081600181111561331f5761331f614339565b1461333d576040516307fe6cb960e21b815260040160405180910390fd5b6133478284614647565b85511461336757604051630b8aa6f760e31b815260040160405180910390fd5b61139a85602001518484614126565b60028101546001600160a01b038316600090815260036020526040812080546001600160801b03909316929091906133af908490614647565b90915550505050565b6000806133cd3660011981013560f01c900390565b929092013560601c92915050565b606060006133f13660011981013560f01c900390565b905060405191508282528284820160208401378260208301016000815260208101604052505092915050565b6000806134323660011981013560f01c900390565b929092013592915050565b7e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f6307c4acdd60e01b6001600160401b03831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b60006134bf6001600160801b038416600161482b565b905060006134cf828660016139fd565b9050600086901a8380613531575061350860027f00000000000000000000000000000000000000000000000000000000000000006147f7565b6004830154600290613522906001600160801b031661343d565b61352c91906148d3565b60ff16145b156135705760ff81166001148061354b575060ff81166002145b61356b5760405163f40239db60e01b8152600481018890526024016122d5565b613595565b60ff8116156135955760405163f40239db60e01b8152600481018890526024016122d5565b50505050505050565b6001600160801b03811160071b81811c6001600160401b031060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b17600082136135f357631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d6c8c3f38e95a6b1ff2ab1c3b343619018302821d6d02384773bdf1ac5676facced60901901830290911d6cb9a025d814b29c212b8b1a07cd1901909102780a09507084cc699bb0e71ea869ffffffffffffffffffffffff190105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a7640000021582026137f157637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b6000816000190483118202156138215763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b600068023f2fa8f6da5b9d2819821361384957919050565b680755bf798b4a1bf1e582126138675763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056001605f1b01901d6bb17217f7d1cf79abc9e3b39881029093036c240c330e9fb2d9cbaf0fd5aafb1981018102606090811d6d0277594991cfc85f6e2461837cd9018202811d6d1a521255e34f6a5061b25ef1c9c319018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d6e02c72388d9f74f51a9331fed693f1419018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084016d01d3967ed30fc4f89c02bab5708119010290911d6e0587f503bb6ea29d25fcb740196450019091026d360d7aeea093263ecc6e0ecb291760621b010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b60006130b7670de0b6b3a7640000836139c68661359e565b6139d091906148f5565b6139da919061497a565b613831565b6000806139eb8361343d565b600160ff919091161b90920392915050565b60008082613a3d57613a386001600160801b0386167f00000000000000000000000000000000000000000000000000000000000000006141ba565b613a4f565b613a4f856001600160801b0316614229565b905060028481548110613a6457613a6461461b565b906000526020600020906005020191505b60048201546001600160801b03828116911614613abe57815460028054909163ffffffff16908110613aa957613aa961461b565b90600052602060002090600502019150613a75565b509392505050565b6000806000806000613ad786613af5565b9350935093509350613aeb84848484613d64565b9695505050505050565b6000806000806000859050600060028281548110613b1557613b1561461b565b6000918252602090912060059091020160048101549091507f000000000000000000000000000000000000000000000000000000000000000090613b61906001600160801b031661343d565b60ff1611613b82576040516359a5ae1160e11b815260040160405180910390fd5b6000815b60048301547f000000000000000000000000000000000000000000000000000000000000000090613bbf906001600160801b031661343d565b60ff169250821115613c3457825463ffffffff16613bfe7f00000000000000000000000000000000000000000000000000000000000000006001614647565b8303613c08578391505b60028181548110613c1b57613c1b61461b565b9060005260206000209060050201935080945050613b86565b600481810154908401546001600160801b0391821691166000816001600160801b0316613c79613c6d856001600160801b031660011c90565b6001600160801b031690565b6001600160801b03161490508015613d12576000613c9f836001600160801b03166139df565b6001600160801b03161115613cef576000613ccf613cc760016001600160801b03861661480b565b8960016139fd565b6003810154600490910154909c506001600160801b03169a50613cf59050565b6008549a505b600386015460048701549099506001600160801b03169750613d56565b6000613d2b613cc76001600160801b038516600161482b565b6003808901546004808b015492840154930154909e506001600160801b039182169d50919b50169850505b505050505050509193509193565b60006001600160801b03841615613dbf5760408051602081018790526001600160801b038087169282019290925260608101859052908316608082015260a0016040516020818303038152906040528051906020012061139a565b8282604051602001613de49291909182526001600160801b0316602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080613e0f8461343d565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003613e5a57604051635ab458fb60e01b815260040160405180910390fd5b6020840151805160001a607f8111613e7f57600060016000945094509450505061411f565b60b78111613f17576000613e94608083614678565b905080876000015111613eba576040516366c9448560e01b815260040160405180910390fd5b6001838101516001600160f81b0319169082148015613ee65750600160ff1b6001600160f81b03198216105b15613f045760405163babb01dd60e01b815260040160405180910390fd5b506001955093506000925061411f915050565b60bf8111613ff9576000613f2c60b783614678565b905080876000015111613f52576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b0319166000819003613f835760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c60378111613fb25760405163babb01dd60e01b815260040160405180910390fd5b613fbc8184614647565b895111613fdc576040516366c9448560e01b815260040160405180910390fd5b613fe7836001614647565b975095506000945061411f9350505050565b60f7811161404557600061400e60c083614678565b905080876000015111614034576040516366c9448560e01b815260040160405180910390fd5b60019550935084925061411f915050565b600061405260f783614678565b905080876000015111614078576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b03191660008190036140a95760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c603781116140d85760405163babb01dd60e01b815260040160405180910390fd5b6140e28184614647565b895111614102576040516366c9448560e01b815260040160405180910390fd5b61410d836001614647565b975095506001945061411f9350505050565b9193909250565b6060816001600160401b0381111561414057614140614582565b6040519080825280601f01601f19166020018201604052801561416a576020820181803683370190505b50905081156141b357600061417f8486614647565b90506020820160005b848110156141a0578281015182820152602001614188565b848111156141af576000858301525b5050505b9392505050565b6000816141cf846001600160801b031661343d565b60ff16116141e55763b34b5c226000526004601cfd5b6141ee83614229565b905081614203826001600160801b031661343d565b60ff16116130ba576130b7614219836001614647565b6001600160801b0383169061424d565b6000811960018301168161423c8261343d565b60ff169390931c8015179392505050565b6000806142598461343d565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f84011261428757600080fd5b5081356001600160401b0381111561429e57600080fd5b6020830191508360208285010111156142b657600080fd5b9250929050565b600080600083850360a08112156142d357600080fd5b60808112156142e157600080fd5b5083925060808401356001600160401b038111156142fe57600080fd5b61430a86828701614275565b9497909650939450505050565b6000806040838503121561432a57600080fd5b50508035926020909101359150565b634e487b7160e01b600052602160045260246000fd5b6003811061436d57634e487b7160e01b600052602160045260246000fd5b50565b6020810161437d8361434f565b91905290565b6001600160a01b038116811461436d57600080fd5b6000602082840312156143aa57600080fd5b81356141b381614383565b6000806000606084860312156143ca57600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b81811015614407576020818501810151868301820152016143eb565b81811115614419576000602083870101525b50601f01601f19169290920160200192915050565b6020815260006130b760208301846143e1565b60006020828403121561445357600080fd5b5035919050565b801515811461436d57600080fd5b6000806000806080858703121561447e57600080fd5b843593506020850135925060408501359150606085013561449e8161445a565b939692955090935050565b6000602082840312156144bb57600080fd5b81356001600160801b03811681146141b357600080fd5b600080600080600080608087890312156144eb57600080fd5b8635955060208701356144fd8161445a565b945060408701356001600160401b038082111561451957600080fd5b6145258a838b01614275565b9096509450606089013591508082111561453e57600080fd5b5061454b89828a01614275565b979a9699509497509295939492505050565b63ffffffff8416815282602082015260606040820152600061139a60608301846143e1565b634e487b7160e01b600052604160045260246000fd5b6000608082840312156145aa57600080fd5b604051608081018181106001600160401b03821117156145da57634e487b7160e01b600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000821982111561465a5761465a614631565b500190565b60006001820161467157614671614631565b5060010190565b60008282101561468a5761468a614631565b500390565b6000602082840312156146a157600080fd5b81516141b381614383565b6000602082840312156146be57600080fd5b5051919050565b60006001600160401b038083168185168083038211156146e7576146e7614631565b01949350505050565b60006001600160401b038083168185168183048111821515161561471657614716614631565b02949350505050565b60006001600160401b038381169083168181101561473f5761473f614631565b039392505050565b60006020828403121561475957600080fd5b81516141b38161445a565b6000806040838503121561477757600080fd5b505080516020909101519092909150565b60006020828403121561479a57600080fd5b815163ffffffff811681146141b357600080fd5b634e487b7160e01b600052601260045260246000fd5b6000826147d3576147d36147ae565b500490565b60008160001904831182151516156147f2576147f2614631565b500290565b600082614806576148066147ae565b500690565b60006001600160801b038381169083168181101561473f5761473f614631565b60006001600160801b038083168185168083038211156146e7576146e7614631565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b60608152600061488a60608301878961484d565b828103602084015261489d81868861484d565b9150508260408301529695505050505050565b600060ff821660ff8416808210156148ca576148ca614631565b90039392505050565b600060ff8316806148e6576148e66147ae565b8060ff84160691505092915050565b60006001600160ff1b038184138284138082168684048611161561491b5761491b614631565b600160ff1b600087128281168783058912161561493a5761493a614631565b6000871292508782058712848416161561495657614956614631565b8785058712818416161561496c5761496c614631565b505050929093029392505050565b600082614989576149896147ae565b600160ff1b8214600019841416156149a3576149a3614631565b50059056fea264697066735822122042af6780a7c8dda46d8b2a5e18225ee0551564fb98a13883feff792f9f9e94d364736f6c634300080f0033000000000000000000000000000000000000000000000000000000000000000003682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b60000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000f027f4a985560fb13324e943edf55ad6f1d15dc1000000000000000000000000a2f2ac6f5af72e494a227d79db20473cf7a1ffe8000000000000000000000000496286e5ee7758de84dd17e6d2d97afc2ace4cc70000000000000000000000000000000000000000000000000000000000002105", + "nonce": "0x6", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + }, + { + "hash": "0xaf6a01bd98b0ad5b06f96c78a218b4df164643844fd7cd602b70b9e1d12e07e6", + "transactionType": "CREATE", + "contractName": "PermissionedDisputeGame", + "contractAddress": "0x7344da3a618b86cda67f8260c0cc2027d99f5b49", + "function": null, + "arguments": [ + "(1, 0x03682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b6, 73, 30, 10800, 302400, 0xF027F4A985560fb13324e943edf55ad6F1d15Dc1, 0x3E8a0B63f57e975c268d610ece93da5f78c01321, 0x496286e5eE7758de84Dd17e6d2d97afC2ACE4cc7, 8453)", + "0x642229f238fb9dE03374Be34B0eD8D9De80752c5", + "0x8Ca1E12404d16373Aef756179B185F27b2994F3a" + ], + "transaction": { + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "gas": "0x54ce60", + "value": "0x0", + "input": "0x6102006040523480156200001257600080fd5b50604051620054a0380380620054a083398101604081905262000035916200053b565b82620000446001607e6200064a565b60ff16816040015111156200006c57604051633beff19960e11b815260040160405180910390fd5b60001981606001511480620000965750604081015160608201516200009390600162000670565b10155b15620000b55760405163e62ccf3960e01b815260040160405180910390fd5b600281606001511015620000dc5760405163e62ccf3960e01b815260040160405180910390fd5b6001600160401b0380168160c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000129573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200014f91906200068b565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156200018d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b39190620006ab565b1115620001d35760405163b4e1243360e01b815260040160405180910390fd5b6000620001f882608001516001600160401b03166200048e60201b62000c1b1760201c565b6200020e906001600160401b03166002620006c5565b905060008260c001516001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000255573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200027b91906200068b565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa158015620002b9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002df9190620006ab565b6200030284608001516001600160401b03166200048e60201b62000c1b1760201c565b6001600160401b031662000317919062000670565b905060006200033283836200049160201b620022951760201c565b90506001600160401b038111156200035d5760405163235dfb2b60e21b815260040160405180910390fd5b620003808460a001516001600160401b03166200048e60201b62000c1b1760201c565b6001600160401b0316816001600160401b03161115620003b35760405163235dfb2b60e21b815260040160405180910390fd5b63ffffffff8016620003da856000015163ffffffff166200048e60201b62000c1b1760201c565b63ffffffff1603620003ff5760405163073ed16760e31b815260040160405180910390fd5b5050815163ffffffff1661012090815260208301516080908152604084015160a0908152606085015160c0908152918501516001600160401b039081166101a052908501511660e0908152908401516001600160a01b03908116610100908152918501518116610140529084015181166101605292015161018052509182166101c052166101e05250620006e7565b90565b6000818311620004a25781620004a4565b825b9392505050565b60405161014081016001600160401b0381118282101715620004dd57634e487b7160e01b600052604160045260246000fd5b60405290565b805163ffffffff81168114620004f857600080fd5b919050565b80516001600160401b0381168114620004f857600080fd5b6001600160a01b03811681146200052b57600080fd5b50565b8051620004f88162000515565b60008060008385036101808112156200055357600080fd5b610140808212156200056457600080fd5b6200056e620004ab565b91506200057b86620004e3565b8252602086015160208301526040860151604083015260608601516060830152620005a960808701620004fd565b6080830152620005bc60a08701620004fd565b60a0830152620005cf60c087016200052e565b60c0830152620005e260e087016200052e565b60e0830152610100620005f78188016200052e565b8184015250610120808701518184015250819450620006188187016200052e565b935050506200062b61016085016200052e565b90509250925092565b634e487b7160e01b600052601160045260246000fd5b600060ff821660ff84168082101562000667576200066762000634565b90039392505050565b6000821982111562000686576200068662000634565b500190565b6000602082840312156200069e57600080fd5b8151620004a48162000515565b600060208284031215620006be57600080fd5b5051919050565b6000816000190483118215151615620006e257620006e262000634565b500290565b60805160a05160c05160e05161010051610120516101405161016051610180516101a0516101c0516101e051614be5620008bb600039600081816105be015281816117310152611e9e01526000818161087d015281816116ff01528181611a630152611e6c0152600081816106f501528181612a0801528181612a720152612aa4015260008181610a2701526121ed0152600081816106780152818161184f015281816118f70152818161196d01528181612ecc015261322001526000818161054b0152818161154c0152818161161601528181612dee01526131580152600081816108b80152818161225901526131f70152600081816104f701528181611f530152818161292101526139a0015260008181610a7a01528181610dff01528181611bee01528181611c2e015281816128aa01528181612ad30152612b2e015260008181610aad015281816120d4015281816127670152818161283301528181612a430152818161384901528181613b2b01528181613b8901528181613bd4015281816141f101526142e0015260008181610b5401528181611c7201528181611cdf015281816127ef015281816128f5015281816137e2015261386a0152600081816107aa01526138ed0152614be56000f3fe60806040526004361061031a5760003560e01c80636f034409116101ab578063c0d8bb74116100f7578063dabd396d11610095578063f8f43ff61161006f578063f8f43ff614610b01578063fa24f74314610b21578063fa315aa914610b45578063fe2bbeb214610b7857600080fd5b8063dabd396d14610a6b578063ec5e630814610a9e578063eff0f59214610ad157600080fd5b8063cf09e0d0116100d1578063cf09e0d0146109d8578063d5d44d80146109f8578063d6ae3cd514610a18578063d8cc1a3c14610a4b57600080fd5b8063c0d8bb7414610917578063c395e1ca14610944578063c6f0308c1461096457600080fd5b80638b85902b11610164578063a8e4fb901161013e578063a8e4fb901461086e578063bbdc02db146108a1578063bcef3b55146108e2578063bd8da956146108f757600080fd5b80638b85902b146107865780638d450a951461079b578063a445ece6146107ce57600080fd5b80636f0344091461071957806370872aa51461072c578063786b844b146107415780637b0f0adc146107565780638129fc1c146107695780638980e0cc1461077157600080fd5b80633e3ac9121161026a57806357da950e11610223578063609d3334116101fd578063609d33341461069c57806360e27464146106b15780636361506d146106d15780636b6716c0146106e657600080fd5b806357da950e146106195780635a5fa2d9146106495780635c0cba331461066957600080fd5b80633e3ac9121461051b5780633fc8cef31461053c578063472777c61461056f578063529d6a8c14610582578063534db0e2146105af57806354fd4d50146105e257600080fd5b806325fc2ace116102d757806330dbe570116102b157806330dbe57014610481578063378dd48c146104b957806337b1b229146104d35780633a768463146104e857600080fd5b806325fc2ace1461042d5780632810e1d61461044c5780632ad69aeb1461046157600080fd5b8063019351301461031f57806303c2924d1461034157806319effeb414610361578063200d2ed2146103a5578063222abf45146103d3578063250e69bd14610413575b600080fd5b34801561032b57600080fd5b5061033f61033a3660046144c4565b610ba8565b005b34801561034d57600080fd5b5061033f61035c36600461451e565b610d86565b34801561036d57600080fd5b5060005461038890600160401b90046001600160401b031681565b6040516001600160401b0390911681526020015b60405180910390f35b3480156103b157600080fd5b506000546103c690600160801b900460ff1681565b60405161039c9190614577565b3480156103df57600080fd5b506104036103ee36600461459f565b600c6020526000908152604090205460ff1681565b604051901515815260200161039c565b34801561041f57600080fd5b50600a546104039060ff1681565b34801561043957600080fd5b506008545b60405190815260200161039c565b34801561045857600080fd5b506103c6611231565b34801561046d57600080fd5b5061043e61047c36600461451e565b6113b1565b34801561048d57600080fd5b506001546104a1906001600160a01b031681565b6040516001600160a01b03909116815260200161039c565b3480156104c557600080fd5b50600d546103c69060ff1681565b3480156104df57600080fd5b506104a16113e2565b3480156104f457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104a1565b34801561052757600080fd5b5060005461040390600160901b900460ff1681565b34801561054857600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104a1565b61033f61057d3660046145bc565b6113f3565b34801561058e57600080fd5b5061043e61059d36600461459f565b60036020526000908152604090205481565b3480156105bb57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104a1565b3480156105ee57600080fd5b50604080518082019091526005815264312e342e3160d81b60208201525b60405161039c9190614635565b34801561062557600080fd5b50600854600954610634919082565b6040805192835260208301919091520161039c565b34801561065557600080fd5b5061043e610664366004614648565b611405565b34801561067557600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104a1565b3480156106a857600080fd5b5061060c61143f565b3480156106bd57600080fd5b5061033f6106cc36600461459f565b61144d565b3480156106dd57600080fd5b5061043e6116e8565b3480156106f257600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610388565b61033f61072736600461466f565b6116f4565b34801561073857600080fd5b5060095461043e565b34801561074d57600080fd5b5061033f611782565b61033f6107643660046145bc565b611a4b565b61033f611a58565b34801561077d57600080fd5b5060025461043e565b34801561079257600080fd5b5061043e611aab565b3480156107a757600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061043e565b3480156107da57600080fd5b506108306107e9366004614648565b6007602052600090815260409020805460019091015460ff821691610100810463ffffffff1691650100000000009091046001600160801b0316906001600160a01b031684565b60408051941515855263ffffffff90931660208501526001600160801b03909116918301919091526001600160a01b0316606082015260800161039c565b34801561087a57600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006104a1565b3480156108ad57600080fd5b5060405163ffffffff7f000000000000000000000000000000000000000000000000000000000000000016815260200161039c565b3480156108ee57600080fd5b5061043e611ab7565b34801561090357600080fd5b50610388610912366004614648565b611ac3565b34801561092357600080fd5b5061043e61093236600461459f565b600b6020526000908152604090205481565b34801561095057600080fd5b5061043e61095f3660046146b0565b611c56565b34801561097057600080fd5b5061098461097f366004614648565b611d96565b6040805163ffffffff90981688526001600160a01b03968716602089015295909416948601949094526001600160801b039182166060860152608085015291821660a08401521660c082015260e00161039c565b3480156109e457600080fd5b50600054610388906001600160401b031681565b348015610a0457600080fd5b5061043e610a1336600461459f565b611e09565b348015610a2457600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061043e565b348015610a5757600080fd5b5061033f610a663660046146d9565b611e61565b348015610a7757600080fd5b507f0000000000000000000000000000000000000000000000000000000000000000610388565b348015610aaa57600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061043e565b348015610add57600080fd5b50610403610aec366004614648565b60046020526000908152604090205460ff1681565b348015610b0d57600080fd5b5061033f610b1c3660046145bc565b611eeb565b348015610b2d57600080fd5b50610b36612257565b60405161039c93929190614764565b348015610b5157600080fd5b507f000000000000000000000000000000000000000000000000000000000000000061043e565b348015610b8457600080fd5b50610403610b93366004614648565b60066020526000908152604090205460ff1681565b60008054600160801b900460ff166002811115610bc757610bc7614540565b14610be55760405163067fe19560e41b815260040160405180910390fd5b600054600160901b900460ff1615610c105760405163075173a960e11b815260040160405180910390fd5b610c1e610c1b611ab7565b90565b610c35610c303686900386018661479f565b6122af565b14610c5357604051639cc00b5b60e01b815260040160405180910390fd5b82606001358282604051610c68929190614812565b604051809103902014610c8e5760405163d81d583b60e01b815260040160405180910390fd5b6000610cd7610cd284848080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061230b92505050565b61235f565b90506000610cfe82600881518110610cf157610cf1614822565b60200260200101516124e3565b9050602081511115610d235760405163d81d583b60e01b815260040160405180910390fd5b602081810151825190910360031b1c610d3a611aab565b8103610d5957604051630b8ed88360e41b815260040160405180910390fd5b5050600180546001600160a01b0319163317905550506000805460ff60901b1916600160901b1790555050565b60008054600160801b900460ff166002811115610da557610da5614540565b14610dc35760405163067fe19560e41b815260040160405180910390fd5b600060028381548110610dd857610dd8614822565b906000526020600020906005020190506000610df384611ac3565b90506001600160401b037f000000000000000000000000000000000000000000000000000000000000000081169082161015610e425760405163f2440b5360e01b815260040160405180910390fd5b60008481526006602052604090205460ff1615610e725760405163f1a9458160e01b815260040160405180910390fd5b6000848152600560205260409020805480158015610e8f57508515155b15610ef1578354600160201b90046001600160a01b031660008115610eb45781610ec3565b60018601546001600160a01b03165b9050610ecf8187612565565b505050600094855250506006602052505060409020805460ff19166001179055565b6000868152600760209081526040918290208251608081018452815460ff81161515808352610100820463ffffffff16948301949094526501000000000090046001600160801b031693810193909352600101546001600160a01b03166060830152610f75576001600160801b036040820152600181526000869003610f75578195505b600086826020015163ffffffff16610f8d919061484e565b90506000838211610f9e5781610fa0565b835b602084015190915063ffffffff165b818110156110a6576000868281548110610fcb57610fcb614822565b6000918252602080832090910154808352600690915260409091205490915060ff1661100a57604051634d03b32360e11b815260040160405180910390fd5b60006002828154811061101f5761101f614822565b600091825260209091206005909102018054909150600160201b90046001600160a01b03161580156110655750600481015460408701516001600160801b039182169116115b156110915760018101546001600160a01b0316606087015260048101546001600160801b031660408701525b5050808061109e90614866565b915050610faf565b5063ffffffff818116602085810191825260008c815260079091526040908190208651815493519288015164ffffffffff1990941690151564ffffffff00191617610100929094169182029390931774ffffffffffffffffffffffffffffffff00000000001916650100000000006001600160801b03909316929092029190911782556060850151600190920180546001600160a01b0319166001600160a01b039093169290921790915584900361122657606083015160008a8152600660205260409020805460ff191660011790558915801561118d5750600054600160901b900460ff165b156111d3576001546001600160a01b03166111a8818a612565565b88546001600160a01b03909116600160201b02640100000000600160c01b0319909116178855611224565b6112006001600160a01b038216156111eb57816111fa565b60018901546001600160a01b03165b89612565565b8754640100000000600160c01b031916600160201b6001600160a01b038316021788555b505b505050505050505050565b600080600054600160801b900460ff16600281111561125257611252614540565b146112705760405163067fe19560e41b815260040160405180910390fd5b6000805260066020527f54cdd369e4e8a8515e52ca72ec816c2101831ad1f18bf44102ed171459c9b4f85460ff166112bb57604051634d03b32360e11b815260040160405180910390fd5b60006001600160a01b031660026000815481106112da576112da614822565b6000918252602090912060059091020154600160201b90046001600160a01b03161461130757600161130a565b60025b600080546001600160401b034216600160401b026fffffffffffffffff000000000000000019821681178355929350839260ff60801b191670ffffffffffffffffff00000000000000001990911617600160801b83600281111561137057611370614540565b02179055600281111561138557611385614540565b6040517f5e186f09b9c93491f14e277eea7faa5de6a2d4bda75a79af7a3684fbfb42da6090600090a290565b600560205281600052604060002081815481106113cd57600080fd5b90600052602060002001600091509150505481565b60006113ee60006125a7565b905090565b61140083838360016116f4565b505050565b6000818152600760209081526040808320600590925282208054825461143690610100900463ffffffff168261487f565b95945050505050565b60606113ee605460206125ca565b611455611782565b60006002600d5460ff16600281111561147057611470614540565b0361149457506001600160a01b0381166000908152600b60205260409020546114ea565b6001600d5460ff1660028111156114ad576114ad614540565b036114d157506001600160a01b0381166000908152600360205260409020546114ea565b6040516301e28f7d60e21b815260040160405180910390fd5b6001600160a01b0382166000908152600c602052604090205460ff166115ae576001600160a01b038281166000818152600c602052604090819020805460ff1916600117905551637eee288d60e01b81526004810191909152602481018390527f000000000000000000000000000000000000000000000000000000000000000090911690637eee288d90604401600060405180830381600087803b15801561159257600080fd5b505af11580156115a6573d6000803e3d6000fd5b505050505050565b806000036115cf576040516317bfe5f760e01b815260040160405180910390fd5b6001600160a01b038281166000818152600b602090815260408083208390556003909152808220919091555163f3fef3a360e01b81526004810191909152602481018390527f00000000000000000000000000000000000000000000000000000000000000009091169063f3fef3a390604401600060405180830381600087803b15801561165c57600080fd5b505af1158015611670573d6000803e3d6000fd5b505050506000826001600160a01b03168260405160006040518083038185875af1925050503d80600081146116c1576040519150601f19603f3d011682016040523d82523d6000602084013e6116c6565b606091505b5050905080611400576040516383e6cc6b60e01b815260040160405180910390fd5b60006113ee603461260c565b336001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614806117535750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b611770576040516369c3779f60e11b815260040160405180910390fd5b61177c8484848461262c565b50505050565b6002600d5460ff16600281111561179b5761179b614540565b14806117bd57506001600d5460ff1660028111156117bb576117bb614540565b145b156117c457565b6000600d5460ff1660028111156117dd576117dd614540565b146117fb576040516301e28f7d60e21b815260040160405180910390fd5b600054600160401b90046001600160401b03166001600160401b031660000361183757604051636082930560e11b815260040160405180910390fd5b604051630314d2b360e01b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690630314d2b390602401602060405180830381865afa15801561189e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118c29190614896565b9050806118e257604051634851bd9b60e01b815260040160405180910390fd5b6040516317cf21a960e01b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316906317cf21a990602401600060405180830381600087803b15801561194357600080fd5b505af1925050508015611954575060015b506040516324b5ce0b60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063496b9c1690602401602060405180830381865afa1580156119bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906119e09190614896565b905080156119fa57600d805460ff19166001179055611a08565b600d805460ff191660021790555b600d546040517f9908eaac0645df9d0704d06adc9e07337c951de2f06b5f2836151d48d5e4722f91611a3f9160ff90911690614577565b60405180910390a15050565b61140083838360006116f4565b326001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001614611aa1576040516369c3779f60e11b815260040160405180910390fd5b611aa9612e9d565b565b60006113ee605461260c565b60006113ee601461260c565b600080600054600160801b900460ff166002811115611ae457611ae4614540565b14611b025760405163067fe19560e41b815260040160405180910390fd5b600060028381548110611b1757611b17614822565b600091825260208220600590910201805490925063ffffffff90811614611b7d57815460028054909163ffffffff16908110611b5557611b55614822565b906000526020600020906005020160040160109054906101000a90046001600160801b031690505b6004820154600090611ba690600160801b90046001600160401b03165b6001600160401b031690565b611bb9906001600160401b03164261487f565b611bcf611b9a846001600160801b031660401c90565b6001600160401b0316611be2919061484e565b90506001600160401b037f0000000000000000000000000000000000000000000000000000000000000000166001600160401b0316816001600160401b031611611c2c5780611436565b7f000000000000000000000000000000000000000000000000000000000000000095945050505050565b600080611c6b836001600160801b03166132b3565b60ff1690507f0000000000000000000000000000000000000000000000000000000000000000811115611cb1576040516356f57b2b60e01b815260040160405180910390fd5b642e90edd00062061a806311e1a3006000611ccc83836148c9565b9050670de0b6b3a76400006000611d03827f00000000000000000000000000000000000000000000000000000000000000006148dd565b90506000611d21611d1c670de0b6b3a7640000866148dd565b61331f565b90506000611d2f8484613535565b90506000611d3d8383613584565b90506000611d4a826135b2565b90506000611d6982611d64670de0b6b3a76400008f6148dd565b61372f565b90506000611d778b83613584565b9050611d83818d6148dd565b9f9e505050505050505050505050505050565b60028181548110611da657600080fd5b60009182526020909120600590910201805460018201546002830154600384015460049094015463ffffffff84169550600160201b9093046001600160a01b03908116949216926001600160801b03918216929180821691600160801b90041687565b60006002600d5460ff166002811115611e2457611e24614540565b03611e4557506001600160a01b03166000908152600b602052604090205490565b506001600160a01b031660009081526003602052604090205490565b336001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000161480611ec05750336001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016145b611edd576040516369c3779f60e11b815260040160405180910390fd5b6115a6868686868686613760565b60008054600160801b900460ff166002811115611f0a57611f0a614540565b14611f285760405163067fe19560e41b815260040160405180910390fd5b600080600080611f3786613af1565b93509350935093506000611f4d85858585613d60565b905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa158015611faf573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611fd391906148fc565b90506001890361207d576001600160a01b0381166352f0f3ad8a84611ff9610c1b6116e8565b6040516001600160e01b031960e086901b16815260048101939093526024830191909152604482015260206064820152608481018a905260a4015b6020604051808303816000875af1158015612053573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906120779190614919565b50611226565b6002890361209c576001600160a01b0381166352f0f3ad8a8489611ff9565b600389036120bb576001600160a01b0381166352f0f3ad8a8487611ff9565b600489036121c85760006120f86001600160801b0385167f0000000000000000000000000000000000000000000000000000000000000000613dff565b600954612105919061484e565b61211090600161484e565b905061211a611aab565b811061212d57612128611aab565b61212f565b805b90506001600160a01b0382166352f0f3ad8b8560405160e084901b6001600160e01b03191681526004810192909252602482015260c084901b604482015260086064820152608481018b905260a4016020604051808303816000875af115801561219d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121c19190614919565b5050611226565b6005890361223b576040516352f0f3ad60e01b8152600481018a9052602481018390527f000000000000000000000000000000000000000000000000000000000000000060c01b604482015260086064820152608481018890526001600160a01b038216906352f0f3ad9060a401612034565b604051600162ec819b60e01b0319815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000060006060612284611ab7565b915061228e61143f565b9050909192565b60008183116122a457816122a6565b825b90505b92915050565b600081600001518260200151836040015184606001516040516020016122ee949392919093845260208401929092526040830152606082015260800190565b604051602081830303815290604052805190602001209050919050565b6040805180820190915260008082526020820152815160000361234157604051635ab458fb60e01b815260040160405180910390fd5b50604080518082019091528151815260209182019181019190915290565b6060600080600061236f85613e2c565b91945092509050600181600181111561238a5761238a614540565b146123a8576040516325ce355f60e11b815260040160405180910390fd5b84516123b4838561484e565b146123d257604051630b8aa6f760e31b815260040160405180910390fd5b604080516020808252610420820190925290816020015b60408051808201909152600080825260208201528152602001906001900390816123e95790505093506000835b86518110156124d75760008061245c6040518060400160405280858c60000151612440919061487f565b8152602001858c60200151612455919061484e565b9052613e2c565b509150915060405180604001604052808383612478919061484e565b8152602001848b6020015161248d919061484e565b8152508885815181106124a2576124a2614822565b60209081029190910101526124b860018561484e565b93506124c4818361484e565b6124ce908461484e565b92505050612416565b50845250919392505050565b606060008060006124f385613e2c565b91945092509050600081600181111561250e5761250e614540565b1461252c576040516307fe6cb960e21b815260040160405180910390fd5b612536828461484e565b85511461255657604051630b8aa6f760e31b815260040160405180910390fd5b61143685602001518484614122565b60028101546001600160a01b038316600090815260036020526040812080546001600160801b039093169290919061259e90849061484e565b90915550505050565b6000806125bc3660011981013560f01c900390565b929092013560601c92915050565b606060006125e03660011981013560f01c900390565b905060405191508282528284820160208401378260208301016000815260208101604052505092915050565b6000806126213660011981013560f01c900390565b929092013592915050565b60008054600160801b900460ff16600281111561264b5761264b614540565b146126695760405163067fe19560e41b815260040160405180910390fd5b60006002848154811061267e5761267e614822565b60009182526020918290206040805160e0810182526005909302909101805463ffffffff811684526001600160a01b03600160201b90910481169484019490945260018101549093169082015260028201546001600160801b03908116606083015260038301546080830181905260049093015480821660a0840152600160801b90041660c0820152915085146127285760405163180a019960e11b815260040160405180910390fd5b60a0810151600083156001600160801b0383161760011b90506000612755826001600160801b03166132b3565b60ff169050861580612790575061278d7f0000000000000000000000000000000000000000000000000000000000000000600261484e565b81145b801561279a575084155b156127b8576040516329098def60e21b815260040160405180910390fd5b600054600160901b900460ff1680156127cf575086155b156127ed5760405163075173a960e11b815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000081111561282e576040516356f57b2b60e01b815260040160405180910390fd5b6128597f0000000000000000000000000000000000000000000000000000000000000000600161484e565b810361286b5761286b868885886141b6565b3461287583611c56565b1461289357604051638620aa1960e01b815260040160405180910390fd5b600061289e88611ac3565b90506001600160401b037f00000000000000000000000000000000000000000000000000000000000000008116908216036128ec57604051630ce0744560e21b815260040160405180910390fd5b600061291960017f000000000000000000000000000000000000000000000000000000000000000061487f565b8303612a3c577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316637dc0d1d06040518163ffffffff1660e01b8152600401602060405180830381865afa15801561297d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906129a191906148fc565b6001600160a01b031663f3f480d96040518163ffffffff1660e01b8152600401602060405180830381865afa1580156129de573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a029190614919565b612a35907f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316614932565b9050612acd565b612a6760017f000000000000000000000000000000000000000000000000000000000000000061487f565b8303612aa157612a357f00000000000000000000000000000000000000000000000000000000000000006001600160401b0316600261495d565b507f00000000000000000000000000000000000000000000000000000000000000006001600160401b03165b612b00817f00000000000000000000000000000000000000000000000000000000000000006001600160401b031661498c565b6001600160401b0316612b19836001600160401b031690565b6001600160401b03161115612b5e57612b5b817f00000000000000000000000000000000000000000000000000000000000000006001600160401b031661498c565b91505b6000604083901b421760008a8152608087901b6001600160801b038d1617602052604081209192509060008181526004602052604090205490915060ff1615612bba576040516380497e3b60e01b815260040160405180910390fd5b60016004600083815260200190815260200160002060006101000a81548160ff02191690831515021790555060026040518060e001604052808d63ffffffff16815260200160006001600160a01b03168152602001336001600160a01b03168152602001346001600160801b031681526020018c8152602001886001600160801b03168152602001846001600160801b0316815250908060018154018082558091505060019003906000526020600020906005020160009091909190915060008201518160000160006101000a81548163ffffffff021916908363ffffffff16021790555060208201518160000160046101000a8154816001600160a01b0302191690836001600160a01b0316021790555060408201518160010160006101000a8154816001600160a01b0302191690836001600160a01b0316021790555060608201518160020160006101000a8154816001600160801b0302191690836001600160801b031602179055506080820151816003015560a08201518160040160006101000a8154816001600160801b0302191690836001600160801b0316021790555060c08201518160040160106101000a8154816001600160801b0302191690836001600160801b031602179055505050600560008c81526020019081526020016000206001600280549050612db1919061487f565b81546001810183556000928352602080842090910191909155338252600b9052604081208054349290612de590849061484e565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b158015612e4757600080fd5b505af1158015612e5b573d6000803e3d6000fd5b50506040513393508d92508e91507f9b3245740ec3b155098a55be84957a4da13eaf7f14a8bc6f53126c0b9350f2be90600090a4505050505050505050505050565b600054600160881b900460ff1615612ec75760405162dc149f60e41b815260040160405180910390fd5b6000807f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d83ef2676040518163ffffffff1660e01b81526004016040805180830381865afa158015612f27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f4b91906149b4565b909250905081612f6e57604051633535e1d960e11b815260040160405180910390fd5b604080518082019091528281526020018190526008829055600981905536607a14612fa157639824bdab6000526004601cfd5b80612faa611aab565b11612fdc57612fb7611ab7565b60405163f40239db60e01b8152600401612fd391815260200190565b60405180910390fd5b6040805160e08101825263ffffffff81526000602082015260029181016130016113e2565b6001600160a01b03168152602001346001600160801b03168152602001613026611ab7565b815260016020820152604001426001600160801b0390811690915282546001808201855560009485526020808620855160059094020180549186015163ffffffff9094166001600160c01b031990921691909117600160201b6001600160a01b0394851602178155604085015191810180546001600160a01b031916929093169190911790915560608301516002820180546fffffffffffffffffffffffffffffffff19169184169190911790556080830151600382015560a083015160c090930151928216600160801b9390921692909202176004909101558054600160881b60ff60881b199091161781553490600b906131206113e2565b6001600160a01b03166001600160a01b03168152602001908152602001600020600082825461314f919061484e565b925050819055507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031663d0e30db0346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156131b157600080fd5b505af11580156131c5573d6000803e3d6000fd5b50506000805467ffffffffffffffff1916426001600160401b0316179055505060408051630f27ce5f60e21b815290517f000000000000000000000000000000000000000000000000000000000000000063ffffffff1692507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031691633c9f397c9160048083019260209291908290030181865afa158015613273573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061329791906149d8565b600a805460ff191663ffffffff92909216929092141790555050565b7e09010a0d15021d0b0e10121619031e080c141c0f111807131b17061a05041f6307c4acdd60e01b6001600160401b03831160061b83811c63ffffffff1060051b1792831c600181901c17600281901c17600481901c17600881901c17601081901c170260fb1c1a1790565b6001600160801b03811160071b81811c6001600160401b031060061b1781811c63ffffffff1060051b1781811c61ffff1060041b1781811c60ff1060031b176000821361337457631615e6386000526004601cfd5b7ff8f9f9faf9fdfafbf9fdfcfdfafbfcfef9fafdfafcfcfbfefafafcfbffffffff6f8421084210842108cc6318c6db6d54be83831c1c601f161a1890811b609f90811c6c465772b2bbbb5f824b15207a3081018102606090811d6d0388eaa27412d5aca026815d636e018202811d6d0df99ac502031bf953eff472fdcc018202811d6d13cdffb29d51d99322bdff5f2211018202811d6d0a0f742023def783a307a986912e018202811d6d01920d8043ca89b5239253284e42018202811d6c0b7a86d7375468fac667a0a527016c29508e458543d8aa4df2abee7883018302821d6d0139601a2efabe717e604cbb4894018302821d6d02247f7a7b6594320649aa03aba1018302821d6c8c3f38e95a6b1ff2ab1c3b343619018302821d6d02384773bdf1ac5676facced60901901830290911d6cb9a025d814b29c212b8b1a07cd1901909102780a09507084cc699bb0e71ea869ffffffffffffffffffffffff190105711340daa0d5f769dba1915cef59f0815a5506029190037d0267a36c0c95b3975ab3ee5b203a7614a3f75373f047d803ae7b6687f2b302017d57115e47018c7177eebf7cd370a3356a1b7863008a5ae8028c72b88642840160ae1d90565b60007812725dd1d243aba0e75fe645cc4873f9e65afe688c928e1f218311670de0b6b3a76400000215820261357257637c5f487d6000526004601cfd5b50670de0b6b3a7640000919091020490565b6000816000190483118202156135a25763bac65e5b6000526004601cfd5b50670de0b6b3a764000091020490565b600068023f2fa8f6da5b9d281982136135ca57919050565b680755bf798b4a1bf1e582126135e85763a37bfec96000526004601cfd5b6503782dace9d9604e83901b059150600060606bb17217f7d1cf79abc9e3b39884821b056001605f1b01901d6bb17217f7d1cf79abc9e3b39881029093036c240c330e9fb2d9cbaf0fd5aafb1981018102606090811d6d0277594991cfc85f6e2461837cd9018202811d6d1a521255e34f6a5061b25ef1c9c319018202811d6db1bbb201f443cf962f1a1d3db4a5018202811d6e02c72388d9f74f51a9331fed693f1419018202811d6e05180bb14799ab47a8a8cb2a527d57016d02d16720577bd19bf614176fe9ea6c10fe68e7fd37d0007b713f765084018402831d9081019084016d01d3967ed30fc4f89c02bab5708119010290911d6e0587f503bb6ea29d25fcb740196450019091026d360d7aeea093263ecc6e0ecb291760621b010574029d9dc38563c32e5c2f6dc192ee70ef65f9978af30260c3939093039290921c92915050565b60006122a6670de0b6b3a7640000836137478661331f565b61375191906149fe565b61375b9190614a83565b6135b2565b60008054600160801b900460ff16600281111561377f5761377f614540565b1461379d5760405163067fe19560e41b815260040160405180910390fd5b6000600287815481106137b2576137b2614822565b6000918252602082206005919091020160048101549092506001600160801b0316908715821760011b90506138087f0000000000000000000000000000000000000000000000000000000000000000600161484e565b61381a826001600160801b03166132b3565b60ff161461383b57604051630bea7bb360e31b815260040160405180910390fd5b60008089156139175761388e7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000061487f565b6001901b6138a4846001600160801b03166142ab565b6001600160801b03166138b79190614ab1565b156138eb576138e26138d360016001600160801b038716614ac5565b865463ffffffff1660006142c9565b6003015461390d565b7f00000000000000000000000000000000000000000000000000000000000000005b9150849050613938565b600385015491506139356138d36001600160801b0386166001614ae5565b90505b600882901b60088a8a60405161394f929190614812565b6040518091039020901b146139775760405163696550ff60e01b815260040160405180910390fd5b60006139828c614392565b90506000613991836003015490565b6040516370a6769960e11b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063e14ced32906139e5908f908f908f908f908a90600401614b30565b6020604051808303816000875af1158015613a04573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613a289190614919565b600485015491149150600090600290613a49906001600160801b03166132b3565b613a5b896001600160801b03166132b3565b613a659190614b6a565b613a6f9190614b8d565b60ff161590508115158103613a975760405163fb4e40dd60e01b815260040160405180910390fd5b8754600160201b90046001600160a01b031615613ac757604051639071e6af60e01b815260040160405180910390fd5b50508554640100000000600160c01b03191633600160201b02179095555050505050505050505050565b6000806000806000859050600060028281548110613b1157613b11614822565b6000918252602090912060059091020160048101549091507f000000000000000000000000000000000000000000000000000000000000000090613b5d906001600160801b03166132b3565b60ff1611613b7e576040516359a5ae1160e11b815260040160405180910390fd5b6000815b60048301547f000000000000000000000000000000000000000000000000000000000000000090613bbb906001600160801b03166132b3565b60ff169250821115613c3057825463ffffffff16613bfa7f0000000000000000000000000000000000000000000000000000000000000000600161484e565b8303613c04578391505b60028181548110613c1757613c17614822565b9060005260206000209060050201935080945050613b82565b600481810154908401546001600160801b0391821691166000816001600160801b0316613c75613c69856001600160801b031660011c90565b6001600160801b031690565b6001600160801b03161490508015613d0e576000613c9b836001600160801b03166142ab565b6001600160801b03161115613ceb576000613ccb613cc360016001600160801b038616614ac5565b8960016142c9565b6003810154600490910154909c506001600160801b03169a50613cf19050565b6008549a505b600386015460048701549099506001600160801b03169750613d52565b6000613d27613cc36001600160801b0385166001614ae5565b6003808901546004808b015492840154930154909e506001600160801b039182169d50919b50169850505b505050505050509193509193565b60006001600160801b03841615613dbb5760408051602081018790526001600160801b038087169282019290925260608101859052908316608082015260a00160405160208183030381529060405280519060200120611436565b8282604051602001613de09291909182526001600160801b0316602082015260400190565b6040516020818303038152906040528051906020012095945050505050565b600080613e0b846132b3565b60ff1690508083036001841b600180831b0386831b17039250505092915050565b60008060008360000151600003613e5657604051635ab458fb60e01b815260040160405180910390fd5b6020840151805160001a607f8111613e7b57600060016000945094509450505061411b565b60b78111613f13576000613e9060808361487f565b905080876000015111613eb6576040516366c9448560e01b815260040160405180910390fd5b6001838101516001600160f81b0319169082148015613ee25750600160ff1b6001600160f81b03198216105b15613f005760405163babb01dd60e01b815260040160405180910390fd5b506001955093506000925061411b915050565b60bf8111613ff5576000613f2860b78361487f565b905080876000015111613f4e576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b0319166000819003613f7f5760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c60378111613fae5760405163babb01dd60e01b815260040160405180910390fd5b613fb8818461484e565b895111613fd8576040516366c9448560e01b815260040160405180910390fd5b613fe383600161484e565b975095506000945061411b9350505050565b60f7811161404157600061400a60c08361487f565b905080876000015111614030576040516366c9448560e01b815260040160405180910390fd5b60019550935084925061411b915050565b600061404e60f78361487f565b905080876000015111614074576040516366c9448560e01b815260040160405180910390fd5b60018301516001600160f81b03191660008190036140a55760405163babb01dd60e01b815260040160405180910390fd5b600184015160088302610100031c603781116140d45760405163babb01dd60e01b815260040160405180910390fd5b6140de818461484e565b8951116140fe576040516366c9448560e01b815260040160405180910390fd5b61410983600161484e565b975095506001945061411b9350505050565b9193909250565b6060816001600160401b0381111561413c5761413c614789565b6040519080825280601f01601f191660200182016040528015614166576020820181803683370190505b50905081156141af57600061417b848661484e565b90506020820160005b8481101561419c578281015182820152602001614184565b848111156141ab576000858301525b5050505b9392505050565b60006141cc6001600160801b0384166001614ae5565b905060006141dc828660016142c9565b9050600086901a838061423e575061421560027f0000000000000000000000000000000000000000000000000000000000000000614ab1565b600483015460029061422f906001600160801b03166132b3565b6142399190614b8d565b60ff16145b1561427d5760ff811660011480614258575060ff81166002145b6142785760405163f40239db60e01b815260048101889052602401612fd3565b6142a2565b60ff8116156142a25760405163f40239db60e01b815260048101889052602401612fd3565b50505050505050565b6000806142b7836132b3565b600160ff919091161b90920392915050565b60008082614309576143046001600160801b0386167f00000000000000000000000000000000000000000000000000000000000000006143c1565b61431b565b61431b856001600160801b0316614430565b90506002848154811061433057614330614822565b906000526020600020906005020191505b60048201546001600160801b0382811691161461438a57815460028054909163ffffffff1690811061437557614375614822565b90600052602060002090600502019150614341565b509392505050565b60008060008060006143a386613af1565b93509350935093506143b784848484613d60565b9695505050505050565b6000816143d6846001600160801b03166132b3565b60ff16116143ec5763b34b5c226000526004601cfd5b6143f583614430565b90508161440a826001600160801b03166132b3565b60ff16116122a9576122a661442083600161484e565b6001600160801b03831690614454565b60008119600183011681614443826132b3565b60ff169390931c8015179392505050565b600080614460846132b3565b60ff169050808303600180821b0385821b179250505092915050565b60008083601f84011261448e57600080fd5b5081356001600160401b038111156144a557600080fd5b6020830191508360208285010111156144bd57600080fd5b9250929050565b600080600083850360a08112156144da57600080fd5b60808112156144e857600080fd5b5083925060808401356001600160401b0381111561450557600080fd5b6145118682870161447c565b9497909650939450505050565b6000806040838503121561453157600080fd5b50508035926020909101359150565b634e487b7160e01b600052602160045260246000fd5b6003811061457457634e487b7160e01b600052602160045260246000fd5b50565b6020810161458483614556565b91905290565b6001600160a01b038116811461457457600080fd5b6000602082840312156145b157600080fd5b81356141af8161458a565b6000806000606084860312156145d157600080fd5b505081359360208301359350604090920135919050565b6000815180845260005b8181101561460e576020818501810151868301820152016145f2565b81811115614620576000602083870101525b50601f01601f19169290920160200192915050565b6020815260006122a660208301846145e8565b60006020828403121561465a57600080fd5b5035919050565b801515811461457457600080fd5b6000806000806080858703121561468557600080fd5b84359350602085013592506040850135915060608501356146a581614661565b939692955090935050565b6000602082840312156146c257600080fd5b81356001600160801b03811681146141af57600080fd5b600080600080600080608087890312156146f257600080fd5b86359550602087013561470481614661565b945060408701356001600160401b038082111561472057600080fd5b61472c8a838b0161447c565b9096509450606089013591508082111561474557600080fd5b5061475289828a0161447c565b979a9699509497509295939492505050565b63ffffffff8416815282602082015260606040820152600061143660608301846145e8565b634e487b7160e01b600052604160045260246000fd5b6000608082840312156147b157600080fd5b604051608081018181106001600160401b03821117156147e157634e487b7160e01b600052604160045260246000fd5b8060405250823581526020830135602082015260408301356040820152606083013560608201528091505092915050565b8183823760009101908152919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b6000821982111561486157614861614838565b500190565b60006001820161487857614878614838565b5060010190565b60008282101561489157614891614838565b500390565b6000602082840312156148a857600080fd5b81516141af81614661565b634e487b7160e01b600052601260045260246000fd5b6000826148d8576148d86148b3565b500490565b60008160001904831182151516156148f7576148f7614838565b500290565b60006020828403121561490e57600080fd5b81516141af8161458a565b60006020828403121561492b57600080fd5b5051919050565b60006001600160401b0380831681851680830382111561495457614954614838565b01949350505050565b60006001600160401b038083168185168183048111821515161561498357614983614838565b02949350505050565b60006001600160401b03838116908316818110156149ac576149ac614838565b039392505050565b600080604083850312156149c757600080fd5b505080516020909101519092909150565b6000602082840312156149ea57600080fd5b815163ffffffff811681146141af57600080fd5b60006001600160ff1b0381841382841380821686840486111615614a2457614a24614838565b600160ff1b6000871282811687830589121615614a4357614a43614838565b60008712925087820587128484161615614a5f57614a5f614838565b87850587128184161615614a7557614a75614838565b505050929093029392505050565b600082614a9257614a926148b3565b600160ff1b821460001984141615614aac57614aac614838565b500590565b600082614ac057614ac06148b3565b500690565b60006001600160801b03838116908316818110156149ac576149ac614838565b60006001600160801b0380831681851680830382111561495457614954614838565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b606081526000614b44606083018789614b07565b8281036020840152614b57818688614b07565b9150508260408301529695505050505050565b600060ff821660ff841680821015614b8457614b84614838565b90039392505050565b600060ff831680614ba057614ba06148b3565b8060ff8416069150509291505056fea2646970667358221220f7ed1e8138fabb419e12943b164c707feba00282c8887ea78c4d88e07890192064736f6c634300080f0033000000000000000000000000000000000000000000000000000000000000000103682932cec7ce0a3874b19675a6bbc923054a7b321efc7d3835187b172494b60000000000000000000000000000000000000000000000000000000000000049000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000002a300000000000000000000000000000000000000000000000000000000000049d40000000000000000000000000f027f4a985560fb13324e943edf55ad6f1d15dc10000000000000000000000003e8a0b63f57e975c268d610ece93da5f78c01321000000000000000000000000496286e5ee7758de84dd17e6d2d97afc2ace4cc70000000000000000000000000000000000000000000000000000000000002105000000000000000000000000642229f238fb9de03374be34b0ed8d9de80752c50000000000000000000000008ca1e12404d16373aef756179b185f27b2994f3a", + "nonce": "0x7", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x1ba0044", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x0d255db3c8490310d1e4559f5b3333d16875be63f94fac356388f61b0563980a", + "transactionIndex": "0xcc", + "blockHash": "0xebc8eaa4c264ac5a931efc852283c603e2967c19c325edfe2380aa46fb1975f2", + "blockNumber": "0x15552bc", + "gasUsed": "0x3f8429", + "effectiveGasPrice": "0x324e5664", + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "to": null, + "contractAddress": "0xab91fb6cef84199145133f75cbd96b8a31f184ed" + }, + { + "status": "0x1", + "cumulativeGasUsed": "0x1fb3c8e", + "logs": [], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xaf6a01bd98b0ad5b06f96c78a218b4df164643844fd7cd602b70b9e1d12e07e6", + "transactionIndex": "0xcd", + "blockHash": "0xebc8eaa4c264ac5a931efc852283c603e2967c19c325edfe2380aa46fb1975f2", + "blockNumber": "0x15552bc", + "gasUsed": "0x413c4a", + "effectiveGasPrice": "0x324e5664", + "from": "0x24c3ae1aedb8142d32bb6d3b988f5910f272d53b", + "to": null, + "contractAddress": "0x7344da3a618b86cda67f8260c0cc2027d99f5b49" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1745860191, + "chain": 1, + "commit": "c6a3d05" +} \ No newline at end of file From 9f50d014ca8fb7b35b6544a589b132b6eaa75c13 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 16:57:41 -0400 Subject: [PATCH 17/27] add OP signer validations --- .../validations/OP.md | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md new file mode 100644 index 00000000..63b491be --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md @@ -0,0 +1,86 @@ +# Validation + +This document can be used to validate the state diff resulting from the execution of the upgrade transactions. + +For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: + +- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. +- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. +- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. + +## Expected Domain and Message Hashes + +> [!CAUTION] +> +> Before signing, ensure the below hashes match what is on your ledger. +> +> ### OP Signers +> +> - Domain Hash: `0x4e6a6554de0308f5ece8ff736beed8a1b876d16f5c27cac8e466d7de0c703890` +> - Message Hash: `0x46fe3f9cbb360cab153b001412c217c0399bc13e3c0c70a894bfbcbb9758aeaf` + +## Mainnet State Overrides + +### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +### `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` (`OPSignerSafe`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000003`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the owner count to 1 so the transaction simulation can occur. + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +- **Key**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from cast index address 0xca11bde05977b3631167028862be2a173976ca11 2. + +- **Key**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
+ **Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
+ **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from cast index address 0x0000000000000000000000000000000000000001 2. + +## Mainnet State Changes + +### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000008`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000009`
+ **Meaning**: Nonce increment. + +- **Key**: `0x677ccc35cbca06cc7e18392d16ec576e71fa6bee6c9228127ba81e2326729ab2`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Sets an approval for this transaction from the signer. + **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`. + +### `0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e` (`DisputeGameFactory`) + +- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
+ **Before**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
+ **After**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address from `0xe749aa49c3edaf1dcb997ea3dac23dff72bcb826` to `0x7344da3a618b86cda67f8260c0cc2027d99f5b49`. + **Verify**: You can verify the key derivation by running `cast index uint32 1 101` in your terminal. + +- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
+ **Before**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
+ **After**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
+ **Meaning**: Updates the `FaultDisputeGame` implementation address from `0xe17d670043c3cdd705a3223b3d89a228a1f07f0f` to `0xab91fb6cef84199145133f75cbd96b8a31f184ed`. + **Verify**: You can verify the key derivation by running `cast index uint32 0 101` in your terminal. + +### `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` (`OP Nested Safe`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000068`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000069`
+ **Meaning**: Nonce increment. + +### Signing Address + +Nonce increment. From f6856f9d2ff90708a6c9e85236868b9336222993 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 17:01:40 -0400 Subject: [PATCH 18/27] fix op readme --- mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md index 63b491be..bfc8f614 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md @@ -14,7 +14,7 @@ For each contract listed in the state diff, please verify that no contracts or s > > Before signing, ensure the below hashes match what is on your ledger. > -> ### OP Signers +> ### OP Signer Safe: `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` > > - Domain Hash: `0x4e6a6554de0308f5ece8ff736beed8a1b876d16f5c27cac8e466d7de0c703890` > - Message Hash: `0x46fe3f9cbb360cab153b001412c217c0399bc13e3c0c70a894bfbcbb9758aeaf` From d5d7396cabdc59120d6bdfd475ded310a02d88de Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 17:13:08 -0400 Subject: [PATCH 19/27] cb signer validations --- .../validations/CB.md | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md new file mode 100644 index 00000000..c7336a83 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md @@ -0,0 +1,105 @@ +# Validation + +This document can be used to validate the state diff resulting from the execution of the upgrade transactions. + +For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: + +- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. +- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. +- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. + +## Expected Domain and Message Hashes + +> [!CAUTION] +> +> Before signing, ensure the below hashes match what is on your ledger. +> +> ### CB Signer Safe `0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110` +> +> - Domain Hash: `` +> - Message Hash: `` + +## Mainnet State Overrides + +### Proxy Admin Owner (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +### CB Signer Safe (`0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000003`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the owner count to 1 so the transaction simulation can occur. + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +- **Key**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from cast index address 0xca11bde05977b3631167028862be2a173976ca11 2. + +- **Key**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
+ **Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
+ **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from cast index address 0x0000000000000000000000000000000000000001 2. + +### Coordinator Safe (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +## Mainnet State Changes + +### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000008`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000009`
+ **Meaning**: Nonce increment. + +- **Key**: ``
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Sets an approval for this transaction from the signer. + **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`. + +### `0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e` (`DisputeGameFactory`) + +- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
+ **Before**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
+ **After**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address from `0xe749aa49c3edaf1dcb997ea3dac23dff72bcb826` to `0x7344da3a618b86cda67f8260c0cc2027d99f5b49`. + **Verify**: You can verify the key derivation by running `cast index uint32 1 101` in your terminal. + +- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
+ **Before**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
+ **After**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
+ **Meaning**: Updates the `FaultDisputeGame` implementation address from `0xe17d670043c3cdd705a3223b3d89a228a1f07f0f` to `0xab91fb6cef84199145133f75cbd96b8a31f184ed`. + **Verify**: You can verify the key derivation by running `cast index uint32 0 101` in your terminal. + +### `0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110` (`CBSignerSafe`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Nonce increment. + +### `0x9855054731540A48b28990B63DcF4f33d8AE46A1` (`CoordinatorSafe`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: ``
+ **After**: ``
+ **Meaning**: Nonce increment. + +- **Key**: ``
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Sets an approval for this transaction from the signer. + **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110`. + +### Signing Address + +Nonce increment. From 41d95e22e3fa8230be3705e80248406fdb55dd1e Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 18:00:00 -0400 Subject: [PATCH 20/27] add initial setup instructions to readme --- .../2025-04-23-upgrade-fault-proofs/README.md | 27 +++++ .../validations/SC.md | 105 ++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index 685b8f29..e3f969cb 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -6,6 +6,33 @@ Status: READY TO DEPLOY This task contains two scripts. One for deploying new versions of the `FaultDisputeGame` and `PermissionedDisputeGame` contracts, and one for updating the `DisputeGameFactory` contract to reference the new dispute game contracts. +## Initial Setup + +These instructions are for initial setup of your development environment to install basic tools (e.g Go, Git etc.) needed for the rest of the README. If you already +have these tools or have used this repo before, feel free to skip this section. + +### 1. Install Xcode + - Download Xcode from the Mac App Store + +### 2. Install Xcode Command Line Tools + - Open the Terminal Application + - The Terminal Application can be found using LaunchPad and typing in "Terminal" + - Run the command: + ```bash + xcode-select --install + ``` + +### 3. Install Golang + - Naviate to [https://go.dev/doc/install](https://go.dev/doc/install) + - Click the download button to install the latest version of Golang + - Follow the installation prompts + +### 4. Install Forge + - Inside Terminal run: + ```bash + curl -L https://foundry.paradigm.xyz | bash + ``` + ## Procedure ### 1. Update repo: diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md new file mode 100644 index 00000000..dc75e383 --- /dev/null +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md @@ -0,0 +1,105 @@ +# Validation + +This document can be used to validate the state diff resulting from the execution of the upgrade transactions. + +For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: + +- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. +- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. +- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. + +## Expected Domain and Message Hashes + +> [!CAUTION] +> +> Before signing, ensure the below hashes match what is on your ledger. +> +> ### Security Council Safe (`0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`) +> +> - Domain Hash: `` +> - Message Hash: `` + +## Mainnet State Overrides + +### Proxy Admin Owner (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +### Security Council Safe (`0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000003`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the owner count to 1 so the transaction simulation can occur. + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +- **Key**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from cast index address 0xca11bde05977b3631167028862be2a173976ca11 2. + +- **Key**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
+ **Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
+ **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from cast index address 0x0000000000000000000000000000000000000001 2. + +### Coordinator Safe (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. + +## Mainnet State Changes + +### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000008`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000009`
+ **Meaning**: Nonce increment. + +- **Key**: ``
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Sets an approval for this transaction from the signer. + **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`. + +### `0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e` (`DisputeGameFactory`) + +- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
+ **Before**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
+ **After**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address from `0xe749aa49c3edaf1dcb997ea3dac23dff72bcb826` to `0x7344da3a618b86cda67f8260c0cc2027d99f5b49`. + **Verify**: You can verify the key derivation by running `cast index uint32 1 101` in your terminal. + +- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
+ **Before**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
+ **After**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
+ **Meaning**: Updates the `FaultDisputeGame` implementation address from `0xe17d670043c3cdd705a3223b3d89a228a1f07f0f` to `0xab91fb6cef84199145133f75cbd96b8a31f184ed`. + **Verify**: You can verify the key derivation by running `cast index uint32 0 101` in your terminal. + +### `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd` (`Security Council Safe`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Nonce increment. + +### `0x9855054731540A48b28990B63DcF4f33d8AE46A1` (`CoordinatorSafe`) + +- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Before**: ``
+ **After**: ``
+ **Meaning**: Nonce increment. + +- **Key**: ``
+ **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Sets an approval for this transaction from the signer. + **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`. + +### Signing Address + +Nonce increment. From 0a4ea1b3bfc76fa6b313e33afecfdadc5f4d69a7 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 18:10:11 -0400 Subject: [PATCH 21/27] improve readme --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index e3f969cb..e4b1cec5 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -33,6 +33,8 @@ have these tools or have used this repo before, feel free to skip this section. curl -L https://foundry.paradigm.xyz | bash ``` +### 4. Install Forge + ## Procedure ### 1. Update repo: @@ -99,7 +101,17 @@ validate integrity of the simulation, we need to check the following: ##### 3.2.2. Validate correctness of the state diff. -Now click on the "State" tab, and refer to the [State Validations](./VALIDATION.md) instructions for the transaction you are signing. +Now click on the "State" tab. + +- If **CB Signer** +refer to the [State Validations](./validations/CB.md) instructions for the transaction you are signing. + +- If **OP Signer** +refer to the [State Validations](./validations/OP.md) instructions for the transaction you are signing. + +- If **B Signer** +refer to the [State Validations](./validations/B.md) instructions for the transaction you are signing. + Once complete return to this document to complete the signing. ##### 3.2.3. Extract the domain hash and the message hash to approve. From e103ba9ceef09b5a5259f4cd4485de64e95ae6b8 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 18:11:21 -0400 Subject: [PATCH 22/27] fix readme --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index e4b1cec5..d25c1670 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -104,13 +104,13 @@ validate integrity of the simulation, we need to check the following: Now click on the "State" tab. - If **CB Signer** -refer to the [State Validations](./validations/CB.md) instructions for the transaction you are signing. +refer to the [CB State Validations](./validations/CB.md) instructions for the transaction you are signing. - If **OP Signer** -refer to the [State Validations](./validations/OP.md) instructions for the transaction you are signing. +refer to the [OP State Validations](./validations/OP.md) instructions for the transaction you are signing. - If **B Signer** -refer to the [State Validations](./validations/B.md) instructions for the transaction you are signing. +refer to the [B State Validations](./validations/B.md) instructions for the transaction you are signing. Once complete return to this document to complete the signing. From 03f18e817966d50fc82f05eb71cbbdc7b0bd2b46 Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Mon, 28 Apr 2025 18:13:03 -0400 Subject: [PATCH 23/27] ready to sign --- mainnet/2025-04-23-upgrade-fault-proofs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index d25c1670..e171aa93 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -1,6 +1,6 @@ # Upgrade Fault Proofs -Status: READY TO DEPLOY +Status: READY TO SIGN ## Description From 3934490bc82c28a7d739135e18807cfa81023c6f Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Tue, 29 Apr 2025 14:44:47 -0400 Subject: [PATCH 24/27] finalize validations for all parties --- .../2025-04-23-upgrade-fault-proofs/Makefile | 25 ++- .../validations/CB.md | 178 ++++++++++-------- .../validations/OP.md | 135 +++++++------ .../validations/SC.md | 172 ++++++++++------- 4 files changed, 302 insertions(+), 208 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile index 7afd0a14..3806a238 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -29,8 +29,8 @@ sign-cb: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "sign(address[])" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] -.PHONY: sign-b -sign-b: +.PHONY: sign-sc +sign-sc: $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "sign(address[])" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] @@ -57,3 +57,24 @@ approve-coordinator: execute: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "run(bytes)" 0x --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv + +.PHONY: gen-validation-op +gen-validation-op: + if [ ! -d validations ]; then mkdir validations; fi + $(GOPATH)/bin/state-diff --rpc $(L1_RPC_URL) -o validations/OP.md \ + -- forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "sign(address[])" [$(OP_SIGNER_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 + +.PHONY: gen-validation-cb +gen-validation-cb: + if [ ! -d validations ]; then mkdir validations; fi + $(GOPATH)/bin/state-diff --rpc $(L1_RPC_URL) -o validations/cb_test.md \ + -- forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "sign(address[])" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 + +.PHONY: gen-validation-sc +gen-validation-sc: + if [ ! -d validations ]; then mkdir validations; fi + $(GOPATH)/bin/state-diff --rpc $(L1_RPC_URL) -o validations/sc_test.md \ + -- forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ + --sig "sign(address[])" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md index c7336a83..15c78beb 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md @@ -1,105 +1,131 @@ # Validation -This document can be used to validate the state diff resulting from the execution of the upgrade transactions. +This document can be used to validate the inputs and result of the execution of the upgrade transaction which you are signing. -For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: +The steps are: -- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. -- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. -- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. +1. [Validate the Domain and Message Hashes](#expected-domain-and-message-hashes) +2. [Verifying the state changes](#state-changes) ## Expected Domain and Message Hashes +First, we need to validate the domain and message hashes. These values should match both the values on your ledger and the values printed to the terminal when you run the task. + > [!CAUTION] > > Before signing, ensure the below hashes match what is on your ledger. > -> ### CB Signer Safe `0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110` +> ### CB Signer Safe - Mainnet: `0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110` > -> - Domain Hash: `` -> - Message Hash: `` +> - Domain Hash: `0xfb308368b8deca582e84a807d31c1bfcec6fda754061e2801b4d6be5cb52a8ac` +> - Message Hash: `0xfb35bb9de829bcf7b4a682ac101da587ee4fbd8a00b678c27cf752645789cc31` -## Mainnet State Overrides +# State Validations -### Proxy Admin Owner (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) +For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
- **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Override the threshold to 1 so the transaction simulation can occur. +- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. +- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. +- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. -### CB Signer Safe (`0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110`) +## State Overrides -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000003`
- **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Override the owner count to 1 so the transaction simulation can occur. +### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
**Meaning**: Override the threshold to 1 so the transaction simulation can occur. -- **Key**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
- **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from cast index address 0xca11bde05977b3631167028862be2a173976ca11 2. - -- **Key**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
- **Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
- **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from cast index address 0x0000000000000000000000000000000000000001 2. - -### Coordinator Safe (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) +### CB Coordinator Safe - Mainnet (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
**Meaning**: Override the threshold to 1 so the transaction simulation can occur. -## Mainnet State Changes - -### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) - -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000008`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000009`
- **Meaning**: Nonce increment. - -- **Key**: ``
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Sets an approval for this transaction from the signer. - **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`. - -### `0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e` (`DisputeGameFactory`) - -- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
- **Before**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
- **After**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
- **Meaning**: Updates the `PermissionedDisputeGame` implementation address from `0xe749aa49c3edaf1dcb997ea3dac23dff72bcb826` to `0x7344da3a618b86cda67f8260c0cc2027d99f5b49`. - **Verify**: You can verify the key derivation by running `cast index uint32 1 101` in your terminal. - -- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
- **Before**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
- **After**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
- **Meaning**: Updates the `FaultDisputeGame` implementation address from `0xe17d670043c3cdd705a3223b3d89a228a1f07f0f` to `0xab91fb6cef84199145133f75cbd96b8a31f184ed`. - **Verify**: You can verify the key derivation by running `cast index uint32 0 101` in your terminal. - -### `0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110` (`CBSignerSafe`) +### CB Signer Safe - Mainnet (`0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Nonce increment. - -### `0x9855054731540A48b28990B63DcF4f33d8AE46A1` (`CoordinatorSafe`) - -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: ``
- **After**: ``
- **Meaning**: Nonce increment. +- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000003`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Sets the owner count to 1 so the transaction simulation can occur. -- **Key**: ``
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Sets an approval for this transaction from the signer. - **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110`. +- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. -### Signing Address +- **Raw Slot**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. -Nonce increment. +- **Raw Slot**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
+ **Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
+ **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. + +## Task State Changes + +### Dispute Game Factory Proxy - Mainnet (`0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e`) + +0. **Raw Slot**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
+ **Raw Old Value**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
+ **Raw New Value**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
+ **Value Type**: address
+ **Decoded Old Value**: `0xE749aA49c3eDAF1DCb997eA3DAC23dff72bcb826`
+ **Decoded New Value**: `0x7344Da3A618b86cdA67f8260C0cc2027D99F5B49`
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address.
+ +1. **Raw Slot**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
+ **Raw Old Value**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
+ **Raw New Value**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
+ **Value Type**: address
+ **Decoded Old Value**: `0xE17d670043c3cDd705a3223B3D89A228A1f07F0f`
+ **Decoded New Value**: `0xAB91FB6cef84199145133f75cBD96B8a31F184ED`
+ **Meaning**: Updates the `FaultDisputeGame` implementation address.
+ +### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) + +2. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000008`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000009`
+ **Value Type**: uint256
+ **Decoded Old Value**: `8`
+ **Decoded New Value**: `9`
+ **Meaning**: Increments the nonce
+ +3. **Raw Slot**: `0xb6dd246ed63451030f1723985e9b9585b536e679783d2a9c70d84aa5a465dcb7`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested has for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`.
+ +### CB Coordinator Safe - Mainnet (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) + +4. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000015`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000016`
+ **Value Type**: uint256
+ **Decoded Old Value**: `21`
+ **Decoded New Value**: `22`
+ **Meaning**: Increments the nonce
+ +5. **Raw Slot**: `0xbb0e1c8c01e4568beec4555fc6acdf5ffe7d5c669a69fc2b4e6e0fae42db8834`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0xbb32860528d49e6103c942c2d7ffeb7d2ff304e1c86cec7c2bc445c3a3921335` (you should see this in your terminal as the Nested has for safe 0x9855054731540A48b28990B63DcF4f33d8AE46A1) and `NESTED_SAFE` is `0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110`.
+ +### CB Signer Safe - Mainnet (`0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110`) + +6. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Increments the nonce
+ +### Your Signer Address + +- Nonce increment diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md index bfc8f614..dd4db297 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md @@ -1,86 +1,107 @@ # Validation -This document can be used to validate the state diff resulting from the execution of the upgrade transactions. +This document can be used to validate the inputs and result of the execution of the upgrade transaction which you are signing. -For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: +The steps are: -- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. -- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. -- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. +1. [Validate the Domain and Message Hashes](#expected-domain-and-message-hashes) +2. [Verifying the state changes](#state-changes) ## Expected Domain and Message Hashes +First, we need to validate the domain and message hashes. These values should match both the values on your ledger and the values printed to the terminal when you run the task. + > [!CAUTION] > > Before signing, ensure the below hashes match what is on your ledger. > -> ### OP Signer Safe: `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` +> ### OP Signer Safe - Mainnet: `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` > > - Domain Hash: `0x4e6a6554de0308f5ece8ff736beed8a1b876d16f5c27cac8e466d7de0c703890` > - Message Hash: `0x46fe3f9cbb360cab153b001412c217c0399bc13e3c0c70a894bfbcbb9758aeaf` -## Mainnet State Overrides +# State Validations + +For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: + +- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. +- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. +- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. + +## State Overrides -### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) +### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
**Meaning**: Override the threshold to 1 so the transaction simulation can occur. -### `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` (`OPSignerSafe`) +### OP Signer Safe - Mainnet (`0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000003`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000003`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Override the owner count to 1 so the transaction simulation can occur. + **Meaning**: Sets the owner count to 1 so the transaction simulation can occur. -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
**Meaning**: Override the threshold to 1 so the transaction simulation can occur. -- **Key**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
+- **Raw Slot**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from cast index address 0xca11bde05977b3631167028862be2a173976ca11 2. + **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. -- **Key**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
+- **Raw Slot**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
**Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
- **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from cast index address 0x0000000000000000000000000000000000000001 2. - -## Mainnet State Changes - -### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) - -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000008`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000009`
- **Meaning**: Nonce increment. - -- **Key**: `0x677ccc35cbca06cc7e18392d16ec576e71fa6bee6c9228127ba81e2326729ab2`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Sets an approval for this transaction from the signer. - **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`. - -### `0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e` (`DisputeGameFactory`) - -- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
- **Before**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
- **After**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
- **Meaning**: Updates the `PermissionedDisputeGame` implementation address from `0xe749aa49c3edaf1dcb997ea3dac23dff72bcb826` to `0x7344da3a618b86cda67f8260c0cc2027d99f5b49`. - **Verify**: You can verify the key derivation by running `cast index uint32 1 101` in your terminal. - -- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
- **Before**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
- **After**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
- **Meaning**: Updates the `FaultDisputeGame` implementation address from `0xe17d670043c3cdd705a3223b3d89a228a1f07f0f` to `0xab91fb6cef84199145133f75cbd96b8a31f184ed`. - **Verify**: You can verify the key derivation by running `cast index uint32 0 101` in your terminal. - -### `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A` (`OP Nested Safe`) - -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000068`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000069`
- **Meaning**: Nonce increment. - -### Signing Address - -Nonce increment. + **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. + +## Task State Changes + +### Dispute Game Factory Proxy - Mainnet (`0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e`) + +0. **Raw Slot**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
+ **Raw Old Value**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
+ **Raw New Value**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
+ **Value Type**: address
+ **Decoded Old Value**: `0xE749aA49c3eDAF1DCb997eA3DAC23dff72bcb826`
+ **Decoded New Value**: `0x7344Da3A618b86cdA67f8260C0cc2027D99F5B49`
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address.
+ +1. **Raw Slot**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
+ **Raw Old Value**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
+ **Raw New Value**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
+ **Value Type**: address
+ **Decoded Old Value**: `0xE17d670043c3cDd705a3223B3D89A228A1f07F0f`
+ **Decoded New Value**: `0xAB91FB6cef84199145133f75cBD96B8a31F184ED`
+ **Meaning**: Updates the `FaultDisputeGame` implementation address.
+ +### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) + +2. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000008`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000009`
+ **Value Type**: uint256
+ **Decoded Old Value**: `8`
+ **Decoded New Value**: `9`
+ **Meaning**: Increments the nonce
+ +3. **Raw Slot**: `0x677ccc35cbca06cc7e18392d16ec576e71fa6bee6c9228127ba81e2326729ab2`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested has for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`.
+ +### OP Signer Safe - Mainnet (`0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`) + +4. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000068`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000069`
+ **Value Type**: uint256
+ **Decoded Old Value**: `104`
+ **Decoded New Value**: `105`
+ **Meaning**: Increments the nonce
+ +### Your Signer Address + +- Nonce increment diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md index dc75e383..9499aea2 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md @@ -1,105 +1,131 @@ # Validation -This document can be used to validate the state diff resulting from the execution of the upgrade transactions. +This document can be used to validate the inputs and result of the execution of the upgrade transaction which you are signing. -For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: +The steps are: -- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. -- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. -- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. +1. [Validate the Domain and Message Hashes](#expected-domain-and-message-hashes) +2. [Verifying the state changes](#state-changes) ## Expected Domain and Message Hashes +First, we need to validate the domain and message hashes. These values should match both the values on your ledger and the values printed to the terminal when you run the task. + > [!CAUTION] > > Before signing, ensure the below hashes match what is on your ledger. > -> ### Security Council Safe (`0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`) +> ### Security Council Safe - Mainnet: `0x20AcF55A3DCfe07fC4cecaCFa1628F788EC8A4Dd` > -> - Domain Hash: `` -> - Message Hash: `` +> - Domain Hash: `0x1fbfdc61ceb715f63cb17c56922b88c3a980f1d83873df2b9325a579753e8aa3` +> - Message Hash: `0xfb35bb9de829bcf7b4a682ac101da587ee4fbd8a00b678c27cf752645789cc31` -## Mainnet State Overrides +# State Validations -### Proxy Admin Owner (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) +For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract: -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
- **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Override the threshold to 1 so the transaction simulation can occur. +- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur. +- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic. +- All key values match the semantic meaning provided, which can be validated using the storage layout links provided. + +## State Overrides -### Security Council Safe (`0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`) +### Security Council Safe - Mainnet (`0x20AcF55A3DCfe07fC4cecaCFa1628F788EC8A4Dd`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000003`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000003`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Override the owner count to 1 so the transaction simulation can occur. + **Meaning**: Sets the owner count to 1 so the transaction simulation can occur. -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
**Meaning**: Override the threshold to 1 so the transaction simulation can occur. -- **Key**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
+- **Raw Slot**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from cast index address 0xca11bde05977b3631167028862be2a173976ca11 2. + **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. -- **Key**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
+- **Raw Slot**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
**Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
- **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from cast index address 0x0000000000000000000000000000000000000001 2. + **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. -### Coordinator Safe (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) +### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
**Meaning**: Override the threshold to 1 so the transaction simulation can occur. -## Mainnet State Changes - -### `0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c` (`ProxyAdminOwner`) +### CB Coordinator Safe - Mainnet (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000008`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000009`
- **Meaning**: Nonce increment. - -- **Key**: ``
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Sets an approval for this transaction from the signer. - **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`. - -### `0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e` (`DisputeGameFactory`) - -- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
- **Before**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
- **After**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
- **Meaning**: Updates the `PermissionedDisputeGame` implementation address from `0xe749aa49c3edaf1dcb997ea3dac23dff72bcb826` to `0x7344da3a618b86cda67f8260c0cc2027d99f5b49`. - **Verify**: You can verify the key derivation by running `cast index uint32 1 101` in your terminal. - -- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
- **Before**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
- **After**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
- **Meaning**: Updates the `FaultDisputeGame` implementation address from `0xe17d670043c3cdd705a3223b3d89a228a1f07f0f` to `0xab91fb6cef84199145133f75cbd96b8a31f184ed`. - **Verify**: You can verify the key derivation by running `cast index uint32 0 101` in your terminal. - -### `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd` (`Security Council Safe`) - -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Nonce increment. - -### `0x9855054731540A48b28990B63DcF4f33d8AE46A1` (`CoordinatorSafe`) - -- **Key**: `0x0000000000000000000000000000000000000000000000000000000000000005`
- **Before**: ``
- **After**: ``
- **Meaning**: Nonce increment. - -- **Key**: ``
- **Before**: `0x0000000000000000000000000000000000000000000000000000000000000000`
- **After**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: Sets an approval for this transaction from the signer. - **Verify**: Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `` (you should see this in your terminal after the transaction simulation) and `NESTED_SAFE` is `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`. - -### Signing Address +- **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000004`
+ **Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Meaning**: Override the threshold to 1 so the transaction simulation can occur. -Nonce increment. +## Task State Changes + +### Security Council Safe - Mainnet (`0x20AcF55A3DCfe07fC4cecaCFa1628F788EC8A4Dd`) + +0. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Increments the nonce
+ +### Dispute Game Factory Proxy - Mainnet (`0x43edB88C4B80fDD2AdFF2412A7BebF9dF42cB40e`) + +1. **Raw Slot**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e`
+ **Raw Old Value**: `0x000000000000000000000000e749aa49c3edaf1dcb997ea3dac23dff72bcb826`
+ **Raw New Value**: `0x0000000000000000000000007344da3a618b86cda67f8260c0cc2027d99f5b49`
+ **Value Type**: address
+ **Decoded Old Value**: `0xE749aA49c3eDAF1DCb997eA3DAC23dff72bcb826`
+ **Decoded New Value**: `0x7344Da3A618b86cdA67f8260C0cc2027D99F5B49`
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address.
+ +2. **Raw Slot**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
+ **Raw Old Value**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
+ **Raw New Value**: `0x000000000000000000000000ab91fb6cef84199145133f75cbd96b8a31f184ed`
+ **Value Type**: address
+ **Decoded Old Value**: `0xE17d670043c3cDd705a3223B3D89A228A1f07F0f`
+ **Decoded New Value**: `0xAB91FB6cef84199145133f75cBD96B8a31F184ED`
+ **Meaning**: Updates the `FaultDisputeGame` implementation address.
+ +### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) + +3. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000008`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000009`
+ **Value Type**: uint256
+ **Decoded Old Value**: `8`
+ **Decoded New Value**: `9`
+ **Meaning**: Increments the nonce
+ +4. **Raw Slot**: `0xb6dd246ed63451030f1723985e9b9585b536e679783d2a9c70d84aa5a465dcb7`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested has for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`.
+ +### CB Coordinator Safe - Mainnet (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) + +5. **Raw Slot**: `0x0000000000000000000000000000000000000000000000000000000000000005`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000015`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000016`
+ **Value Type**: uint256
+ **Decoded Old Value**: `21`
+ **Decoded New Value**: `22`
+ **Meaning**: Increments the nonce
+ +6. **Raw Slot**: `0xd44aa84538c38f5f557ad41295befbb0b175c0e64da81611575bb33319b6c9f5`
+ **Raw Old Value**: `0x0000000000000000000000000000000000000000000000000000000000000000`
+ **Raw New Value**: `0x0000000000000000000000000000000000000000000000000000000000000001`
+ **Value Type**: uint256
+ **Decoded Old Value**: `0`
+ **Decoded New Value**: `1`
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0xbb32860528d49e6103c942c2d7ffeb7d2ff304e1c86cec7c2bc445c3a3921335` (you should see this in your terminal as the Nested has for safe 0x9855054731540A48b28990B63DcF4f33d8AE46A1) and `NESTED_SAFE` is `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`.
+ +### Your Signer Address + +- Nonce increment From 08c6c340716eda8d0104b626d5a1746357606fdd Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Tue, 29 Apr 2025 15:59:53 -0400 Subject: [PATCH 25/27] use sc instead of b --- mainnet/2025-04-23-upgrade-fault-proofs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile index 3806a238..22a63329 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -41,8 +41,8 @@ approve-cb: --sig "approve(address[],bytes)" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv -.PHONY: approve-b -approve-b: +.PHONY: approve-sc +approve-sc: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ --sig "approve(address[],bytes)" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv From 0fdee2e3c55463808e1b2259642955a8f3a9434b Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Tue, 29 Apr 2025 16:20:30 -0400 Subject: [PATCH 26/27] pr feedback --- mainnet/2025-04-23-upgrade-fault-proofs/.env | 4 +-- .../2025-04-23-upgrade-fault-proofs/Makefile | 12 ++++---- .../2025-04-23-upgrade-fault-proofs/README.md | 28 ++++++++++++++++--- .../validations/CB.md | 12 ++++---- .../validations/OP.md | 10 +++---- .../validations/SC.md | 12 ++++---- 6 files changed, 49 insertions(+), 29 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/.env b/mainnet/2025-04-23-upgrade-fault-proofs/.env index bf492643..eb32e7ee 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/.env +++ b/mainnet/2025-04-23-upgrade-fault-proofs/.env @@ -8,5 +8,5 @@ SYSTEM_CONFIG=0x73a79Fab69143498Ed3712e519A88a918e1f4072 OWNER_SAFE=0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c COORDINATOR_SAFE_ADDR=0x9855054731540A48b28990B63DcF4f33d8AE46A1 OP_SIGNER_SAFE_ADDR=0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A -SAFE_A=0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110 -SAFE_B=0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd +CB_SIGNER_SAFE=0x9c4a57feb77e294fd7bf5ebe9ab01caa0a90a110 +SECURITY_COUNCIL_SAFE=0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile index 22a63329..0c0aab8f 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/Makefile +++ b/mainnet/2025-04-23-upgrade-fault-proofs/Makefile @@ -27,24 +27,24 @@ approve-op: sign-cb: $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "sign(address[])" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] + --sig "sign(address[])" [$(CB_SIGNER_SAFE),$(COORDINATOR_SAFE_ADDR)] .PHONY: sign-sc sign-sc: $(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \ forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "sign(address[])" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] + --sig "sign(address[])" [$(SECURITY_COUNCIL_SAFE),$(COORDINATOR_SAFE_ADDR)] .PHONY: approve-cb approve-cb: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "approve(address[],bytes)" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ + --sig "approve(address[],bytes)" [$(CB_SIGNER_SAFE),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv .PHONY: approve-sc approve-sc: forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "approve(address[],bytes)" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ + --sig "approve(address[],bytes)" [$(SECURITY_COUNCIL_SAFE),$(COORDINATOR_SAFE_ADDR)] $(SIGNATURES) \ --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast -vvvv .PHONY: approve-coordinator @@ -70,11 +70,11 @@ gen-validation-cb: if [ ! -d validations ]; then mkdir validations; fi $(GOPATH)/bin/state-diff --rpc $(L1_RPC_URL) -o validations/cb_test.md \ -- forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "sign(address[])" [$(SAFE_A),$(COORDINATOR_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 + --sig "sign(address[])" [$(CB_SIGNER_SAFE),$(COORDINATOR_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 .PHONY: gen-validation-sc gen-validation-sc: if [ ! -d validations ]; then mkdir validations; fi $(GOPATH)/bin/state-diff --rpc $(L1_RPC_URL) -o validations/sc_test.md \ -- forge script --rpc-url $(L1_RPC_URL) UpgradeDGF \ - --sig "sign(address[])" [$(SAFE_B),$(COORDINATOR_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 + --sig "sign(address[])" [$(SECURITY_COUNCIL_SAFE),$(COORDINATOR_SAFE_ADDR)] --sender 0x9986ccaf9e3de0ffef82a0f7fa3a06d5afe07252 diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index e171aa93..58e35edf 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -33,7 +33,11 @@ have these tools or have used this repo before, feel free to skip this section. curl -L https://foundry.paradigm.xyz | bash ``` -### 4. Install Forge +### 4. Clone Repo + - Inside Terminal run: + ```bash + git clone git@github.com:base/contract-deployments.git + ``` ## Procedure @@ -54,7 +58,7 @@ is ready". ### 3. Run relevant script(s) -#### 3.1 Deploy new Dispute Game Implementations +#### 3.1 [Base Engineer] Deploy new Dispute Game Implementations ```bash make deploy @@ -76,6 +80,12 @@ Op signer: make sign-op ``` +Security Council signer: + +```bash +make sign-sc +``` + You will see a "Simulation link" from the output. Paste this URL in your browser. A prompt may ask you to choose a @@ -109,8 +119,8 @@ refer to the [CB State Validations](./validations/CB.md) instructions for the tr - If **OP Signer** refer to the [OP State Validations](./validations/OP.md) instructions for the transaction you are signing. -- If **B Signer** -refer to the [B State Validations](./validations/B.md) instructions for the transaction you are signing. +- If **Security Council Signer** +refer to the [B State Validations](./validations/SC.md) instructions for the transaction you are signing. Once complete return to this document to complete the signing. @@ -205,10 +215,20 @@ Optimism facilitator: SIGNATURES=AAAABBBB make approve-op ``` +Security Council facilitator: + +```bash +SIGNATURES=AAAABBBB make approve-sc +``` + #### Execute the transaction Once the signatures have been submitted approving the transaction for all nested Safes run: +```bash +make approve-coordinator +``` + ```bash make execute ``` diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md index 15c78beb..f0453717 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/CB.md @@ -54,11 +54,11 @@ For each contract listed in the state diff, please verify that no contracts or s - **Raw Slot**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. + **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. - **Raw Slot**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
**Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
- **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. + **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. ## Task State Changes @@ -70,7 +70,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: address
**Decoded Old Value**: `0xE749aA49c3eDAF1DCb997eA3DAC23dff72bcb826`
**Decoded New Value**: `0x7344Da3A618b86cdA67f8260C0cc2027D99F5B49`
- **Meaning**: Updates the `PermissionedDisputeGame` implementation address.
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address. You can verify the key derivation by running `cast index uint32 1 101` in your terminal.
1. **Raw Slot**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
**Raw Old Value**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
@@ -78,7 +78,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: address
**Decoded Old Value**: `0xE17d670043c3cDd705a3223B3D89A228A1f07F0f`
**Decoded New Value**: `0xAB91FB6cef84199145133f75cBD96B8a31F184ED`
- **Meaning**: Updates the `FaultDisputeGame` implementation address.
+ **Meaning**: Updates the `FaultDisputeGame` implementation address. You can verify the key derivation by running `cast index uint32 0 101` in your terminal.
### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) @@ -96,7 +96,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: uint256
**Decoded Old Value**: `0`
**Decoded New Value**: `1`
- **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested has for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`.
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested hash for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`.
### CB Coordinator Safe - Mainnet (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) @@ -114,7 +114,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: uint256
**Decoded Old Value**: `0`
**Decoded New Value**: `1`
- **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0xbb32860528d49e6103c942c2d7ffeb7d2ff304e1c86cec7c2bc445c3a3921335` (you should see this in your terminal as the Nested has for safe 0x9855054731540A48b28990B63DcF4f33d8AE46A1) and `NESTED_SAFE` is `0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110`.
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0xbb32860528d49e6103c942c2d7ffeb7d2ff304e1c86cec7c2bc445c3a3921335` (you should see this in your terminal as the Nested hash for safe 0x9855054731540A48b28990B63DcF4f33d8AE46A1) and `NESTED_SAFE` is `0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110`.
### CB Signer Safe - Mainnet (`0x9C4a57Feb77e294Fd7BF5EBE9AB01CAA0a90A110`) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md index dd4db297..d7022cf4 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/OP.md @@ -48,11 +48,11 @@ For each contract listed in the state diff, please verify that no contracts or s - **Raw Slot**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. + **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. - **Raw Slot**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
**Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
- **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. + **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. ## Task State Changes @@ -64,7 +64,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: address
**Decoded Old Value**: `0xE749aA49c3eDAF1DCb997eA3DAC23dff72bcb826`
**Decoded New Value**: `0x7344Da3A618b86cdA67f8260C0cc2027D99F5B49`
- **Meaning**: Updates the `PermissionedDisputeGame` implementation address.
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address. You can verify the key derivation by running `cast index uint32 1 101` in your terminal.
1. **Raw Slot**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
**Raw Old Value**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
@@ -72,7 +72,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: address
**Decoded Old Value**: `0xE17d670043c3cDd705a3223B3D89A228A1f07F0f`
**Decoded New Value**: `0xAB91FB6cef84199145133f75cBD96B8a31F184ED`
- **Meaning**: Updates the `FaultDisputeGame` implementation address.
+ **Meaning**: Updates the `FaultDisputeGame` implementation address. You can verify the key derivation by running `cast index uint32 0 101` in your terminal.
### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) @@ -90,7 +90,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: uint256
**Decoded Old Value**: `0`
**Decoded New Value**: `1`
- **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested has for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`.
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested hash for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`.
### OP Signer Safe - Mainnet (`0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A`) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md b/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md index 9499aea2..6680a17a 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/validations/SC.md @@ -42,11 +42,11 @@ For each contract listed in the state diff, please verify that no contracts or s - **Raw Slot**: `0x316a0aac0d94f5824f0b66f5bbe94a8c360a17699a1d3a233aafcf7146e9f11c`
**Override**: `0x0000000000000000000000000000000000000000000000000000000000000001`
- **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. + **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. - **Raw Slot**: `0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0`
**Override**: `0x000000000000000000000000ca11bde05977b3631167028862be2a173976ca11`
- **Meaning**: This is owners[0xca11bde05977b3631167028862be2a173976ca11] -> 1, so the key can be derived from `cast index address 0xca11bde05977b3631167028862be2a173976ca11 2`. + **Meaning**: This is owners[1] -> 0xca11bde05977b3631167028862be2a173976ca11, so the key can be derived from `cast index address 0x0000000000000000000000000000000000000001 2`. ### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) @@ -80,7 +80,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: address
**Decoded Old Value**: `0xE749aA49c3eDAF1DCb997eA3DAC23dff72bcb826`
**Decoded New Value**: `0x7344Da3A618b86cdA67f8260C0cc2027D99F5B49`
- **Meaning**: Updates the `PermissionedDisputeGame` implementation address.
+ **Meaning**: Updates the `PermissionedDisputeGame` implementation address. You can verify the key derivation by running `cast index uint32 1 101` in your terminal.
2. **Raw Slot**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b`
**Raw Old Value**: `0x000000000000000000000000e17d670043c3cdd705a3223b3d89a228a1f07f0f`
@@ -88,7 +88,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: address
**Decoded Old Value**: `0xE17d670043c3cDd705a3223B3D89A228A1f07F0f`
**Decoded New Value**: `0xAB91FB6cef84199145133f75cBD96B8a31F184ED`
- **Meaning**: Updates the `FaultDisputeGame` implementation address.
+ **Meaning**: Updates the `FaultDisputeGame` implementation address. You can verify the key derivation by running `cast index uint32 0 101` in your terminal.
### Proxy Admin Owner - Mainnet (`0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c`) @@ -106,7 +106,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: uint256
**Decoded Old Value**: `0`
**Decoded New Value**: `1`
- **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested has for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`.
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0x378644b143fa5f6becf1f80e7c66ebb76369df458d06f1d2a82ec1cae4124806` (you should see this in your terminal as the Nested hash for safe 0x7bB41C3008B3f03FE483B28b8DB90e19Cf07595c) and `NESTED_SAFE` is `0x9855054731540A48b28990B63DcF4f33d8AE46A1`.
### CB Coordinator Safe - Mainnet (`0x9855054731540A48b28990B63DcF4f33d8AE46A1`) @@ -124,7 +124,7 @@ For each contract listed in the state diff, please verify that no contracts or s **Value Type**: uint256
**Decoded Old Value**: `0`
**Decoded New Value**: `1`
- **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0xbb32860528d49e6103c942c2d7ffeb7d2ff304e1c86cec7c2bc445c3a3921335` (you should see this in your terminal as the Nested has for safe 0x9855054731540A48b28990B63DcF4f33d8AE46A1) and `NESTED_SAFE` is `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`.
+ **Meaning**: Sets an approval for this transaction from the signer. Compute the expected raw slot key with `cast index bytes32 $NESTED_HASH $(cast index address $NESTED_SAFE 8)` where `NESTED_HASH` is `0xbb32860528d49e6103c942c2d7ffeb7d2ff304e1c86cec7c2bc445c3a3921335` (you should see this in your terminal as the Nested hash for safe 0x9855054731540A48b28990B63DcF4f33d8AE46A1) and `NESTED_SAFE` is `0x20acf55a3dcfe07fc4cecacfa1628f788ec8a4dd`.
### Your Signer Address From 788d034a7dc249c34fce239c41a338c2c9706b6d Mon Sep 17 00:00:00 2001 From: Joby Thundil Date: Tue, 29 Apr 2025 17:05:23 -0400 Subject: [PATCH 27/27] pr feedbacl --- .../2025-04-23-upgrade-fault-proofs/README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mainnet/2025-04-23-upgrade-fault-proofs/README.md b/mainnet/2025-04-23-upgrade-fault-proofs/README.md index 58e35edf..e06439f6 100644 --- a/mainnet/2025-04-23-upgrade-fault-proofs/README.md +++ b/mainnet/2025-04-23-upgrade-fault-proofs/README.md @@ -33,7 +33,7 @@ have these tools or have used this repo before, feel free to skip this section. curl -L https://foundry.paradigm.xyz | bash ``` -### 4. Clone Repo +### 5. Clone Repo - Inside Terminal run: ```bash git clone git@github.com:base/contract-deployments.git @@ -58,7 +58,7 @@ is ready". ### 3. Run relevant script(s) -#### 3.1 [Base Engineer] Deploy new Dispute Game Implementations +#### 3.1 [ONLY for a Base Engineer to run] Deploy new Dispute Game Implementations ```bash make deploy @@ -120,7 +120,7 @@ refer to the [CB State Validations](./validations/CB.md) instructions for the tr refer to the [OP State Validations](./validations/OP.md) instructions for the transaction you are signing. - If **Security Council Signer** -refer to the [B State Validations](./validations/SC.md) instructions for the transaction you are signing. +refer to the [Security Council State Validations](./validations/SC.md) instructions for the transaction you are signing. Once complete return to this document to complete the signing. @@ -180,7 +180,7 @@ congrats, you are done! ### [For Facilitator ONLY] How to execute -#### Execute the transaction +#### Execute the transaction approvals 1. IMPORTANT: Ensure op-challenger has been updated before executing. 1. Collect outputs from all participating signers. @@ -221,14 +221,15 @@ Security Council facilitator: SIGNATURES=AAAABBBB make approve-sc ``` -#### Execute the transaction - -Once the signatures have been submitted approving the transaction for all nested Safes run: - +Once `approve-cb` and `approve-sc` have been executed, run: ```bash make approve-coordinator ``` +#### Execute the transaction + +Once the signatures have been submitted approving the transaction for all nested Safes run: + ```bash make execute ```