From 0e82c086d7389351bdef57517f195b325e4eb7ec Mon Sep 17 00:00:00 2001 From: maclane Date: Fri, 6 Nov 2026 16:48:16 -0600 Subject: [PATCH 1/5] Prepare beacon and wallet registry gas handling for Glamsterdam --- docs/glamsterdam-migration.md | 89 +++++++ solidity/ecdsa/README.adoc | 2 +- solidity/ecdsa/contracts/WalletRegistry.sol | 36 ++- .../ecdsa/contracts/test/RandomBeaconStub.sol | 2 +- solidity/ecdsa/scripts/prepare-glamsterdam.ts | 93 +++++++ .../test/WalletRegistry.RandomBeacon.test.ts | 11 +- .../test/WalletRegistryGovernance.test.ts | 2 +- .../glamsterdam/wallet-registry-sourcify.json | 1 + .../wallet_registry_callback_eels.py | 240 ++++++++++++++++++ solidity/random-beacon/README.adoc | 4 +- .../random-beacon/contracts/RandomBeacon.sol | 22 +- .../random-beacon/contracts/Reimbursable.sol | 20 +- .../contracts/test/ReimbursableImplStub.sol | 12 + .../random-beacon/test/Reimbursable.test.ts | 25 ++ solidity/random-beacon/test/fixtures/index.ts | 4 +- 15 files changed, 535 insertions(+), 28 deletions(-) create mode 100644 docs/glamsterdam-migration.md create mode 100644 solidity/ecdsa/scripts/prepare-glamsterdam.ts create mode 100644 solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json create mode 100644 solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py diff --git a/docs/glamsterdam-migration.md b/docs/glamsterdam-migration.md new file mode 100644 index 0000000000..99622a23a4 --- /dev/null +++ b/docs/glamsterdam-migration.md @@ -0,0 +1,89 @@ +# Glamsterdam gas compatibility + +The current EIP-8037/EIP-8038 proposal changes storage and gas accounting. +These changes are provisional until the fork specification is finalized. + +## Existing deployments + +Changing constructor/initializer defaults does not update an existing contract. +Before activation, use the existing governance setters for these parameters: + +| Contract | Parameter | Previous mainnet value | Proposed draft value | +| --- | --- | ---: | ---: | +| RandomBeacon | callbackGasLimit | 64,000 | 300,000 | +| RandomBeacon | dkgResultSubmissionGas | 237,650 | 450,000 | +| WalletRegistry | dkgResultSubmissionGas | 290,000 | 500,000 | + +The callback limit includes margin over 240,768 gas measured with the deployed +WalletRegistry proxy and implementation under Amsterdam EELS. At 64,000 gas the +callback runs out of gas while writing `startBlock` and `seed`; the beacon catches +the failure, leaving WalletRegistry awaiting its seed until timeout recovery. + +The DKG reimbursement values are provisional budgets, not measured exact costs. +Both result-submission paths create two fresh slots. Their storage costs alone +increase by 175,840 gas versus Osaka. The proposed budgets add margin above the +old budgets plus that delta. Benchmark both complete paths under the final fork +schedule before signing updates; also remeasure every approval/timeout/inactivity +offset and ReimbursementPool.staticGas. Do not blindly add a single opcode delta +to staticGas because refunds and their cap affect the total. + +Generate reviewable begin/finalize calls from live governance references: + +```sh +cd solidity/ecdsa +yarn hardhat run scripts/prepare-glamsterdam.ts --network mainnet +``` + +The script only reads chain state and prints calldata. It does not sign or send. +Review chain ID, owners, current parameters, and any already-pending updates. +Submit the begin calls through the relevant governance owner, wait the on-chain +delay (currently seven days on mainnet), verify each pending value, then submit +the matching finalize calls. Re-read `relayEntryParameters()` and both +`gasParameters()` getters afterward. Never finalize an unrelated pending update. + +Run a full RandomBeacon -> WalletRegistry proxy callback on a fork using the new +rules with transaction gas below and above 2^24. Check that `DkgStarted` occurs, +`CallbackFailed` does not occur, and both startBlock and seed are recorded. Ensure +the outer relay submission has enough gas for its own state changes and refund. + +The public deployed bytecode regression is reproducible separately from Hardhat: + +```sh +python3 -m venv /tmp/keep-glamsterdam-eels +/tmp/keep-glamsterdam-eels/bin/pip install 'ethereum-execution @ git+https://github.com/ethereum/execution-specs.git@a7dbafac0c0ec82e7b2e20959cc7c00ce958442a' +/tmp/keep-glamsterdam-eels/bin/python solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py +``` + +The fixture contains only the verified mainnet implementation runtime for +`0x420c99a4B0e4CB65c4CaBf2b4D2526372aA1ac6e`, obtained from Sourcify; the script +embeds proxy runtime read from `0x46d52E41C2F300BC82217Ce22b920c34995204eb`. +It models the required `AWAITING_SEED` state and a locked sortition-pool response. +Assertions cover Osaka success, Amsterdam failure without a reservoir, Amsterdam +success at 300k, reservoir behavior, and the pinned proxy threshold. It excludes +the outer RandomBeacon frame and does not prove a production relay gas estimate. + +## Gas measurement + +The updated meter clamps a negative `gasStart - gasleft()` delta to zero, including +the negative DKG-timeout offset. This prevents a gas credit from reverting otherwise +successful work. It adds no storage fields and preserves proxy storage layouts. + +This does **not** measure reservoir-paid state gas. For transaction gas above 2^24, +EIP-8037 pays new-state charges from a reservoir invisible to `gasleft()`. Operators +must not expect exact reimbursement for that gas. Use ordinary estimated gas +limits, monitor actual transaction cost, and do not rely on a reservoir to bypass +the old callback cap. A future reimbursement redesign needs an explicitly agreed, +capped fee or a state-aware quote; fixed offsets cannot reconstruct hidden dynamic +state costs. + +ReimbursementPool deliberately treats failed ETH sends as best effort. Contract +operators should use a storage-free receiver and alert on `SendingEtherFailed`. +Adding a fresh retry-credit slot after an out-of-gas receiver call could itself +run out of gas and revert protocol work; this patch does not add that failure path. +A pull-payment replacement pool requires a separate migration and gas benchmark. + +## References + +- https://eips.ethereum.org/EIPS/eip-8037 +- https://eips.ethereum.org/EIPS/eip-8038 +- https://github.com/ethereum/glamsterdam-gas-invariants diff --git a/solidity/ecdsa/README.adoc b/solidity/ecdsa/README.adoc index ef3d2f653b..99d0fb59d8 100644 --- a/solidity/ecdsa/README.adoc +++ b/solidity/ecdsa/README.adoc @@ -351,7 +351,7 @@ inactive for other reasons. |Calculated gas cost for submitting a DKG result. This will be refunded as part of the DKG approval process. |Yes -|`290_000` +|`500_000` (provisional Glamsterdam budget; see `docs/glamsterdam-migration.md`) |dkgResultApprovalGasOffset |Gas that is meant to balance the DKG result approval's overall cost. diff --git a/solidity/ecdsa/contracts/WalletRegistry.sol b/solidity/ecdsa/contracts/WalletRegistry.sol index 55fd9a8e26..23f4685dde 100644 --- a/solidity/ecdsa/contracts/WalletRegistry.sol +++ b/solidity/ecdsa/contracts/WalletRegistry.sol @@ -413,7 +413,10 @@ contract WalletRegistry is // Gas parameters were adjusted based on Ethereum state in April 2022. // If the cost of EVM opcodes change over time, these parameters will // have to be updated. - _dkgResultSubmissionGas = 290_000; + // Amsterdam adds 175,840 gas for the two fresh DKG result slots. + // This provisional budget includes margin and must be rebenchmarked + // against the final fork rules before activation. + _dkgResultSubmissionGas = 500_000; _dkgResultApprovalGasOffset = 72_000; _notifyOperatorInactivityGasOffset = 93_000; _notifySeedTimeoutGasOffset = 7_250; @@ -902,7 +905,7 @@ contract WalletRegistry is // Refund msg.sender's ETH for DKG result submission and result approval reimbursementPool.refund( _dkgResultSubmissionGas + - (gasStart - gasleft()) + + _registryGasSpent(gasStart) + _dkgResultApprovalGasOffset, msg.sender ); @@ -917,7 +920,7 @@ contract WalletRegistry is dkg.notifySeedTimeout(); reimbursementPool.refund( - (gasStart - gasleft()) + _notifySeedTimeoutGasOffset, + _registryGasSpent(gasStart) + _notifySeedTimeoutGasOffset, msg.sender ); } @@ -932,7 +935,10 @@ contract WalletRegistry is // performed on DKG timeout notification removes data from the storage // which is recovering gas for the transaction. reimbursementPool.refund( - (gasStart - gasleft()) - _notifyDkgTimeoutNegativeGasOffset, + _registryGasSpentAfterOffset( + gasStart, + _notifyDkgTimeoutNegativeGasOffset + ), msg.sender ); } @@ -1123,7 +1129,7 @@ contract WalletRegistry is } reimbursementPool.refund( - (gasStart - gasleft()) + _notifyOperatorInactivityGasOffset, + _registryGasSpent(gasStart) + _notifyOperatorInactivityGasOffset, msg.sender ); } @@ -1480,6 +1486,26 @@ contract WalletRegistry is return _maliciousDkgResultSlashingAmount; } + /// @dev Keep the meter local so this upgrade does not require a new + /// random-beacon npm dependency. Reservoir state gas is invisible. + function _registryGasSpent(uint256 gasStart) + internal + view + returns (uint256) + { + uint256 gasEnd = gasleft(); + return gasStart > gasEnd ? gasStart - gasEnd : 0; + } + + function _registryGasSpentAfterOffset(uint256 gasStart, uint256 offset) + internal + view + returns (uint256) + { + uint256 spent = _registryGasSpent(gasStart); + return spent > offset ? spent - offset : 0; + } + /// @notice Retrieves gas-related parameters. /// @return dkgResultSubmissionGas Calculated max gas cost for submitting /// a DKG result. This will be refunded as part of the DKG approval diff --git a/solidity/ecdsa/contracts/test/RandomBeaconStub.sol b/solidity/ecdsa/contracts/test/RandomBeaconStub.sol index cd6cdde703..d9109dee3b 100644 --- a/solidity/ecdsa/contracts/test/RandomBeaconStub.sol +++ b/solidity/ecdsa/contracts/test/RandomBeaconStub.sol @@ -15,7 +15,7 @@ contract RandomBeaconStub is IRandomBeacon { Callback.Data internal callback; // This value has to reflect the one set in the Random Beacon contract! - uint256 public callbackGasLimit = 64000; + uint256 public callbackGasLimit = 300000; event CallbackFailed(uint256 entry, uint256 entrySubmittedBlock); diff --git a/solidity/ecdsa/scripts/prepare-glamsterdam.ts b/solidity/ecdsa/scripts/prepare-glamsterdam.ts new file mode 100644 index 0000000000..d47e5e27c4 --- /dev/null +++ b/solidity/ecdsa/scripts/prepare-glamsterdam.ts @@ -0,0 +1,93 @@ +/* eslint-disable import/no-extraneous-dependencies, no-console */ +import { deployments, ethers, network } from "hardhat" + +// Read-only: print governance calls for review; never submit a transaction. +async function main() { + const beaconDeployment = await deployments.get("RandomBeacon") + const registryDeployment = await deployments.get("WalletRegistry") + const beacon = new ethers.Contract( + beaconDeployment.address, + ["function governance() view returns (address)"], + ethers.provider + ) + const registry = new ethers.Contract( + registryDeployment.address, + ["function governance() view returns (address)"], + ethers.provider + ) + const governanceAbi = [ + "function owner() view returns (address)", + "function governanceDelay() view returns (uint256)", + "function beginCallbackGasLimitUpdate(uint256)", + "function finalizeCallbackGasLimitUpdate()", + "function beginDkgResultSubmissionGasUpdate(uint256)", + "function finalizeDkgResultSubmissionGasUpdate()", + ] + const beaconGovernance = new ethers.Contract( + await beacon.governance(), + governanceAbi, + ethers.provider + ) + const registryGovernance = new ethers.Contract( + await registry.governance(), + governanceAbi, + ethers.provider + ) + const call = ( + target: typeof beaconGovernance, + method: string, + args: number[] = [] + ) => ({ + to: target.address, + value: "0", + data: target.interface.encodeFunctionData(method, args), + method, + }) + const updates = [ + { target: beaconGovernance, parameter: "CallbackGasLimit", value: 300_000 }, + { + target: beaconGovernance, + parameter: "DkgResultSubmissionGas", + value: 450_000, + }, + { + target: registryGovernance, + parameter: "DkgResultSubmissionGas", + value: 500_000, + }, + ] + console.log( + JSON.stringify( + { + network: network.name, + chainId: (await ethers.provider.getNetwork()).chainId, + blockNumber: await ethers.provider.getBlockNumber(), + provisional: true, + owners: { + randomBeacon: await beaconGovernance.owner(), + walletRegistry: await registryGovernance.owner(), + }, + governanceDelays: { + randomBeacon: (await beaconGovernance.governanceDelay()).toString(), + walletRegistry: ( + await registryGovernance.governanceDelay() + ).toString(), + }, + begin: updates.map(({ target, parameter, value }) => + call(target, `begin${parameter}Update`, [value]) + ), + // Submit only after each on-chain pending value and delay are checked. + finalize: updates.map(({ target, parameter }) => + call(target, `finalize${parameter}Update`) + ), + }, + null, + 2 + ) + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts b/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts index 700b0b5230..aea95553e7 100644 --- a/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts +++ b/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts @@ -12,11 +12,10 @@ import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers" import type { IRandomBeacon, RandomBeaconStub, - RandomBeaconStub__factory, WalletRegistry, WalletRegistryStub, } from "../typechain" -import type { BigNumber, ContractTransaction } from "ethers" +import type { ContractTransaction } from "ethers" const { createSnapshot, restoreSnapshot } = helpers.snapshot @@ -210,10 +209,12 @@ describe("WalletRegistry - Random Beacon", async () => { await restoreSnapshot() }) + it("should use the Amsterdam-compatible callback budget", async () => { + expect(await randomBeaconMock.callbackGasLimit()).to.equal(300_000) + }) + it("should succeed", async () => { - const entry: BigNumber = ethers.BigNumber.from( - ethers.utils.randomBytes(32) - ) + const entry = ethers.utils.randomBytes(32) const tx = await randomBeaconMock.submitRelayEntry(entry) diff --git a/solidity/ecdsa/test/WalletRegistryGovernance.test.ts b/solidity/ecdsa/test/WalletRegistryGovernance.test.ts index 1d63b8c42e..137337344b 100644 --- a/solidity/ecdsa/test/WalletRegistryGovernance.test.ts +++ b/solidity/ecdsa/test/WalletRegistryGovernance.test.ts @@ -48,7 +48,7 @@ describe("WalletRegistryGovernance", async () => { const initialAuthorizationDecreaseChangePeriod = 3888000 // 45 days const initialMaliciousDkgResultSlashingAmount = to1e18(400) const initialMaliciousDkgResultNotificationRewardMultiplier = 100 - const initialDkgResultSubmissionGas = 290_000 + const initialDkgResultSubmissionGas = 500_000 const initialDkgResultApprovalGasOffset = 72_000 const initialNotifyOperatorInactivityGasOffset = 93_000 const initialNotifySeedTimeoutGasOffset = 7_250 diff --git a/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json b/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json new file mode 100644 index 0000000000..f37bed0a4a --- /dev/null +++ b/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json @@ -0,0 +1 @@ +{"runtimeBytecode":{"onchainBytecode":"0x608060405234801561001057600080fd5b50600436106103af5760003560e01c80637b35b4e6116101f4578063c88e70f41161011a578063df07ce59116100ad578063f0820c921161007c578063f0820c92146109bb578063f7186ce0146109cc578063f854a27f146109df578063fd2a4788146109f257600080fd5b8063df07ce591461095f578063e03e453514610972578063e686440f14610987578063e83ab3a51461099a57600080fd5b8063d38bfff4116100e9578063d38bfff414610905578063d855c63114610918578063d8dc404d14610920578063ded56d451461093357600080fd5b8063c88e70f4146108b7578063c9bacaad146108ca578063cc562388146108dd578063d0bcc0e3146108f257600080fd5b80639c9de02811610192578063b5e9ce8b11610161578063b5e9ce8b14610845578063c09975cd14610865578063c0c53b8b14610878578063c7c49c981461088b57600080fd5b80639c9de028146107d8578063a04e298014610803578063b13b55b214610816578063b54a23741461081e57600080fd5b8063830f9e02116101ce578063830f9e021461074857806388a59590146107775780638dcbdf4a146107b25780639879d19b146107c557600080fd5b80637b35b4e61461070f5780637e0049fd146107225780637e33cba61461073557600080fd5b80634d99f473116102d95780636b5f2bff1161027757806375e0ae5a1161024657806375e0ae5a1461061c578063770124d31461062f578063789d392a146106375780637b14729e146106b257600080fd5b80636b5f2bff146105db5780636c9ecd64146105ee5780636febd4641461060157806372cc8c6d1461061457600080fd5b80635c5b3870116102b35780635c5b38701461059a578063663032cd146105ad57806368c34948146105c05780636a7f7a90146105c857600080fd5b80634d99f47314610549578063529023011461056c5780635aa6e6751461058757600080fd5b8063227fd44f11610351578063343bb92711610320578063343bb927146104e95780633682a450146104fc57806342d866931461050f5780634cf088d91461052257600080fd5b8063227fd44f1461049c57806329b6eca9146104af5780632b47da52146104c257806331376766146104d657600080fd5b8063167f05171161038d578063167f0517146104485780631ae879e8146104505780631c5b0762146104645780631d35fa631461047757600080fd5b806308aa090b146103b457806314a8547414610407578063153622b31461041c575b600080fd5b6103bc610a05565b6040516103fe9190600060a082019050825182526020830151602083015260408301516040830152606083015160608301526080830151608083015292915050565b60405180910390f35b61041a610415366004614de5565b610a6c565b005b61010654610430906001600160a01b031681565b6040516001600160a01b0390911681526020016103fe565b61041a610b33565b61010554610430906001600160a01b031681565b61041a610472366004614e30565b610b69565b60fc546001600160601b03165b6040516001600160601b0390911681526020016103fe565b61041a6104aa366004614e4d565b610ba1565b61041a6104bd366004614e30565b610c29565b61010754610430906001600160a01b031681565b61041a6104e4366004614e6a565b610d04565b61041a6104f7366004614ea4565b610f6c565b61041a61050a366004614e30565b610fd1565b61041a61051d366004614e30565b610fdc565b6104307f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd781565b61055c610557366004614ea4565b611192565b60405190151581526020016103fe565b60fd5460fe54604080519283526020830191909152016103fe565b600054610430906001600160a01b031681565b61041a6105a8366004614e6a565b6111ad565b61041a6105bb366004614e30565b6113e4565b61055c611486565b61041a6105d6366004614de5565b611497565b61041a6105e9366004614e30565b61152e565b61041a6105fc366004614ebd565b6115a7565b61041a61060f366004614ebd565b611611565b61041a61164c565b61041a61062a366004614e30565b6116dc565b61055c6116f0565b610690610645366004614ea4565b60408051606080820183526000808352602080840182905292840181905293845260ca8252928290208251938401835280548452600181015491840191909152600201549082015290565b60408051825181526020808401519082015291810151908201526060016103fe565b6106e06065546001600160601b038116916001600160401b03600160601b8304811692600160a01b90041690565b604080516001600160601b0390941684526001600160401b0392831660208501529116908201526060016103fe565b61041a61071d366004614e30565b6116fc565b61041a610730366004614e6a565b611785565b610484610743366004614e30565b6117a9565b610769610756366004614ea4565b6101046020526000908152604090205481565b6040519081526020016103fe565b60ff5461010054610101546101025461010354604080519586526020860194909452928401919091526060830152608082015260a0016103fe565b61041a6107c0366004614edf565b6117bf565b61041a6107d3366004614f5e565b6118ac565b6107eb6107e6366004614e30565b611c1f565b6040516001600160401b0390911681526020016103fe565b61041a610811366004614fec565b611c2c565b61041a611cde565b6104307f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc81565b610858610853366004614ea4565b611d45565b6040516103fe9190615081565b603254610430906001600160a01b031681565b61041a610886366004615094565b611d52565b610430610899366004614e30565b6001600160a01b039081166000908152606660205260409020541690565b61041a6108c5366004614edf565b611f39565b61041a6108d8366004614de5565b611fcc565b6108e5612063565b6040516103fe91906150ea565b61041a610900366004614e30565b61206f565b61041a610913366004614e30565b6120e8565b61041a61217c565b61041a61092e366004615112565b6121b9565b610430610941366004614e30565b6001600160a01b039081166000908152606760205260409020541690565b61055c61096d36600461518d565b61242d565b61097a6125b3565b6040516103fe9190615234565b61055c610995366004614e30565b61264e565b6109ad6109a8366004614e6a565b612685565b6040516103fe929190615247565b6065546001600160601b0316610484565b61055c6109da366004614e30565b61269d565b6104846109ed366004614e30565b61272c565b610484610a00366004614e30565b61280b565b610a376040518060a0016040528060008152602001600081526020016000815260200160008152602001600081525090565b506040805160a0810182526099548152609a546020820152609b5491810191909152609c546060820152609d54608082015290565b610107546001600160a01b03168015610aad57336001600160a01b03821614610aa857604051630159dd6560e41b815260040160405180910390fd5b610af6565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd71614610af657604051630159dd6560e41b815260040160405180910390fd5b610b2d610b01612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc87878761287c565b50505050565b610b67610b3e612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6129e8565b565b610b9e610b74612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc84612bc2565b50565b6000546001600160a01b03163314610bd45760405162461bcd60e51b8152600401610bcb90615262565b60405180910390fd5b60fc80546001600160601b0319166001600160601b0383169081179091556040519081527fe132b87eb6644ee4d4c3c32744f7e1c3906335a2d4f99330767bf573909c7d84906020015b60405180910390a150565b606454600290610100900460ff16158015610c4b575060645460ff8083169116105b610c675760405162461bcd60e51b8152600401610bcb90615299565b6064805461ffff191660ff8316176101001790556001600160a01b038216610ca257604051631718673d60e11b815260040160405180910390fd5b61010780546001600160a01b0319166001600160a01b0384161790556064805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15050565b600080610d12609784612da1565b604051638871ca5d60e01b815263ffffffff8216600482015291935091506000906001600160a01b037f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc1690638871ca5d90602401602060405180830381865afa158015610d84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610da891906152e7565b6040805160018082528183019092529192506000919060208083019080368337019050506001600160a01b038084166000908152606760205260409020549192501681600081518110610dfd57610dfd61531a565b6001600160a01b03928316602091820292909201015260fc5460fd546040516383ddba8f60e01b81527f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7909316926383ddba8f92610e6d926001600160601b039091169133908790600401615330565b600060405180830381600087803b158015610e8757600080fd5b505af1925050508015610e98575060015b610ef15760fc54604080516001600160601b0390921682526001600160a01b038416602083015285917f14621289a12ab59e0737decc388bba91d929c723defb4682d5d19b9a12ecfecb910160405180910390a2610f42565b60fc54604080516001600160601b0390921682526001600160a01b038416602083015285917f88f76c659db78142f88e94db3ca791869495394c6c1b3d412ced9022dc97c9e3910160405180910390a25b609b545a1015610f655760405163c8faa26560e01b815260040160405180910390fd5b5050505050565b610105546001600160a01b03163314610f98576040516302add3a960e41b815260040160405180910390fd5b610fa360ca8261310a565b60405181907fa6ae4af610b8ada39d3675190ead27a5552631a8e33f53e4e37dbb082f11a73e90600090a250565b610b9e606582613157565b6001600160a01b038181166000908152606660205260409020541680611015576040516331158d1160e01b815260040160405180910390fd5b604051632de9480760e01b81526001600160a01b0383811660048301526000917f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd790911690632de9480790602401606060405180830381865afa158015611080573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110a491906153a3565b50604051637104c0e560e11b81526001600160a01b0385811660048301528281166024830152919350600092507f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc9091169063e20981ca906044016020604051808303816000875af115801561111e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061114291906153e5565b6040516001600160601b03821681529091506001600160a01b038516907f38532b6dea69d7266fa923c7813d190be37625f2454ddfa3d93c45c79482e3fd9060200160405180910390a250505050565b600081815260ca602052604081206001015415155b92915050565b60005a905060006111bf6097846133ba565b9050600080806111e460c08701356111da6020890189615402565b60ca9291906137af565b925092509250856040516020016111fb9190615688565b60405160208183030381529060405280519060200120837fbe8f27cef1f3d94120c9c547c3614f5b992fdb0c0a497cc920fde06546291ab460405160405180910390a38351156112d3577f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031663942f68928560fe544261128391906156b1565b6040518363ffffffff1660e01b81526004016112a09291906156c4565b600060405180830381600087803b1580156112ba57600080fd5b505af11580156112ce573d6000803e3d6000fd5b505050505b6101055460405163547d07a160e11b81526004810185905260248101849052604481018390526001600160a01b039091169063a8fa0f4290606401600060405180830381600087803b15801561132857600080fd5b505af115801561133c573d6000803e3d6000fd5b5050505061134a609761382a565b603254610100546001600160a01b0390911690637ad226dc905a61136e90896156e6565b60ff5461137b91906156b1565b61138591906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401600060405180830381600087803b1580156113c457600080fd5b505af11580156113d8573d6000803e3d6000fd5b50505050505050505050565b6000546001600160a01b0316331461140e5760405162461bcd60e51b8152600401610bcb90615262565b604051632a59250560e21b81526001600160a01b0382811660048301527f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063a9649414906024015b600060405180830381600087803b15801561147257600080fd5b505af1158015610f65573d6000803e3d6000fd5b6000611492609761388e565b905090565b610107546001600160a01b031680156114d857336001600160a01b038216146114d357604051630159dd6560e41b815260040160405180910390fd5b611521565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7161461152157604051630159dd6560e41b815260040160405180910390fd5b610b2d60658585856138df565b6000546001600160a01b031633146115585760405162461bcd60e51b8152600401610bcb90615262565b61010680546001600160a01b0319166001600160a01b0383169081179091556040519081527f2b34e21b6daa8fcf8cba1c3ed709cbed2b0231d5fb60e9ccd8c2e75a5674bcb390602001610c1e565b6000546001600160a01b031633146115d15760405162461bcd60e51b8152600401610bcb90615262565b60fd82905560fe81905560408051838152602081018390527ff3a6ee10a78fb7d212e87d9be970fb16bd7324e9dc9c38d21cd7ecde781a1d2a9101610cf8565b610106546001600160a01b0316331461163d57604051632880b08760e01b815260040160405180910390fd5b611648609783613b1a565b5050565b610105546001600160a01b03163314611678576040516302add3a960e41b815260040160405180910390fd5b6116826097613bc7565b610106546040516310da3b0360e21b81523060048201526001600160a01b0390911690634368ec0c90602401600060405180830381600087803b1580156116c857600080fd5b505af1158015610b2d573d6000803e3d6000fd5b610b9e6116e7612832565b60659083613cbe565b60006114926097613eff565b6000546001600160a01b031633146117275760405163f2be30fb60e01b815260040160405180910390fd5b6040516001600160a01b03821681527f0e2d2343d31b085b7c4e56d1c8a6ec79f7ab07460386f1c9a1756239fe2533ac9060200160405180910390a1603280546001600160a01b0319166001600160a01b0392909216919091179055565b61179e6117956020830183615402565b60ca9190613f39565b610b9e609782614092565b60006111a76117b6612832565b606590846143a2565b6000546001600160a01b031633146117e95760405162461bcd60e51b8152600401610bcb90615262565b60006117f560976143dd565b6003811115611806576118066150d4565b146118245760405163bede29c160e01b815260040160405180910390fd5b61182f609786614474565b61183a60978561449c565b609b83905561184a6097836144c4565b6118556097826144ec565b604080518681526020810186905290810184905260608101839052608081018290527f59ae8ed7b3a7e5f6dde4cff478f0ac0aa652c5edc4f4757b09a778a430b02c569060a0015b60405180910390a15050505050565b60005a8535600081815261010460205260409020549192509085146118e457604051633ab3447f60e11b815260040160405180910390fd5b6000806118f260ca846145bc565b9092509050600061190460ca8561460c565b905086866040516020016119199291906156f9565b60405160208183030381529060405280519060200120811461194e576040516394977fa560e01b815260040160405180910390fd5b6000738263efcb8f28246697585c89fed0501cd946f76463f4df04be7f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc8c87876040516020016119a8929190918252602082015260400190565b6040516020818303038152906040528d8d8d6040518763ffffffff1660e01b81526004016119db9695949392919061571b565b600060405180830381865af41580156119f8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a209190810190615852565b600086815261010460205260408120805492935090611a3e836158f0565b9091555050604080518a815233602082015286917f326e1ff7c130ed708307116f79cf7dbca649503e7082e5e35a19ceeee1523b39910160405180910390a27f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031663942f68928260fe5442611abb91906156b1565b6040518363ffffffff1660e01b8152600401611ad89291906156c4565b600060405180830381600087803b158015611af257600080fd5b505af1158015611b06573d6000803e3d6000fd5b50611b1b9250505060608b0160408c01615909565b15611b8e5761010554604051631ee74c0960e11b81526004810187905260248101869052604481018590526001600160a01b0390911690633dce981290606401600060405180830381600087803b158015611b7557600080fd5b505af1158015611b89573d6000803e3d6000fd5b505050505b603254610101546001600160a01b0390911690637ad226dc905a611bb2908a6156e6565b611bbc91906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401600060405180830381600087803b158015611bfb57600080fd5b505af1158015611c0f573d6000803e3d6000fd5b5050505050505050505050505050565b60006111a760658361464e565b6000546001600160a01b03163314611c565760405162461bcd60e51b8152600401610bcb90615262565b606580546001600160601b0319166001600160601b038516179055611c7c6065836146e6565b611c8760658261470e565b604080516001600160601b03851681526001600160401b03848116602083015283168183015290517f544b726e42801bb47073854eeedae851903f66fe32a5bd24e626e10b90027b519181900360600190a1505050565b60005a9050611ced6097614736565b603254610102546001600160a01b0390911690637ad226dc905a611d1190856156e6565b611d1b91906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401611458565b60606111a760ca836147bd565b606454610100900460ff1615808015611d725750606454600160ff909116105b80611d8c5750303b158015611d8c575060645460ff166001145b611da85760405162461bcd60e51b8152600401610bcb90615299565b6064805460ff191660011790558015611dcb576064805461ff0019166101001790555b61010680546001600160a01b038086166001600160a01b0319928316179092556032805492851692909116919091179055611e05336147f8565b606580546001600160601b031916690878678326eac9000000179055611e2f6065623b53806146e6565b611e3d6065623b538061470e565b60fc80546001600160601b0319166815af1d78b58c400000179055606460fd556212750060fe55611e9060977f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc86614852565b611e9d6097612d00614474565b611eaa6097612d0061449c565b61c350609b55611ebd60976102186144c4565b611ec9609760146144ec565b62046cd060ff55620119406101005562016b4861010155611c52610102556108fc610103558015610b2d576064805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150505050565b6000546001600160a01b03163314611f635760405162461bcd60e51b8152600401610bcb90615262565b60ff859055610100849055610101839055610102829055610103819055604080518681526020810186905290810184905260608101839052608081018290527f8a3e64fa6013a36bccca7362e8826b11ba41e57fb60f55309c0ca48904dad0829060a00161189d565b610107546001600160a01b0316801561200d57336001600160a01b0382161461200857604051630159dd6560e41b815260040160405180910390fd5b612056565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7161461205657604051630159dd6560e41b815260040160405180910390fd5b610b2d6065858585614947565b600061149260976143dd565b6000546001600160a01b031633146120995760405162461bcd60e51b8152600401610bcb90615262565b61010580546001600160a01b0319166001600160a01b0383169081179091556040519081527fa1993af5a189ba5ad4155263c920cfee33ce0593a8eb231a13bb3ce6f39459e390602001610c1e565b6000546001600160a01b031633146121125760405162461bcd60e51b8152600401610bcb90615262565b6001600160a01b0381166121735760405162461bcd60e51b815260206004820152602260248201527f4e657720676f7665726e616e636520697320746865207a65726f206164647265604482015261737360f01b6064820152608401610bcb565b610b9e816147f8565b60005a905061218b6097614a14565b603254610103546001600160a01b0390911690637ad226dc905a6121af90856156e6565b611d1b91906156e6565b610105546001600160a01b031633146121e5576040516302add3a960e41b815260040160405180910390fd5b60006121f260ca8561460c565b905082826040516020016122079291906156f9565b60405160208183030381529060405280519060200120811461223c576040516323f9e80360e11b815260040160405180910390fd5b604051637bfcd47d60e11b81526000906001600160a01b037f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063f7f9a8fa9061228d90879087906004016156f9565b600060405180830381865afa1580156122aa573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526122d29190810190615926565b90506000836001600160401b038111156122ee576122ee615304565b604051908082528060200260200182016040528015612317578160200160208202803683370190505b50905060005b825181101561239d5761236183828151811061233b5761233b61531a565b60200260200101516001600160a01b039081166000908152606760205260409020541690565b8282815181106123735761237361531a565b6001600160a01b039092166020928302919091019091015280612395816158f0565b91505061231d565b506040516383ddba8f60e01b81526001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd716906383ddba8f906123f0908c908c908c908790600401615330565b600060405180830381600087803b15801561240a57600080fd5b505af115801561241e573d6000803e3d6000fd5b50505050505050505050505050565b604051635a48b46b60e01b81526001600160a01b03838116600483015260009182917f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc1690635a48b46b90602401602060405180830381865afa158015612498573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124bc91906159b4565b90508063ffffffff166000036124e55760405163427ce39560e01b815260040160405180910390fd5b60006124f260ca8961460c565b905086866040516020016125079291906156f9565b60405160208183030381529060405280519060200120811461253c576040516323f9e80360e11b815260040160405180910390fd5b600184108061254a57508584115b1561256857604051635d2de7eb60e01b815260040160405180910390fd5b63ffffffff8216878761257c6001886156e6565b81811061258b5761258b61531a565b90506020020160208101906125a091906159d1565b63ffffffff161498975050505050505050565b60a054604051636c2530b960e01b81526064600482015260248101919091526060907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031690636c2530b990604401600060405180830381865afa158015612626573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526114929190810190615852565b60006111a761265b612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc85614a93565b60006060612694609784614c07565b91509150915091565b6040516307b8c36760e51b81526001600160a01b0382811660048301526000917f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc9091169063f7186ce090602401602060405180830381865afa158015612708573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111a791906159ee565b600080612751836001600160a01b039081166000908152606660205260409020541690565b90506001600160a01b03811661277a576040516331158d1160e01b815260040160405180910390fd5b60405163439f18fd60e11b81526001600160a01b0382811660048301527f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063873e31fa90602401602060405180830381865afa1580156127e0573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061280491906153e5565b9392505050565b6001600160a01b0381166000908152606860205260408120546001600160601b03166111a7565b610107546000906001600160a01b031661286b57507f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd790565b50610107546001600160a01b031690565b6001600160a01b03808416600090815260018801602052604090205416806128a457506129e0565b6040516307b8c36760e51b81526001600160a01b03828116600483015286169063f7186ce090602401602060405180830381865afa1580156128ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061290e91906159ee565b156129de57846001600160a01b031663a4e2d6346040518163ffffffff1660e01b8152600401602060405180830381865afa158015612951573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061297591906159ee565b156129d257604080516001600160601b038086168252841660208201526001600160a01b0380841692908716917f1b09380d63e78fd72c1d79a805a7e2dfadf02b22418e24bebff51376b7df33b0910160405180910390a36129de565b6129de87878784612bc2565b505b505050505050565b3360008181526002850160205260409020546001600160a01b031680612a205760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b038116600090815260038601602052604081208054909190612a57908890889086906001600160601b0316614ceb565b9050806001600160601b0316600003612ab25760405162461bcd60e51b815260206004820152601f60248201527f417574686f72697a6174696f6e2062656c6f7720746865206d696e696d756d006044820152606401610bcb565b836001600160a01b0316836001600160a01b03167f5075aaa89894a888eb2cac81a27320c60855febb0cf1706b66bdc754e640d43360405160405180910390a3604051630483483160e31b81526001600160a01b0386169063241a418890612b209087908590600401615a35565b600060405180830381600087803b158015612b3a57600080fd5b505af1158015612b4e573d6000803e3d6000fd5b5050835467fffffffffffffffe19600160601b9091046001600160401b03160191506129de9050578654612b9290600160601b90046001600160401b031642615a57565b82546001600160401b0391909116600160601b0267ffffffffffffffff60601b1990911617825550505050505050565b6001600160a01b0380821660009081526002860160205260409020541680612bfc5760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b03808216600081815260038801602052604080822090519093861692917f1231fe5ee649a593b524a494cd53146a196380a872115a0d0fe16c0735afdf2691a36040516307b8c36760e51b81526001600160a01b03848116600483015285169063f7186ce090602401602060405180830381865afa158015612c89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612cad91906159ee565b15612d34578054600090612ccf908890889086906001600160601b0316614ceb565b60405163dc7520c560e01b81529091506001600160a01b0386169063dc7520c590612d009087908590600401615a35565b600060405180830381600087803b158015612d1a57600080fd5b505af1158015612d2e573d6000803e3d6000fd5b50505050505b805467fffffffffffffffe19600160601b9091046001600160401b0316016129e0578554612d7290600160601b90046001600160401b031642615a57565b81546001600160401b0391909116600160601b0267ffffffffffffffff60601b19909116178155505050505050565b6000806003612daf856143dd565b6003811115612dc057612dc06150d4565b14612e0d5760405162461bcd60e51b815260206004820152601e60248201527f43757272656e74207374617465206973206e6f74204348414c4c454e474500006044820152606401610bcb565b6003840154600c850154612e2191906156b1565b431115612e7c5760405162461bcd60e51b815260206004820152602360248201527f4368616c6c656e676520706572696f642068617320616c7265616479207061736044820152621cd95960ea1b6064820152608401610bcb565b83600b015483604051602001612e929190615688565b6040516020818303038152906040528051906020012014612f1b5760405162461bcd60e51b815260206004820152603a60248201527f526573756c7420756e646572206368616c6c656e67652069732064696666657260448201527f656e74207468616e20746865207375626d6974746564206f6e650000000000006064820152608401610bcb565b6001840154600985015460088601546040516373b33d5d60e11b81526001600160a01b039093169263e7667aba92612f57928892600401615a7e565b600060405180830381865afa925050508015612f9557506040513d6000823e601f3d908101601f19168201604052612f929190810190615aa3565b60015b61300a57336001600160a01b031684600b01547f703feb01415a2995816e8d082fd7aad0eacada1a2f63fdb3226e47f8a0285436604051612ffd906020808252601390820152721d985b1a59185d1a5bdb881c995d995c9d1959606a1b604082015260600190565b60405180910390a3613099565b81156130505760405162461bcd60e51b8152602060048201526015602482015274756e6a7573746966696564206368616c6c656e676560581b6044820152606401610bcb565b336001600160a01b031686600b01547f703feb01415a2995816e8d082fd7aad0eacada1a2f63fdb3226e47f8a02854368360405161308e9190615081565b60405180910390a350505b600b84015491506130ad60a0840184615b4c565b6130b9600186356156e6565b8181106130c8576130c861531a565b90506020020160208101906130dd91906159d1565b90508360080154436130ef91906156e6565b600a8501556000600b8501819055600c8501555b9250929050565b6000818152602083905260409020600101546131385760405162461bcd60e51b8152600401610bcb90615b95565b6000908152602091909152604081208181556001810182905560020155565b336001600160a01b0382166131ae5760405162461bcd60e51b815260206004820181905260248201527f4f70657261746f722063616e206e6f74206265207a65726f20616464726573736044820152606401610bcb565b6001600160a01b038181166000908152600185016020526040902054161561322e5760405162461bcd60e51b815260206004820152602d60248201527f4f70657261746f7220616c72656164792073657420666f72207468652073746160448201526c35b4b73390383937bb34b232b960991b6064820152608401610bcb565b6001600160a01b03828116600090815260028501602052604090205416156132985760405162461bcd60e51b815260206004820152601f60248201527f4f70657261746f72206164647265737320616c726561647920696e20757365006044820152606401610bcb565b6001600160a01b038116600090815260038401602052604090208054600160601b90046001600160401b03161561332b5760405162461bcd60e51b815260206004820152603160248201527f546865726520697320612070656e64696e6720617574686f72697a6174696f6e60448201527008191958dc99585cd9481c995c5d595cdd607a1b6064820152608401610bcb565b826001600160a01b0316826001600160a01b03167fa453db612af59e5521d6ab9284dc3e2d06af286eb1b1b7b771fce4716c19f2c160405160405180910390a3506001600160a01b03908116600081815260018501602090815260408083208054959096166001600160a01b031995861681179096559482526002909501909452919092208054909216179055565b606060036133c7846143dd565b60038111156133d8576133d86150d4565b146134255760405162461bcd60e51b815260206004820152601e60248201527f43757272656e74207374617465206973206e6f74204348414c4c454e474500006044820152606401610bcb565b6003830154600c84015460009161343b916156b1565b90508043116134985760405162461bcd60e51b815260206004820152602360248201527f4368616c6c656e676520706572696f6420686173206e6f7420706173736564206044820152621e595d60ea1b6064820152608401610bcb565b83600b0154836040516020016134ae9190615688565b60405160208183030381529060405280519060200120146135375760405162461bcd60e51b815260206004820152603960248201527f526573756c7420756e64657220617070726f76616c206973206469666665726560448201527f6e74207468616e20746865207375626d6974746564206f6e65000000000000006064820152608401610bcb565b83546000906001600160a01b0316638871ca5d61355760a0870187615b4c565b613563600189356156e6565b8181106135725761357261531a565b905060200201602081019061358791906159d1565b6040516001600160e01b031960e084901b16815263ffffffff919091166004820152602401602060405180830381865afa1580156135c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906135ed91906152e7565b9050336001600160a01b03821614806136135750600685015461361090836156b1565b43115b61365f5760405162461bcd60e51b815260206004820152601e60248201527f4f6e6c79207375626d69747465722063616e20617070726f7665206e6f7700006044820152606401610bcb565b61366c6040850185615b4c565b90506001600160401b0381111561368557613685615304565b6040519080825280602002602001820160405280156136ae578160200160208202803683370190505b50925060005b6136c16040860186615b4c565b9050811015613775576136d760a0860186615b4c565b60016136e66040890189615b4c565b858181106136f6576136f661531a565b905060200201602081019061370b9190615be5565b6137159190615c00565b60ff168181106137275761372761531a565b905060200201602081019061373c91906159d1565b84828151811061374e5761374e61531a565b63ffffffff909216602092830291909101909101528061376d816158f0565b9150506136b4565b50600b8501546040513391907fe6e9d5eba171e82025efb3f3d44fd35905e7283d104284cb9f3bbc5bf1e4276f90600090a3505092915050565b600080600084846040516137c4929190615c19565b60405190819003902092506137dd602060008688615c29565b6137e691615c53565b91506137f58460208188615c29565b6137fe91615c53565b600084815260209890985260409097209586555060018501819055600290940185905594929392915050565b60006008820181905560098201819055600a8201819055600b8201819055600c820181905581546040805163a69df4b560e01b815290516001600160a01b039092169263a69df4b59260048084019382900301818387803b15801561147257600080fd5b6000600261389b836143dd565b60038111156138ac576138ac6150d4565b1480156111a757506005820154600a83015460088401546138cd91906156b1565b6138d791906156b1565b431192915050565b6001600160601b0381161580613903575083546001600160601b0390811690821610155b61396d5760405162461bcd60e51b815260206004820152603560248201527f417574686f72697a6174696f6e20616d6f756e742073686f756c642062652030604482015274206f722061626f766520746865206d696e696d756d60581b6064820152608401610bcb565b6001600160a01b03808416600090815260018601602052604081205490911690816139995750426139a3565b506001600160401b035b60006139af8486615c71565b6001600160a01b03871660009081526003890160205260409020805491925090600160601b90046001600160401b031680158015906139f757506001600160401b0381811614155b15613a8a578854613a1890600160a01b90046001600160401b031682615c91565b6001600160401b0316421015613a8a5760405162461bcd60e51b815260206004820152603160248201527f4e6f7420656e6f7567682074696d65207061737365642073696e636520746865604482015270081bdc9a59da5b985b081c995c5d595cdd607a1b6064820152608401610bcb565b81546001600160401b038516600160601b81026001600160a01b03199092166001600160601b0386811691909117929092178455604080518a8416815292891660208401528201526001600160a01b0386811691908a16907f545cbf267cef6fe43f11f6219417ab43a0e8e345adbaae5f626d9bc325e8535a9060600160405180910390a3505050505050505050565b6001613b25836143dd565b6003811115613b3657613b366150d4565b14613b8e5760405162461bcd60e51b815260206004820152602260248201527f43757272656e74207374617465206973206e6f74204157414954494e475f5345604482015261115160f21b6064820152608401610bcb565b60405181907fb2ad26c2940889d79df2ee9c758a8aefa00c5ca90eee119af0e5d795df3b98bb90600090a2436008830155600990910155565b6000613bd2826143dd565b6003811115613be357613be36150d4565b14613c2c5760405162461bcd60e51b815260206004820152601960248201527843757272656e74207374617465206973206e6f742049444c4560381b6044820152606401610bcb565b6040517f5c3ed2397d4d21298b2fb5027ac8e2d42e3c9c72bbb55ddb030e2a36a0cdff6b90600090a1805460408051637c1e845d60e11b815290516001600160a01b039092169163f83d08ba9160048082019260009290919082900301818387803b158015613c9a57600080fd5b505af1158015613cae573d6000803e3d6000fd5b5050505043816007018190555050565b6001600160a01b038116600090815260038401602052604090208054600160601b90046001600160401b0316613d425760405162461bcd60e51b8152602060048201526024808201527f417574686f72697a6174696f6e206465637265617365206e6f742072657175656044820152631cdd195960e21b6064820152608401610bcb565b805467fffffffffffffffe19600160601b9091046001600160401b031601613dc15760405162461bcd60e51b815260206004820152602c60248201527f417574686f72697a6174696f6e2064656372656173652072657175657374206e60448201526b1bdd081858dd1a5d985d195960a21b6064820152608401610bcb565b8054600160601b90046001600160401b0316421015613e325760405162461bcd60e51b815260206004820152602760248201527f417574686f72697a6174696f6e2064656372656173652064656c6179206e6f74604482015266081c185cdcd95960ca1b6064820152608401610bcb565b6040516001600160a01b038316907f50270a522c2fef97b6b7385c2aa4a4518adda681530e0a1fe9f5e840f6f2cd9d90600090a2604051633af0572d60e11b81526001600160a01b0383811660048301528416906375e0ae5a906024016020604051808303816000875af1158015613eae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613ed291906153e5565b50506001600160a01b031660009081526003909201602052506040902080546001600160a01b0319169055565b60006001613f0c836143dd565b6003811115613f1d57613f1d6150d4565b1480156111a75750600282015460078301546138d791906156b1565b60408114613f895760405162461bcd60e51b815260206004820181905260248201527f496e76616c6964206c656e677468206f6620746865207075626c6963206b65796044820152606401610bcb565b60008282604051613f9b929190615c19565b6040805191829003909120600081815260208790529190912060010154909150156140205760405162461bcd60e51b815260206004820152602f60248201527f57616c6c657420776974682074686520676976656e207075626c6963206b657960448201526e20616c72656164792065786973747360881b6064820152608401610bcb565b600061402f6020828587615c29565b61403891615c53565b905080610f655760405162461bcd60e51b815260206004820152602260248201527f57616c6c6574207075626c6963206b6579206d757374206265206e6f6e2d7a65604482015261726f60f01b6064820152608401610bcb565b600261409d836143dd565b60038111156140ae576140ae6150d4565b146141075760405162461bcd60e51b8152602060048201526024808201527f43757272656e74207374617465206973206e6f74204157414954494e475f524560448201526314d5531560e21b6064820152608401610bcb565b6141108261388e565b1561415d5760405162461bcd60e51b815260206004820152601a60248201527f444b472074696d656f757420616c7265616479207061737365640000000000006044820152606401610bcb565b81546040516307b8c36760e51b81523360048201526001600160a01b0390911690819063f7186ce090602401602060405180830381865afa1580156141a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906141ca91906159ee565b6142225760405162461bcd60e51b815260206004820152602360248201527f5375626d6974746572206e6f7420696e2074686520736f72746974696f6e20706044820152621bdbdb60ea1b6064820152608401610bcb565b336001600160a01b038216638871ca5d61423f60a0860186615b4c565b61424b600188356156e6565b81811061425a5761425a61531a565b905060200201602081019061426f91906159d1565b6040516001600160e01b031960e084901b16815263ffffffff919091166004820152602401602060405180830381865afa1580156142b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906142d591906152e7565b6001600160a01b03161461432b5760405162461bcd60e51b815260206004820152601a60248201527f556e6578706563746564207375626d697474657220696e6465780000000000006044820152606401610bcb565b8160405160200161433c9190615688565b60408051601f19818403018152908290528051602090910120600b850181905543600c8601556009850154917f8e7fd4293d7db11807147d8890c287fad3396fbb09a4e92273fc7856076c153a90614395908690615688565b60405180910390a3505050565b6001600160a01b03811660009081526003840160205260408120546143d5908590859085906001600160601b0316614ceb565b949350505050565b805460408051632938b58d60e21b815290516000926001600160a01b03169163a4e2d6349160048083019260209291908290030181865afa158015614426573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061444a91906159ee565b1561446f575060088101546001901561446f5750600c8101546002901561446f575060035b919050565b600081116144945760405162461bcd60e51b8152600401610bcb90615cb1565b600290910155565b600081116144bc5760405162461bcd60e51b8152600401610bcb90615cb1565b600390910155565b600081116144e45760405162461bcd60e51b8152600401610bcb90615cb1565b600590910155565b60006144f7836143dd565b6003811115614508576145086150d4565b146145515760405162461bcd60e51b815260206004820152601960248201527843757272656e74207374617465206973206e6f742049444c4560381b6044820152606401610bcb565b600582015481106145b45760405162461bcd60e51b815260206004820152602760248201527f56616c7565206578636565647320726573756c74207375626d697373696f6e206044820152661d1a5b595bdd5d60ca1b6064820152608401610bcb565b600690910155565b60008181526020839052604081206001015481906145ec5760405162461bcd60e51b8152600401610bcb90615b95565b505060009081526020919091526040902060018101546002909101549091565b60008181526020839052604081206001015461463a5760405162461bcd60e51b8152600401610bcb90615b95565b506000908152602091909152604090205490565b6001600160a01b03811660009081526003830160205260408120805467fffffffffffffffe19600160601b9091046001600160401b03160161469a576001600160401b039150506111a7565b805442906001600160401b03600160601b9091048116908216116146da5781546146d5908290600160601b90046001600160401b0316615c91565b6146dd565b60005b95945050505050565b81546001600160401b03909116600160601b0267ffffffffffffffff60601b19909116179055565b81546001600160401b03909116600160a01b0267ffffffffffffffff60a01b19909116179055565b61473f81613eff565b61478b5760405162461bcd60e51b815260206004820152601f60248201527f4177616974696e67207365656420686173206e6f742074696d6564206f7574006044820152606401610bcb565b6040517f68c52f05452e81639fa06f379aee3178cddee4725521fff886f244c99e868b5090600090a1610b9e8161382a565b60606000806147cc85856145bc565b604080516020810193909352828101919091528051808303820181526060909201905295945050505050565b600080546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce809101610cf8565b82546001600160a01b0316156148b55760405162461bcd60e51b815260206004820152602260248201527f536f72746974696f6e20506f6f6c206164647265737320616c72656164792073604482015261195d60f21b6064820152608401610bcb565b60018301546001600160a01b03161561491a5760405162461bcd60e51b815260206004820152602160248201527f444b472056616c696461746f72206164647265737320616c72656164792073656044820152601d60fa1b6064820152608401610bcb565b82546001600160a01b03199081166001600160a01b03938416178455600190930180549093169116179055565b83546001600160601b0390811690821610156149a55760405162461bcd60e51b815260206004820152601f60248201527f417574686f72697a6174696f6e2062656c6f7720746865206d696e696d756d006044820152606401610bcb565b6001600160a01b0383811660008181526001870160209081526040918290205482516001600160601b03888116825287169281019290925282519416938493927f87f9f9f59204f53d57a89a817c6083a17979cd0531791c91e18551a56e3cfdd7928290030190a35050505050565b614a1d8161388e565b614a615760405162461bcd60e51b81526020600482015260156024820152741112d1c81a185cc81b9bdd081d1a5b5959081bdd5d605a1b6044820152606401610bcb565b6040517f2852b3e178dd281713b041c3d90b4815bb55b7ec812931d1e8e8d8bb2ed72d3e90600090a1610b9e8161382a565b6001600160a01b03808216600090815260028601602052604081205490911680614acf5760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b038116600090815260038701602052604081208054909190614b06908990899086906001600160601b0316614ceb565b6040516307b8c36760e51b81526001600160a01b0387811660048301529192509087169063f7186ce090602401602060405180830381865afa158015614b50573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614b7491906159ee565b614b8c576001600160601b03161592506143d5915050565b6040516304de824f60e41b81526001600160a01b03871690634de824f090614bba9088908590600401615a35565b602060405180830381865afa158015614bd7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614bfb91906159ee565b98975050505050505050565b600060606000846008015411614c5f5760405162461bcd60e51b815260206004820152601860248201527f444b4720686173206e6f74206265656e207374617274656400000000000000006044820152606401610bcb565b6001840154600985015460088601546040516373b33d5d60e11b81526001600160a01b039093169263e7667aba92614c9b928892600401615a7e565b600060405180830381865afa158015614cb8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052614ce09190810190615aa3565b915091509250929050565b604051637004922d60e11b81526001600160a01b038381166004830152306024830152600091829186169063e009245a90604401602060405180830381865afa158015614d3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614d6091906153e5565b90506000836001600160601b0316826001600160601b031611614d84576000614d8e565b614d8e8483615c71565b87549091506001600160601b039081169082161015614db2576000925050506143d5565b91506143d59050565b6001600160a01b0381168114610b9e57600080fd5b6001600160601b0381168114610b9e57600080fd5b600080600060608486031215614dfa57600080fd5b8335614e0581614dbb565b92506020840135614e1581614dd0565b91506040840135614e2581614dd0565b809150509250925092565b600060208284031215614e4257600080fd5b813561280481614dbb565b600060208284031215614e5f57600080fd5b813561280481614dd0565b600060208284031215614e7c57600080fd5b81356001600160401b03811115614e9257600080fd5b820160e0818503121561280457600080fd5b600060208284031215614eb657600080fd5b5035919050565b60008060408385031215614ed057600080fd5b50508035926020909101359150565b600080600080600060a08688031215614ef757600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60008083601f840112614f2c57600080fd5b5081356001600160401b03811115614f4357600080fd5b6020830191508360208260051b850101111561310357600080fd5b60008060008060608587031215614f7457600080fd5b84356001600160401b0380821115614f8b57600080fd5b9086019060a08289031215614f9f57600080fd5b9094506020860135935060408601359080821115614fbc57600080fd5b50614fc987828801614f1a565b95989497509550505050565b80356001600160401b038116811461446f57600080fd5b60008060006060848603121561500157600080fd5b833561500c81614dd0565b925061501a60208501614fd5565b915061502860408501614fd5565b90509250925092565b60005b8381101561504c578181015183820152602001615034565b50506000910152565b6000815180845261506d816020860160208601615031565b601f01601f19169290920160200192915050565b6020815260006128046020830184615055565b6000806000606084860312156150a957600080fd5b83356150b481614dbb565b925060208401356150c481614dbb565b91506040840135614e2581614dbb565b634e487b7160e01b600052602160045260246000fd5b602081016004831061510c57634e487b7160e01b600052602160045260246000fd5b91905290565b60008060008060008060a0878903121561512b57600080fd5b863561513681614dd0565b955060208701359450604087013561514d81614dbb565b93506060870135925060808701356001600160401b0381111561516f57600080fd5b61517b89828a01614f1a565b979a9699509497509295939492505050565b6000806000806000608086880312156151a557600080fd5b8535945060208601356001600160401b038111156151c257600080fd5b6151ce88828901614f1a565b90955093505060408601356151e281614dbb565b949793965091946060013592915050565b600081518084526020808501945080840160005b8381101561522957815163ffffffff1687529582019590820190600101615207565b509495945050505050565b60208152600061280460208301846151f3565b82151581526040602082015260006143d56040830184615055565b6020808252601c908201527f43616c6c6572206973206e6f742074686520676f7665726e616e636500000000604082015260600190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6000602082840312156152f957600080fd5b815161280481614dbb565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6001600160601b038516815260208082018590526001600160a01b038481166040840152608060608401819052845190840181905260009285810192909160a0860190855b81811015615393578551841683529484019491840191600101615375565b50909a9950505050505050505050565b6000806000606084860312156153b857600080fd5b83516153c381614dbb565b60208501519093506153d481614dbb565b6040850151909250614e2581614dbb565b6000602082840312156153f757600080fd5b815161280481614dd0565b6000808335601e1984360301811261541957600080fd5b8301803591506001600160401b0382111561543357600080fd5b60200191503681900382131561310357600080fd5b6000808335601e1984360301811261545f57600080fd5b83016020810192503590506001600160401b0381111561547e57600080fd5b80360382131561310357600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6000808335601e198436030181126154cd57600080fd5b83016020810192503590506001600160401b038111156154ec57600080fd5b8060051b360382131561310357600080fd5b803560ff8116811461446f57600080fd5b81835260006001600160fb1b0383111561552857600080fd5b8260051b80836020870137939093016020019392505050565b63ffffffff81168114610b9e57600080fd5b8183526000602080850194508260005b8581101561522957813561557681615541565b63ffffffff1687529582019590820190600101615563565b80358252600060206155a281840184615448565b60e0838701526155b660e08701828461548d565b9150506155c660408501856154b6565b868303604088015280835290916000919084015b818310156156025760ff6155ed856154fe565b168152928401926001929092019184016155da565b61560f6060880188615448565b95509350878103606089015261562681868661548d565b94505050505061563960808401846154b6565b858303608087015261564c83828461550f565b9250505061565d60a08401846154b6565b85830360a0870152615670838284615553565b9250505060c083013560c08501528091505092915050565b602081526000612804602083018461558e565b634e487b7160e01b600052601160045260246000fd5b808201808211156111a7576111a761569b565b6040815260006156d760408301856151f3565b90508260208301529392505050565b818103818111156111a7576111a761569b565b6020815260006143d5602083018486615553565b8015158114610b9e57600080fd5b60018060a01b038716815260a06020820152853560a0820152600061574360208801886154b6565b60a060c08501526157596101408501828461550f565b915050604088013561576a8161570d565b151560e084015261577e6060890189615448565b609f19808685030161010087015261579784838561548d565b93506157a660808c018c6154b6565b935091508086850301610120870152506157c183838361550f565b9250505082810360408401526157d78188615055565b905085606084015282810360808401526157f2818587615553565b9998505050505050505050565b604051601f8201601f191681016001600160401b038111828210171561582757615827615304565b604052919050565b60006001600160401b0382111561584857615848615304565b5060051b60200190565b6000602080838503121561586557600080fd5b82516001600160401b0381111561587b57600080fd5b8301601f8101851361588c57600080fd5b805161589f61589a8261582f565b6157ff565b81815260059190911b820183019083810190878311156158be57600080fd5b928401925b828410156158e55783516158d681615541565b825292840192908401906158c3565b979650505050505050565b6000600182016159025761590261569b565b5060010190565b60006020828403121561591b57600080fd5b81356128048161570d565b6000602080838503121561593957600080fd5b82516001600160401b0381111561594f57600080fd5b8301601f8101851361596057600080fd5b805161596e61589a8261582f565b81815260059190911b8201830190838101908783111561598d57600080fd5b928401925b828410156158e55783516159a581614dbb565b82529284019290840190615992565b6000602082840312156159c657600080fd5b815161280481615541565b6000602082840312156159e357600080fd5b813561280481615541565b600060208284031215615a0057600080fd5b81516128048161570d565b60208082526010908201526f2ab735b737bbb71037b832b930ba37b960811b604082015260600190565b6001600160a01b039290921682526001600160601b0316602082015260400190565b6001600160401b03818116838216019080821115615a7757615a7761569b565b5092915050565b606081526000615a91606083018661558e565b60208301949094525060400152919050565b60008060408385031215615ab657600080fd5b8251615ac18161570d565b60208401519092506001600160401b0380821115615ade57600080fd5b818501915085601f830112615af257600080fd5b815181811115615b0457615b04615304565b615b17601f8201601f19166020016157ff565b9150808252866020828501011115615b2e57600080fd5b615b3f816020840160208601615031565b5080925050509250929050565b6000808335601e19843603018112615b6357600080fd5b8301803591506001600160401b03821115615b7d57600080fd5b6020019150600581901b360382131561310357600080fd5b60208082526030908201527f57616c6c657420776974682074686520676976656e20494420686173206e6f7460408201526f081899595b881c9959da5cdd195c995960821b606082015260800190565b600060208284031215615bf757600080fd5b612804826154fe565b60ff82811682821603908111156111a7576111a761569b565b8183823760009101908152919050565b60008085851115615c3957600080fd5b83861115615c4657600080fd5b5050820193919092039150565b803560208310156111a757600019602084900360031b1b1692915050565b6001600160601b03828116828216039080821115615a7757615a7761569b565b6001600160401b03828116828216039080821115615a7757615a7761569b565b6020808252601f908201527f56616c7565206d7573742062652067726561746572207468616e207a65726f0060408201526060019056fea2646970667358221220dde34c826480318674a5b15d4f6f3483a5ee47c0ebae5b5ab0690d6c8097e3df64736f6c63430008110033"}} diff --git a/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py b/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py new file mode 100644 index 0000000000..9e90eeee5f --- /dev/null +++ b/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py @@ -0,0 +1,240 @@ +"""Run the deployed WalletRegistry callback bytecode under Osaka/Amsterdam.""" + +import json +from pathlib import Path + +from ethereum.crypto.hash import Hash32, keccak256 +from ethereum.state import Account, Address +from ethereum.state_mpt import State, set_account, set_storage, store_code +from ethereum_types.bytes import Bytes, Bytes32 +from ethereum_types.numeric import U64, U256, Uint + + +ORIGIN = Address(bytes.fromhex("5499f54b4a1cb4816eefcf78962040461be3d80b")) +TARGET = Address(bytes.fromhex("46d52e41c2f300bc82217ce22b920c34995204eb")) +IMPLEMENTATION = Address(bytes.fromhex("420c99a4b0e4cb65c4cabf2b4d2526372aa1ac6e")) +ADMIN = Address(bytes.fromhex("44" * 20)) +SORTITION_POOL = Address(bytes.fromhex("33" * 20)) +ZERO32 = Bytes32(bytes(32)) +TRUE_RETURNER = Bytes.fromhex("600160005260206000f3") +PROXY_CODE = Bytes.fromhex("60806040526004361061004e5760003560e01c80633659cfe6146100655780634f1ef286146100855780635c60da1b146100985780638f283970146100c9578063f851a440146100e95761005d565b3661005d5761005b6100fe565b005b61005b6100fe565b34801561007157600080fd5b5061005b6100803660046106ed565b610118565b61005b610093366004610707565b610164565b3480156100a457600080fd5b506100ad6101da565b6040516001600160a01b03909116815260200160405180910390f35b3480156100d557600080fd5b5061005b6100e43660046106ed565b610217565b3480156100f557600080fd5b506100ad610241565b6101066102a2565b610116610111610346565b610355565b565b610120610379565b6001600160a01b0316336001600160a01b0316141561015957610154816040518060200160405280600081525060006103ac565b610161565b6101616100fe565b50565b61016c610379565b6001600160a01b0316336001600160a01b031614156101cd576101c88383838080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250600192506103ac915050565b6101d5565b6101d56100fe565b505050565b60006101e4610379565b6001600160a01b0316336001600160a01b0316141561020c57610205610346565b9050610214565b6102146100fe565b90565b61021f610379565b6001600160a01b0316336001600160a01b03161415610159576101548161040b565b600061024b610379565b6001600160a01b0316336001600160a01b0316141561020c57610205610379565b606061029183836040518060600160405280602781526020016108016027913961045f565b9392505050565b803b15155b919050565b6102aa610379565b6001600160a01b0316336001600160a01b031614156103415760405162461bcd60e51b815260206004820152604260248201527f5472616e73706172656e745570677261646561626c6550726f78793a2061646d60448201527f696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267606482015261195d60f21b608482015260a4015b60405180910390fd5b610116565b600061035061053a565b905090565b3660008037600080366000845af43d6000803e808015610374573d6000f35b3d6000fd5b60007fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d61035b546001600160a01b0316905090565b6103b583610562565b6040516001600160a01b038416907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a26000825111806103f65750805b156101d557610405838361026c565b50505050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f610434610379565b604080516001600160a01b03928316815291841660208301520160405180910390a161016181610611565b606061046a84610298565b6104c55760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b6064820152608401610338565b600080856001600160a01b0316856040516104e09190610785565b600060405180830381855af49150503d806000811461051b576040519150601f19603f3d011682016040523d82523d6000602084013e610520565b606091505b509150915061053082828661069d565b9695505050505050565b60007f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc61039d565b61056b81610298565b6105cd5760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b6064820152608401610338565b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6001600160a01b0381166106765760405162461bcd60e51b815260206004820152602660248201527f455243313936373a206e65772061646d696e20697320746865207a65726f206160448201526564647265737360d01b6064820152608401610338565b807fb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d61036105f0565b606083156106ac575081610291565b8251156106bc5782518084602001fd5b8160405162461bcd60e51b815260040161033891906107a1565b80356001600160a01b038116811461029d57600080fd5b6000602082840312156106fe578081fd5b610291826106d6565b60008060006040848603121561071b578182fd5b610724846106d6565b9250602084013567ffffffffffffffff80821115610740578384fd5b818601915086601f830112610753578384fd5b813581811115610761578485fd5b876020828501011115610772578485fd5b6020830194508093505050509250925092565b600082516107978184602087016107d4565b9190910192915050565b60006020825282518060208401526107c08160408501602087016107d4565b601f01601f19169190910160400192915050565b60005b838110156107ef5781810151838201526020016107d7565b83811115610405575050600091015256fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122093f028255035b61df476b13b9dba3c4f06f60e51b9b4caee31680b389aef327f64736f6c63430008020033") +CALLDATA = Bytes( + keccak256(b"__beaconCallback(uint256,uint256)")[:4] + + (1234).to_bytes(32, "big") + + (0).to_bytes(32, "big") +) +IMPLEMENTATION_SLOT = Bytes32( + bytes.fromhex("360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc") +) +ADMIN_SLOT = Bytes32( + bytes.fromhex("b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103") +) + + +def slot(value: int) -> Bytes32: + return Bytes32(value.to_bytes(32, "big")) + + +def wallet_registry_code() -> Bytes: + source = Path(__file__).with_name("wallet-registry-sourcify.json") + data = json.loads(source.read_text()) + return Bytes.fromhex(data["runtimeBytecode"]["onchainBytecode"][2:]) + + +def make_pre_state(use_proxy: bool = False) -> State: + state = State() + implementation_code_hash = store_code(state, wallet_registry_code()) + pool_code_hash = store_code(state, TRUE_RETURNER) + set_account( + state, + ORIGIN, + Account(nonce=Uint(0), balance=U256(10**18), code_hash=Hash32(ZERO32)), + ) + if use_proxy: + proxy_code_hash = store_code(state, PROXY_CODE) + set_account( + state, + TARGET, + Account(nonce=Uint(1), balance=U256(0), code_hash=proxy_code_hash), + ) + set_account( + state, + IMPLEMENTATION, + Account( + nonce=Uint(1), balance=U256(0), code_hash=implementation_code_hash + ), + ) + set_storage( + state, + TARGET, + IMPLEMENTATION_SLOT, + U256.from_be_bytes(IMPLEMENTATION), + ) + set_storage(state, TARGET, ADMIN_SLOT, U256.from_be_bytes(ADMIN)) + else: + set_account( + state, + TARGET, + Account( + nonce=Uint(1), balance=U256(0), code_hash=implementation_code_hash + ), + ) + set_account( + state, + SORTITION_POOL, + Account(nonce=Uint(1), balance=U256(0), code_hash=pool_code_hash), + ) + # WalletRegistry layout: dkg begins at slot 151; its sortitionPool is +0, + # startBlock is +8 and seed is +9. randomBeacon is slot 262. + set_storage(state, TARGET, slot(151), U256.from_be_bytes(SORTITION_POOL)) + set_storage(state, TARGET, slot(262), U256.from_be_bytes(ORIGIN)) + return state + + +def result(tx_state, output, get_storage, fork: str) -> dict[str, object]: + return { + "fork": fork, + "success": output.error is None, + "start_block": int(get_storage(tx_state, TARGET, slot(159))), + "seed": int(get_storage(tx_state, TARGET, slot(160))), + "error": type(output.error).__name__ if output.error else None, + } + + +def run_osaka(gas: int, use_proxy: bool = False) -> dict[str, object]: + from ethereum.forks.osaka.state_tracker import ( + BlockState, + TransactionState, + get_storage, + ) + from ethereum.forks.osaka.transactions import LegacyTransaction + from ethereum.forks.osaka.utils.message import prepare_message + from ethereum.forks.osaka.vm import BlockEnvironment, TransactionEnvironment + from ethereum.forks.osaka.vm.interpreter import process_message_call + + tx_state = TransactionState(BlockState(make_pre_state(use_proxy))) + block_env = BlockEnvironment( + chain_id=U64(1), + state=tx_state.parent, + block_gas_limit=Uint(200_000_000), + block_hashes=[], + coinbase=ORIGIN, + number=Uint(20_000_000), + base_fee_per_gas=Uint(0), + time=U256(0), + prev_randao=ZERO32, + excess_blob_gas=U64(0), + parent_beacon_block_root=ZERO32, + ) + tx_env = TransactionEnvironment( + origin=ORIGIN, + gas_price=Uint(0), + gas=Uint(gas), + access_list_addresses=set(), + access_list_storage_keys=set(), + state=tx_state, + blob_versioned_hashes=(), + authorizations=(), + index_in_block=Uint(0), + tx_hash=None, + ) + tx = LegacyTransaction( + nonce=U256(0), + gas_price=Uint(0), + gas=Uint(gas), + to=TARGET, + value=U256(0), + data=CALLDATA, + v=U256(0), + r=U256(0), + s=U256(0), + ) + output = process_message_call(prepare_message(block_env, tx_env, tx)) + data = result(tx_state, output, get_storage, "osaka") + data["path"] = "proxy" if use_proxy else "implementation" + data["gas_left"] = int(output.gas_left) + return data + + +def run_amsterdam( + execution_gas: int, state_reservoir: int, use_proxy: bool = False +) -> dict[str, object]: + from ethereum.forks.amsterdam.block_access_lists import BlockAccessListBuilder + from ethereum.forks.amsterdam.fork_types import ExecutionGas, StateGas + from ethereum.forks.amsterdam.state_tracker import ( + BlockState, + TransactionState, + get_storage, + ) + from ethereum.forks.amsterdam.vm import BlockEnvironment, TransactionEnvironment + from ethereum.forks.amsterdam.vm.interpreter import process_top_level + + tx_state = TransactionState(BlockState(make_pre_state(use_proxy))) + block_env = BlockEnvironment( + chain_id=U64(1), + state=tx_state.parent, + block_gas_limit=Uint(200_000_000), + block_hashes=[], + coinbase=ORIGIN, + number=Uint(20_000_000), + base_fee_per_gas=Uint(0), + time=U256(0), + prev_randao=ZERO32, + excess_blob_gas=U64(0), + parent_beacon_block_root=ZERO32, + block_access_list_builder=BlockAccessListBuilder(), + slot_number=U64(0), + ) + tx_env = TransactionEnvironment( + origin=ORIGIN, + recipient=TARGET, + is_create=False, + data=CALLDATA, + value=U256(0), + gas_limit=Uint(execution_gas + state_reservoir), + effective_gas_price=Uint(0), + execution_gas_grant=ExecutionGas(Uint(execution_gas)), + state_gas_reservoir=StateGas(Uint(state_reservoir)), + calldata_floor=Uint(0), + access_list_addresses=set(), + access_list_storage_keys=set(), + accounts_with_paid_writes=set(), + state=tx_state, + blob_versioned_hashes=(), + authorizations=(), + index_in_block=Uint(0), + tx_hash=None, + ) + output = process_top_level(block_env, tx_env) + data = result(tx_state, output, get_storage, "amsterdam") + data["path"] = "proxy" if use_proxy else "implementation" + data["execution_gas_limit"] = execution_gas + data["state_reservoir_limit"] = state_reservoir + data["execution_gas_left"] = int(output.gas_left) + data["state_gas_left"] = int(output.state_gas_left) + return data + + +if __name__ == "__main__": + assert run_osaka(64_000)["success"] + assert not run_amsterdam(64_000, 0, True)["success"] + assert run_amsterdam(300_000, 0, True)["success"] + assert run_amsterdam(64_000, 2 * 97_920, True)["success"] + print(run_osaka(64_000)) + print(run_amsterdam(64_000, 0)) + print(run_amsterdam(64_000, 2 * 97_920)) + for gas in range(220_000, 311_000, 10_000): + print(run_amsterdam(gas, 0)) + for gas in (220_000, 230_000, 240_000, 250_000, 300_000): + print(run_amsterdam(gas, 0, use_proxy=True)) + + lower = 240_000 + upper = 250_000 + while lower < upper: + candidate = (lower + upper) // 2 + if run_amsterdam(candidate, 0, use_proxy=True)["success"]: + upper = candidate + else: + lower = candidate + 1 + print({"proxy_first_success": lower, "result": run_amsterdam(lower, 0, True)}) + assert lower == 240_768 diff --git a/solidity/random-beacon/README.adoc b/solidity/random-beacon/README.adoc index d1448f1f80..dee39f899a 100644 --- a/solidity/random-beacon/README.adoc +++ b/solidity/random-beacon/README.adoc @@ -375,7 +375,7 @@ _~24h assuming 15s block time_ |callbackGasLimit |Relay entry callback gas limit. |Yes -d|`64_000` +d|`300_000` 4+s|Slashing @@ -428,7 +428,7 @@ inactive for other reasons. |Calculated gas cost for submitting a DKG result. This will be refunded as part of the DKG approval process. |Yes -|`235_000` +|`450_000` (provisional Glamsterdam budget; see `docs/glamsterdam-migration.md`) |dkgResultApprovalGasOffset |Gas that is meant to balance the DKG result approval's overall cost. diff --git a/solidity/random-beacon/contracts/RandomBeacon.sol b/solidity/random-beacon/contracts/RandomBeacon.sol index 74e8dc11d8..003816a781 100644 --- a/solidity/random-beacon/contracts/RandomBeacon.sol +++ b/solidity/random-beacon/contracts/RandomBeacon.sol @@ -449,11 +449,10 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { // Relay entry hard timeout is set to ~48h assuming 15s block time. relay.setTimeouts(1_280, 5_760); - // Callback gas limit is set to 56k units of gas. As of April 2022, it - // is enough to store new entry and block number on-chain. - // If the cost of EVM opcodes change over time, these parameters will - // have to be updated. - _callbackGasLimit = 64_000; + // Includes margin above the 240,768 gas measured for the deployed + // WalletRegistry proxy callback under the Amsterdam gas schedule. + // Existing deployments require a governance parameter update. + _callbackGasLimit = 300_000; // Group lifetime is set to 45 days assuming 15s block time. // @@ -468,7 +467,10 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { // Gas parameters were adjusted based on Ethereum state in April 2022. // If the cost of EVM opcodes change over time, these parameters will // have to be updated. - _dkgResultSubmissionGas = 237_650; + // Amsterdam adds 175,840 gas for the two fresh DKG result slots. + // This provisional budget includes margin and must be rebenchmarked + // against the final fork rules before activation. + _dkgResultSubmissionGas = 450_000; _dkgResultApprovalGasOffset = 41_500; _notifyOperatorInactivityGasOffset = 54_500; _relayEntrySubmissionGasOffset = 11_250; @@ -900,7 +902,7 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { // Refund msg.sender's ETH for DKG result submission and result approval reimbursementPool.refund( _dkgResultSubmissionGas + - (gasStart - gasleft()) + + _gasSpent(gasStart) + _dkgResultApprovalGasOffset, msg.sender ); @@ -1057,7 +1059,7 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { callback.executeCallback(uint256(keccak256(entry)), _callbackGasLimit); reimbursementPool.refund( - (gasStart - gasleft()) + _relayEntrySubmissionGasOffset, + _gasSpent(gasStart) + _relayEntrySubmissionGasOffset, msg.sender ); } @@ -1123,7 +1125,7 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { callback.executeCallback(uint256(keccak256(entry)), _callbackGasLimit); reimbursementPool.refund( - (gasStart - gasleft()) + _relayEntrySubmissionGasOffset, + _gasSpent(gasStart) + _relayEntrySubmissionGasOffset, msg.sender ); } @@ -1323,7 +1325,7 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { ); reimbursementPool.refund( - (gasStart - gasleft()) + _notifyOperatorInactivityGasOffset, + _gasSpent(gasStart) + _notifyOperatorInactivityGasOffset, msg.sender ); } diff --git a/solidity/random-beacon/contracts/Reimbursable.sol b/solidity/random-beacon/contracts/Reimbursable.sol index 3fe4a663dc..6ee43cedbc 100644 --- a/solidity/random-beacon/contracts/Reimbursable.sol +++ b/solidity/random-beacon/contracts/Reimbursable.sol @@ -32,7 +32,7 @@ abstract contract Reimbursable { modifier refundable(address receiver) { uint256 gasStart = gasleft(); _; - reimbursementPool.refund(gasStart - gasleft(), receiver); + reimbursementPool.refund(_gasSpent(gasStart), receiver); } modifier onlyReimbursableAdmin() virtual { @@ -47,4 +47,22 @@ abstract contract Reimbursable { reimbursementPool = _reimbursementPool; } + + /// @dev Measures execution gas without assuming gasleft is monotonic. + /// EIP-8037 state-gas credits can increase gasleft. State gas paid by + /// a reservoir is not visible here; this is not total transaction gas. + function _gasSpent(uint256 gasStart) internal view returns (uint256) { + uint256 gasEnd = gasleft(); + return gasStart > gasEnd ? gasStart - gasEnd : 0; + } + + /// @dev Applies a negative offset without reverting after a gas credit. + function _gasSpentAfterOffset(uint256 gasStart, uint256 offset) + internal + view + returns (uint256) + { + uint256 spent = _gasSpent(gasStart); + return spent > offset ? spent - offset : 0; + } } diff --git a/solidity/random-beacon/contracts/test/ReimbursableImplStub.sol b/solidity/random-beacon/contracts/test/ReimbursableImplStub.sol index ff03f9558c..5004f8c1cb 100644 --- a/solidity/random-beacon/contracts/test/ReimbursableImplStub.sol +++ b/solidity/random-beacon/contracts/test/ReimbursableImplStub.sol @@ -14,4 +14,16 @@ contract ReimbursableImplStub is Reimbursable { require(admin == msg.sender, "Caller is not the admin"); _; } + + function gasSpent(uint256 gasStart) external view returns (uint256) { + return _gasSpent(gasStart); + } + + function gasSpentAfterOffset(uint256 gasStart, uint256 offset) + external + view + returns (uint256) + { + return _gasSpentAfterOffset(gasStart, offset); + } } diff --git a/solidity/random-beacon/test/Reimbursable.test.ts b/solidity/random-beacon/test/Reimbursable.test.ts index e112ef98f8..8094d80c35 100644 --- a/solidity/random-beacon/test/Reimbursable.test.ts +++ b/solidity/random-beacon/test/Reimbursable.test.ts @@ -28,6 +28,31 @@ describe("Reimbursable", () => { )) as ReimbursableImplStub }) + describe("gas measurement after state-gas credits", () => { + it("clamps a reading larger than the starting gas to zero", async () => { + expect(await reimbursableImplStub.gasSpent(0)).to.equal(0) + }) + + it("keeps a positive execution-gas delta", async () => { + const spent = await reimbursableImplStub.gasSpent(1_000_000, { + gasLimit: 100_000, + }) + expect(spent).to.be.gt(900_000) + expect(spent).to.be.lt(1_000_000) + }) + + it("clamps a negative offset larger than the measured gas", async () => { + expect(await reimbursableImplStub.gasSpentAfterOffset(0, 2_300)).to.equal( + 0 + ) + expect( + await reimbursableImplStub.gasSpentAfterOffset(1_000_000, 1_000_000, { + gasLimit: 100_000, + }) + ).to.equal(0) + }) + }) + describe("updateReimbursementPool", () => { context("when a caller is the deployer", () => { it("should revert", async () => { diff --git a/solidity/random-beacon/test/fixtures/index.ts b/solidity/random-beacon/test/fixtures/index.ts index 8872d8c9db..a520c0b465 100644 --- a/solidity/random-beacon/test/fixtures/index.ts +++ b/solidity/random-beacon/test/fixtures/index.ts @@ -34,7 +34,7 @@ export const params = { governanceDelay: 604_800, // 1 week relayEntrySoftTimeout: 35, relayEntryHardTimeout: 100, - callbackGasLimit: 200_000, + callbackGasLimit: 300_000, groupCreationFrequency: 10, groupLifetime: 5761, // 1 day in blocks assuming 15s block time dkgResultChallengePeriodLength: 100, @@ -53,7 +53,7 @@ export const params = { authorizationDecreaseChangePeriod: 403_200, reimbursementPoolStaticGas: 40_800, reimbursementPoolMaxGasPrice: ethers.utils.parseUnits("500", "gwei"), - dkgResultSubmissionGas: 237_650, + dkgResultSubmissionGas: 450_000, dkgResultApprovalGasOffset: 41_500, notifyOperatorInactivityGasOffset: 54_500, relayEntrySubmissionGasOffset: 11_250, From 317e57bab5bc77fac8cd60bd79b9d6d8af418b0a Mon Sep 17 00:00:00 2001 From: maclane Date: Fri, 6 Nov 2026 17:53:19 -0600 Subject: [PATCH 2/5] Fix Glamsterdam refund assertions and CI compatibility --- .github/workflows/contracts-ecdsa.yml | 3 +- .github/workflows/contracts-random-beacon.yml | 3 +- .../WalletRegistry.WalletCreation.test.ts | 40 ++++++++++++++--- .../glamsterdam/wallet-registry-sourcify.json | 6 ++- .../test/RandomBeacon.GroupCreation.test.ts | 44 ++++++++++++++++--- 5 files changed, 82 insertions(+), 14 deletions(-) diff --git a/.github/workflows/contracts-ecdsa.yml b/.github/workflows/contracts-ecdsa.yml index a219824f88..cfa70d388d 100644 --- a/.github/workflows/contracts-ecdsa.yml +++ b/.github/workflows/contracts-ecdsa.yml @@ -80,7 +80,8 @@ jobs: if: | github.event_name != 'pull_request' || needs.contracts-detect-changes.outputs.path-filter == 'true' - runs-on: ubuntu-latest + # Python 3.10.8 has an official Actions build for this runner image. + runs-on: ubuntu-22.04 defaults: run: working-directory: ./solidity/ecdsa diff --git a/.github/workflows/contracts-random-beacon.yml b/.github/workflows/contracts-random-beacon.yml index f693643be9..4d57d8c9b7 100644 --- a/.github/workflows/contracts-random-beacon.yml +++ b/.github/workflows/contracts-random-beacon.yml @@ -80,7 +80,8 @@ jobs: if: | github.event_name != 'pull_request' || needs.contracts-detect-changes.outputs.path-filter == 'true' - runs-on: ubuntu-latest + # Python 3.10.8 has an official Actions build for this runner image. + runs-on: ubuntu-22.04 defaults: run: working-directory: ./solidity/random-beacon diff --git a/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts b/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts index a9153f42ae..6a294772ab 100644 --- a/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts +++ b/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts @@ -93,6 +93,25 @@ describe("WalletRegistry - Wallet Creation", async () => { let sortitionPool: SortitionPool let staking: TokenStaking let randomBeacon: Mock + + // Retain the pre-Glamsterdam execution-cost bounds and separately account + // for the increased fixed submission reimbursement. A missing or incorrect + // reimbursement of that configured increase still fails these assertions. + async function legacyDkgRefundSurplus( + surplus: BigNumber, + approvalTx: ContractTransaction + ): Promise { + const { dkgResultSubmissionGas } = await walletRegistry.gasParameters() + const pool = await ethers.getContractAt( + "ReimbursementPool", + await walletRegistry.reimbursementPool() + ) + const maxGasPrice = await pool.maxGasPrice() + const refundGasPrice = approvalTx.gasPrice.gt(maxGasPrice) + ? maxGasPrice + : approvalTx.gasPrice + return surplus.sub(dkgResultSubmissionGas.sub(290_000).mul(refundGasPrice)) + } let walletOwner: Mock let deployer: SignerWithAddress @@ -1693,8 +1712,11 @@ describe("WalletRegistry - Wallet Creation", async () => { it("should refund ETH to a submitter", async () => { const postDkgResultApprovalSubmitterInitialBalance = await provider.getBalance(await submitter.getAddress()) - const diff = postDkgResultApprovalSubmitterInitialBalance.sub( - submitterInitialBalance + const diff = await legacyDkgRefundSurplus( + postDkgResultApprovalSubmitterInitialBalance.sub( + submitterInitialBalance + ), + tx ) expect(diff).to.be.gt(0) @@ -2057,8 +2079,11 @@ describe("WalletRegistry - Wallet Creation", async () => { it("should refund ETH to a submitter", async () => { const postDkgResultApprovalSubmitterInitialBalance = await provider.getBalance(await submitter.getAddress()) - const diff = postDkgResultApprovalSubmitterInitialBalance.sub( - submitterInitialBalance + const diff = await legacyDkgRefundSurplus( + postDkgResultApprovalSubmitterInitialBalance.sub( + submitterInitialBalance + ), + tx ) expect(diff).to.be.gt(ethers.utils.parseUnits("-1000000", "gwei")) // -0,001 ETH @@ -2271,8 +2296,11 @@ describe("WalletRegistry - Wallet Creation", async () => { it("should refund ETH to a submitter", async () => { const postDkgResultApprovalSubmitterInitialBalance = await provider.getBalance(await submitter.getAddress()) - const diff = postDkgResultApprovalSubmitterInitialBalance.sub( - submitterInitialBalance + const diff = await legacyDkgRefundSurplus( + postDkgResultApprovalSubmitterInitialBalance.sub( + submitterInitialBalance + ), + tx ) expect(diff).to.be.gt(0) diff --git a/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json b/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json index f37bed0a4a..215af6b677 100644 --- a/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json +++ b/solidity/ecdsa/test/glamsterdam/wallet-registry-sourcify.json @@ -1 +1,5 @@ -{"runtimeBytecode":{"onchainBytecode":"0x608060405234801561001057600080fd5b50600436106103af5760003560e01c80637b35b4e6116101f4578063c88e70f41161011a578063df07ce59116100ad578063f0820c921161007c578063f0820c92146109bb578063f7186ce0146109cc578063f854a27f146109df578063fd2a4788146109f257600080fd5b8063df07ce591461095f578063e03e453514610972578063e686440f14610987578063e83ab3a51461099a57600080fd5b8063d38bfff4116100e9578063d38bfff414610905578063d855c63114610918578063d8dc404d14610920578063ded56d451461093357600080fd5b8063c88e70f4146108b7578063c9bacaad146108ca578063cc562388146108dd578063d0bcc0e3146108f257600080fd5b80639c9de02811610192578063b5e9ce8b11610161578063b5e9ce8b14610845578063c09975cd14610865578063c0c53b8b14610878578063c7c49c981461088b57600080fd5b80639c9de028146107d8578063a04e298014610803578063b13b55b214610816578063b54a23741461081e57600080fd5b8063830f9e02116101ce578063830f9e021461074857806388a59590146107775780638dcbdf4a146107b25780639879d19b146107c557600080fd5b80637b35b4e61461070f5780637e0049fd146107225780637e33cba61461073557600080fd5b80634d99f473116102d95780636b5f2bff1161027757806375e0ae5a1161024657806375e0ae5a1461061c578063770124d31461062f578063789d392a146106375780637b14729e146106b257600080fd5b80636b5f2bff146105db5780636c9ecd64146105ee5780636febd4641461060157806372cc8c6d1461061457600080fd5b80635c5b3870116102b35780635c5b38701461059a578063663032cd146105ad57806368c34948146105c05780636a7f7a90146105c857600080fd5b80634d99f47314610549578063529023011461056c5780635aa6e6751461058757600080fd5b8063227fd44f11610351578063343bb92711610320578063343bb927146104e95780633682a450146104fc57806342d866931461050f5780634cf088d91461052257600080fd5b8063227fd44f1461049c57806329b6eca9146104af5780632b47da52146104c257806331376766146104d657600080fd5b8063167f05171161038d578063167f0517146104485780631ae879e8146104505780631c5b0762146104645780631d35fa631461047757600080fd5b806308aa090b146103b457806314a8547414610407578063153622b31461041c575b600080fd5b6103bc610a05565b6040516103fe9190600060a082019050825182526020830151602083015260408301516040830152606083015160608301526080830151608083015292915050565b60405180910390f35b61041a610415366004614de5565b610a6c565b005b61010654610430906001600160a01b031681565b6040516001600160a01b0390911681526020016103fe565b61041a610b33565b61010554610430906001600160a01b031681565b61041a610472366004614e30565b610b69565b60fc546001600160601b03165b6040516001600160601b0390911681526020016103fe565b61041a6104aa366004614e4d565b610ba1565b61041a6104bd366004614e30565b610c29565b61010754610430906001600160a01b031681565b61041a6104e4366004614e6a565b610d04565b61041a6104f7366004614ea4565b610f6c565b61041a61050a366004614e30565b610fd1565b61041a61051d366004614e30565b610fdc565b6104307f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd781565b61055c610557366004614ea4565b611192565b60405190151581526020016103fe565b60fd5460fe54604080519283526020830191909152016103fe565b600054610430906001600160a01b031681565b61041a6105a8366004614e6a565b6111ad565b61041a6105bb366004614e30565b6113e4565b61055c611486565b61041a6105d6366004614de5565b611497565b61041a6105e9366004614e30565b61152e565b61041a6105fc366004614ebd565b6115a7565b61041a61060f366004614ebd565b611611565b61041a61164c565b61041a61062a366004614e30565b6116dc565b61055c6116f0565b610690610645366004614ea4565b60408051606080820183526000808352602080840182905292840181905293845260ca8252928290208251938401835280548452600181015491840191909152600201549082015290565b60408051825181526020808401519082015291810151908201526060016103fe565b6106e06065546001600160601b038116916001600160401b03600160601b8304811692600160a01b90041690565b604080516001600160601b0390941684526001600160401b0392831660208501529116908201526060016103fe565b61041a61071d366004614e30565b6116fc565b61041a610730366004614e6a565b611785565b610484610743366004614e30565b6117a9565b610769610756366004614ea4565b6101046020526000908152604090205481565b6040519081526020016103fe565b60ff5461010054610101546101025461010354604080519586526020860194909452928401919091526060830152608082015260a0016103fe565b61041a6107c0366004614edf565b6117bf565b61041a6107d3366004614f5e565b6118ac565b6107eb6107e6366004614e30565b611c1f565b6040516001600160401b0390911681526020016103fe565b61041a610811366004614fec565b611c2c565b61041a611cde565b6104307f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc81565b610858610853366004614ea4565b611d45565b6040516103fe9190615081565b603254610430906001600160a01b031681565b61041a610886366004615094565b611d52565b610430610899366004614e30565b6001600160a01b039081166000908152606660205260409020541690565b61041a6108c5366004614edf565b611f39565b61041a6108d8366004614de5565b611fcc565b6108e5612063565b6040516103fe91906150ea565b61041a610900366004614e30565b61206f565b61041a610913366004614e30565b6120e8565b61041a61217c565b61041a61092e366004615112565b6121b9565b610430610941366004614e30565b6001600160a01b039081166000908152606760205260409020541690565b61055c61096d36600461518d565b61242d565b61097a6125b3565b6040516103fe9190615234565b61055c610995366004614e30565b61264e565b6109ad6109a8366004614e6a565b612685565b6040516103fe929190615247565b6065546001600160601b0316610484565b61055c6109da366004614e30565b61269d565b6104846109ed366004614e30565b61272c565b610484610a00366004614e30565b61280b565b610a376040518060a0016040528060008152602001600081526020016000815260200160008152602001600081525090565b506040805160a0810182526099548152609a546020820152609b5491810191909152609c546060820152609d54608082015290565b610107546001600160a01b03168015610aad57336001600160a01b03821614610aa857604051630159dd6560e41b815260040160405180910390fd5b610af6565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd71614610af657604051630159dd6560e41b815260040160405180910390fd5b610b2d610b01612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc87878761287c565b50505050565b610b67610b3e612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6129e8565b565b610b9e610b74612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc84612bc2565b50565b6000546001600160a01b03163314610bd45760405162461bcd60e51b8152600401610bcb90615262565b60405180910390fd5b60fc80546001600160601b0319166001600160601b0383169081179091556040519081527fe132b87eb6644ee4d4c3c32744f7e1c3906335a2d4f99330767bf573909c7d84906020015b60405180910390a150565b606454600290610100900460ff16158015610c4b575060645460ff8083169116105b610c675760405162461bcd60e51b8152600401610bcb90615299565b6064805461ffff191660ff8316176101001790556001600160a01b038216610ca257604051631718673d60e11b815260040160405180910390fd5b61010780546001600160a01b0319166001600160a01b0384161790556064805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15050565b600080610d12609784612da1565b604051638871ca5d60e01b815263ffffffff8216600482015291935091506000906001600160a01b037f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc1690638871ca5d90602401602060405180830381865afa158015610d84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610da891906152e7565b6040805160018082528183019092529192506000919060208083019080368337019050506001600160a01b038084166000908152606760205260409020549192501681600081518110610dfd57610dfd61531a565b6001600160a01b03928316602091820292909201015260fc5460fd546040516383ddba8f60e01b81527f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7909316926383ddba8f92610e6d926001600160601b039091169133908790600401615330565b600060405180830381600087803b158015610e8757600080fd5b505af1925050508015610e98575060015b610ef15760fc54604080516001600160601b0390921682526001600160a01b038416602083015285917f14621289a12ab59e0737decc388bba91d929c723defb4682d5d19b9a12ecfecb910160405180910390a2610f42565b60fc54604080516001600160601b0390921682526001600160a01b038416602083015285917f88f76c659db78142f88e94db3ca791869495394c6c1b3d412ced9022dc97c9e3910160405180910390a25b609b545a1015610f655760405163c8faa26560e01b815260040160405180910390fd5b5050505050565b610105546001600160a01b03163314610f98576040516302add3a960e41b815260040160405180910390fd5b610fa360ca8261310a565b60405181907fa6ae4af610b8ada39d3675190ead27a5552631a8e33f53e4e37dbb082f11a73e90600090a250565b610b9e606582613157565b6001600160a01b038181166000908152606660205260409020541680611015576040516331158d1160e01b815260040160405180910390fd5b604051632de9480760e01b81526001600160a01b0383811660048301526000917f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd790911690632de9480790602401606060405180830381865afa158015611080573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110a491906153a3565b50604051637104c0e560e11b81526001600160a01b0385811660048301528281166024830152919350600092507f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc9091169063e20981ca906044016020604051808303816000875af115801561111e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061114291906153e5565b6040516001600160601b03821681529091506001600160a01b038516907f38532b6dea69d7266fa923c7813d190be37625f2454ddfa3d93c45c79482e3fd9060200160405180910390a250505050565b600081815260ca602052604081206001015415155b92915050565b60005a905060006111bf6097846133ba565b9050600080806111e460c08701356111da6020890189615402565b60ca9291906137af565b925092509250856040516020016111fb9190615688565b60405160208183030381529060405280519060200120837fbe8f27cef1f3d94120c9c547c3614f5b992fdb0c0a497cc920fde06546291ab460405160405180910390a38351156112d3577f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031663942f68928560fe544261128391906156b1565b6040518363ffffffff1660e01b81526004016112a09291906156c4565b600060405180830381600087803b1580156112ba57600080fd5b505af11580156112ce573d6000803e3d6000fd5b505050505b6101055460405163547d07a160e11b81526004810185905260248101849052604481018390526001600160a01b039091169063a8fa0f4290606401600060405180830381600087803b15801561132857600080fd5b505af115801561133c573d6000803e3d6000fd5b5050505061134a609761382a565b603254610100546001600160a01b0390911690637ad226dc905a61136e90896156e6565b60ff5461137b91906156b1565b61138591906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401600060405180830381600087803b1580156113c457600080fd5b505af11580156113d8573d6000803e3d6000fd5b50505050505050505050565b6000546001600160a01b0316331461140e5760405162461bcd60e51b8152600401610bcb90615262565b604051632a59250560e21b81526001600160a01b0382811660048301527f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063a9649414906024015b600060405180830381600087803b15801561147257600080fd5b505af1158015610f65573d6000803e3d6000fd5b6000611492609761388e565b905090565b610107546001600160a01b031680156114d857336001600160a01b038216146114d357604051630159dd6560e41b815260040160405180910390fd5b611521565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7161461152157604051630159dd6560e41b815260040160405180910390fd5b610b2d60658585856138df565b6000546001600160a01b031633146115585760405162461bcd60e51b8152600401610bcb90615262565b61010680546001600160a01b0319166001600160a01b0383169081179091556040519081527f2b34e21b6daa8fcf8cba1c3ed709cbed2b0231d5fb60e9ccd8c2e75a5674bcb390602001610c1e565b6000546001600160a01b031633146115d15760405162461bcd60e51b8152600401610bcb90615262565b60fd82905560fe81905560408051838152602081018390527ff3a6ee10a78fb7d212e87d9be970fb16bd7324e9dc9c38d21cd7ecde781a1d2a9101610cf8565b610106546001600160a01b0316331461163d57604051632880b08760e01b815260040160405180910390fd5b611648609783613b1a565b5050565b610105546001600160a01b03163314611678576040516302add3a960e41b815260040160405180910390fd5b6116826097613bc7565b610106546040516310da3b0360e21b81523060048201526001600160a01b0390911690634368ec0c90602401600060405180830381600087803b1580156116c857600080fd5b505af1158015610b2d573d6000803e3d6000fd5b610b9e6116e7612832565b60659083613cbe565b60006114926097613eff565b6000546001600160a01b031633146117275760405163f2be30fb60e01b815260040160405180910390fd5b6040516001600160a01b03821681527f0e2d2343d31b085b7c4e56d1c8a6ec79f7ab07460386f1c9a1756239fe2533ac9060200160405180910390a1603280546001600160a01b0319166001600160a01b0392909216919091179055565b61179e6117956020830183615402565b60ca9190613f39565b610b9e609782614092565b60006111a76117b6612832565b606590846143a2565b6000546001600160a01b031633146117e95760405162461bcd60e51b8152600401610bcb90615262565b60006117f560976143dd565b6003811115611806576118066150d4565b146118245760405163bede29c160e01b815260040160405180910390fd5b61182f609786614474565b61183a60978561449c565b609b83905561184a6097836144c4565b6118556097826144ec565b604080518681526020810186905290810184905260608101839052608081018290527f59ae8ed7b3a7e5f6dde4cff478f0ac0aa652c5edc4f4757b09a778a430b02c569060a0015b60405180910390a15050505050565b60005a8535600081815261010460205260409020549192509085146118e457604051633ab3447f60e11b815260040160405180910390fd5b6000806118f260ca846145bc565b9092509050600061190460ca8561460c565b905086866040516020016119199291906156f9565b60405160208183030381529060405280519060200120811461194e576040516394977fa560e01b815260040160405180910390fd5b6000738263efcb8f28246697585c89fed0501cd946f76463f4df04be7f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc8c87876040516020016119a8929190918252602082015260400190565b6040516020818303038152906040528d8d8d6040518763ffffffff1660e01b81526004016119db9695949392919061571b565b600060405180830381865af41580156119f8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a209190810190615852565b600086815261010460205260408120805492935090611a3e836158f0565b9091555050604080518a815233602082015286917f326e1ff7c130ed708307116f79cf7dbca649503e7082e5e35a19ceeee1523b39910160405180910390a27f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031663942f68928260fe5442611abb91906156b1565b6040518363ffffffff1660e01b8152600401611ad89291906156c4565b600060405180830381600087803b158015611af257600080fd5b505af1158015611b06573d6000803e3d6000fd5b50611b1b9250505060608b0160408c01615909565b15611b8e5761010554604051631ee74c0960e11b81526004810187905260248101869052604481018590526001600160a01b0390911690633dce981290606401600060405180830381600087803b158015611b7557600080fd5b505af1158015611b89573d6000803e3d6000fd5b505050505b603254610101546001600160a01b0390911690637ad226dc905a611bb2908a6156e6565b611bbc91906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401600060405180830381600087803b158015611bfb57600080fd5b505af1158015611c0f573d6000803e3d6000fd5b5050505050505050505050505050565b60006111a760658361464e565b6000546001600160a01b03163314611c565760405162461bcd60e51b8152600401610bcb90615262565b606580546001600160601b0319166001600160601b038516179055611c7c6065836146e6565b611c8760658261470e565b604080516001600160601b03851681526001600160401b03848116602083015283168183015290517f544b726e42801bb47073854eeedae851903f66fe32a5bd24e626e10b90027b519181900360600190a1505050565b60005a9050611ced6097614736565b603254610102546001600160a01b0390911690637ad226dc905a611d1190856156e6565b611d1b91906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401611458565b60606111a760ca836147bd565b606454610100900460ff1615808015611d725750606454600160ff909116105b80611d8c5750303b158015611d8c575060645460ff166001145b611da85760405162461bcd60e51b8152600401610bcb90615299565b6064805460ff191660011790558015611dcb576064805461ff0019166101001790555b61010680546001600160a01b038086166001600160a01b0319928316179092556032805492851692909116919091179055611e05336147f8565b606580546001600160601b031916690878678326eac9000000179055611e2f6065623b53806146e6565b611e3d6065623b538061470e565b60fc80546001600160601b0319166815af1d78b58c400000179055606460fd556212750060fe55611e9060977f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc86614852565b611e9d6097612d00614474565b611eaa6097612d0061449c565b61c350609b55611ebd60976102186144c4565b611ec9609760146144ec565b62046cd060ff55620119406101005562016b4861010155611c52610102556108fc610103558015610b2d576064805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150505050565b6000546001600160a01b03163314611f635760405162461bcd60e51b8152600401610bcb90615262565b60ff859055610100849055610101839055610102829055610103819055604080518681526020810186905290810184905260608101839052608081018290527f8a3e64fa6013a36bccca7362e8826b11ba41e57fb60f55309c0ca48904dad0829060a00161189d565b610107546001600160a01b0316801561200d57336001600160a01b0382161461200857604051630159dd6560e41b815260040160405180910390fd5b612056565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7161461205657604051630159dd6560e41b815260040160405180910390fd5b610b2d6065858585614947565b600061149260976143dd565b6000546001600160a01b031633146120995760405162461bcd60e51b8152600401610bcb90615262565b61010580546001600160a01b0319166001600160a01b0383169081179091556040519081527fa1993af5a189ba5ad4155263c920cfee33ce0593a8eb231a13bb3ce6f39459e390602001610c1e565b6000546001600160a01b031633146121125760405162461bcd60e51b8152600401610bcb90615262565b6001600160a01b0381166121735760405162461bcd60e51b815260206004820152602260248201527f4e657720676f7665726e616e636520697320746865207a65726f206164647265604482015261737360f01b6064820152608401610bcb565b610b9e816147f8565b60005a905061218b6097614a14565b603254610103546001600160a01b0390911690637ad226dc905a6121af90856156e6565b611d1b91906156e6565b610105546001600160a01b031633146121e5576040516302add3a960e41b815260040160405180910390fd5b60006121f260ca8561460c565b905082826040516020016122079291906156f9565b60405160208183030381529060405280519060200120811461223c576040516323f9e80360e11b815260040160405180910390fd5b604051637bfcd47d60e11b81526000906001600160a01b037f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063f7f9a8fa9061228d90879087906004016156f9565b600060405180830381865afa1580156122aa573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526122d29190810190615926565b90506000836001600160401b038111156122ee576122ee615304565b604051908082528060200260200182016040528015612317578160200160208202803683370190505b50905060005b825181101561239d5761236183828151811061233b5761233b61531a565b60200260200101516001600160a01b039081166000908152606760205260409020541690565b8282815181106123735761237361531a565b6001600160a01b039092166020928302919091019091015280612395816158f0565b91505061231d565b506040516383ddba8f60e01b81526001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd716906383ddba8f906123f0908c908c908c908790600401615330565b600060405180830381600087803b15801561240a57600080fd5b505af115801561241e573d6000803e3d6000fd5b50505050505050505050505050565b604051635a48b46b60e01b81526001600160a01b03838116600483015260009182917f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc1690635a48b46b90602401602060405180830381865afa158015612498573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124bc91906159b4565b90508063ffffffff166000036124e55760405163427ce39560e01b815260040160405180910390fd5b60006124f260ca8961460c565b905086866040516020016125079291906156f9565b60405160208183030381529060405280519060200120811461253c576040516323f9e80360e11b815260040160405180910390fd5b600184108061254a57508584115b1561256857604051635d2de7eb60e01b815260040160405180910390fd5b63ffffffff8216878761257c6001886156e6565b81811061258b5761258b61531a565b90506020020160208101906125a091906159d1565b63ffffffff161498975050505050505050565b60a054604051636c2530b960e01b81526064600482015260248101919091526060907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031690636c2530b990604401600060405180830381865afa158015612626573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526114929190810190615852565b60006111a761265b612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc85614a93565b60006060612694609784614c07565b91509150915091565b6040516307b8c36760e51b81526001600160a01b0382811660048301526000917f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc9091169063f7186ce090602401602060405180830381865afa158015612708573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111a791906159ee565b600080612751836001600160a01b039081166000908152606660205260409020541690565b90506001600160a01b03811661277a576040516331158d1160e01b815260040160405180910390fd5b60405163439f18fd60e11b81526001600160a01b0382811660048301527f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063873e31fa90602401602060405180830381865afa1580156127e0573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061280491906153e5565b9392505050565b6001600160a01b0381166000908152606860205260408120546001600160601b03166111a7565b610107546000906001600160a01b031661286b57507f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd790565b50610107546001600160a01b031690565b6001600160a01b03808416600090815260018801602052604090205416806128a457506129e0565b6040516307b8c36760e51b81526001600160a01b03828116600483015286169063f7186ce090602401602060405180830381865afa1580156128ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061290e91906159ee565b156129de57846001600160a01b031663a4e2d6346040518163ffffffff1660e01b8152600401602060405180830381865afa158015612951573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061297591906159ee565b156129d257604080516001600160601b038086168252841660208201526001600160a01b0380841692908716917f1b09380d63e78fd72c1d79a805a7e2dfadf02b22418e24bebff51376b7df33b0910160405180910390a36129de565b6129de87878784612bc2565b505b505050505050565b3360008181526002850160205260409020546001600160a01b031680612a205760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b038116600090815260038601602052604081208054909190612a57908890889086906001600160601b0316614ceb565b9050806001600160601b0316600003612ab25760405162461bcd60e51b815260206004820152601f60248201527f417574686f72697a6174696f6e2062656c6f7720746865206d696e696d756d006044820152606401610bcb565b836001600160a01b0316836001600160a01b03167f5075aaa89894a888eb2cac81a27320c60855febb0cf1706b66bdc754e640d43360405160405180910390a3604051630483483160e31b81526001600160a01b0386169063241a418890612b209087908590600401615a35565b600060405180830381600087803b158015612b3a57600080fd5b505af1158015612b4e573d6000803e3d6000fd5b5050835467fffffffffffffffe19600160601b9091046001600160401b03160191506129de9050578654612b9290600160601b90046001600160401b031642615a57565b82546001600160401b0391909116600160601b0267ffffffffffffffff60601b1990911617825550505050505050565b6001600160a01b0380821660009081526002860160205260409020541680612bfc5760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b03808216600081815260038801602052604080822090519093861692917f1231fe5ee649a593b524a494cd53146a196380a872115a0d0fe16c0735afdf2691a36040516307b8c36760e51b81526001600160a01b03848116600483015285169063f7186ce090602401602060405180830381865afa158015612c89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612cad91906159ee565b15612d34578054600090612ccf908890889086906001600160601b0316614ceb565b60405163dc7520c560e01b81529091506001600160a01b0386169063dc7520c590612d009087908590600401615a35565b600060405180830381600087803b158015612d1a57600080fd5b505af1158015612d2e573d6000803e3d6000fd5b50505050505b805467fffffffffffffffe19600160601b9091046001600160401b0316016129e0578554612d7290600160601b90046001600160401b031642615a57565b81546001600160401b0391909116600160601b0267ffffffffffffffff60601b19909116178155505050505050565b6000806003612daf856143dd565b6003811115612dc057612dc06150d4565b14612e0d5760405162461bcd60e51b815260206004820152601e60248201527f43757272656e74207374617465206973206e6f74204348414c4c454e474500006044820152606401610bcb565b6003840154600c850154612e2191906156b1565b431115612e7c5760405162461bcd60e51b815260206004820152602360248201527f4368616c6c656e676520706572696f642068617320616c7265616479207061736044820152621cd95960ea1b6064820152608401610bcb565b83600b015483604051602001612e929190615688565b6040516020818303038152906040528051906020012014612f1b5760405162461bcd60e51b815260206004820152603a60248201527f526573756c7420756e646572206368616c6c656e67652069732064696666657260448201527f656e74207468616e20746865207375626d6974746564206f6e650000000000006064820152608401610bcb565b6001840154600985015460088601546040516373b33d5d60e11b81526001600160a01b039093169263e7667aba92612f57928892600401615a7e565b600060405180830381865afa925050508015612f9557506040513d6000823e601f3d908101601f19168201604052612f929190810190615aa3565b60015b61300a57336001600160a01b031684600b01547f703feb01415a2995816e8d082fd7aad0eacada1a2f63fdb3226e47f8a0285436604051612ffd906020808252601390820152721d985b1a59185d1a5bdb881c995d995c9d1959606a1b604082015260600190565b60405180910390a3613099565b81156130505760405162461bcd60e51b8152602060048201526015602482015274756e6a7573746966696564206368616c6c656e676560581b6044820152606401610bcb565b336001600160a01b031686600b01547f703feb01415a2995816e8d082fd7aad0eacada1a2f63fdb3226e47f8a02854368360405161308e9190615081565b60405180910390a350505b600b84015491506130ad60a0840184615b4c565b6130b9600186356156e6565b8181106130c8576130c861531a565b90506020020160208101906130dd91906159d1565b90508360080154436130ef91906156e6565b600a8501556000600b8501819055600c8501555b9250929050565b6000818152602083905260409020600101546131385760405162461bcd60e51b8152600401610bcb90615b95565b6000908152602091909152604081208181556001810182905560020155565b336001600160a01b0382166131ae5760405162461bcd60e51b815260206004820181905260248201527f4f70657261746f722063616e206e6f74206265207a65726f20616464726573736044820152606401610bcb565b6001600160a01b038181166000908152600185016020526040902054161561322e5760405162461bcd60e51b815260206004820152602d60248201527f4f70657261746f7220616c72656164792073657420666f72207468652073746160448201526c35b4b73390383937bb34b232b960991b6064820152608401610bcb565b6001600160a01b03828116600090815260028501602052604090205416156132985760405162461bcd60e51b815260206004820152601f60248201527f4f70657261746f72206164647265737320616c726561647920696e20757365006044820152606401610bcb565b6001600160a01b038116600090815260038401602052604090208054600160601b90046001600160401b03161561332b5760405162461bcd60e51b815260206004820152603160248201527f546865726520697320612070656e64696e6720617574686f72697a6174696f6e60448201527008191958dc99585cd9481c995c5d595cdd607a1b6064820152608401610bcb565b826001600160a01b0316826001600160a01b03167fa453db612af59e5521d6ab9284dc3e2d06af286eb1b1b7b771fce4716c19f2c160405160405180910390a3506001600160a01b03908116600081815260018501602090815260408083208054959096166001600160a01b031995861681179096559482526002909501909452919092208054909216179055565b606060036133c7846143dd565b60038111156133d8576133d86150d4565b146134255760405162461bcd60e51b815260206004820152601e60248201527f43757272656e74207374617465206973206e6f74204348414c4c454e474500006044820152606401610bcb565b6003830154600c84015460009161343b916156b1565b90508043116134985760405162461bcd60e51b815260206004820152602360248201527f4368616c6c656e676520706572696f6420686173206e6f7420706173736564206044820152621e595d60ea1b6064820152608401610bcb565b83600b0154836040516020016134ae9190615688565b60405160208183030381529060405280519060200120146135375760405162461bcd60e51b815260206004820152603960248201527f526573756c7420756e64657220617070726f76616c206973206469666665726560448201527f6e74207468616e20746865207375626d6974746564206f6e65000000000000006064820152608401610bcb565b83546000906001600160a01b0316638871ca5d61355760a0870187615b4c565b613563600189356156e6565b8181106135725761357261531a565b905060200201602081019061358791906159d1565b6040516001600160e01b031960e084901b16815263ffffffff919091166004820152602401602060405180830381865afa1580156135c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906135ed91906152e7565b9050336001600160a01b03821614806136135750600685015461361090836156b1565b43115b61365f5760405162461bcd60e51b815260206004820152601e60248201527f4f6e6c79207375626d69747465722063616e20617070726f7665206e6f7700006044820152606401610bcb565b61366c6040850185615b4c565b90506001600160401b0381111561368557613685615304565b6040519080825280602002602001820160405280156136ae578160200160208202803683370190505b50925060005b6136c16040860186615b4c565b9050811015613775576136d760a0860186615b4c565b60016136e66040890189615b4c565b858181106136f6576136f661531a565b905060200201602081019061370b9190615be5565b6137159190615c00565b60ff168181106137275761372761531a565b905060200201602081019061373c91906159d1565b84828151811061374e5761374e61531a565b63ffffffff909216602092830291909101909101528061376d816158f0565b9150506136b4565b50600b8501546040513391907fe6e9d5eba171e82025efb3f3d44fd35905e7283d104284cb9f3bbc5bf1e4276f90600090a3505092915050565b600080600084846040516137c4929190615c19565b60405190819003902092506137dd602060008688615c29565b6137e691615c53565b91506137f58460208188615c29565b6137fe91615c53565b600084815260209890985260409097209586555060018501819055600290940185905594929392915050565b60006008820181905560098201819055600a8201819055600b8201819055600c820181905581546040805163a69df4b560e01b815290516001600160a01b039092169263a69df4b59260048084019382900301818387803b15801561147257600080fd5b6000600261389b836143dd565b60038111156138ac576138ac6150d4565b1480156111a757506005820154600a83015460088401546138cd91906156b1565b6138d791906156b1565b431192915050565b6001600160601b0381161580613903575083546001600160601b0390811690821610155b61396d5760405162461bcd60e51b815260206004820152603560248201527f417574686f72697a6174696f6e20616d6f756e742073686f756c642062652030604482015274206f722061626f766520746865206d696e696d756d60581b6064820152608401610bcb565b6001600160a01b03808416600090815260018601602052604081205490911690816139995750426139a3565b506001600160401b035b60006139af8486615c71565b6001600160a01b03871660009081526003890160205260409020805491925090600160601b90046001600160401b031680158015906139f757506001600160401b0381811614155b15613a8a578854613a1890600160a01b90046001600160401b031682615c91565b6001600160401b0316421015613a8a5760405162461bcd60e51b815260206004820152603160248201527f4e6f7420656e6f7567682074696d65207061737365642073696e636520746865604482015270081bdc9a59da5b985b081c995c5d595cdd607a1b6064820152608401610bcb565b81546001600160401b038516600160601b81026001600160a01b03199092166001600160601b0386811691909117929092178455604080518a8416815292891660208401528201526001600160a01b0386811691908a16907f545cbf267cef6fe43f11f6219417ab43a0e8e345adbaae5f626d9bc325e8535a9060600160405180910390a3505050505050505050565b6001613b25836143dd565b6003811115613b3657613b366150d4565b14613b8e5760405162461bcd60e51b815260206004820152602260248201527f43757272656e74207374617465206973206e6f74204157414954494e475f5345604482015261115160f21b6064820152608401610bcb565b60405181907fb2ad26c2940889d79df2ee9c758a8aefa00c5ca90eee119af0e5d795df3b98bb90600090a2436008830155600990910155565b6000613bd2826143dd565b6003811115613be357613be36150d4565b14613c2c5760405162461bcd60e51b815260206004820152601960248201527843757272656e74207374617465206973206e6f742049444c4560381b6044820152606401610bcb565b6040517f5c3ed2397d4d21298b2fb5027ac8e2d42e3c9c72bbb55ddb030e2a36a0cdff6b90600090a1805460408051637c1e845d60e11b815290516001600160a01b039092169163f83d08ba9160048082019260009290919082900301818387803b158015613c9a57600080fd5b505af1158015613cae573d6000803e3d6000fd5b5050505043816007018190555050565b6001600160a01b038116600090815260038401602052604090208054600160601b90046001600160401b0316613d425760405162461bcd60e51b8152602060048201526024808201527f417574686f72697a6174696f6e206465637265617365206e6f742072657175656044820152631cdd195960e21b6064820152608401610bcb565b805467fffffffffffffffe19600160601b9091046001600160401b031601613dc15760405162461bcd60e51b815260206004820152602c60248201527f417574686f72697a6174696f6e2064656372656173652072657175657374206e60448201526b1bdd081858dd1a5d985d195960a21b6064820152608401610bcb565b8054600160601b90046001600160401b0316421015613e325760405162461bcd60e51b815260206004820152602760248201527f417574686f72697a6174696f6e2064656372656173652064656c6179206e6f74604482015266081c185cdcd95960ca1b6064820152608401610bcb565b6040516001600160a01b038316907f50270a522c2fef97b6b7385c2aa4a4518adda681530e0a1fe9f5e840f6f2cd9d90600090a2604051633af0572d60e11b81526001600160a01b0383811660048301528416906375e0ae5a906024016020604051808303816000875af1158015613eae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613ed291906153e5565b50506001600160a01b031660009081526003909201602052506040902080546001600160a01b0319169055565b60006001613f0c836143dd565b6003811115613f1d57613f1d6150d4565b1480156111a75750600282015460078301546138d791906156b1565b60408114613f895760405162461bcd60e51b815260206004820181905260248201527f496e76616c6964206c656e677468206f6620746865207075626c6963206b65796044820152606401610bcb565b60008282604051613f9b929190615c19565b6040805191829003909120600081815260208790529190912060010154909150156140205760405162461bcd60e51b815260206004820152602f60248201527f57616c6c657420776974682074686520676976656e207075626c6963206b657960448201526e20616c72656164792065786973747360881b6064820152608401610bcb565b600061402f6020828587615c29565b61403891615c53565b905080610f655760405162461bcd60e51b815260206004820152602260248201527f57616c6c6574207075626c6963206b6579206d757374206265206e6f6e2d7a65604482015261726f60f01b6064820152608401610bcb565b600261409d836143dd565b60038111156140ae576140ae6150d4565b146141075760405162461bcd60e51b8152602060048201526024808201527f43757272656e74207374617465206973206e6f74204157414954494e475f524560448201526314d5531560e21b6064820152608401610bcb565b6141108261388e565b1561415d5760405162461bcd60e51b815260206004820152601a60248201527f444b472074696d656f757420616c7265616479207061737365640000000000006044820152606401610bcb565b81546040516307b8c36760e51b81523360048201526001600160a01b0390911690819063f7186ce090602401602060405180830381865afa1580156141a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906141ca91906159ee565b6142225760405162461bcd60e51b815260206004820152602360248201527f5375626d6974746572206e6f7420696e2074686520736f72746974696f6e20706044820152621bdbdb60ea1b6064820152608401610bcb565b336001600160a01b038216638871ca5d61423f60a0860186615b4c565b61424b600188356156e6565b81811061425a5761425a61531a565b905060200201602081019061426f91906159d1565b6040516001600160e01b031960e084901b16815263ffffffff919091166004820152602401602060405180830381865afa1580156142b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906142d591906152e7565b6001600160a01b03161461432b5760405162461bcd60e51b815260206004820152601a60248201527f556e6578706563746564207375626d697474657220696e6465780000000000006044820152606401610bcb565b8160405160200161433c9190615688565b60408051601f19818403018152908290528051602090910120600b850181905543600c8601556009850154917f8e7fd4293d7db11807147d8890c287fad3396fbb09a4e92273fc7856076c153a90614395908690615688565b60405180910390a3505050565b6001600160a01b03811660009081526003840160205260408120546143d5908590859085906001600160601b0316614ceb565b949350505050565b805460408051632938b58d60e21b815290516000926001600160a01b03169163a4e2d6349160048083019260209291908290030181865afa158015614426573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061444a91906159ee565b1561446f575060088101546001901561446f5750600c8101546002901561446f575060035b919050565b600081116144945760405162461bcd60e51b8152600401610bcb90615cb1565b600290910155565b600081116144bc5760405162461bcd60e51b8152600401610bcb90615cb1565b600390910155565b600081116144e45760405162461bcd60e51b8152600401610bcb90615cb1565b600590910155565b60006144f7836143dd565b6003811115614508576145086150d4565b146145515760405162461bcd60e51b815260206004820152601960248201527843757272656e74207374617465206973206e6f742049444c4560381b6044820152606401610bcb565b600582015481106145b45760405162461bcd60e51b815260206004820152602760248201527f56616c7565206578636565647320726573756c74207375626d697373696f6e206044820152661d1a5b595bdd5d60ca1b6064820152608401610bcb565b600690910155565b60008181526020839052604081206001015481906145ec5760405162461bcd60e51b8152600401610bcb90615b95565b505060009081526020919091526040902060018101546002909101549091565b60008181526020839052604081206001015461463a5760405162461bcd60e51b8152600401610bcb90615b95565b506000908152602091909152604090205490565b6001600160a01b03811660009081526003830160205260408120805467fffffffffffffffe19600160601b9091046001600160401b03160161469a576001600160401b039150506111a7565b805442906001600160401b03600160601b9091048116908216116146da5781546146d5908290600160601b90046001600160401b0316615c91565b6146dd565b60005b95945050505050565b81546001600160401b03909116600160601b0267ffffffffffffffff60601b19909116179055565b81546001600160401b03909116600160a01b0267ffffffffffffffff60a01b19909116179055565b61473f81613eff565b61478b5760405162461bcd60e51b815260206004820152601f60248201527f4177616974696e67207365656420686173206e6f742074696d6564206f7574006044820152606401610bcb565b6040517f68c52f05452e81639fa06f379aee3178cddee4725521fff886f244c99e868b5090600090a1610b9e8161382a565b60606000806147cc85856145bc565b604080516020810193909352828101919091528051808303820181526060909201905295945050505050565b600080546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce809101610cf8565b82546001600160a01b0316156148b55760405162461bcd60e51b815260206004820152602260248201527f536f72746974696f6e20506f6f6c206164647265737320616c72656164792073604482015261195d60f21b6064820152608401610bcb565b60018301546001600160a01b03161561491a5760405162461bcd60e51b815260206004820152602160248201527f444b472056616c696461746f72206164647265737320616c72656164792073656044820152601d60fa1b6064820152608401610bcb565b82546001600160a01b03199081166001600160a01b03938416178455600190930180549093169116179055565b83546001600160601b0390811690821610156149a55760405162461bcd60e51b815260206004820152601f60248201527f417574686f72697a6174696f6e2062656c6f7720746865206d696e696d756d006044820152606401610bcb565b6001600160a01b0383811660008181526001870160209081526040918290205482516001600160601b03888116825287169281019290925282519416938493927f87f9f9f59204f53d57a89a817c6083a17979cd0531791c91e18551a56e3cfdd7928290030190a35050505050565b614a1d8161388e565b614a615760405162461bcd60e51b81526020600482015260156024820152741112d1c81a185cc81b9bdd081d1a5b5959081bdd5d605a1b6044820152606401610bcb565b6040517f2852b3e178dd281713b041c3d90b4815bb55b7ec812931d1e8e8d8bb2ed72d3e90600090a1610b9e8161382a565b6001600160a01b03808216600090815260028601602052604081205490911680614acf5760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b038116600090815260038701602052604081208054909190614b06908990899086906001600160601b0316614ceb565b6040516307b8c36760e51b81526001600160a01b0387811660048301529192509087169063f7186ce090602401602060405180830381865afa158015614b50573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614b7491906159ee565b614b8c576001600160601b03161592506143d5915050565b6040516304de824f60e41b81526001600160a01b03871690634de824f090614bba9088908590600401615a35565b602060405180830381865afa158015614bd7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614bfb91906159ee565b98975050505050505050565b600060606000846008015411614c5f5760405162461bcd60e51b815260206004820152601860248201527f444b4720686173206e6f74206265656e207374617274656400000000000000006044820152606401610bcb565b6001840154600985015460088601546040516373b33d5d60e11b81526001600160a01b039093169263e7667aba92614c9b928892600401615a7e565b600060405180830381865afa158015614cb8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052614ce09190810190615aa3565b915091509250929050565b604051637004922d60e11b81526001600160a01b038381166004830152306024830152600091829186169063e009245a90604401602060405180830381865afa158015614d3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614d6091906153e5565b90506000836001600160601b0316826001600160601b031611614d84576000614d8e565b614d8e8483615c71565b87549091506001600160601b039081169082161015614db2576000925050506143d5565b91506143d59050565b6001600160a01b0381168114610b9e57600080fd5b6001600160601b0381168114610b9e57600080fd5b600080600060608486031215614dfa57600080fd5b8335614e0581614dbb565b92506020840135614e1581614dd0565b91506040840135614e2581614dd0565b809150509250925092565b600060208284031215614e4257600080fd5b813561280481614dbb565b600060208284031215614e5f57600080fd5b813561280481614dd0565b600060208284031215614e7c57600080fd5b81356001600160401b03811115614e9257600080fd5b820160e0818503121561280457600080fd5b600060208284031215614eb657600080fd5b5035919050565b60008060408385031215614ed057600080fd5b50508035926020909101359150565b600080600080600060a08688031215614ef757600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60008083601f840112614f2c57600080fd5b5081356001600160401b03811115614f4357600080fd5b6020830191508360208260051b850101111561310357600080fd5b60008060008060608587031215614f7457600080fd5b84356001600160401b0380821115614f8b57600080fd5b9086019060a08289031215614f9f57600080fd5b9094506020860135935060408601359080821115614fbc57600080fd5b50614fc987828801614f1a565b95989497509550505050565b80356001600160401b038116811461446f57600080fd5b60008060006060848603121561500157600080fd5b833561500c81614dd0565b925061501a60208501614fd5565b915061502860408501614fd5565b90509250925092565b60005b8381101561504c578181015183820152602001615034565b50506000910152565b6000815180845261506d816020860160208601615031565b601f01601f19169290920160200192915050565b6020815260006128046020830184615055565b6000806000606084860312156150a957600080fd5b83356150b481614dbb565b925060208401356150c481614dbb565b91506040840135614e2581614dbb565b634e487b7160e01b600052602160045260246000fd5b602081016004831061510c57634e487b7160e01b600052602160045260246000fd5b91905290565b60008060008060008060a0878903121561512b57600080fd5b863561513681614dd0565b955060208701359450604087013561514d81614dbb565b93506060870135925060808701356001600160401b0381111561516f57600080fd5b61517b89828a01614f1a565b979a9699509497509295939492505050565b6000806000806000608086880312156151a557600080fd5b8535945060208601356001600160401b038111156151c257600080fd5b6151ce88828901614f1a565b90955093505060408601356151e281614dbb565b949793965091946060013592915050565b600081518084526020808501945080840160005b8381101561522957815163ffffffff1687529582019590820190600101615207565b509495945050505050565b60208152600061280460208301846151f3565b82151581526040602082015260006143d56040830184615055565b6020808252601c908201527f43616c6c6572206973206e6f742074686520676f7665726e616e636500000000604082015260600190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6000602082840312156152f957600080fd5b815161280481614dbb565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6001600160601b038516815260208082018590526001600160a01b038481166040840152608060608401819052845190840181905260009285810192909160a0860190855b81811015615393578551841683529484019491840191600101615375565b50909a9950505050505050505050565b6000806000606084860312156153b857600080fd5b83516153c381614dbb565b60208501519093506153d481614dbb565b6040850151909250614e2581614dbb565b6000602082840312156153f757600080fd5b815161280481614dd0565b6000808335601e1984360301811261541957600080fd5b8301803591506001600160401b0382111561543357600080fd5b60200191503681900382131561310357600080fd5b6000808335601e1984360301811261545f57600080fd5b83016020810192503590506001600160401b0381111561547e57600080fd5b80360382131561310357600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6000808335601e198436030181126154cd57600080fd5b83016020810192503590506001600160401b038111156154ec57600080fd5b8060051b360382131561310357600080fd5b803560ff8116811461446f57600080fd5b81835260006001600160fb1b0383111561552857600080fd5b8260051b80836020870137939093016020019392505050565b63ffffffff81168114610b9e57600080fd5b8183526000602080850194508260005b8581101561522957813561557681615541565b63ffffffff1687529582019590820190600101615563565b80358252600060206155a281840184615448565b60e0838701526155b660e08701828461548d565b9150506155c660408501856154b6565b868303604088015280835290916000919084015b818310156156025760ff6155ed856154fe565b168152928401926001929092019184016155da565b61560f6060880188615448565b95509350878103606089015261562681868661548d565b94505050505061563960808401846154b6565b858303608087015261564c83828461550f565b9250505061565d60a08401846154b6565b85830360a0870152615670838284615553565b9250505060c083013560c08501528091505092915050565b602081526000612804602083018461558e565b634e487b7160e01b600052601160045260246000fd5b808201808211156111a7576111a761569b565b6040815260006156d760408301856151f3565b90508260208301529392505050565b818103818111156111a7576111a761569b565b6020815260006143d5602083018486615553565b8015158114610b9e57600080fd5b60018060a01b038716815260a06020820152853560a0820152600061574360208801886154b6565b60a060c08501526157596101408501828461550f565b915050604088013561576a8161570d565b151560e084015261577e6060890189615448565b609f19808685030161010087015261579784838561548d565b93506157a660808c018c6154b6565b935091508086850301610120870152506157c183838361550f565b9250505082810360408401526157d78188615055565b905085606084015282810360808401526157f2818587615553565b9998505050505050505050565b604051601f8201601f191681016001600160401b038111828210171561582757615827615304565b604052919050565b60006001600160401b0382111561584857615848615304565b5060051b60200190565b6000602080838503121561586557600080fd5b82516001600160401b0381111561587b57600080fd5b8301601f8101851361588c57600080fd5b805161589f61589a8261582f565b6157ff565b81815260059190911b820183019083810190878311156158be57600080fd5b928401925b828410156158e55783516158d681615541565b825292840192908401906158c3565b979650505050505050565b6000600182016159025761590261569b565b5060010190565b60006020828403121561591b57600080fd5b81356128048161570d565b6000602080838503121561593957600080fd5b82516001600160401b0381111561594f57600080fd5b8301601f8101851361596057600080fd5b805161596e61589a8261582f565b81815260059190911b8201830190838101908783111561598d57600080fd5b928401925b828410156158e55783516159a581614dbb565b82529284019290840190615992565b6000602082840312156159c657600080fd5b815161280481615541565b6000602082840312156159e357600080fd5b813561280481615541565b600060208284031215615a0057600080fd5b81516128048161570d565b60208082526010908201526f2ab735b737bbb71037b832b930ba37b960811b604082015260600190565b6001600160a01b039290921682526001600160601b0316602082015260400190565b6001600160401b03818116838216019080821115615a7757615a7761569b565b5092915050565b606081526000615a91606083018661558e565b60208301949094525060400152919050565b60008060408385031215615ab657600080fd5b8251615ac18161570d565b60208401519092506001600160401b0380821115615ade57600080fd5b818501915085601f830112615af257600080fd5b815181811115615b0457615b04615304565b615b17601f8201601f19166020016157ff565b9150808252866020828501011115615b2e57600080fd5b615b3f816020840160208601615031565b5080925050509250929050565b6000808335601e19843603018112615b6357600080fd5b8301803591506001600160401b03821115615b7d57600080fd5b6020019150600581901b360382131561310357600080fd5b60208082526030908201527f57616c6c657420776974682074686520676976656e20494420686173206e6f7460408201526f081899595b881c9959da5cdd195c995960821b606082015260800190565b600060208284031215615bf757600080fd5b612804826154fe565b60ff82811682821603908111156111a7576111a761569b565b8183823760009101908152919050565b60008085851115615c3957600080fd5b83861115615c4657600080fd5b5050820193919092039150565b803560208310156111a757600019602084900360031b1b1692915050565b6001600160601b03828116828216039080821115615a7757615a7761569b565b6001600160401b03828116828216039080821115615a7757615a7761569b565b6020808252601f908201527f56616c7565206d7573742062652067726561746572207468616e207a65726f0060408201526060019056fea2646970667358221220dde34c826480318674a5b15d4f6f3483a5ee47c0ebae5b5ab0690d6c8097e3df64736f6c63430008110033"}} +{ + "runtimeBytecode": { + "onchainBytecode": "0x608060405234801561001057600080fd5b50600436106103af5760003560e01c80637b35b4e6116101f4578063c88e70f41161011a578063df07ce59116100ad578063f0820c921161007c578063f0820c92146109bb578063f7186ce0146109cc578063f854a27f146109df578063fd2a4788146109f257600080fd5b8063df07ce591461095f578063e03e453514610972578063e686440f14610987578063e83ab3a51461099a57600080fd5b8063d38bfff4116100e9578063d38bfff414610905578063d855c63114610918578063d8dc404d14610920578063ded56d451461093357600080fd5b8063c88e70f4146108b7578063c9bacaad146108ca578063cc562388146108dd578063d0bcc0e3146108f257600080fd5b80639c9de02811610192578063b5e9ce8b11610161578063b5e9ce8b14610845578063c09975cd14610865578063c0c53b8b14610878578063c7c49c981461088b57600080fd5b80639c9de028146107d8578063a04e298014610803578063b13b55b214610816578063b54a23741461081e57600080fd5b8063830f9e02116101ce578063830f9e021461074857806388a59590146107775780638dcbdf4a146107b25780639879d19b146107c557600080fd5b80637b35b4e61461070f5780637e0049fd146107225780637e33cba61461073557600080fd5b80634d99f473116102d95780636b5f2bff1161027757806375e0ae5a1161024657806375e0ae5a1461061c578063770124d31461062f578063789d392a146106375780637b14729e146106b257600080fd5b80636b5f2bff146105db5780636c9ecd64146105ee5780636febd4641461060157806372cc8c6d1461061457600080fd5b80635c5b3870116102b35780635c5b38701461059a578063663032cd146105ad57806368c34948146105c05780636a7f7a90146105c857600080fd5b80634d99f47314610549578063529023011461056c5780635aa6e6751461058757600080fd5b8063227fd44f11610351578063343bb92711610320578063343bb927146104e95780633682a450146104fc57806342d866931461050f5780634cf088d91461052257600080fd5b8063227fd44f1461049c57806329b6eca9146104af5780632b47da52146104c257806331376766146104d657600080fd5b8063167f05171161038d578063167f0517146104485780631ae879e8146104505780631c5b0762146104645780631d35fa631461047757600080fd5b806308aa090b146103b457806314a8547414610407578063153622b31461041c575b600080fd5b6103bc610a05565b6040516103fe9190600060a082019050825182526020830151602083015260408301516040830152606083015160608301526080830151608083015292915050565b60405180910390f35b61041a610415366004614de5565b610a6c565b005b61010654610430906001600160a01b031681565b6040516001600160a01b0390911681526020016103fe565b61041a610b33565b61010554610430906001600160a01b031681565b61041a610472366004614e30565b610b69565b60fc546001600160601b03165b6040516001600160601b0390911681526020016103fe565b61041a6104aa366004614e4d565b610ba1565b61041a6104bd366004614e30565b610c29565b61010754610430906001600160a01b031681565b61041a6104e4366004614e6a565b610d04565b61041a6104f7366004614ea4565b610f6c565b61041a61050a366004614e30565b610fd1565b61041a61051d366004614e30565b610fdc565b6104307f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd781565b61055c610557366004614ea4565b611192565b60405190151581526020016103fe565b60fd5460fe54604080519283526020830191909152016103fe565b600054610430906001600160a01b031681565b61041a6105a8366004614e6a565b6111ad565b61041a6105bb366004614e30565b6113e4565b61055c611486565b61041a6105d6366004614de5565b611497565b61041a6105e9366004614e30565b61152e565b61041a6105fc366004614ebd565b6115a7565b61041a61060f366004614ebd565b611611565b61041a61164c565b61041a61062a366004614e30565b6116dc565b61055c6116f0565b610690610645366004614ea4565b60408051606080820183526000808352602080840182905292840181905293845260ca8252928290208251938401835280548452600181015491840191909152600201549082015290565b60408051825181526020808401519082015291810151908201526060016103fe565b6106e06065546001600160601b038116916001600160401b03600160601b8304811692600160a01b90041690565b604080516001600160601b0390941684526001600160401b0392831660208501529116908201526060016103fe565b61041a61071d366004614e30565b6116fc565b61041a610730366004614e6a565b611785565b610484610743366004614e30565b6117a9565b610769610756366004614ea4565b6101046020526000908152604090205481565b6040519081526020016103fe565b60ff5461010054610101546101025461010354604080519586526020860194909452928401919091526060830152608082015260a0016103fe565b61041a6107c0366004614edf565b6117bf565b61041a6107d3366004614f5e565b6118ac565b6107eb6107e6366004614e30565b611c1f565b6040516001600160401b0390911681526020016103fe565b61041a610811366004614fec565b611c2c565b61041a611cde565b6104307f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc81565b610858610853366004614ea4565b611d45565b6040516103fe9190615081565b603254610430906001600160a01b031681565b61041a610886366004615094565b611d52565b610430610899366004614e30565b6001600160a01b039081166000908152606660205260409020541690565b61041a6108c5366004614edf565b611f39565b61041a6108d8366004614de5565b611fcc565b6108e5612063565b6040516103fe91906150ea565b61041a610900366004614e30565b61206f565b61041a610913366004614e30565b6120e8565b61041a61217c565b61041a61092e366004615112565b6121b9565b610430610941366004614e30565b6001600160a01b039081166000908152606760205260409020541690565b61055c61096d36600461518d565b61242d565b61097a6125b3565b6040516103fe9190615234565b61055c610995366004614e30565b61264e565b6109ad6109a8366004614e6a565b612685565b6040516103fe929190615247565b6065546001600160601b0316610484565b61055c6109da366004614e30565b61269d565b6104846109ed366004614e30565b61272c565b610484610a00366004614e30565b61280b565b610a376040518060a0016040528060008152602001600081526020016000815260200160008152602001600081525090565b506040805160a0810182526099548152609a546020820152609b5491810191909152609c546060820152609d54608082015290565b610107546001600160a01b03168015610aad57336001600160a01b03821614610aa857604051630159dd6560e41b815260040160405180910390fd5b610af6565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd71614610af657604051630159dd6560e41b815260040160405180910390fd5b610b2d610b01612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc87878761287c565b50505050565b610b67610b3e612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6129e8565b565b610b9e610b74612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc84612bc2565b50565b6000546001600160a01b03163314610bd45760405162461bcd60e51b8152600401610bcb90615262565b60405180910390fd5b60fc80546001600160601b0319166001600160601b0383169081179091556040519081527fe132b87eb6644ee4d4c3c32744f7e1c3906335a2d4f99330767bf573909c7d84906020015b60405180910390a150565b606454600290610100900460ff16158015610c4b575060645460ff8083169116105b610c675760405162461bcd60e51b8152600401610bcb90615299565b6064805461ffff191660ff8316176101001790556001600160a01b038216610ca257604051631718673d60e11b815260040160405180910390fd5b61010780546001600160a01b0319166001600160a01b0384161790556064805461ff001916905560405160ff821681527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15050565b600080610d12609784612da1565b604051638871ca5d60e01b815263ffffffff8216600482015291935091506000906001600160a01b037f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc1690638871ca5d90602401602060405180830381865afa158015610d84573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610da891906152e7565b6040805160018082528183019092529192506000919060208083019080368337019050506001600160a01b038084166000908152606760205260409020549192501681600081518110610dfd57610dfd61531a565b6001600160a01b03928316602091820292909201015260fc5460fd546040516383ddba8f60e01b81527f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7909316926383ddba8f92610e6d926001600160601b039091169133908790600401615330565b600060405180830381600087803b158015610e8757600080fd5b505af1925050508015610e98575060015b610ef15760fc54604080516001600160601b0390921682526001600160a01b038416602083015285917f14621289a12ab59e0737decc388bba91d929c723defb4682d5d19b9a12ecfecb910160405180910390a2610f42565b60fc54604080516001600160601b0390921682526001600160a01b038416602083015285917f88f76c659db78142f88e94db3ca791869495394c6c1b3d412ced9022dc97c9e3910160405180910390a25b609b545a1015610f655760405163c8faa26560e01b815260040160405180910390fd5b5050505050565b610105546001600160a01b03163314610f98576040516302add3a960e41b815260040160405180910390fd5b610fa360ca8261310a565b60405181907fa6ae4af610b8ada39d3675190ead27a5552631a8e33f53e4e37dbb082f11a73e90600090a250565b610b9e606582613157565b6001600160a01b038181166000908152606660205260409020541680611015576040516331158d1160e01b815260040160405180910390fd5b604051632de9480760e01b81526001600160a01b0383811660048301526000917f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd790911690632de9480790602401606060405180830381865afa158015611080573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110a491906153a3565b50604051637104c0e560e11b81526001600160a01b0385811660048301528281166024830152919350600092507f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc9091169063e20981ca906044016020604051808303816000875af115801561111e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061114291906153e5565b6040516001600160601b03821681529091506001600160a01b038516907f38532b6dea69d7266fa923c7813d190be37625f2454ddfa3d93c45c79482e3fd9060200160405180910390a250505050565b600081815260ca602052604081206001015415155b92915050565b60005a905060006111bf6097846133ba565b9050600080806111e460c08701356111da6020890189615402565b60ca9291906137af565b925092509250856040516020016111fb9190615688565b60405160208183030381529060405280519060200120837fbe8f27cef1f3d94120c9c547c3614f5b992fdb0c0a497cc920fde06546291ab460405160405180910390a38351156112d3577f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031663942f68928560fe544261128391906156b1565b6040518363ffffffff1660e01b81526004016112a09291906156c4565b600060405180830381600087803b1580156112ba57600080fd5b505af11580156112ce573d6000803e3d6000fd5b505050505b6101055460405163547d07a160e11b81526004810185905260248101849052604481018390526001600160a01b039091169063a8fa0f4290606401600060405180830381600087803b15801561132857600080fd5b505af115801561133c573d6000803e3d6000fd5b5050505061134a609761382a565b603254610100546001600160a01b0390911690637ad226dc905a61136e90896156e6565b60ff5461137b91906156b1565b61138591906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401600060405180830381600087803b1580156113c457600080fd5b505af11580156113d8573d6000803e3d6000fd5b50505050505050505050565b6000546001600160a01b0316331461140e5760405162461bcd60e51b8152600401610bcb90615262565b604051632a59250560e21b81526001600160a01b0382811660048301527f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063a9649414906024015b600060405180830381600087803b15801561147257600080fd5b505af1158015610f65573d6000803e3d6000fd5b6000611492609761388e565b905090565b610107546001600160a01b031680156114d857336001600160a01b038216146114d357604051630159dd6560e41b815260040160405180910390fd5b611521565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7161461152157604051630159dd6560e41b815260040160405180910390fd5b610b2d60658585856138df565b6000546001600160a01b031633146115585760405162461bcd60e51b8152600401610bcb90615262565b61010680546001600160a01b0319166001600160a01b0383169081179091556040519081527f2b34e21b6daa8fcf8cba1c3ed709cbed2b0231d5fb60e9ccd8c2e75a5674bcb390602001610c1e565b6000546001600160a01b031633146115d15760405162461bcd60e51b8152600401610bcb90615262565b60fd82905560fe81905560408051838152602081018390527ff3a6ee10a78fb7d212e87d9be970fb16bd7324e9dc9c38d21cd7ecde781a1d2a9101610cf8565b610106546001600160a01b0316331461163d57604051632880b08760e01b815260040160405180910390fd5b611648609783613b1a565b5050565b610105546001600160a01b03163314611678576040516302add3a960e41b815260040160405180910390fd5b6116826097613bc7565b610106546040516310da3b0360e21b81523060048201526001600160a01b0390911690634368ec0c90602401600060405180830381600087803b1580156116c857600080fd5b505af1158015610b2d573d6000803e3d6000fd5b610b9e6116e7612832565b60659083613cbe565b60006114926097613eff565b6000546001600160a01b031633146117275760405163f2be30fb60e01b815260040160405180910390fd5b6040516001600160a01b03821681527f0e2d2343d31b085b7c4e56d1c8a6ec79f7ab07460386f1c9a1756239fe2533ac9060200160405180910390a1603280546001600160a01b0319166001600160a01b0392909216919091179055565b61179e6117956020830183615402565b60ca9190613f39565b610b9e609782614092565b60006111a76117b6612832565b606590846143a2565b6000546001600160a01b031633146117e95760405162461bcd60e51b8152600401610bcb90615262565b60006117f560976143dd565b6003811115611806576118066150d4565b146118245760405163bede29c160e01b815260040160405180910390fd5b61182f609786614474565b61183a60978561449c565b609b83905561184a6097836144c4565b6118556097826144ec565b604080518681526020810186905290810184905260608101839052608081018290527f59ae8ed7b3a7e5f6dde4cff478f0ac0aa652c5edc4f4757b09a778a430b02c569060a0015b60405180910390a15050505050565b60005a8535600081815261010460205260409020549192509085146118e457604051633ab3447f60e11b815260040160405180910390fd5b6000806118f260ca846145bc565b9092509050600061190460ca8561460c565b905086866040516020016119199291906156f9565b60405160208183030381529060405280519060200120811461194e576040516394977fa560e01b815260040160405180910390fd5b6000738263efcb8f28246697585c89fed0501cd946f76463f4df04be7f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc8c87876040516020016119a8929190918252602082015260400190565b6040516020818303038152906040528d8d8d6040518763ffffffff1660e01b81526004016119db9695949392919061571b565b600060405180830381865af41580156119f8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611a209190810190615852565b600086815261010460205260408120805492935090611a3e836158f0565b9091555050604080518a815233602082015286917f326e1ff7c130ed708307116f79cf7dbca649503e7082e5e35a19ceeee1523b39910160405180910390a27f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031663942f68928260fe5442611abb91906156b1565b6040518363ffffffff1660e01b8152600401611ad89291906156c4565b600060405180830381600087803b158015611af257600080fd5b505af1158015611b06573d6000803e3d6000fd5b50611b1b9250505060608b0160408c01615909565b15611b8e5761010554604051631ee74c0960e11b81526004810187905260248101869052604481018590526001600160a01b0390911690633dce981290606401600060405180830381600087803b158015611b7557600080fd5b505af1158015611b89573d6000803e3d6000fd5b505050505b603254610101546001600160a01b0390911690637ad226dc905a611bb2908a6156e6565b611bbc91906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401600060405180830381600087803b158015611bfb57600080fd5b505af1158015611c0f573d6000803e3d6000fd5b5050505050505050505050505050565b60006111a760658361464e565b6000546001600160a01b03163314611c565760405162461bcd60e51b8152600401610bcb90615262565b606580546001600160601b0319166001600160601b038516179055611c7c6065836146e6565b611c8760658261470e565b604080516001600160601b03851681526001600160401b03848116602083015283168183015290517f544b726e42801bb47073854eeedae851903f66fe32a5bd24e626e10b90027b519181900360600190a1505050565b60005a9050611ced6097614736565b603254610102546001600160a01b0390911690637ad226dc905a611d1190856156e6565b611d1b91906156b1565b6040516001600160e01b031960e084901b1681526004810191909152336024820152604401611458565b60606111a760ca836147bd565b606454610100900460ff1615808015611d725750606454600160ff909116105b80611d8c5750303b158015611d8c575060645460ff166001145b611da85760405162461bcd60e51b8152600401610bcb90615299565b6064805460ff191660011790558015611dcb576064805461ff0019166101001790555b61010680546001600160a01b038086166001600160a01b0319928316179092556032805492851692909116919091179055611e05336147f8565b606580546001600160601b031916690878678326eac9000000179055611e2f6065623b53806146e6565b611e3d6065623b538061470e565b60fc80546001600160601b0319166815af1d78b58c400000179055606460fd556212750060fe55611e9060977f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc86614852565b611e9d6097612d00614474565b611eaa6097612d0061449c565b61c350609b55611ebd60976102186144c4565b611ec9609760146144ec565b62046cd060ff55620119406101005562016b4861010155611c52610102556108fc610103558015610b2d576064805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a150505050565b6000546001600160a01b03163314611f635760405162461bcd60e51b8152600401610bcb90615262565b60ff859055610100849055610101839055610102829055610103819055604080518681526020810186905290810184905260608101839052608081018290527f8a3e64fa6013a36bccca7362e8826b11ba41e57fb60f55309c0ca48904dad0829060a00161189d565b610107546001600160a01b0316801561200d57336001600160a01b0382161461200857604051630159dd6560e41b815260040160405180910390fd5b612056565b336001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd7161461205657604051630159dd6560e41b815260040160405180910390fd5b610b2d6065858585614947565b600061149260976143dd565b6000546001600160a01b031633146120995760405162461bcd60e51b8152600401610bcb90615262565b61010580546001600160a01b0319166001600160a01b0383169081179091556040519081527fa1993af5a189ba5ad4155263c920cfee33ce0593a8eb231a13bb3ce6f39459e390602001610c1e565b6000546001600160a01b031633146121125760405162461bcd60e51b8152600401610bcb90615262565b6001600160a01b0381166121735760405162461bcd60e51b815260206004820152602260248201527f4e657720676f7665726e616e636520697320746865207a65726f206164647265604482015261737360f01b6064820152608401610bcb565b610b9e816147f8565b60005a905061218b6097614a14565b603254610103546001600160a01b0390911690637ad226dc905a6121af90856156e6565b611d1b91906156e6565b610105546001600160a01b031633146121e5576040516302add3a960e41b815260040160405180910390fd5b60006121f260ca8561460c565b905082826040516020016122079291906156f9565b60405160208183030381529060405280519060200120811461223c576040516323f9e80360e11b815260040160405180910390fd5b604051637bfcd47d60e11b81526000906001600160a01b037f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063f7f9a8fa9061228d90879087906004016156f9565b600060405180830381865afa1580156122aa573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526122d29190810190615926565b90506000836001600160401b038111156122ee576122ee615304565b604051908082528060200260200182016040528015612317578160200160208202803683370190505b50905060005b825181101561239d5761236183828151811061233b5761233b61531a565b60200260200101516001600160a01b039081166000908152606760205260409020541690565b8282815181106123735761237361531a565b6001600160a01b039092166020928302919091019091015280612395816158f0565b91505061231d565b506040516383ddba8f60e01b81526001600160a01b037f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd716906383ddba8f906123f0908c908c908c908790600401615330565b600060405180830381600087803b15801561240a57600080fd5b505af115801561241e573d6000803e3d6000fd5b50505050505050505050505050565b604051635a48b46b60e01b81526001600160a01b03838116600483015260009182917f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc1690635a48b46b90602401602060405180830381865afa158015612498573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124bc91906159b4565b90508063ffffffff166000036124e55760405163427ce39560e01b815260040160405180910390fd5b60006124f260ca8961460c565b905086866040516020016125079291906156f9565b60405160208183030381529060405280519060200120811461253c576040516323f9e80360e11b815260040160405180910390fd5b600184108061254a57508584115b1561256857604051635d2de7eb60e01b815260040160405180910390fd5b63ffffffff8216878761257c6001886156e6565b81811061258b5761258b61531a565b90506020020160208101906125a091906159d1565b63ffffffff161498975050505050505050565b60a054604051636c2530b960e01b81526064600482015260248101919091526060907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc6001600160a01b031690636c2530b990604401600060405180830381865afa158015612626573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526114929190810190615852565b60006111a761265b612832565b6065907f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc85614a93565b60006060612694609784614c07565b91509150915091565b6040516307b8c36760e51b81526001600160a01b0382811660048301526000917f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc9091169063f7186ce090602401602060405180830381865afa158015612708573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111a791906159ee565b600080612751836001600160a01b039081166000908152606660205260409020541690565b90506001600160a01b03811661277a576040516331158d1160e01b815260040160405180910390fd5b60405163439f18fd60e11b81526001600160a01b0382811660048301527f000000000000000000000000c2731fb2823af3efc2694c9bc86f444d5c5bb4dc169063873e31fa90602401602060405180830381865afa1580156127e0573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061280491906153e5565b9392505050565b6001600160a01b0381166000908152606860205260408120546001600160601b03166111a7565b610107546000906001600160a01b031661286b57507f00000000000000000000000001b67b1194c75264d06f808a921228a95c765dd790565b50610107546001600160a01b031690565b6001600160a01b03808416600090815260018801602052604090205416806128a457506129e0565b6040516307b8c36760e51b81526001600160a01b03828116600483015286169063f7186ce090602401602060405180830381865afa1580156128ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061290e91906159ee565b156129de57846001600160a01b031663a4e2d6346040518163ffffffff1660e01b8152600401602060405180830381865afa158015612951573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061297591906159ee565b156129d257604080516001600160601b038086168252841660208201526001600160a01b0380841692908716917f1b09380d63e78fd72c1d79a805a7e2dfadf02b22418e24bebff51376b7df33b0910160405180910390a36129de565b6129de87878784612bc2565b505b505050505050565b3360008181526002850160205260409020546001600160a01b031680612a205760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b038116600090815260038601602052604081208054909190612a57908890889086906001600160601b0316614ceb565b9050806001600160601b0316600003612ab25760405162461bcd60e51b815260206004820152601f60248201527f417574686f72697a6174696f6e2062656c6f7720746865206d696e696d756d006044820152606401610bcb565b836001600160a01b0316836001600160a01b03167f5075aaa89894a888eb2cac81a27320c60855febb0cf1706b66bdc754e640d43360405160405180910390a3604051630483483160e31b81526001600160a01b0386169063241a418890612b209087908590600401615a35565b600060405180830381600087803b158015612b3a57600080fd5b505af1158015612b4e573d6000803e3d6000fd5b5050835467fffffffffffffffe19600160601b9091046001600160401b03160191506129de9050578654612b9290600160601b90046001600160401b031642615a57565b82546001600160401b0391909116600160601b0267ffffffffffffffff60601b1990911617825550505050505050565b6001600160a01b0380821660009081526002860160205260409020541680612bfc5760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b03808216600081815260038801602052604080822090519093861692917f1231fe5ee649a593b524a494cd53146a196380a872115a0d0fe16c0735afdf2691a36040516307b8c36760e51b81526001600160a01b03848116600483015285169063f7186ce090602401602060405180830381865afa158015612c89573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612cad91906159ee565b15612d34578054600090612ccf908890889086906001600160601b0316614ceb565b60405163dc7520c560e01b81529091506001600160a01b0386169063dc7520c590612d009087908590600401615a35565b600060405180830381600087803b158015612d1a57600080fd5b505af1158015612d2e573d6000803e3d6000fd5b50505050505b805467fffffffffffffffe19600160601b9091046001600160401b0316016129e0578554612d7290600160601b90046001600160401b031642615a57565b81546001600160401b0391909116600160601b0267ffffffffffffffff60601b19909116178155505050505050565b6000806003612daf856143dd565b6003811115612dc057612dc06150d4565b14612e0d5760405162461bcd60e51b815260206004820152601e60248201527f43757272656e74207374617465206973206e6f74204348414c4c454e474500006044820152606401610bcb565b6003840154600c850154612e2191906156b1565b431115612e7c5760405162461bcd60e51b815260206004820152602360248201527f4368616c6c656e676520706572696f642068617320616c7265616479207061736044820152621cd95960ea1b6064820152608401610bcb565b83600b015483604051602001612e929190615688565b6040516020818303038152906040528051906020012014612f1b5760405162461bcd60e51b815260206004820152603a60248201527f526573756c7420756e646572206368616c6c656e67652069732064696666657260448201527f656e74207468616e20746865207375626d6974746564206f6e650000000000006064820152608401610bcb565b6001840154600985015460088601546040516373b33d5d60e11b81526001600160a01b039093169263e7667aba92612f57928892600401615a7e565b600060405180830381865afa925050508015612f9557506040513d6000823e601f3d908101601f19168201604052612f929190810190615aa3565b60015b61300a57336001600160a01b031684600b01547f703feb01415a2995816e8d082fd7aad0eacada1a2f63fdb3226e47f8a0285436604051612ffd906020808252601390820152721d985b1a59185d1a5bdb881c995d995c9d1959606a1b604082015260600190565b60405180910390a3613099565b81156130505760405162461bcd60e51b8152602060048201526015602482015274756e6a7573746966696564206368616c6c656e676560581b6044820152606401610bcb565b336001600160a01b031686600b01547f703feb01415a2995816e8d082fd7aad0eacada1a2f63fdb3226e47f8a02854368360405161308e9190615081565b60405180910390a350505b600b84015491506130ad60a0840184615b4c565b6130b9600186356156e6565b8181106130c8576130c861531a565b90506020020160208101906130dd91906159d1565b90508360080154436130ef91906156e6565b600a8501556000600b8501819055600c8501555b9250929050565b6000818152602083905260409020600101546131385760405162461bcd60e51b8152600401610bcb90615b95565b6000908152602091909152604081208181556001810182905560020155565b336001600160a01b0382166131ae5760405162461bcd60e51b815260206004820181905260248201527f4f70657261746f722063616e206e6f74206265207a65726f20616464726573736044820152606401610bcb565b6001600160a01b038181166000908152600185016020526040902054161561322e5760405162461bcd60e51b815260206004820152602d60248201527f4f70657261746f7220616c72656164792073657420666f72207468652073746160448201526c35b4b73390383937bb34b232b960991b6064820152608401610bcb565b6001600160a01b03828116600090815260028501602052604090205416156132985760405162461bcd60e51b815260206004820152601f60248201527f4f70657261746f72206164647265737320616c726561647920696e20757365006044820152606401610bcb565b6001600160a01b038116600090815260038401602052604090208054600160601b90046001600160401b03161561332b5760405162461bcd60e51b815260206004820152603160248201527f546865726520697320612070656e64696e6720617574686f72697a6174696f6e60448201527008191958dc99585cd9481c995c5d595cdd607a1b6064820152608401610bcb565b826001600160a01b0316826001600160a01b03167fa453db612af59e5521d6ab9284dc3e2d06af286eb1b1b7b771fce4716c19f2c160405160405180910390a3506001600160a01b03908116600081815260018501602090815260408083208054959096166001600160a01b031995861681179096559482526002909501909452919092208054909216179055565b606060036133c7846143dd565b60038111156133d8576133d86150d4565b146134255760405162461bcd60e51b815260206004820152601e60248201527f43757272656e74207374617465206973206e6f74204348414c4c454e474500006044820152606401610bcb565b6003830154600c84015460009161343b916156b1565b90508043116134985760405162461bcd60e51b815260206004820152602360248201527f4368616c6c656e676520706572696f6420686173206e6f7420706173736564206044820152621e595d60ea1b6064820152608401610bcb565b83600b0154836040516020016134ae9190615688565b60405160208183030381529060405280519060200120146135375760405162461bcd60e51b815260206004820152603960248201527f526573756c7420756e64657220617070726f76616c206973206469666665726560448201527f6e74207468616e20746865207375626d6974746564206f6e65000000000000006064820152608401610bcb565b83546000906001600160a01b0316638871ca5d61355760a0870187615b4c565b613563600189356156e6565b8181106135725761357261531a565b905060200201602081019061358791906159d1565b6040516001600160e01b031960e084901b16815263ffffffff919091166004820152602401602060405180830381865afa1580156135c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906135ed91906152e7565b9050336001600160a01b03821614806136135750600685015461361090836156b1565b43115b61365f5760405162461bcd60e51b815260206004820152601e60248201527f4f6e6c79207375626d69747465722063616e20617070726f7665206e6f7700006044820152606401610bcb565b61366c6040850185615b4c565b90506001600160401b0381111561368557613685615304565b6040519080825280602002602001820160405280156136ae578160200160208202803683370190505b50925060005b6136c16040860186615b4c565b9050811015613775576136d760a0860186615b4c565b60016136e66040890189615b4c565b858181106136f6576136f661531a565b905060200201602081019061370b9190615be5565b6137159190615c00565b60ff168181106137275761372761531a565b905060200201602081019061373c91906159d1565b84828151811061374e5761374e61531a565b63ffffffff909216602092830291909101909101528061376d816158f0565b9150506136b4565b50600b8501546040513391907fe6e9d5eba171e82025efb3f3d44fd35905e7283d104284cb9f3bbc5bf1e4276f90600090a3505092915050565b600080600084846040516137c4929190615c19565b60405190819003902092506137dd602060008688615c29565b6137e691615c53565b91506137f58460208188615c29565b6137fe91615c53565b600084815260209890985260409097209586555060018501819055600290940185905594929392915050565b60006008820181905560098201819055600a8201819055600b8201819055600c820181905581546040805163a69df4b560e01b815290516001600160a01b039092169263a69df4b59260048084019382900301818387803b15801561147257600080fd5b6000600261389b836143dd565b60038111156138ac576138ac6150d4565b1480156111a757506005820154600a83015460088401546138cd91906156b1565b6138d791906156b1565b431192915050565b6001600160601b0381161580613903575083546001600160601b0390811690821610155b61396d5760405162461bcd60e51b815260206004820152603560248201527f417574686f72697a6174696f6e20616d6f756e742073686f756c642062652030604482015274206f722061626f766520746865206d696e696d756d60581b6064820152608401610bcb565b6001600160a01b03808416600090815260018601602052604081205490911690816139995750426139a3565b506001600160401b035b60006139af8486615c71565b6001600160a01b03871660009081526003890160205260409020805491925090600160601b90046001600160401b031680158015906139f757506001600160401b0381811614155b15613a8a578854613a1890600160a01b90046001600160401b031682615c91565b6001600160401b0316421015613a8a5760405162461bcd60e51b815260206004820152603160248201527f4e6f7420656e6f7567682074696d65207061737365642073696e636520746865604482015270081bdc9a59da5b985b081c995c5d595cdd607a1b6064820152608401610bcb565b81546001600160401b038516600160601b81026001600160a01b03199092166001600160601b0386811691909117929092178455604080518a8416815292891660208401528201526001600160a01b0386811691908a16907f545cbf267cef6fe43f11f6219417ab43a0e8e345adbaae5f626d9bc325e8535a9060600160405180910390a3505050505050505050565b6001613b25836143dd565b6003811115613b3657613b366150d4565b14613b8e5760405162461bcd60e51b815260206004820152602260248201527f43757272656e74207374617465206973206e6f74204157414954494e475f5345604482015261115160f21b6064820152608401610bcb565b60405181907fb2ad26c2940889d79df2ee9c758a8aefa00c5ca90eee119af0e5d795df3b98bb90600090a2436008830155600990910155565b6000613bd2826143dd565b6003811115613be357613be36150d4565b14613c2c5760405162461bcd60e51b815260206004820152601960248201527843757272656e74207374617465206973206e6f742049444c4560381b6044820152606401610bcb565b6040517f5c3ed2397d4d21298b2fb5027ac8e2d42e3c9c72bbb55ddb030e2a36a0cdff6b90600090a1805460408051637c1e845d60e11b815290516001600160a01b039092169163f83d08ba9160048082019260009290919082900301818387803b158015613c9a57600080fd5b505af1158015613cae573d6000803e3d6000fd5b5050505043816007018190555050565b6001600160a01b038116600090815260038401602052604090208054600160601b90046001600160401b0316613d425760405162461bcd60e51b8152602060048201526024808201527f417574686f72697a6174696f6e206465637265617365206e6f742072657175656044820152631cdd195960e21b6064820152608401610bcb565b805467fffffffffffffffe19600160601b9091046001600160401b031601613dc15760405162461bcd60e51b815260206004820152602c60248201527f417574686f72697a6174696f6e2064656372656173652072657175657374206e60448201526b1bdd081858dd1a5d985d195960a21b6064820152608401610bcb565b8054600160601b90046001600160401b0316421015613e325760405162461bcd60e51b815260206004820152602760248201527f417574686f72697a6174696f6e2064656372656173652064656c6179206e6f74604482015266081c185cdcd95960ca1b6064820152608401610bcb565b6040516001600160a01b038316907f50270a522c2fef97b6b7385c2aa4a4518adda681530e0a1fe9f5e840f6f2cd9d90600090a2604051633af0572d60e11b81526001600160a01b0383811660048301528416906375e0ae5a906024016020604051808303816000875af1158015613eae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190613ed291906153e5565b50506001600160a01b031660009081526003909201602052506040902080546001600160a01b0319169055565b60006001613f0c836143dd565b6003811115613f1d57613f1d6150d4565b1480156111a75750600282015460078301546138d791906156b1565b60408114613f895760405162461bcd60e51b815260206004820181905260248201527f496e76616c6964206c656e677468206f6620746865207075626c6963206b65796044820152606401610bcb565b60008282604051613f9b929190615c19565b6040805191829003909120600081815260208790529190912060010154909150156140205760405162461bcd60e51b815260206004820152602f60248201527f57616c6c657420776974682074686520676976656e207075626c6963206b657960448201526e20616c72656164792065786973747360881b6064820152608401610bcb565b600061402f6020828587615c29565b61403891615c53565b905080610f655760405162461bcd60e51b815260206004820152602260248201527f57616c6c6574207075626c6963206b6579206d757374206265206e6f6e2d7a65604482015261726f60f01b6064820152608401610bcb565b600261409d836143dd565b60038111156140ae576140ae6150d4565b146141075760405162461bcd60e51b8152602060048201526024808201527f43757272656e74207374617465206973206e6f74204157414954494e475f524560448201526314d5531560e21b6064820152608401610bcb565b6141108261388e565b1561415d5760405162461bcd60e51b815260206004820152601a60248201527f444b472074696d656f757420616c7265616479207061737365640000000000006044820152606401610bcb565b81546040516307b8c36760e51b81523360048201526001600160a01b0390911690819063f7186ce090602401602060405180830381865afa1580156141a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906141ca91906159ee565b6142225760405162461bcd60e51b815260206004820152602360248201527f5375626d6974746572206e6f7420696e2074686520736f72746974696f6e20706044820152621bdbdb60ea1b6064820152608401610bcb565b336001600160a01b038216638871ca5d61423f60a0860186615b4c565b61424b600188356156e6565b81811061425a5761425a61531a565b905060200201602081019061426f91906159d1565b6040516001600160e01b031960e084901b16815263ffffffff919091166004820152602401602060405180830381865afa1580156142b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906142d591906152e7565b6001600160a01b03161461432b5760405162461bcd60e51b815260206004820152601a60248201527f556e6578706563746564207375626d697474657220696e6465780000000000006044820152606401610bcb565b8160405160200161433c9190615688565b60408051601f19818403018152908290528051602090910120600b850181905543600c8601556009850154917f8e7fd4293d7db11807147d8890c287fad3396fbb09a4e92273fc7856076c153a90614395908690615688565b60405180910390a3505050565b6001600160a01b03811660009081526003840160205260408120546143d5908590859085906001600160601b0316614ceb565b949350505050565b805460408051632938b58d60e21b815290516000926001600160a01b03169163a4e2d6349160048083019260209291908290030181865afa158015614426573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061444a91906159ee565b1561446f575060088101546001901561446f5750600c8101546002901561446f575060035b919050565b600081116144945760405162461bcd60e51b8152600401610bcb90615cb1565b600290910155565b600081116144bc5760405162461bcd60e51b8152600401610bcb90615cb1565b600390910155565b600081116144e45760405162461bcd60e51b8152600401610bcb90615cb1565b600590910155565b60006144f7836143dd565b6003811115614508576145086150d4565b146145515760405162461bcd60e51b815260206004820152601960248201527843757272656e74207374617465206973206e6f742049444c4560381b6044820152606401610bcb565b600582015481106145b45760405162461bcd60e51b815260206004820152602760248201527f56616c7565206578636565647320726573756c74207375626d697373696f6e206044820152661d1a5b595bdd5d60ca1b6064820152608401610bcb565b600690910155565b60008181526020839052604081206001015481906145ec5760405162461bcd60e51b8152600401610bcb90615b95565b505060009081526020919091526040902060018101546002909101549091565b60008181526020839052604081206001015461463a5760405162461bcd60e51b8152600401610bcb90615b95565b506000908152602091909152604090205490565b6001600160a01b03811660009081526003830160205260408120805467fffffffffffffffe19600160601b9091046001600160401b03160161469a576001600160401b039150506111a7565b805442906001600160401b03600160601b9091048116908216116146da5781546146d5908290600160601b90046001600160401b0316615c91565b6146dd565b60005b95945050505050565b81546001600160401b03909116600160601b0267ffffffffffffffff60601b19909116179055565b81546001600160401b03909116600160a01b0267ffffffffffffffff60a01b19909116179055565b61473f81613eff565b61478b5760405162461bcd60e51b815260206004820152601f60248201527f4177616974696e67207365656420686173206e6f742074696d6564206f7574006044820152606401610bcb565b6040517f68c52f05452e81639fa06f379aee3178cddee4725521fff886f244c99e868b5090600090a1610b9e8161382a565b60606000806147cc85856145bc565b604080516020810193909352828101919091528051808303820181526060909201905295945050505050565b600080546001600160a01b038381166001600160a01b031983168117909355604080519190921680825260208201939093527f5f56bee8cffbe9a78652a74a60705edede02af10b0bbb888ca44b79a0d42ce809101610cf8565b82546001600160a01b0316156148b55760405162461bcd60e51b815260206004820152602260248201527f536f72746974696f6e20506f6f6c206164647265737320616c72656164792073604482015261195d60f21b6064820152608401610bcb565b60018301546001600160a01b03161561491a5760405162461bcd60e51b815260206004820152602160248201527f444b472056616c696461746f72206164647265737320616c72656164792073656044820152601d60fa1b6064820152608401610bcb565b82546001600160a01b03199081166001600160a01b03938416178455600190930180549093169116179055565b83546001600160601b0390811690821610156149a55760405162461bcd60e51b815260206004820152601f60248201527f417574686f72697a6174696f6e2062656c6f7720746865206d696e696d756d006044820152606401610bcb565b6001600160a01b0383811660008181526001870160209081526040918290205482516001600160601b03888116825287169281019290925282519416938493927f87f9f9f59204f53d57a89a817c6083a17979cd0531791c91e18551a56e3cfdd7928290030190a35050505050565b614a1d8161388e565b614a615760405162461bcd60e51b81526020600482015260156024820152741112d1c81a185cc81b9bdd081d1a5b5959081bdd5d605a1b6044820152606401610bcb565b6040517f2852b3e178dd281713b041c3d90b4815bb55b7ec812931d1e8e8d8bb2ed72d3e90600090a1610b9e8161382a565b6001600160a01b03808216600090815260028601602052604081205490911680614acf5760405162461bcd60e51b8152600401610bcb90615a0b565b6001600160a01b038116600090815260038701602052604081208054909190614b06908990899086906001600160601b0316614ceb565b6040516307b8c36760e51b81526001600160a01b0387811660048301529192509087169063f7186ce090602401602060405180830381865afa158015614b50573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614b7491906159ee565b614b8c576001600160601b03161592506143d5915050565b6040516304de824f60e41b81526001600160a01b03871690634de824f090614bba9088908590600401615a35565b602060405180830381865afa158015614bd7573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614bfb91906159ee565b98975050505050505050565b600060606000846008015411614c5f5760405162461bcd60e51b815260206004820152601860248201527f444b4720686173206e6f74206265656e207374617274656400000000000000006044820152606401610bcb565b6001840154600985015460088601546040516373b33d5d60e11b81526001600160a01b039093169263e7667aba92614c9b928892600401615a7e565b600060405180830381865afa158015614cb8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052614ce09190810190615aa3565b915091509250929050565b604051637004922d60e11b81526001600160a01b038381166004830152306024830152600091829186169063e009245a90604401602060405180830381865afa158015614d3c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190614d6091906153e5565b90506000836001600160601b0316826001600160601b031611614d84576000614d8e565b614d8e8483615c71565b87549091506001600160601b039081169082161015614db2576000925050506143d5565b91506143d59050565b6001600160a01b0381168114610b9e57600080fd5b6001600160601b0381168114610b9e57600080fd5b600080600060608486031215614dfa57600080fd5b8335614e0581614dbb565b92506020840135614e1581614dd0565b91506040840135614e2581614dd0565b809150509250925092565b600060208284031215614e4257600080fd5b813561280481614dbb565b600060208284031215614e5f57600080fd5b813561280481614dd0565b600060208284031215614e7c57600080fd5b81356001600160401b03811115614e9257600080fd5b820160e0818503121561280457600080fd5b600060208284031215614eb657600080fd5b5035919050565b60008060408385031215614ed057600080fd5b50508035926020909101359150565b600080600080600060a08688031215614ef757600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60008083601f840112614f2c57600080fd5b5081356001600160401b03811115614f4357600080fd5b6020830191508360208260051b850101111561310357600080fd5b60008060008060608587031215614f7457600080fd5b84356001600160401b0380821115614f8b57600080fd5b9086019060a08289031215614f9f57600080fd5b9094506020860135935060408601359080821115614fbc57600080fd5b50614fc987828801614f1a565b95989497509550505050565b80356001600160401b038116811461446f57600080fd5b60008060006060848603121561500157600080fd5b833561500c81614dd0565b925061501a60208501614fd5565b915061502860408501614fd5565b90509250925092565b60005b8381101561504c578181015183820152602001615034565b50506000910152565b6000815180845261506d816020860160208601615031565b601f01601f19169290920160200192915050565b6020815260006128046020830184615055565b6000806000606084860312156150a957600080fd5b83356150b481614dbb565b925060208401356150c481614dbb565b91506040840135614e2581614dbb565b634e487b7160e01b600052602160045260246000fd5b602081016004831061510c57634e487b7160e01b600052602160045260246000fd5b91905290565b60008060008060008060a0878903121561512b57600080fd5b863561513681614dd0565b955060208701359450604087013561514d81614dbb565b93506060870135925060808701356001600160401b0381111561516f57600080fd5b61517b89828a01614f1a565b979a9699509497509295939492505050565b6000806000806000608086880312156151a557600080fd5b8535945060208601356001600160401b038111156151c257600080fd5b6151ce88828901614f1a565b90955093505060408601356151e281614dbb565b949793965091946060013592915050565b600081518084526020808501945080840160005b8381101561522957815163ffffffff1687529582019590820190600101615207565b509495945050505050565b60208152600061280460208301846151f3565b82151581526040602082015260006143d56040830184615055565b6020808252601c908201527f43616c6c6572206973206e6f742074686520676f7665726e616e636500000000604082015260600190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6000602082840312156152f957600080fd5b815161280481614dbb565b634e487b7160e01b600052604160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6001600160601b038516815260208082018590526001600160a01b038481166040840152608060608401819052845190840181905260009285810192909160a0860190855b81811015615393578551841683529484019491840191600101615375565b50909a9950505050505050505050565b6000806000606084860312156153b857600080fd5b83516153c381614dbb565b60208501519093506153d481614dbb565b6040850151909250614e2581614dbb565b6000602082840312156153f757600080fd5b815161280481614dd0565b6000808335601e1984360301811261541957600080fd5b8301803591506001600160401b0382111561543357600080fd5b60200191503681900382131561310357600080fd5b6000808335601e1984360301811261545f57600080fd5b83016020810192503590506001600160401b0381111561547e57600080fd5b80360382131561310357600080fd5b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b6000808335601e198436030181126154cd57600080fd5b83016020810192503590506001600160401b038111156154ec57600080fd5b8060051b360382131561310357600080fd5b803560ff8116811461446f57600080fd5b81835260006001600160fb1b0383111561552857600080fd5b8260051b80836020870137939093016020019392505050565b63ffffffff81168114610b9e57600080fd5b8183526000602080850194508260005b8581101561522957813561557681615541565b63ffffffff1687529582019590820190600101615563565b80358252600060206155a281840184615448565b60e0838701526155b660e08701828461548d565b9150506155c660408501856154b6565b868303604088015280835290916000919084015b818310156156025760ff6155ed856154fe565b168152928401926001929092019184016155da565b61560f6060880188615448565b95509350878103606089015261562681868661548d565b94505050505061563960808401846154b6565b858303608087015261564c83828461550f565b9250505061565d60a08401846154b6565b85830360a0870152615670838284615553565b9250505060c083013560c08501528091505092915050565b602081526000612804602083018461558e565b634e487b7160e01b600052601160045260246000fd5b808201808211156111a7576111a761569b565b6040815260006156d760408301856151f3565b90508260208301529392505050565b818103818111156111a7576111a761569b565b6020815260006143d5602083018486615553565b8015158114610b9e57600080fd5b60018060a01b038716815260a06020820152853560a0820152600061574360208801886154b6565b60a060c08501526157596101408501828461550f565b915050604088013561576a8161570d565b151560e084015261577e6060890189615448565b609f19808685030161010087015261579784838561548d565b93506157a660808c018c6154b6565b935091508086850301610120870152506157c183838361550f565b9250505082810360408401526157d78188615055565b905085606084015282810360808401526157f2818587615553565b9998505050505050505050565b604051601f8201601f191681016001600160401b038111828210171561582757615827615304565b604052919050565b60006001600160401b0382111561584857615848615304565b5060051b60200190565b6000602080838503121561586557600080fd5b82516001600160401b0381111561587b57600080fd5b8301601f8101851361588c57600080fd5b805161589f61589a8261582f565b6157ff565b81815260059190911b820183019083810190878311156158be57600080fd5b928401925b828410156158e55783516158d681615541565b825292840192908401906158c3565b979650505050505050565b6000600182016159025761590261569b565b5060010190565b60006020828403121561591b57600080fd5b81356128048161570d565b6000602080838503121561593957600080fd5b82516001600160401b0381111561594f57600080fd5b8301601f8101851361596057600080fd5b805161596e61589a8261582f565b81815260059190911b8201830190838101908783111561598d57600080fd5b928401925b828410156158e55783516159a581614dbb565b82529284019290840190615992565b6000602082840312156159c657600080fd5b815161280481615541565b6000602082840312156159e357600080fd5b813561280481615541565b600060208284031215615a0057600080fd5b81516128048161570d565b60208082526010908201526f2ab735b737bbb71037b832b930ba37b960811b604082015260600190565b6001600160a01b039290921682526001600160601b0316602082015260400190565b6001600160401b03818116838216019080821115615a7757615a7761569b565b5092915050565b606081526000615a91606083018661558e565b60208301949094525060400152919050565b60008060408385031215615ab657600080fd5b8251615ac18161570d565b60208401519092506001600160401b0380821115615ade57600080fd5b818501915085601f830112615af257600080fd5b815181811115615b0457615b04615304565b615b17601f8201601f19166020016157ff565b9150808252866020828501011115615b2e57600080fd5b615b3f816020840160208601615031565b5080925050509250929050565b6000808335601e19843603018112615b6357600080fd5b8301803591506001600160401b03821115615b7d57600080fd5b6020019150600581901b360382131561310357600080fd5b60208082526030908201527f57616c6c657420776974682074686520676976656e20494420686173206e6f7460408201526f081899595b881c9959da5cdd195c995960821b606082015260800190565b600060208284031215615bf757600080fd5b612804826154fe565b60ff82811682821603908111156111a7576111a761569b565b8183823760009101908152919050565b60008085851115615c3957600080fd5b83861115615c4657600080fd5b5050820193919092039150565b803560208310156111a757600019602084900360031b1b1692915050565b6001600160601b03828116828216039080821115615a7757615a7761569b565b6001600160401b03828116828216039080821115615a7757615a7761569b565b6020808252601f908201527f56616c7565206d7573742062652067726561746572207468616e207a65726f0060408201526060019056fea2646970667358221220dde34c826480318674a5b15d4f6f3483a5ee47c0ebae5b5ab0690d6c8097e3df64736f6c63430008110033" + } +} diff --git a/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts b/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts index 839f720b95..00d377c2db 100644 --- a/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts +++ b/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts @@ -82,6 +82,25 @@ describe("RandomBeacon - Group Creation", () => { let staking: TokenStaking let t: T + // These balance bounds were calibrated on the pre-Glamsterdam EVM. Keep + // checking the same execution-cost surplus while requiring the configured + // increase in the fixed DKG submission reimbursement to be paid in full. + async function legacyDkgRefundSurplus( + surplus: BigNumber, + approvalTx: ContractTransaction + ): Promise { + const { dkgResultSubmissionGas } = await randomBeacon.gasParameters() + const pool = await ethers.getContractAt( + "ReimbursementPool", + await randomBeacon.reimbursementPool() + ) + const maxGasPrice = await pool.maxGasPrice() + const refundGasPrice = approvalTx.gasPrice.gt(maxGasPrice) + ? maxGasPrice + : approvalTx.gasPrice + return surplus.sub(dkgResultSubmissionGas.sub(237_650).mul(refundGasPrice)) + } + before(async () => { ;[thirdParty] = await helpers.signers.getUnnamedSigners() let randomBeaconStub: RandomBeaconTest @@ -1577,7 +1596,10 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = postBalance.sub(submitterInitialBalance) + const diff = await legacyDkgRefundSurplus( + postBalance.sub(submitterInitialBalance), + tx + ) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1782,7 +1804,10 @@ describe("RandomBeacon - Group Creation", () => { const postBalance = await provider.getBalance( anotherSubmitter.address ) - const diff = postBalance.sub(anotherSubmitterInitialBalance) + const diff = await legacyDkgRefundSurplus( + postBalance.sub(anotherSubmitterInitialBalance), + tx + ) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1895,7 +1920,10 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = postBalance.sub(submitterInitialBalance) + const diff = await legacyDkgRefundSurplus( + postBalance.sub(submitterInitialBalance), + tx + ) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1943,7 +1971,10 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = postBalance.sub(submitterInitialBalance) + const diff = await legacyDkgRefundSurplus( + postBalance.sub(submitterInitialBalance), + await tx + ) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1988,7 +2019,10 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = postBalance.sub(submitterInitialBalance) + const diff = await legacyDkgRefundSurplus( + postBalance.sub(submitterInitialBalance), + await tx + ) expect(diff).to.be.gt(0) expect(diff).to.be.lt( From 62f52b8b0d18c25e860de791ea8cfa52937f2194 Mon Sep 17 00:00:00 2001 From: maclane Date: Fri, 6 Nov 2026 17:58:04 -0600 Subject: [PATCH 3/5] Recalibrate misbehaved approval gas benchmarks --- .../test/WalletRegistry.WalletCreation.test.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts b/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts index 6a294772ab..ad5cd6f05f 100644 --- a/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts +++ b/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts @@ -1544,6 +1544,12 @@ describe("WalletRegistry - Wallet Creation", async () => { }) describe("approveDkgResult", async () => { + // Identical inputs used 344,895 gas on the baseline and 344,968 with the + // saturating meter. Random inputs also reached a legacy-equivalent 345,015 + // gas, so recenter at 345,000 plus the measured 73-gas metering overhead. + // Retain the original 15,000-gas tolerance. + const misbehavedApprovalGas = 345_000 + 73 + context("with initial contract state", async () => { it("should revert with 'Current state is not CHALLENGE' error", async () => { await expect( @@ -2092,8 +2098,8 @@ describe("WalletRegistry - Wallet Creation", async () => { ) }) - it("should use close to 330 000 gas", async () => { - await assertGasUsed(tx, 330_000, 15_000) + it("should use close to 345 073 gas", async () => { + await assertGasUsed(tx, misbehavedApprovalGas, 15_000) }) }) @@ -2134,8 +2140,8 @@ describe("WalletRegistry - Wallet Creation", async () => { await expect(tx).to.not.be.reverted }) - it("should use close to 330 000 gas", async () => { - await assertGasUsed(await tx, 330_000, 15_000) + it("should use close to 345 073 gas", async () => { + await assertGasUsed(await tx, misbehavedApprovalGas, 15_000) }) } ) From 1ae111f0aaba6b8f476a6d31cad4f49c9be4661b Mon Sep 17 00:00:00 2001 From: maclane Date: Sat, 7 Nov 2026 09:30:15 -0600 Subject: [PATCH 4/5] Correct Glamsterdam live beacon and reimbursement assumptions --- docs/glamsterdam-migration.md | 160 ++++++++++-------- solidity/ecdsa/README.adoc | 2 +- solidity/ecdsa/contracts/WalletRegistry.sol | 5 +- .../ecdsa/contracts/test/RandomBeaconStub.sol | 2 +- solidity/ecdsa/scripts/prepare-glamsterdam.ts | 89 ++++++---- .../test/WalletRegistry.RandomBeacon.test.ts | 11 +- .../WalletRegistry.WalletCreation.test.ts | 40 +---- .../test/WalletRegistryGovernance.test.ts | 2 +- .../wallet_registry_callback_eels.py | 8 +- solidity/random-beacon/README.adoc | 4 +- .../random-beacon/contracts/RandomBeacon.sol | 14 +- .../test/RandomBeacon.GroupCreation.test.ts | 44 +---- solidity/random-beacon/test/fixtures/index.ts | 4 +- 13 files changed, 184 insertions(+), 201 deletions(-) diff --git a/docs/glamsterdam-migration.md b/docs/glamsterdam-migration.md index 99622a23a4..a33c887c88 100644 --- a/docs/glamsterdam-migration.md +++ b/docs/glamsterdam-migration.md @@ -1,89 +1,107 @@ # Glamsterdam gas compatibility -The current EIP-8037/EIP-8038 proposal changes storage and gas accounting. -These changes are provisional until the fork specification is finalized. - -## Existing deployments +The current Amsterdam gas rules are provisional until the fork specification is +finalized. This draft provides defensive gas-meter arithmetic and review tooling; +it does not establish a required mainnet contract upgrade. + +## Live wallet-creation wiring + +At mainnet block 26,363,834, WalletRegistry +`0x46d52E41C2F300BC82217Ce22b920c34995204eb` returned +`0xF23fc18EcE6Afe7fb57ba59979e8600bb4B0294a` from `randomBeacon()`. +That provider is RandomBeaconChaosnet, whose callback forwards available gas +without a fixed 64k cap. The registry switched to it on January 25, 2023 in +[this transaction](https://etherscan.io/tx/0xa7314c468cb059867cb9d544b964754ca95d228aa72d6d74e9c40e419083304a). + +The separate RandomBeacon at `0x5499f54b4A1CB4816eefCf78962040461be3D80b` +has a 64k callback parameter, but it is not the live registry's provider. +Consequently, this draft does not change callback defaults or generate callback +governance updates. Always read the registry's actual provider before assessing +callback limits. + +The EELS fixture in `solidity/ecdsa/test/glamsterdam/` uses verified deployed +registry bytecode with **synthetic storage assigning the capped beacon** and a +stub sortition pool. It demonstrates a hypothetical capped-callback failure, +not the current mainnet wallet-creation path. Its 240,768 threshold and 300k +success must not be used to justify a live callback update. + +## DKG reimbursement: calldata floor matters + +DKG submission can succeed while its fixed reimbursement underpays operators. +The draft leaves the historical defaults unchanged: 237,650 gas for RandomBeacon +and 290,000 for WalletRegistry. These are not post-fork recommendations. + +For a WalletRegistry result with 100 members, 100 signatures and no misbehaved +members, both submission and approval calldata are 13,412 bytes. With no value +or access list, the pinned Amsterdam transaction floor is: + +```text +12,000 base + 3,000 recipient access + 64 × 13,412 bytes = 873,368 gas +``` -Changing constructor/initializer defaults does not update an existing contract. -Before activation, use the existing governance setters for these parameters: +The floor depends on the actual encoding and signature count. It is imposed at +final transaction settlement, so `gasleft()` cannot observe it even below a +`2^24` transaction gas limit. Adding only the two fresh-slot cost increases +misses this mechanism; the earlier 450k/500k proposals were not justified. -| Contract | Parameter | Previous mainnet value | Proposed draft value | -| --- | --- | ---: | ---: | -| RandomBeacon | callbackGasLimit | 64,000 | 300,000 | -| RandomBeacon | dkgResultSubmissionGas | 237,650 | 450,000 | -| WalletRegistry | dkgResultSubmissionGas | 290,000 | 500,000 | +A supplied Sepolia lab report says a WalletRegistry allowance of 920k covered +the full cost of a real 100-member DKG, and was then restored. Treat 920k as a +reported benchmark candidate until its receipts, signature count, gas prices, +approval measurement and reimbursement are independently checked. Do not copy it +to RandomBeacon: that DKG uses a different result shape and 64 members. -The callback limit includes margin over 240,768 gas measured with the deployed -WalletRegistry proxy and implementation under Amsterdam EELS. At 64,000 gas the -callback runs out of gas while writing `startBlock` and `seed`; the beacon catches -the failure, leaving WalletRegistry awaiting its seed until timeout recovery. +Benchmark the complete submission **and** approval transactions, using actual +receipts and credited ETH at the pool's capped reimbursement gas price. Include +the approval offset and `ReimbursementPool.staticGas` (40,800 in the observed +mainnet deployment). Recheck all timeout/inactivity offsets separately. Existing +governance setters can change reimbursement parameters without upgrading the +contract implementation. -The DKG reimbursement values are provisional budgets, not measured exact costs. -Both result-submission paths create two fresh slots. Their storage costs alone -increase by 175,840 gas versus Osaka. The proposed budgets add margin above the -old budgets plus that delta. Benchmark both complete paths under the final fork -schedule before signing updates; also remeasure every approval/timeout/inactivity -offset and ReimbursementPool.staticGas. Do not blindly add a single opcode delta -to staticGas because refunds and their cap affect the total. +## Read-only governance preparation -Generate reviewable begin/finalize calls from live governance references: +The script prints the actual registry provider, current gas parameters, owners, +delays and optional refund-update calldata at one pinned block. With neither +environment variable set, it prints no update calls. Supply a separately +benchmarked positive integer for each parameter you intend to review: ```sh cd solidity/ecdsa -yarn hardhat run scripts/prepare-glamsterdam.ts --network mainnet -``` - -The script only reads chain state and prints calldata. It does not sign or send. -Review chain ID, owners, current parameters, and any already-pending updates. -Submit the begin calls through the relevant governance owner, wait the on-chain -delay (currently seven days on mainnet), verify each pending value, then submit -the matching finalize calls. Re-read `relayEntryParameters()` and both -`gasParameters()` getters afterward. Never finalize an unrelated pending update. - -Run a full RandomBeacon -> WalletRegistry proxy callback on a fork using the new -rules with transaction gas below and above 2^24. Check that `DkgStarted` occurs, -`CallbackFailed` does not occur, and both startBlock and seed are recorded. Ensure -the outer relay submission has enough gas for its own state changes and refund. - -The public deployed bytecode regression is reproducible separately from Hardhat: - -```sh -python3 -m venv /tmp/keep-glamsterdam-eels -/tmp/keep-glamsterdam-eels/bin/pip install 'ethereum-execution @ git+https://github.com/ethereum/execution-specs.git@a7dbafac0c0ec82e7b2e20959cc7c00ce958442a' -/tmp/keep-glamsterdam-eels/bin/python solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py +GLAMSTERDAM_WALLET_DKG_SUBMISSION_GAS= \ + yarn hardhat run scripts/prepare-glamsterdam.ts --network mainnet ``` -The fixture contains only the verified mainnet implementation runtime for -`0x420c99a4B0e4CB65c4CaBf2b4D2526372aA1ac6e`, obtained from Sourcify; the script -embeds proxy runtime read from `0x46d52E41C2F300BC82217Ce22b920c34995204eb`. -It models the required `AWAITING_SEED` state and a locked sortition-pool response. -Assertions cover Osaka success, Amsterdam failure without a reservoir, Amsterdam -success at 300k, reservoir behavior, and the pinned proxy threshold. It excludes -the outer RandomBeacon frame and does not prove a production relay gas estimate. - -## Gas measurement - -The updated meter clamps a negative `gasStart - gasleft()` delta to zero, including -the negative DKG-timeout offset. This prevents a gas credit from reverting otherwise -successful work. It adds no storage fields and preserves proxy storage layouts. - -This does **not** measure reservoir-paid state gas. For transaction gas above 2^24, -EIP-8037 pays new-state charges from a reservoir invisible to `gasleft()`. Operators -must not expect exact reimbursement for that gas. Use ordinary estimated gas -limits, monitor actual transaction cost, and do not rely on a reservoir to bypass -the old callback cap. A future reimbursement redesign needs an explicitly agreed, -capped fee or a state-aware quote; fixed offsets cannot reconstruct hidden dynamic -state costs. - -ReimbursementPool deliberately treats failed ETH sends as best effort. Contract -operators should use a storage-free receiver and alert on `SendingEtherFailed`. -Adding a fresh retry-credit slot after an out-of-gas receiver call could itself -run out of gas and revert protocol work; this patch does not add that failure path. -A pull-payment replacement pool requires a separate migration and gas benchmark. +Use `GLAMSTERDAM_BEACON_DKG_SUBMISSION_GAS` only after a separate RandomBeacon +benchmark. The script never signs or broadcasts. Review the chain ID, live +provider, owners and pending updates; submit approved begin calls, wait the +on-chain governance delay, verify pending values, then submit matching finalize +calls. Never finalize an unrelated pending update. Read `gasParameters()` again +afterward. Neither historical defaults nor supplied environment values become +automatically validated by generating calldata. + +## Gas measurement and payout limitations + +The updated meter clamps a negative `gasStart - gasleft()` delta to zero, +including the negative DKG-timeout offset. This prevents arithmetic underflow +from reverting otherwise successful work. It adds no storage fields and preserves +proxy storage layouts. No ordinary production transaction has been demonstrated +to trigger such an underflow; this is defensive compatibility work. + +Saturation does not make reimbursement exact. Besides the settlement floor, +reservoir-paid new-state gas above `2^24` is invisible to `gasleft()`. Monitor +actual transaction costs and use ordinary fresh estimates. A reimbursement +redesign needs an agreed capped fee or a state-aware quote; this draft does not +provide one. + +ReimbursementPool treats failed ETH sends as best effort. Contract operators +should use a storage-free receiver and monitor `SendingEtherFailed`. Adding a +fresh retry-credit slot after an out-of-gas receiver call can itself exhaust gas +and revert protocol work; this draft does not add that failure path. A replacement +pool requires separate migration and gas benchmarks. ## References +- https://eips.ethereum.org/EIPS/eip-7976 +- https://eips.ethereum.org/EIPS/eip-2780 - https://eips.ethereum.org/EIPS/eip-8037 - https://eips.ethereum.org/EIPS/eip-8038 - https://github.com/ethereum/glamsterdam-gas-invariants diff --git a/solidity/ecdsa/README.adoc b/solidity/ecdsa/README.adoc index 99d0fb59d8..ef3d2f653b 100644 --- a/solidity/ecdsa/README.adoc +++ b/solidity/ecdsa/README.adoc @@ -351,7 +351,7 @@ inactive for other reasons. |Calculated gas cost for submitting a DKG result. This will be refunded as part of the DKG approval process. |Yes -|`500_000` (provisional Glamsterdam budget; see `docs/glamsterdam-migration.md`) +|`290_000` |dkgResultApprovalGasOffset |Gas that is meant to balance the DKG result approval's overall cost. diff --git a/solidity/ecdsa/contracts/WalletRegistry.sol b/solidity/ecdsa/contracts/WalletRegistry.sol index 23f4685dde..b5c6c5efed 100644 --- a/solidity/ecdsa/contracts/WalletRegistry.sol +++ b/solidity/ecdsa/contracts/WalletRegistry.sol @@ -413,10 +413,7 @@ contract WalletRegistry is // Gas parameters were adjusted based on Ethereum state in April 2022. // If the cost of EVM opcodes change over time, these parameters will // have to be updated. - // Amsterdam adds 175,840 gas for the two fresh DKG result slots. - // This provisional budget includes margin and must be rebenchmarked - // against the final fork rules before activation. - _dkgResultSubmissionGas = 500_000; + _dkgResultSubmissionGas = 290_000; _dkgResultApprovalGasOffset = 72_000; _notifyOperatorInactivityGasOffset = 93_000; _notifySeedTimeoutGasOffset = 7_250; diff --git a/solidity/ecdsa/contracts/test/RandomBeaconStub.sol b/solidity/ecdsa/contracts/test/RandomBeaconStub.sol index d9109dee3b..cd6cdde703 100644 --- a/solidity/ecdsa/contracts/test/RandomBeaconStub.sol +++ b/solidity/ecdsa/contracts/test/RandomBeaconStub.sol @@ -15,7 +15,7 @@ contract RandomBeaconStub is IRandomBeacon { Callback.Data internal callback; // This value has to reflect the one set in the Random Beacon contract! - uint256 public callbackGasLimit = 300000; + uint256 public callbackGasLimit = 64000; event CallbackFailed(uint256 entry, uint256 entrySubmittedBlock); diff --git a/solidity/ecdsa/scripts/prepare-glamsterdam.ts b/solidity/ecdsa/scripts/prepare-glamsterdam.ts index d47e5e27c4..c8efe93684 100644 --- a/solidity/ecdsa/scripts/prepare-glamsterdam.ts +++ b/solidity/ecdsa/scripts/prepare-glamsterdam.ts @@ -1,84 +1,111 @@ /* eslint-disable import/no-extraneous-dependencies, no-console */ import { deployments, ethers, network } from "hardhat" -// Read-only: print governance calls for review; never submit a transaction. +// Read-only: explicit, independently benchmarked inputs are required. No defaults. +function benchmarkedGas(name: string): string | undefined { + const value = process.env[name] + if (value === undefined) return undefined + if (!/^[1-9][0-9]*$/.test(value)) { + throw new Error( + `${name} must be a positive integer from a full DKG benchmark` + ) + } + if (ethers.BigNumber.from(value).gt(ethers.constants.MaxUint256)) { + throw new Error(`${name} exceeds uint256`) + } + return value +} + async function main() { + const beaconGas = benchmarkedGas("GLAMSTERDAM_BEACON_DKG_SUBMISSION_GAS") + const registryGas = benchmarkedGas("GLAMSTERDAM_WALLET_DKG_SUBMISSION_GAS") + const blockNumber = await ethers.provider.getBlockNumber() + const atBlock = { blockTag: blockNumber } const beaconDeployment = await deployments.get("RandomBeacon") const registryDeployment = await deployments.get("WalletRegistry") const beacon = new ethers.Contract( beaconDeployment.address, - ["function governance() view returns (address)"], + [ + "function governance() view returns (address)", + "function relayEntryParameters() view returns (uint256,uint256,uint256)", + "function gasParameters() view returns (uint256,uint256,uint256,uint256)", + ], ethers.provider ) const registry = new ethers.Contract( registryDeployment.address, - ["function governance() view returns (address)"], + [ + "function governance() view returns (address)", + "function randomBeacon() view returns (address)", + "function gasParameters() view returns (uint256,uint256,uint256,uint256,uint256)", + ], ethers.provider ) const governanceAbi = [ "function owner() view returns (address)", "function governanceDelay() view returns (uint256)", - "function beginCallbackGasLimitUpdate(uint256)", - "function finalizeCallbackGasLimitUpdate()", "function beginDkgResultSubmissionGasUpdate(uint256)", "function finalizeDkgResultSubmissionGasUpdate()", ] const beaconGovernance = new ethers.Contract( - await beacon.governance(), + await beacon.governance(atBlock), governanceAbi, ethers.provider ) const registryGovernance = new ethers.Contract( - await registry.governance(), + await registry.governance(atBlock), governanceAbi, ethers.provider ) + const updates = [ + { target: beaconGovernance, value: beaconGas }, + { target: registryGovernance, value: registryGas }, + ].filter(({ value }) => value !== undefined) const call = ( target: typeof beaconGovernance, method: string, - args: number[] = [] + args: string[] = [] ) => ({ to: target.address, value: "0", data: target.interface.encodeFunctionData(method, args), method, }) - const updates = [ - { target: beaconGovernance, parameter: "CallbackGasLimit", value: 300_000 }, - { - target: beaconGovernance, - parameter: "DkgResultSubmissionGas", - value: 450_000, - }, - { - target: registryGovernance, - parameter: "DkgResultSubmissionGas", - value: 500_000, - }, - ] console.log( JSON.stringify( { network: network.name, chainId: (await ethers.provider.getNetwork()).chainId, - blockNumber: await ethers.provider.getBlockNumber(), - provisional: true, + blockNumber, + walletRegistry: registry.address, + walletRegistryRandomBeacon: await registry.randomBeacon(atBlock), + cappedRandomBeacon: beacon.address, + // The deployed RandomBeacon artifact is not necessarily the registry's + // actual provider. Never infer callback wiring from its parameters. + callbackUpdateGenerated: false, + currentParameters: { + beaconRelay: (await beacon.relayEntryParameters(atBlock)).map(String), + beaconGas: (await beacon.gasParameters(atBlock)).map(String), + registryGas: (await registry.gasParameters(atBlock)).map(String), + }, owners: { - randomBeacon: await beaconGovernance.owner(), - walletRegistry: await registryGovernance.owner(), + randomBeacon: await beaconGovernance.owner(atBlock), + walletRegistry: await registryGovernance.owner(atBlock), }, governanceDelays: { - randomBeacon: (await beaconGovernance.governanceDelay()).toString(), + randomBeacon: ( + await beaconGovernance.governanceDelay(atBlock) + ).toString(), walletRegistry: ( - await registryGovernance.governanceDelay() + await registryGovernance.governanceDelay(atBlock) ).toString(), }, - begin: updates.map(({ target, parameter, value }) => - call(target, `begin${parameter}Update`, [value]) + begin: updates.map(({ target, value }) => + call(target, "beginDkgResultSubmissionGasUpdate", [value as string]) ), // Submit only after each on-chain pending value and delay are checked. - finalize: updates.map(({ target, parameter }) => - call(target, `finalize${parameter}Update`) + finalize: updates.map(({ target }) => + call(target, "finalizeDkgResultSubmissionGasUpdate") ), }, null, diff --git a/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts b/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts index aea95553e7..700b0b5230 100644 --- a/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts +++ b/solidity/ecdsa/test/WalletRegistry.RandomBeacon.test.ts @@ -12,10 +12,11 @@ import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers" import type { IRandomBeacon, RandomBeaconStub, + RandomBeaconStub__factory, WalletRegistry, WalletRegistryStub, } from "../typechain" -import type { ContractTransaction } from "ethers" +import type { BigNumber, ContractTransaction } from "ethers" const { createSnapshot, restoreSnapshot } = helpers.snapshot @@ -209,12 +210,10 @@ describe("WalletRegistry - Random Beacon", async () => { await restoreSnapshot() }) - it("should use the Amsterdam-compatible callback budget", async () => { - expect(await randomBeaconMock.callbackGasLimit()).to.equal(300_000) - }) - it("should succeed", async () => { - const entry = ethers.utils.randomBytes(32) + const entry: BigNumber = ethers.BigNumber.from( + ethers.utils.randomBytes(32) + ) const tx = await randomBeaconMock.submitRelayEntry(entry) diff --git a/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts b/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts index ad5cd6f05f..91a6579477 100644 --- a/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts +++ b/solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts @@ -93,25 +93,6 @@ describe("WalletRegistry - Wallet Creation", async () => { let sortitionPool: SortitionPool let staking: TokenStaking let randomBeacon: Mock - - // Retain the pre-Glamsterdam execution-cost bounds and separately account - // for the increased fixed submission reimbursement. A missing or incorrect - // reimbursement of that configured increase still fails these assertions. - async function legacyDkgRefundSurplus( - surplus: BigNumber, - approvalTx: ContractTransaction - ): Promise { - const { dkgResultSubmissionGas } = await walletRegistry.gasParameters() - const pool = await ethers.getContractAt( - "ReimbursementPool", - await walletRegistry.reimbursementPool() - ) - const maxGasPrice = await pool.maxGasPrice() - const refundGasPrice = approvalTx.gasPrice.gt(maxGasPrice) - ? maxGasPrice - : approvalTx.gasPrice - return surplus.sub(dkgResultSubmissionGas.sub(290_000).mul(refundGasPrice)) - } let walletOwner: Mock let deployer: SignerWithAddress @@ -1718,11 +1699,8 @@ describe("WalletRegistry - Wallet Creation", async () => { it("should refund ETH to a submitter", async () => { const postDkgResultApprovalSubmitterInitialBalance = await provider.getBalance(await submitter.getAddress()) - const diff = await legacyDkgRefundSurplus( - postDkgResultApprovalSubmitterInitialBalance.sub( - submitterInitialBalance - ), - tx + const diff = postDkgResultApprovalSubmitterInitialBalance.sub( + submitterInitialBalance ) expect(diff).to.be.gt(0) @@ -2085,11 +2063,8 @@ describe("WalletRegistry - Wallet Creation", async () => { it("should refund ETH to a submitter", async () => { const postDkgResultApprovalSubmitterInitialBalance = await provider.getBalance(await submitter.getAddress()) - const diff = await legacyDkgRefundSurplus( - postDkgResultApprovalSubmitterInitialBalance.sub( - submitterInitialBalance - ), - tx + const diff = postDkgResultApprovalSubmitterInitialBalance.sub( + submitterInitialBalance ) expect(diff).to.be.gt(ethers.utils.parseUnits("-1000000", "gwei")) // -0,001 ETH @@ -2302,11 +2277,8 @@ describe("WalletRegistry - Wallet Creation", async () => { it("should refund ETH to a submitter", async () => { const postDkgResultApprovalSubmitterInitialBalance = await provider.getBalance(await submitter.getAddress()) - const diff = await legacyDkgRefundSurplus( - postDkgResultApprovalSubmitterInitialBalance.sub( - submitterInitialBalance - ), - tx + const diff = postDkgResultApprovalSubmitterInitialBalance.sub( + submitterInitialBalance ) expect(diff).to.be.gt(0) diff --git a/solidity/ecdsa/test/WalletRegistryGovernance.test.ts b/solidity/ecdsa/test/WalletRegistryGovernance.test.ts index 137337344b..1d63b8c42e 100644 --- a/solidity/ecdsa/test/WalletRegistryGovernance.test.ts +++ b/solidity/ecdsa/test/WalletRegistryGovernance.test.ts @@ -48,7 +48,7 @@ describe("WalletRegistryGovernance", async () => { const initialAuthorizationDecreaseChangePeriod = 3888000 // 45 days const initialMaliciousDkgResultSlashingAmount = to1e18(400) const initialMaliciousDkgResultNotificationRewardMultiplier = 100 - const initialDkgResultSubmissionGas = 500_000 + const initialDkgResultSubmissionGas = 290_000 const initialDkgResultApprovalGasOffset = 72_000 const initialNotifyOperatorInactivityGasOffset = 93_000 const initialNotifySeedTimeoutGasOffset = 7_250 diff --git a/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py b/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py index 9e90eeee5f..a62fda186f 100644 --- a/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py +++ b/solidity/ecdsa/test/glamsterdam/wallet_registry_callback_eels.py @@ -1,4 +1,9 @@ -"""Run the deployed WalletRegistry callback bytecode under Osaka/Amsterdam.""" +"""Test deployed registry bytecode with hypothetical capped-beacon wiring. + +This fixture assigns synthetic registry storage to the capped RandomBeacon. +The live mainnet registry has used uncapped RandomBeaconChaosnet since January +2023. These assertions do not reproduce its current wallet-creation path. +""" import json from pathlib import Path @@ -87,6 +92,7 @@ def make_pre_state(use_proxy: bool = False) -> State: # WalletRegistry layout: dkg begins at slot 151; its sortitionPool is +0, # startBlock is +8 and seed is +9. randomBeacon is slot 262. set_storage(state, TARGET, slot(151), U256.from_be_bytes(SORTITION_POOL)) + # Synthetic provider wiring, NOT the current live registry storage value. set_storage(state, TARGET, slot(262), U256.from_be_bytes(ORIGIN)) return state diff --git a/solidity/random-beacon/README.adoc b/solidity/random-beacon/README.adoc index dee39f899a..d1448f1f80 100644 --- a/solidity/random-beacon/README.adoc +++ b/solidity/random-beacon/README.adoc @@ -375,7 +375,7 @@ _~24h assuming 15s block time_ |callbackGasLimit |Relay entry callback gas limit. |Yes -d|`300_000` +d|`64_000` 4+s|Slashing @@ -428,7 +428,7 @@ inactive for other reasons. |Calculated gas cost for submitting a DKG result. This will be refunded as part of the DKG approval process. |Yes -|`450_000` (provisional Glamsterdam budget; see `docs/glamsterdam-migration.md`) +|`235_000` |dkgResultApprovalGasOffset |Gas that is meant to balance the DKG result approval's overall cost. diff --git a/solidity/random-beacon/contracts/RandomBeacon.sol b/solidity/random-beacon/contracts/RandomBeacon.sol index 003816a781..8f0840c837 100644 --- a/solidity/random-beacon/contracts/RandomBeacon.sol +++ b/solidity/random-beacon/contracts/RandomBeacon.sol @@ -449,10 +449,11 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { // Relay entry hard timeout is set to ~48h assuming 15s block time. relay.setTimeouts(1_280, 5_760); - // Includes margin above the 240,768 gas measured for the deployed - // WalletRegistry proxy callback under the Amsterdam gas schedule. - // Existing deployments require a governance parameter update. - _callbackGasLimit = 300_000; + // Callback gas limit is set to 56k units of gas. As of April 2022, it + // is enough to store new entry and block number on-chain. + // If the cost of EVM opcodes change over time, these parameters will + // have to be updated. + _callbackGasLimit = 64_000; // Group lifetime is set to 45 days assuming 15s block time. // @@ -467,10 +468,7 @@ contract RandomBeacon is IRandomBeacon, IApplication, Governable, Reimbursable { // Gas parameters were adjusted based on Ethereum state in April 2022. // If the cost of EVM opcodes change over time, these parameters will // have to be updated. - // Amsterdam adds 175,840 gas for the two fresh DKG result slots. - // This provisional budget includes margin and must be rebenchmarked - // against the final fork rules before activation. - _dkgResultSubmissionGas = 450_000; + _dkgResultSubmissionGas = 237_650; _dkgResultApprovalGasOffset = 41_500; _notifyOperatorInactivityGasOffset = 54_500; _relayEntrySubmissionGasOffset = 11_250; diff --git a/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts b/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts index 00d377c2db..839f720b95 100644 --- a/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts +++ b/solidity/random-beacon/test/RandomBeacon.GroupCreation.test.ts @@ -82,25 +82,6 @@ describe("RandomBeacon - Group Creation", () => { let staking: TokenStaking let t: T - // These balance bounds were calibrated on the pre-Glamsterdam EVM. Keep - // checking the same execution-cost surplus while requiring the configured - // increase in the fixed DKG submission reimbursement to be paid in full. - async function legacyDkgRefundSurplus( - surplus: BigNumber, - approvalTx: ContractTransaction - ): Promise { - const { dkgResultSubmissionGas } = await randomBeacon.gasParameters() - const pool = await ethers.getContractAt( - "ReimbursementPool", - await randomBeacon.reimbursementPool() - ) - const maxGasPrice = await pool.maxGasPrice() - const refundGasPrice = approvalTx.gasPrice.gt(maxGasPrice) - ? maxGasPrice - : approvalTx.gasPrice - return surplus.sub(dkgResultSubmissionGas.sub(237_650).mul(refundGasPrice)) - } - before(async () => { ;[thirdParty] = await helpers.signers.getUnnamedSigners() let randomBeaconStub: RandomBeaconTest @@ -1596,10 +1577,7 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = await legacyDkgRefundSurplus( - postBalance.sub(submitterInitialBalance), - tx - ) + const diff = postBalance.sub(submitterInitialBalance) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1804,10 +1782,7 @@ describe("RandomBeacon - Group Creation", () => { const postBalance = await provider.getBalance( anotherSubmitter.address ) - const diff = await legacyDkgRefundSurplus( - postBalance.sub(anotherSubmitterInitialBalance), - tx - ) + const diff = postBalance.sub(anotherSubmitterInitialBalance) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1920,10 +1895,7 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = await legacyDkgRefundSurplus( - postBalance.sub(submitterInitialBalance), - tx - ) + const diff = postBalance.sub(submitterInitialBalance) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -1971,10 +1943,7 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = await legacyDkgRefundSurplus( - postBalance.sub(submitterInitialBalance), - await tx - ) + const diff = postBalance.sub(submitterInitialBalance) expect(diff).to.be.gt(0) expect(diff).to.be.lt( @@ -2019,10 +1988,7 @@ describe("RandomBeacon - Group Creation", () => { it("should refund ETH", async () => { const postBalance = await provider.getBalance(submitter.address) - const diff = await legacyDkgRefundSurplus( - postBalance.sub(submitterInitialBalance), - await tx - ) + const diff = postBalance.sub(submitterInitialBalance) expect(diff).to.be.gt(0) expect(diff).to.be.lt( diff --git a/solidity/random-beacon/test/fixtures/index.ts b/solidity/random-beacon/test/fixtures/index.ts index a520c0b465..8872d8c9db 100644 --- a/solidity/random-beacon/test/fixtures/index.ts +++ b/solidity/random-beacon/test/fixtures/index.ts @@ -34,7 +34,7 @@ export const params = { governanceDelay: 604_800, // 1 week relayEntrySoftTimeout: 35, relayEntryHardTimeout: 100, - callbackGasLimit: 300_000, + callbackGasLimit: 200_000, groupCreationFrequency: 10, groupLifetime: 5761, // 1 day in blocks assuming 15s block time dkgResultChallengePeriodLength: 100, @@ -53,7 +53,7 @@ export const params = { authorizationDecreaseChangePeriod: 403_200, reimbursementPoolStaticGas: 40_800, reimbursementPoolMaxGasPrice: ethers.utils.parseUnits("500", "gwei"), - dkgResultSubmissionGas: 450_000, + dkgResultSubmissionGas: 237_650, dkgResultApprovalGasOffset: 41_500, notifyOperatorInactivityGasOffset: 54_500, relayEntrySubmissionGasOffset: 11_250, From 996bbef72158d8804ff34d4e0236dfafbc77fcbe Mon Sep 17 00:00:00 2001 From: maclane Date: Sat, 7 Nov 2026 12:26:51 -0600 Subject: [PATCH 5/5] docs: distinguish gas coverage from ETH reimbursement --- docs/glamsterdam-migration.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/glamsterdam-migration.md b/docs/glamsterdam-migration.md index a33c887c88..f7378b120f 100644 --- a/docs/glamsterdam-migration.md +++ b/docs/glamsterdam-migration.md @@ -44,11 +44,13 @@ final transaction settlement, so `gasleft()` cannot observe it even below a `2^24` transaction gas limit. Adding only the two fresh-slot cost increases misses this mechanism; the earlier 450k/500k proposals were not justified. -A supplied Sepolia lab report says a WalletRegistry allowance of 920k covered -the full cost of a real 100-member DKG, and was then restored. Treat 920k as a -reported benchmark candidate until its receipts, signature count, gas prices, -approval measurement and reimbursement are independently checked. Do not copy it -to RandomBeacon: that DKG uses a different result shape and 64 members. +A supplied Sepolia benchmark proposes a WalletRegistry allowance of 920k. +Treat it as a candidate for that measured path, not a mainnet quote. Covering +gas units does not guarantee full ETH reimbursement: submission and approval +can use different effective gas prices, and the pool pays at its capped +approval-transaction price. Check both receipts, signature count, implementation, +approval measurement and credited ETH. Do not copy the value to RandomBeacon: +that DKG uses a different result shape and 64 members. Benchmark the complete submission **and** approval transactions, using actual receipts and credited ETH at the pool's capped reimbursement gas price. Include