Skip to content

N
nebula
Commit 44a2d9ce authored by smartcontracts's avatar smartcontracts Committed by GitHub
Browse files
Options

feat: deploy and devnet tests for FPAC (#9325) 

Updates contract deployments to include a new config value that
will deploy OptimismPortal2 over OptimismPortal. Updates devnet
tests to also include a new environment variable that will trigger
this deployment and run SDK tests for this deployment.
parent c0d0db91
Hide whitespace changes
Inline Side-by-side
Showing with 583 additions and 112 deletions
.changeset/spicy-pears-smile.md 0 → 100644
View file @ 44a2d9ce
---
'@eth-optimism/sdk': minor
---
Updates the SDK to support FPAC in a backwards compatible way.
.circleci/config.yml
View file @ 44a2d9ce
......@@ -1020,9 +1020,13 @@ jobs:
devnet:
machine:
image: <<pipeline.parameters.base_image>>
parameters:
devnet_fpac:
type: string
environment:
DOCKER_BUILDKIT: 1
DEVNET_NO_BUILD: 'true'
DEVNET_FPAC: <<parameters.devnet_fpac>>
steps:
- checkout
- check-changed:
......@@ -1123,12 +1127,23 @@ jobs:
command: |
docker logs ops-bedrock-op-proposer-1 || echo "No logs."
when: on_fail
- run:
name: Dump op-challenger logs
command: |
docker logs ops-bedrock-op-challenger-1 || echo "No logs."
when: on_fail
- run:
name: Log deployment artifact
command: |
cat broadcast/Deploy.s.sol/900/run-latest.json || echo "No deployment file found"
when: on_fail
working_directory: packages/contracts-bedrock
- run:
name: Log devnet config
command: |
cat deploy-config/devnetL1.json || echo "No devnet config found"
when: on_fail
working_directory: packages/contracts-bedrock
- run:
name: Log artifacts directory
command: |
......@@ -1613,6 +1628,9 @@ workflows:
requires:
- go-mod-download
- devnet:
matrix:
parameters:
devnet_fpac: ["false", "true"]
requires:
- pnpm-monorepo
- op-batcher-docker-build
......
bedrock-devnet/devnet/__init__.py
View file @ 44a2d9ce
......@@ -26,6 +26,10 @@ parser.add_argument('--test', help='Tests the deployment, must already be deploy
log = logging.getLogger()
# Global environment variables
DEVNET_NO_BUILD = os.getenv('DEVNET_NO_BUILD') == "true"
DEVNET_FPAC = os.getenv('DEVNET_FPAC') == "true"
class Bunch:
def __init__(self, **kwds):
self.__dict__.update(kwds)
......@@ -104,7 +108,7 @@ def main():
git_date = subprocess.run(['git', 'show', '-s', "--format=%ct"], capture_output=True, text=True).stdout.strip()
# CI loads the images from workspace, and does not otherwise know the images are good as-is
if os.getenv('DEVNET_NO_BUILD') == "true":
if DEVNET_NO_BUILD:
log.info('Skipping docker images build')
else:
log.info(f'Building docker images for git commit {git_commit} ({git_date})')
......@@ -123,6 +127,9 @@ def init_devnet_l1_deploy_config(paths, update_timestamp=False):
deploy_config = read_json(paths.devnet_config_template_path)
if update_timestamp:
deploy_config['l1GenesisBlockTimestamp'] = '{:#x}'.format(int(time.time()))
if DEVNET_FPAC:
deploy_config['useFaultProofs'] = True
deploy_config['faultGameMaxDuration'] = 10
write_json(paths.devnet_config_path, deploy_config)
def devnet_l1_genesis(paths):
......@@ -146,7 +153,11 @@ def devnet_deploy(paths):
log.info('L1 genesis already generated.')
else:
log.info('Generating L1 genesis.')
if os.path.exists(paths.allocs_path) == False:
if os.path.exists(paths.allocs_path) == False or DEVNET_FPAC == True:
# If this is the FPAC devnet then we need to generate the allocs
# file here always. This is because CI will run devnet-allocs
# without DEVNET_FPAC=true which means the allocs will be wrong.
# Re-running this step means the allocs will be correct.
devnet_l1_genesis(paths)
# It's odd that we want to regenerate the devnetL1.json file with
......@@ -186,30 +197,49 @@ def devnet_deploy(paths):
rollup_config = read_json(paths.rollup_config_path)
addresses = read_json(paths.addresses_json_path)
# Start the L2.
log.info('Bringing up L2.')
run_command(['docker', 'compose', 'up', '-d', 'l2'], cwd=paths.ops_bedrock_dir, env={
'PWD': paths.ops_bedrock_dir
})
# Wait for the L2 to be available.
wait_up(9545)
wait_for_rpc_server('127.0.0.1:9545')
# Print out the addresses being used for easier debugging.
l2_output_oracle = addresses['L2OutputOracleProxy']
log.info(f'Using L2OutputOracle {l2_output_oracle}')
dispute_game_factory = addresses['DisputeGameFactoryProxy']
batch_inbox_address = rollup_config['batch_inbox_address']
log.info(f'Using L2OutputOracle {l2_output_oracle}')
log.info(f'Using DisputeGameFactory {dispute_game_factory}')
log.info(f'Using batch inbox {batch_inbox_address}')
log.info('Bringing up `op-node`, `op-proposer` and `op-batcher`.')
run_command(['docker', 'compose', 'up', '-d', 'op-node', 'op-proposer', 'op-batcher'], cwd=paths.ops_bedrock_dir, env={
# Set up the base docker environment.
docker_env = {
'PWD': paths.ops_bedrock_dir,
'L2OO_ADDRESS': l2_output_oracle,
'SEQUENCER_BATCH_INBOX_ADDRESS': batch_inbox_address
})
}
# Selectively set the L2OO_ADDRESS or DGF_ADDRESS if using FPAC.
# Must be done selectively because op-proposer throws if both are set.
if DEVNET_FPAC:
docker_env['DGF_ADDRESS'] = dispute_game_factory
docker_env['DG_TYPE'] = '0'
docker_env['PROPOSAL_INTERVAL'] = '10s'
else:
docker_env['L2OO_ADDRESS'] = l2_output_oracle
log.info('Bringing up `artifact-server`')
run_command(['docker', 'compose', 'up', '-d', 'artifact-server'], cwd=paths.ops_bedrock_dir, env={
'PWD': paths.ops_bedrock_dir
})
# Bring up the rest of the services.
log.info('Bringing up `op-node`, `op-proposer` and `op-batcher`.')
run_command(['docker', 'compose', 'up', '-d', 'op-node', 'op-proposer', 'op-batcher', 'artifact-server'], cwd=paths.ops_bedrock_dir, env=docker_env)
# Optionally bring up op-challenger.
if DEVNET_FPAC:
log.info('Bringing up `op-challenger`.')
run_command(['docker', 'compose', 'up', '-d', 'op-challenger'], cwd=paths.ops_bedrock_dir, env=docker_env)
# Fin.
log.info('Devnet ready.')
def wait_for_rpc_server(url):
......
op-bindings/bindings/disputegamefactory.go
View file @ 44a2d9ce
......@@ -30,14 +30,17 @@ var (
// IDisputeGameFactoryGameSearchResult is an auto generated low-level Go binding around an user-defined struct.
type IDisputeGameFactoryGameSearchResult struct {
Index *big.Int
Metadata [32]byte
Index *big.Int
Metadata [32]byte
Timestamp uint64
RootClaim [32]byte
ExtraData []byte
}
// DisputeGameFactoryMetaData contains all meta data concerning the DisputeGameFactory contract.
var DisputeGameFactoryMetaData = &bind.MetaData{
ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"create\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"proxy_\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"findLatestGames\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_start\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_n\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"games_\",\"type\":\"tuple[]\",\"internalType\":\"structIDisputeGameFactory.GameSearchResult[]\",\"components\":[{\"name\":\"index\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"metadata\",\"type\":\"bytes32\",\"internalType\":\"GameId\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gameAtIndex\",\"inputs\":[{\"name\":\"_index\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"gameType_\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"timestamp_\",\"type\":\"uint64\",\"internalType\":\"Timestamp\"},{\"name\":\"proxy_\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gameCount\",\"inputs\":[],\"outputs\":[{\"name\":\"gameCount_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gameImpls\",\"inputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"GameType\"}],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"games\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"proxy_\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"},{\"name\":\"timestamp_\",\"type\":\"uint64\",\"internalType\":\"Timestamp\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getGameUUID\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"uuid_\",\"type\":\"bytes32\",\"internalType\":\"Hash\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"initBonds\",\"inputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"GameType\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setImplementation\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_impl\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setInitBond\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_initBond\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"event\",\"name\":\"DisputeGameCreated\",\"inputs\":[{\"name\":\"disputeProxy\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"gameType\",\"type\":\"uint32\",\"indexed\":true,\"internalType\":\"GameType\"},{\"name\":\"rootClaim\",\"type\":\"bytes32\",\"indexed\":true,\"internalType\":\"Claim\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"ImplementationSet\",\"inputs\":[{\"name\":\"impl\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"gameType\",\"type\":\"uint32\",\"indexed\":true,\"internalType\":\"GameType\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"InitBondUpdated\",\"inputs\":[{\"name\":\"gameType\",\"type\":\"uint32\",\"indexed\":true,\"internalType\":\"GameType\"},{\"name\":\"newBond\",\"type\":\"uint256\",\"indexed\":true,\"internalType\":\"uint256\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"GameAlreadyExists\",\"inputs\":[{\"name\":\"uuid\",\"type\":\"bytes32\",\"internalType\":\"Hash\"}]},{\"type\":\"error\",\"name\":\"InsufficientBond\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"NoImplementation\",\"inputs\":[{\"name\":\"gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"}]}]",
Bin: "0x60806040523480156200001157600080fd5b506200001e600062000024565b62000292565b600054610100900460ff1615808015620000455750600054600160ff909116105b8062000075575062000062306200016260201b62000b721760201c565b15801562000075575060005460ff166001145b620000de5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801562000102576000805461ff0019166101001790555b6200010c62000171565b6200011782620001d9565b80156200015e576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050565b6001600160a01b03163b151590565b600054610100900460ff16620001cd5760405162461bcd60e51b815260206004820152602b6024820152600080516020620014f483398151915260448201526a6e697469616c697a696e6760a81b6064820152608401620000d5565b620001d76200022b565b565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600054610100900460ff16620002875760405162461bcd60e51b815260206004820152602b6024820152600080516020620014f483398151915260448201526a6e697469616c697a696e6760a81b6064820152608401620000d5565b620001d733620001d9565b61125280620002a26000396000f3fe6080604052600436106100e85760003560e01c80636593dc6e1161008a57806396cd97201161005957806396cd972014610313578063bb8aa1fc14610333578063c4d66de814610394578063f2fde38b146103b457600080fd5b80636593dc6e14610293578063715018a6146102c057806382ecf2f6146102d55780638da5cb5b146102e857600080fd5b8063254bd683116100c6578063254bd6831461019c5780634d1975b4146101c957806354fd4d50146101e85780635f0150cb1461023e57600080fd5b806314f6b1a3146100ed5780631b685b9e1461010f5780631e3342401461017c575b600080fd5b3480156100f957600080fd5b5061010d610108366004610f2f565b6103d4565b005b34801561011b57600080fd5b5061015261012a366004610f66565b60656020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561018857600080fd5b5061010d610197366004610f81565b61045e565b3480156101a857600080fd5b506101bc6101b7366004610fab565b6104aa565b6040516101739190610fde565b3480156101d557600080fd5b506068545b604051908152602001610173565b3480156101f457600080fd5b506102316040518060400160405280600581526020017f302e302e3900000000000000000000000000000000000000000000000000000081525081565b604051610173919061102d565b34801561024a57600080fd5b5061025e6102593660046110a0565b610597565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835267ffffffffffffffff909116602083015201610173565b34801561029f57600080fd5b506101da6102ae366004610f66565b60666020526000908152604090205481565b3480156102cc57600080fd5b5061010d6105ea565b6101526102e33660046110a0565b6105fe565b3480156102f457600080fd5b5060335473ffffffffffffffffffffffffffffffffffffffff16610152565b34801561031f57600080fd5b506101da61032e3660046110a0565b610884565b34801561033f57600080fd5b5061035361034e366004611127565b6108bd565b6040805163ffffffff909416845267ffffffffffffffff909216602084015273ffffffffffffffffffffffffffffffffffffffff1690820152606001610173565b3480156103a057600080fd5b5061010d6103af366004611140565b61091f565b3480156103c057600080fd5b5061010d6103cf366004611140565b610abb565b6103dc610b8e565b63ffffffff821660008181526065602052604080822080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8616908117909155905190917fff513d80e2c7fa487608f70a618dfbc0cf415699dc69588c747e8c71566c88de91a35050565b610466610b8e565b63ffffffff8216600081815260666020526040808220849055518392917f74d6665c4b26d5596a5aa13d3014e0c06af4d322075a797f87b03cd4c5bc91ca91a35050565b606854606090831015806104bc575081155b610590575060408051600583901b8101602001909152825b83811161058e576000606882815481106104f0576104f061115d565b600091825260209091200154905060e081901c60ff808816908216036105655760018451018452604051806040016040528084815260200183815250846001865161053b919061118c565b8151811061054b5761054b61115d565b60200260200101819052508484511061056557505061058e565b50507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff016104d4565b505b9392505050565b60008060006105a887878787610884565b60009081526067602052604090205473ffffffffffffffffffffffffffffffffffffffff81169860a09190911c67ffffffffffffffff16975095505050505050565b6105f2610b8e565b6105fc6000610c0f565b565b63ffffffff841660009081526065602052604081205473ffffffffffffffffffffffffffffffffffffffff168061066e576040517f031c6de400000000000000000000000000000000000000000000000000000000815263ffffffff871660048201526024015b60405180910390fd5b63ffffffff86166000908152606660205260409020543410156106bd576040517fe92c469f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107208585856040516020016106d5939291906111ca565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905273ffffffffffffffffffffffffffffffffffffffff831690610c86565b91508173ffffffffffffffffffffffffffffffffffffffff16638129fc1c346040518263ffffffff1660e01b81526004016000604051808303818588803b15801561076a57600080fd5b505af115801561077e573d6000803e3d6000fd5b5050505050600061079187878787610884565b600081815260676020526040902054909150156107dd576040517f014f6fe500000000000000000000000000000000000000000000000000000000815260048101829052602401610665565b60004260a01b60e089901b178417600083815260676020526040808220839055606880546001810182559083527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977530183905551919250889163ffffffff8b169173ffffffffffffffffffffffffffffffffffffffff8816917f5b565efe82411da98814f356d0e7bcb8f0219b8d970307c5afb4a6903a8b2e359190a4505050949350505050565b60008484848460405160200161089d94939291906111e4565b604051602081830303815290604052805190602001209050949350505050565b6000806000610912606885815481106108d8576108d861115d565b906000526020600020015460e081901c9160a082901c67ffffffffffffffff169173ffffffffffffffffffffffffffffffffffffffff1690565b9196909550909350915050565b600054610100900460ff161580801561093f5750600054600160ff909116105b806109595750303b158015610959575060005460ff166001145b6109e5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a65640000000000000000000000000000000000006064820152608401610665565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790558015610a4357600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b610a4b610dba565b610a5482610c0f565b8015610ab757600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050565b610ac3610b8e565b73ffffffffffffffffffffffffffffffffffffffff8116610b66576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610665565b610b6f81610c0f565b50565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b60335473ffffffffffffffffffffffffffffffffffffffff1633146105fc576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610665565b6033805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b60006002825101603f8101600a81036040518360581b8260e81b177f6100003d81600a3d39f3363d3d373d3d3d3d610000806035363936013d7300001781528660601b601e8201527f5af43d3d93803e603357fd5bf300000000000000000000000000000000000000603282015285519150603f8101602087015b60208410610d3e57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09093019260209182019101610d01565b517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff602085900360031b1b16815260f085901b9083015282816000f0945084610dab577febfef1880000000000000000000000000000000000000000000000000000000060005260206000fd5b90910160405250909392505050565b600054610100900460ff16610e51576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610665565b6105fc600054610100900460ff16610eeb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610665565b6105fc33610c0f565b803563ffffffff81168114610f0857600080fd5b919050565b73ffffffffffffffffffffffffffffffffffffffff81168114610b6f57600080fd5b60008060408385031215610f4257600080fd5b610f4b83610ef4565b91506020830135610f5b81610f0d565b809150509250929050565b600060208284031215610f7857600080fd5b61059082610ef4565b60008060408385031215610f9457600080fd5b610f9d83610ef4565b946020939093013593505050565b600080600060608486031215610fc057600080fd5b610fc984610ef4565b95602085013595506040909401359392505050565b602080825282518282018190526000919060409081850190868401855b8281101561102057815180518552860151868501529284019290850190600101610ffb565b5091979650505050505050565b600060208083528351808285015260005b8181101561105a5785810183015185820160400152820161103e565b8181111561106c576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b600080600080606085870312156110b657600080fd5b6110bf85610ef4565b935060208501359250604085013567ffffffffffffffff808211156110e357600080fd5b818701915087601f8301126110f757600080fd5b81358181111561110657600080fd5b88602082850101111561111857600080fd5b95989497505060200194505050565b60006020828403121561113957600080fd5b5035919050565b60006020828403121561115257600080fd5b813561059081610f0d565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000828210156111c5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b500390565b838152818360208301376000910160200190815292915050565b63ffffffff8516815283602082015260606040820152816060820152818360808301376000818301608090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101939250505056fea164736f6c634300080f000a496e697469616c697a61626c653a20636f6e7472616374206973206e6f742069",
ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"create\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"proxy_\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"findLatestGames\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_start\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_n\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"games_\",\"type\":\"tuple[]\",\"internalType\":\"structIDisputeGameFactory.GameSearchResult[]\",\"components\":[{\"name\":\"index\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"metadata\",\"type\":\"bytes32\",\"internalType\":\"GameId\"},{\"name\":\"timestamp\",\"type\":\"uint64\",\"internalType\":\"Timestamp\"},{\"name\":\"rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gameAtIndex\",\"inputs\":[{\"name\":\"_index\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[{\"name\":\"gameType_\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"timestamp_\",\"type\":\"uint64\",\"internalType\":\"Timestamp\"},{\"name\":\"proxy_\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gameCount\",\"inputs\":[],\"outputs\":[{\"name\":\"gameCount_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gameImpls\",\"inputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"GameType\"}],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"games\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"proxy_\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"},{\"name\":\"timestamp_\",\"type\":\"uint64\",\"internalType\":\"Timestamp\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"getGameUUID\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_rootClaim\",\"type\":\"bytes32\",\"internalType\":\"Claim\"},{\"name\":\"_extraData\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[{\"name\":\"uuid_\",\"type\":\"bytes32\",\"internalType\":\"Hash\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"initBonds\",\"inputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"GameType\"}],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setImplementation\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_impl\",\"type\":\"address\",\"internalType\":\"contractIDisputeGame\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setInitBond\",\"inputs\":[{\"name\":\"_gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"},{\"name\":\"_initBond\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"event\",\"name\":\"DisputeGameCreated\",\"inputs\":[{\"name\":\"disputeProxy\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"gameType\",\"type\":\"uint32\",\"indexed\":true,\"internalType\":\"GameType\"},{\"name\":\"rootClaim\",\"type\":\"bytes32\",\"indexed\":true,\"internalType\":\"Claim\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"ImplementationSet\",\"inputs\":[{\"name\":\"impl\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"gameType\",\"type\":\"uint32\",\"indexed\":true,\"internalType\":\"GameType\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"InitBondUpdated\",\"inputs\":[{\"name\":\"gameType\",\"type\":\"uint32\",\"indexed\":true,\"internalType\":\"GameType\"},{\"name\":\"newBond\",\"type\":\"uint256\",\"indexed\":true,\"internalType\":\"uint256\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"GameAlreadyExists\",\"inputs\":[{\"name\":\"uuid\",\"type\":\"bytes32\",\"internalType\":\"Hash\"}]},{\"type\":\"error\",\"name\":\"InsufficientBond\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"NoImplementation\",\"inputs\":[{\"name\":\"gameType\",\"type\":\"uint32\",\"internalType\":\"GameType\"}]}]",
Bin: "0x60806040523480156200001157600080fd5b506200001e600062000024565b62000292565b600054610100900460ff1615808015620000455750600054600160ff909116105b8062000075575062000062306200016260201b62000cc91760201c565b15801562000075575060005460ff166001145b620000de5760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801562000102576000805461ff0019166101001790555b6200010c62000171565b6200011782620001d9565b80156200015e576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050565b6001600160a01b03163b151590565b600054610100900460ff16620001cd5760405162461bcd60e51b815260206004820152602b6024820152600080516020620017e683398151915260448201526a6e697469616c697a696e6760a81b6064820152608401620000d5565b620001d76200022b565b565b603380546001600160a01b038381166001600160a01b0319831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b600054610100900460ff16620002875760405162461bcd60e51b815260206004820152602b6024820152600080516020620017e683398151915260448201526a6e697469616c697a696e6760a81b6064820152608401620000d5565b620001d733620001d9565b61154480620002a26000396000f3fe6080604052600436106100e85760003560e01c80636593dc6e1161008a57806396cd97201161005957806396cd972014610313578063bb8aa1fc14610333578063c4d66de814610394578063f2fde38b146103b457600080fd5b80636593dc6e14610293578063715018a6146102c057806382ecf2f6146102d55780638da5cb5b146102e857600080fd5b8063254bd683116100c6578063254bd6831461019c5780634d1975b4146101c957806354fd4d50146101e85780635f0150cb1461023e57600080fd5b806314f6b1a3146100ed5780631b685b9e1461010f5780631e3342401461017c575b600080fd5b3480156100f957600080fd5b5061010d610108366004611086565b6103d4565b005b34801561011b57600080fd5b5061015261012a3660046110bd565b60656020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561018857600080fd5b5061010d6101973660046110d8565b61045e565b3480156101a857600080fd5b506101bc6101b7366004611102565b6104aa565b60405161017391906111af565b3480156101d557600080fd5b506068545b604051908152602001610173565b3480156101f457600080fd5b506102316040518060400160405280600581526020017f302e302e3900000000000000000000000000000000000000000000000000000081525081565b604051610173919061126c565b34801561024a57600080fd5b5061025e61025936600461127f565b6106ee565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835267ffffffffffffffff909116602083015201610173565b34801561029f57600080fd5b506101da6102ae3660046110bd565b60666020526000908152604090205481565b3480156102cc57600080fd5b5061010d610741565b6101526102e336600461127f565b610755565b3480156102f457600080fd5b5060335473ffffffffffffffffffffffffffffffffffffffff16610152565b34801561031f57600080fd5b506101da61032e36600461127f565b6109db565b34801561033f57600080fd5b5061035361034e366004611306565b610a14565b6040805163ffffffff909416845267ffffffffffffffff909216602084015273ffffffffffffffffffffffffffffffffffffffff1690820152606001610173565b3480156103a057600080fd5b5061010d6103af36600461131f565b610a76565b3480156103c057600080fd5b5061010d6103cf36600461131f565b610c12565b6103dc610ce5565b63ffffffff821660008181526065602052604080822080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8616908117909155905190917fff513d80e2c7fa487608f70a618dfbc0cf415699dc69588c747e8c71566c88de91a35050565b610466610ce5565b63ffffffff8216600081815260666020526040808220849055518392917f74d6665c4b26d5596a5aa13d3014e0c06af4d322075a797f87b03cd4c5bc91ca91a35050565b606854606090831015806104bc575081155b6106e7575060408051600583901b8101602001909152825b8381116106e5576000606882815481106104f0576104f061133c565b600091825260209091200154905060e081901c67ffffffffffffffff60a083901c1673ffffffffffffffffffffffffffffffffffffffff831660ff808a16908416036106b6576001865101865260008173ffffffffffffffffffffffffffffffffffffffff1663609d33346040518163ffffffff1660e01b8152600401600060405180830381865afa15801561058a573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526105d0919081019061139a565b905060008273ffffffffffffffffffffffffffffffffffffffff1663bcef3b556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561061f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106439190611465565b90506040518060a001604052808881526020018781526020018567ffffffffffffffff168152602001828152602001838152508860018a51610685919061147e565b815181106106955761069561133c565b6020026020010181905250888851106106b3575050505050506106e5565b50505b50507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90920191506104d49050565b505b9392505050565b60008060006106ff878787876109db565b60009081526067602052604090205473ffffffffffffffffffffffffffffffffffffffff81169860a09190911c67ffffffffffffffff16975095505050505050565b610749610ce5565b6107536000610d66565b565b63ffffffff841660009081526065602052604081205473ffffffffffffffffffffffffffffffffffffffff16806107c5576040517f031c6de400000000000000000000000000000000000000000000000000000000815263ffffffff871660048201526024015b60405180910390fd5b63ffffffff8616600090815260666020526040902054341015610814576040517fe92c469f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61087785858560405160200161082c939291906114bc565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905273ffffffffffffffffffffffffffffffffffffffff831690610ddd565b91508173ffffffffffffffffffffffffffffffffffffffff16638129fc1c346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156108c157600080fd5b505af11580156108d5573d6000803e3d6000fd5b505050505060006108e8878787876109db565b60008181526067602052604090205490915015610934576040517f014f6fe5000000000000000000000000000000000000000000000000000000008152600481018290526024016107bc565b60004260a01b60e089901b178417600083815260676020526040808220839055606880546001810182559083527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977530183905551919250889163ffffffff8b169173ffffffffffffffffffffffffffffffffffffffff8816917f5b565efe82411da98814f356d0e7bcb8f0219b8d970307c5afb4a6903a8b2e359190a4505050949350505050565b6000848484846040516020016109f494939291906114d6565b604051602081830303815290604052805190602001209050949350505050565b6000806000610a6960688581548110610a2f57610a2f61133c565b906000526020600020015460e081901c9160a082901c67ffffffffffffffff169173ffffffffffffffffffffffffffffffffffffffff1690565b9196909550909350915050565b600054610100900460ff1615808015610a965750600054600160ff909116105b80610ab05750303b158015610ab0575060005460ff166001145b610b3c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084016107bc565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790558015610b9a57600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b610ba2610f11565b610bab82610d66565b8015610c0e57600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050565b610c1a610ce5565b73ffffffffffffffffffffffffffffffffffffffff8116610cbd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016107bc565b610cc681610d66565b50565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b60335473ffffffffffffffffffffffffffffffffffffffff163314610753576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016107bc565b6033805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b60006002825101603f8101600a81036040518360581b8260e81b177f6100003d81600a3d39f3363d3d373d3d3d3d610000806035363936013d7300001781528660601b601e8201527f5af43d3d93803e603357fd5bf300000000000000000000000000000000000000603282015285519150603f8101602087015b60208410610e9557805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09093019260209182019101610e58565b517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff602085900360031b1b16815260f085901b9083015282816000f0945084610f02577febfef1880000000000000000000000000000000000000000000000000000000060005260206000fd5b90910160405250909392505050565b600054610100900460ff16610fa8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e6700000000000000000000000000000000000000000060648201526084016107bc565b610753600054610100900460ff16611042576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e6700000000000000000000000000000000000000000060648201526084016107bc565b61075333610d66565b803563ffffffff8116811461105f57600080fd5b919050565b73ffffffffffffffffffffffffffffffffffffffff81168114610cc657600080fd5b6000806040838503121561109957600080fd5b6110a28361104b565b915060208301356110b281611064565b809150509250929050565b6000602082840312156110cf57600080fd5b6106e78261104b565b600080604083850312156110eb57600080fd5b6110f48361104b565b946020939093013593505050565b60008060006060848603121561111757600080fd5b6111208461104b565b95602085013595506040909401359392505050565b60005b83811015611150578181015183820152602001611138565b8381111561115f576000848401525b50505050565b6000815180845261117d816020860160208601611135565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60006020808301818452808551808352604092508286019150828160051b87010184880160005b8381101561125e578883037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc001855281518051845287810151888501528681015167ffffffffffffffff16878501526060808201519085015260809081015160a09185018290529061124a81860183611165565b9689019694505050908601906001016111d6565b509098975050505050505050565b6020815260006106e76020830184611165565b6000806000806060858703121561129557600080fd5b61129e8561104b565b935060208501359250604085013567ffffffffffffffff808211156112c257600080fd5b818701915087601f8301126112d657600080fd5b8135818111156112e557600080fd5b8860208285010111156112f757600080fd5b95989497505060200194505050565b60006020828403121561131857600080fd5b5035919050565b60006020828403121561133157600080fd5b81356106e781611064565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000602082840312156113ac57600080fd5b815167ffffffffffffffff808211156113c457600080fd5b818401915084601f8301126113d857600080fd5b8151818111156113ea576113ea61136b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156114305761143061136b565b8160405282815287602084870101111561144957600080fd5b61145a836020830160208801611135565b979650505050505050565b60006020828403121561147757600080fd5b5051919050565b6000828210156114b7577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b500390565b838152818360208301376000910160200190815292915050565b63ffffffff8516815283602082015260606040820152816060820152818360808301376000818301608090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101939250505056fea164736f6c634300080f000a496e697469616c697a61626c653a20636f6e7472616374206973206e6f742069",
}
// DisputeGameFactoryABI is the input ABI used to generate the binding from.
......@@ -209,7 +212,7 @@ func (_DisputeGameFactory *DisputeGameFactoryTransactorRaw) Transact(opts *bind.
// FindLatestGames is a free data retrieval call binding the contract method 0x254bd683.
//
// Solidity: function findLatestGames(uint32 _gameType, uint256 _start, uint256 _n) view returns((uint256,bytes32)[] games_)
// Solidity: function findLatestGames(uint32 _gameType, uint256 _start, uint256 _n) view returns((uint256,bytes32,uint64,bytes32,bytes)[] games_)
func (_DisputeGameFactory *DisputeGameFactoryCaller) FindLatestGames(opts *bind.CallOpts, _gameType uint32, _start *big.Int, _n *big.Int) ([]IDisputeGameFactoryGameSearchResult, error) {
var out []interface{}
err := _DisputeGameFactory.contract.Call(opts, &out, "findLatestGames", _gameType, _start, _n)
......@@ -226,14 +229,14 @@ func (_DisputeGameFactory *DisputeGameFactoryCaller) FindLatestGames(opts *bind.
// FindLatestGames is a free data retrieval call binding the contract method 0x254bd683.
//
// Solidity: function findLatestGames(uint32 _gameType, uint256 _start, uint256 _n) view returns((uint256,bytes32)[] games_)
// Solidity: function findLatestGames(uint32 _gameType, uint256 _start, uint256 _n) view returns((uint256,bytes32,uint64,bytes32,bytes)[] games_)
func (_DisputeGameFactory *DisputeGameFactorySession) FindLatestGames(_gameType uint32, _start *big.Int, _n *big.Int) ([]IDisputeGameFactoryGameSearchResult, error) {
return _DisputeGameFactory.Contract.FindLatestGames(&_DisputeGameFactory.CallOpts, _gameType, _start, _n)
}
// FindLatestGames is a free data retrieval call binding the contract method 0x254bd683.
//
// Solidity: function findLatestGames(uint32 _gameType, uint256 _start, uint256 _n) view returns((uint256,bytes32)[] games_)
// Solidity: function findLatestGames(uint32 _gameType, uint256 _start, uint256 _n) view returns((uint256,bytes32,uint64,bytes32,bytes)[] games_)
func (_DisputeGameFactory *DisputeGameFactoryCallerSession) FindLatestGames(_gameType uint32, _start *big.Int, _n *big.Int) ([]IDisputeGameFactoryGameSearchResult, error) {
return _DisputeGameFactory.Contract.FindLatestGames(&_DisputeGameFactory.CallOpts, _gameType, _start, _n)
}
......
op-bindings/bindings/disputegamefactory_more.go
View file @ 44a2d9ce
......@@ -13,7 +13,7 @@ const DisputeGameFactoryStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"con
var DisputeGameFactoryStorageLayout = new(solc.StorageLayout)
var DisputeGameFactoryDeployedBin = "0x6080604052600436106100e85760003560e01c80636593dc6e1161008a57806396cd97201161005957806396cd972014610313578063bb8aa1fc14610333578063c4d66de814610394578063f2fde38b146103b457600080fd5b80636593dc6e14610293578063715018a6146102c057806382ecf2f6146102d55780638da5cb5b146102e857600080fd5b8063254bd683116100c6578063254bd6831461019c5780634d1975b4146101c957806354fd4d50146101e85780635f0150cb1461023e57600080fd5b806314f6b1a3146100ed5780631b685b9e1461010f5780631e3342401461017c575b600080fd5b3480156100f957600080fd5b5061010d610108366004610f2f565b6103d4565b005b34801561011b57600080fd5b5061015261012a366004610f66565b60656020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561018857600080fd5b5061010d610197366004610f81565b61045e565b3480156101a857600080fd5b506101bc6101b7366004610fab565b6104aa565b6040516101739190610fde565b3480156101d557600080fd5b506068545b604051908152602001610173565b3480156101f457600080fd5b506102316040518060400160405280600581526020017f302e302e3900000000000000000000000000000000000000000000000000000081525081565b604051610173919061102d565b34801561024a57600080fd5b5061025e6102593660046110a0565b610597565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835267ffffffffffffffff909116602083015201610173565b34801561029f57600080fd5b506101da6102ae366004610f66565b60666020526000908152604090205481565b3480156102cc57600080fd5b5061010d6105ea565b6101526102e33660046110a0565b6105fe565b3480156102f457600080fd5b5060335473ffffffffffffffffffffffffffffffffffffffff16610152565b34801561031f57600080fd5b506101da61032e3660046110a0565b610884565b34801561033f57600080fd5b5061035361034e366004611127565b6108bd565b6040805163ffffffff909416845267ffffffffffffffff909216602084015273ffffffffffffffffffffffffffffffffffffffff1690820152606001610173565b3480156103a057600080fd5b5061010d6103af366004611140565b61091f565b3480156103c057600080fd5b5061010d6103cf366004611140565b610abb565b6103dc610b8e565b63ffffffff821660008181526065602052604080822080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8616908117909155905190917fff513d80e2c7fa487608f70a618dfbc0cf415699dc69588c747e8c71566c88de91a35050565b610466610b8e565b63ffffffff8216600081815260666020526040808220849055518392917f74d6665c4b26d5596a5aa13d3014e0c06af4d322075a797f87b03cd4c5bc91ca91a35050565b606854606090831015806104bc575081155b610590575060408051600583901b8101602001909152825b83811161058e576000606882815481106104f0576104f061115d565b600091825260209091200154905060e081901c60ff808816908216036105655760018451018452604051806040016040528084815260200183815250846001865161053b919061118c565b8151811061054b5761054b61115d565b60200260200101819052508484511061056557505061058e565b50507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff016104d4565b505b9392505050565b60008060006105a887878787610884565b60009081526067602052604090205473ffffffffffffffffffffffffffffffffffffffff81169860a09190911c67ffffffffffffffff16975095505050505050565b6105f2610b8e565b6105fc6000610c0f565b565b63ffffffff841660009081526065602052604081205473ffffffffffffffffffffffffffffffffffffffff168061066e576040517f031c6de400000000000000000000000000000000000000000000000000000000815263ffffffff871660048201526024015b60405180910390fd5b63ffffffff86166000908152606660205260409020543410156106bd576040517fe92c469f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6107208585856040516020016106d5939291906111ca565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905273ffffffffffffffffffffffffffffffffffffffff831690610c86565b91508173ffffffffffffffffffffffffffffffffffffffff16638129fc1c346040518263ffffffff1660e01b81526004016000604051808303818588803b15801561076a57600080fd5b505af115801561077e573d6000803e3d6000fd5b5050505050600061079187878787610884565b600081815260676020526040902054909150156107dd576040517f014f6fe500000000000000000000000000000000000000000000000000000000815260048101829052602401610665565b60004260a01b60e089901b178417600083815260676020526040808220839055606880546001810182559083527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977530183905551919250889163ffffffff8b169173ffffffffffffffffffffffffffffffffffffffff8816917f5b565efe82411da98814f356d0e7bcb8f0219b8d970307c5afb4a6903a8b2e359190a4505050949350505050565b60008484848460405160200161089d94939291906111e4565b604051602081830303815290604052805190602001209050949350505050565b6000806000610912606885815481106108d8576108d861115d565b906000526020600020015460e081901c9160a082901c67ffffffffffffffff169173ffffffffffffffffffffffffffffffffffffffff1690565b9196909550909350915050565b600054610100900460ff161580801561093f5750600054600160ff909116105b806109595750303b158015610959575060005460ff166001145b6109e5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a65640000000000000000000000000000000000006064820152608401610665565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790558015610a4357600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b610a4b610dba565b610a5482610c0f565b8015610ab757600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050565b610ac3610b8e565b73ffffffffffffffffffffffffffffffffffffffff8116610b66576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f64647265737300000000000000000000000000000000000000000000000000006064820152608401610665565b610b6f81610c0f565b50565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b60335473ffffffffffffffffffffffffffffffffffffffff1633146105fc576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152606401610665565b6033805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b60006002825101603f8101600a81036040518360581b8260e81b177f6100003d81600a3d39f3363d3d373d3d3d3d610000806035363936013d7300001781528660601b601e8201527f5af43d3d93803e603357fd5bf300000000000000000000000000000000000000603282015285519150603f8101602087015b60208410610d3e57805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09093019260209182019101610d01565b517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff602085900360031b1b16815260f085901b9083015282816000f0945084610dab577febfef1880000000000000000000000000000000000000000000000000000000060005260206000fd5b90910160405250909392505050565b600054610100900460ff16610e51576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610665565b6105fc600054610100900460ff16610eeb576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e670000000000000000000000000000000000000000006064820152608401610665565b6105fc33610c0f565b803563ffffffff81168114610f0857600080fd5b919050565b73ffffffffffffffffffffffffffffffffffffffff81168114610b6f57600080fd5b60008060408385031215610f4257600080fd5b610f4b83610ef4565b91506020830135610f5b81610f0d565b809150509250929050565b600060208284031215610f7857600080fd5b61059082610ef4565b60008060408385031215610f9457600080fd5b610f9d83610ef4565b946020939093013593505050565b600080600060608486031215610fc057600080fd5b610fc984610ef4565b95602085013595506040909401359392505050565b602080825282518282018190526000919060409081850190868401855b8281101561102057815180518552860151868501529284019290850190600101610ffb565b5091979650505050505050565b600060208083528351808285015260005b8181101561105a5785810183015185820160400152820161103e565b8181111561106c576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b600080600080606085870312156110b657600080fd5b6110bf85610ef4565b935060208501359250604085013567ffffffffffffffff808211156110e357600080fd5b818701915087601f8301126110f757600080fd5b81358181111561110657600080fd5b88602082850101111561111857600080fd5b95989497505060200194505050565b60006020828403121561113957600080fd5b5035919050565b60006020828403121561115257600080fd5b813561059081610f0d565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000828210156111c5577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b500390565b838152818360208301376000910160200190815292915050565b63ffffffff8516815283602082015260606040820152816060820152818360808301376000818301608090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101939250505056fea164736f6c634300080f000a"
var DisputeGameFactoryDeployedBin = "0x6080604052600436106100e85760003560e01c80636593dc6e1161008a57806396cd97201161005957806396cd972014610313578063bb8aa1fc14610333578063c4d66de814610394578063f2fde38b146103b457600080fd5b80636593dc6e14610293578063715018a6146102c057806382ecf2f6146102d55780638da5cb5b146102e857600080fd5b8063254bd683116100c6578063254bd6831461019c5780634d1975b4146101c957806354fd4d50146101e85780635f0150cb1461023e57600080fd5b806314f6b1a3146100ed5780631b685b9e1461010f5780631e3342401461017c575b600080fd5b3480156100f957600080fd5b5061010d610108366004611086565b6103d4565b005b34801561011b57600080fd5b5061015261012a3660046110bd565b60656020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b34801561018857600080fd5b5061010d6101973660046110d8565b61045e565b3480156101a857600080fd5b506101bc6101b7366004611102565b6104aa565b60405161017391906111af565b3480156101d557600080fd5b506068545b604051908152602001610173565b3480156101f457600080fd5b506102316040518060400160405280600581526020017f302e302e3900000000000000000000000000000000000000000000000000000081525081565b604051610173919061126c565b34801561024a57600080fd5b5061025e61025936600461127f565b6106ee565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835267ffffffffffffffff909116602083015201610173565b34801561029f57600080fd5b506101da6102ae3660046110bd565b60666020526000908152604090205481565b3480156102cc57600080fd5b5061010d610741565b6101526102e336600461127f565b610755565b3480156102f457600080fd5b5060335473ffffffffffffffffffffffffffffffffffffffff16610152565b34801561031f57600080fd5b506101da61032e36600461127f565b6109db565b34801561033f57600080fd5b5061035361034e366004611306565b610a14565b6040805163ffffffff909416845267ffffffffffffffff909216602084015273ffffffffffffffffffffffffffffffffffffffff1690820152606001610173565b3480156103a057600080fd5b5061010d6103af36600461131f565b610a76565b3480156103c057600080fd5b5061010d6103cf36600461131f565b610c12565b6103dc610ce5565b63ffffffff821660008181526065602052604080822080547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff8616908117909155905190917fff513d80e2c7fa487608f70a618dfbc0cf415699dc69588c747e8c71566c88de91a35050565b610466610ce5565b63ffffffff8216600081815260666020526040808220849055518392917f74d6665c4b26d5596a5aa13d3014e0c06af4d322075a797f87b03cd4c5bc91ca91a35050565b606854606090831015806104bc575081155b6106e7575060408051600583901b8101602001909152825b8381116106e5576000606882815481106104f0576104f061133c565b600091825260209091200154905060e081901c67ffffffffffffffff60a083901c1673ffffffffffffffffffffffffffffffffffffffff831660ff808a16908416036106b6576001865101865260008173ffffffffffffffffffffffffffffffffffffffff1663609d33346040518163ffffffff1660e01b8152600401600060405180830381865afa15801561058a573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526105d0919081019061139a565b905060008273ffffffffffffffffffffffffffffffffffffffff1663bcef3b556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561061f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106439190611465565b90506040518060a001604052808881526020018781526020018567ffffffffffffffff168152602001828152602001838152508860018a51610685919061147e565b815181106106955761069561133c565b6020026020010181905250888851106106b3575050505050506106e5565b50505b50507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90920191506104d49050565b505b9392505050565b60008060006106ff878787876109db565b60009081526067602052604090205473ffffffffffffffffffffffffffffffffffffffff81169860a09190911c67ffffffffffffffff16975095505050505050565b610749610ce5565b6107536000610d66565b565b63ffffffff841660009081526065602052604081205473ffffffffffffffffffffffffffffffffffffffff16806107c5576040517f031c6de400000000000000000000000000000000000000000000000000000000815263ffffffff871660048201526024015b60405180910390fd5b63ffffffff8616600090815260666020526040902054341015610814576040517fe92c469f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b61087785858560405160200161082c939291906114bc565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905273ffffffffffffffffffffffffffffffffffffffff831690610ddd565b91508173ffffffffffffffffffffffffffffffffffffffff16638129fc1c346040518263ffffffff1660e01b81526004016000604051808303818588803b1580156108c157600080fd5b505af11580156108d5573d6000803e3d6000fd5b505050505060006108e8878787876109db565b60008181526067602052604090205490915015610934576040517f014f6fe5000000000000000000000000000000000000000000000000000000008152600481018290526024016107bc565b60004260a01b60e089901b178417600083815260676020526040808220839055606880546001810182559083527fa2153420d844928b4421650203c77babc8b33d7f2e7b450e2966db0c220977530183905551919250889163ffffffff8b169173ffffffffffffffffffffffffffffffffffffffff8816917f5b565efe82411da98814f356d0e7bcb8f0219b8d970307c5afb4a6903a8b2e359190a4505050949350505050565b6000848484846040516020016109f494939291906114d6565b604051602081830303815290604052805190602001209050949350505050565b6000806000610a6960688581548110610a2f57610a2f61133c565b906000526020600020015460e081901c9160a082901c67ffffffffffffffff169173ffffffffffffffffffffffffffffffffffffffff1690565b9196909550909350915050565b600054610100900460ff1615808015610a965750600054600160ff909116105b80610ab05750303b158015610ab0575060005460ff166001145b610b3c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084016107bc565b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790558015610b9a57600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b610ba2610f11565b610bab82610d66565b8015610c0e57600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050565b610c1a610ce5565b73ffffffffffffffffffffffffffffffffffffffff8116610cbd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016107bc565b610cc681610d66565b50565b73ffffffffffffffffffffffffffffffffffffffff163b151590565b60335473ffffffffffffffffffffffffffffffffffffffff163314610753576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e657260448201526064016107bc565b6033805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b60006002825101603f8101600a81036040518360581b8260e81b177f6100003d81600a3d39f3363d3d373d3d3d3d610000806035363936013d7300001781528660601b601e8201527f5af43d3d93803e603357fd5bf300000000000000000000000000000000000000603282015285519150603f8101602087015b60208410610e9557805182527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09093019260209182019101610e58565b517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff602085900360031b1b16815260f085901b9083015282816000f0945084610f02577febfef1880000000000000000000000000000000000000000000000000000000060005260206000fd5b90910160405250909392505050565b600054610100900460ff16610fa8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e6700000000000000000000000000000000000000000060648201526084016107bc565b610753600054610100900460ff16611042576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e6700000000000000000000000000000000000000000060648201526084016107bc565b61075333610d66565b803563ffffffff8116811461105f57600080fd5b919050565b73ffffffffffffffffffffffffffffffffffffffff81168114610cc657600080fd5b6000806040838503121561109957600080fd5b6110a28361104b565b915060208301356110b281611064565b809150509250929050565b6000602082840312156110cf57600080fd5b6106e78261104b565b600080604083850312156110eb57600080fd5b6110f48361104b565b946020939093013593505050565b60008060006060848603121561111757600080fd5b6111208461104b565b95602085013595506040909401359392505050565b60005b83811015611150578181015183820152602001611138565b8381111561115f576000848401525b50505050565b6000815180845261117d816020860160208601611135565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60006020808301818452808551808352604092508286019150828160051b87010184880160005b8381101561125e578883037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc001855281518051845287810151888501528681015167ffffffffffffffff16878501526060808201519085015260809081015160a09185018290529061124a81860183611165565b9689019694505050908601906001016111d6565b509098975050505050505050565b6020815260006106e76020830184611165565b6000806000806060858703121561129557600080fd5b61129e8561104b565b935060208501359250604085013567ffffffffffffffff808211156112c257600080fd5b818701915087601f8301126112d657600080fd5b8135818111156112e557600080fd5b8860208285010111156112f757600080fd5b95989497505060200194505050565b60006020828403121561131857600080fd5b5035919050565b60006020828403121561133157600080fd5b81356106e781611064565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000602082840312156113ac57600080fd5b815167ffffffffffffffff808211156113c457600080fd5b818401915084601f8301126113d857600080fd5b8151818111156113ea576113ea61136b565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f011681019083821181831017156114305761143061136b565b8160405282815287602084870101111561144957600080fd5b61145a836020830160208801611135565b979650505050505050565b60006020828403121561147757600080fd5b5051919050565b6000828210156114b7577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b500390565b838152818360208301376000910160200190815292915050565b63ffffffff8516815283602082015260606040820152816060820152818360808301376000818301608090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101939250505056fea164736f6c634300080f000a"
func init() {
......
op-chain-ops/genesis/config.go
View file @ 44a2d9ce
......@@ -233,6 +233,18 @@ type DeployConfig struct {
// RequiredProtocolVersion indicates the protocol version that
// nodes are recommended to adopt, to stay in sync with the network.
RecommendedProtocolVersion params.ProtocolVersion `json:"recommendedProtocolVersion"`
// ProofMaturityDelaySeconds is the number of seconds that a proof must be
// mature before it can be used to finalize a withdrawal.
ProofMaturityDelaySeconds uint64 `json:"proofMaturityDelaySeconds"`
// DisputeGameFinalityDelaySeconds is an additional number of seconds a
// dispute game must wait before it can be used to finalize a withdrawal.
DisputeGameFinalityDelaySeconds uint64 `json:"disputeGameFinalityDelaySeconds"`
// RespectedGameType is the dispute game type that the OptimismPortal
// contract will respect for finalizing withdrawals.
RespectedGameType uint32 `json:"respectedGameType"`
// UseFaultProofs is a flag that indicates if the system is using fault
// proofs instead of the older output oracle mechanism.
UseFaultProofs bool `json:"useFaultProofs"`
// When Cancun activates. Relative to L1 genesis.
L1CancunTimeOffset *hexutil.Uint64 `json:"l1CancunTimeOffset,omitempty"`
......@@ -377,6 +389,12 @@ func (d *DeployConfig) Check() error {
if d.RecommendedProtocolVersion == (params.ProtocolVersion{}) {
log.Warn("RecommendedProtocolVersion is empty")
}
if d.ProofMaturityDelaySeconds == 0 {
log.Warn("ProofMaturityDelaySeconds is 0")
}
if d.DisputeGameFinalityDelaySeconds == 0 {
log.Warn("DisputeGameFinalityDelaySeconds is 0")
}
// checkFork checks that fork A is before or at the same time as fork B
checkFork := func(a, b *hexutil.Uint64, aName, bName string) error {
if a == nil && b == nil {
......
op-chain-ops/genesis/testdata/test-deploy-config-full.json
View file @ 44a2d9ce
......@@ -76,5 +76,9 @@
"preimageOracleCancunActivationTimestamp": 0,
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000"
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"proofMaturityDelaySeconds": 12,
"disputeGameFinalityDelaySeconds": 6,
"respectedGameType": 0,
"useFaultProofs": false
}
ops-bedrock/docker-compose.yml
View file @ 44a2d9ce
......@@ -125,6 +125,9 @@ services:
OP_PROPOSER_MNEMONIC: test test test test test test test test test test test junk
OP_PROPOSER_L2_OUTPUT_HD_PATH: "m/44'/60'/0'/0/1"
OP_PROPOSER_L2OO_ADDRESS: "${L2OO_ADDRESS}"
OP_PROPOSER_DGF_ADDRESS: "${DGF_ADDRESS}"
OP_PROPOSER_DG_TYPE: "${DG_TYPE}"
OP_PROPOSER_PROPOSAL_INTERVAL: "${PROPOSAL_INTERVAL}"
OP_PROPOSER_PPROF_ENABLED: "true"
OP_PROPOSER_METRICS_ENABLED: "true"
OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
......@@ -161,6 +164,34 @@ services:
OP_BATCHER_RPC_ENABLE_ADMIN: "true"
OP_BATCHER_BATCH_TYPE: 0
op-challenger:
depends_on:
- op_stack_go_builder
- l1
- l2
- op-node
build:
context: ../
dockerfile: ./op-challenger/Dockerfile
args:
OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger:devnet
environment:
OP_CHALLENGER_L1_ETH_RPC: http://l1:8545
OP_CHALLENGER_ROLLUP_RPC: http://op-node:8545
OP_CHALLENGER_TRACE_TYPE: cannon
OP_CHALLENGER_GAME_FACTORY_ADDRESS: ${DGF_ADDRESS}
OP_CHALLENGER_DATADIR: temp/challenger-data
OP_CHALLENGER_CANNON_ROLLUP_CONFIG: ./.devnet/rollup.json
OP_CHALLENGER_CANNON_L2_GENESIS: ./.devnet/genesis-l2.json
OP_CHALLENGER_CANNON_BIN: ./cannon/bin/cannon
OP_CHALLENGER_CANNON_SERVER: ./op-program/bin/op-program
OP_CHALLENGER_CANNON_PRESTATE: ./op-program/bin/prestate.json
OP_CHALLENGER_CANNON_L2: http://l2:8545
OP_CHALLENGER_MNEMONIC: test test test test test test test test test test test junk
OP_CHALLENGER_HD_PATH: "m/44'/60'/0'/0/4"
OP_CHALLENGER_NUM_CONFIRMATIONS: 1
artifact-server:
depends_on:
- l1
......
packages/contracts-bedrock/deploy-config/devnetL1-template.json
View file @ 44a2d9ce
......@@ -57,5 +57,9 @@
"faultGameSplitDepth": 14,
"preimageOracleMinProposalSize": 10000,
"preimageOracleChallengePeriod": 120,
"preimageOracleCancunActivationTimestamp": 0
"preimageOracleCancunActivationTimestamp": 0,
"proofMaturityDelaySeconds": 12,
"disputeGameFinalityDelaySeconds": 6,
"respectedGameType": 0,
"useFaultProofs": false
}
packages/contracts-bedrock/deploy-config/hardhat.json
View file @ 44a2d9ce
......@@ -42,5 +42,9 @@
"l2GenesisRegolithTimeOffset": "0x0",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000"
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"proofMaturityDelaySeconds": 12,
"disputeGameFinalityDelaySeconds": 6,
"respectedGameType": 0,
"useFaultProofs": false
}
packages/contracts-bedrock/scripts/ChainAssertions.sol
View file @ 44a2d9ce
......@@ -12,6 +12,7 @@ import { L2OutputOracle } from "src/L1/L2OutputOracle.sol";
import { ProtocolVersion, ProtocolVersions } from "src/L1/ProtocolVersions.sol";
import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
import { OptimismPortal } from "src/L1/OptimismPortal.sol";
import { OptimismPortal2 } from "src/L1/OptimismPortal2.sol";
import { L1CrossDomainMessenger } from "src/L1/L1CrossDomainMessenger.sol";
import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
......@@ -50,6 +51,7 @@ library ChainAssertions {
checkOptimismMintableERC20Factory({ _contracts: _prox, _isProxy: true });
checkL1ERC721Bridge({ _contracts: _prox, _isProxy: true });
checkOptimismPortal({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
checkOptimismPortal2({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
checkProtocolVersions({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
}
......@@ -259,6 +261,42 @@ library ChainAssertions {
}
}
/// @notice Asserts the OptimismPortal2 is setup correctly
function checkOptimismPortal2(
Types.ContractSet memory _contracts,
DeployConfig _cfg,
bool _isProxy
)
internal
view
{
console.log("Running chain assertions on the OptimismPortal2");
OptimismPortal2 portal = OptimismPortal2(payable(_contracts.OptimismPortal2));
address guardian = _cfg.superchainConfigGuardian();
if (guardian.code.length == 0) {
console.log("Guardian has no code: %s", guardian);
}
if (_isProxy) {
require(address(portal.disputeGameFactory()) == _contracts.DisputeGameFactory);
require(address(portal.SYSTEM_CONFIG()) == _contracts.SystemConfig);
require(address(portal.systemConfig()) == _contracts.SystemConfig);
require(portal.GUARDIAN() == guardian);
require(portal.guardian() == guardian);
require(address(portal.superchainConfig()) == address(_contracts.SuperchainConfig));
require(portal.paused() == SuperchainConfig(_contracts.SuperchainConfig).paused());
require(portal.l2Sender() == Constants.DEFAULT_L2_SENDER);
} else {
require(address(portal.disputeGameFactory()) == address(0));
require(address(portal.SYSTEM_CONFIG()) == address(0));
require(address(portal.systemConfig()) == address(0));
require(address(portal.superchainConfig()) == address(0));
require(portal.l2Sender() == Constants.DEFAULT_L2_SENDER);
}
}
/// @notice Asserts that the ProtocolVersions is setup correctly
function checkProtocolVersions(
Types.ContractSet memory _contracts,
......
packages/contracts-bedrock/scripts/Deploy.s.sol
View file @ 44a2d9ce
......@@ -20,6 +20,7 @@ import { Proxy } from "src/universal/Proxy.sol";
import { L1StandardBridge } from "src/L1/L1StandardBridge.sol";
import { StandardBridge } from "src/universal/StandardBridge.sol";
import { OptimismPortal } from "src/L1/OptimismPortal.sol";
import { OptimismPortal2 } from "src/L1/OptimismPortal2.sol";
import { L1ChugSplashProxy } from "src/legacy/L1ChugSplashProxy.sol";
import { ResolvedDelegateProxy } from "src/legacy/ResolvedDelegateProxy.sol";
import { L1CrossDomainMessenger } from "src/L1/L1CrossDomainMessenger.sol";
......@@ -128,8 +129,10 @@ contract Deploy is Deployer {
L1CrossDomainMessenger: mustGetAddress("L1CrossDomainMessengerProxy"),
L1StandardBridge: mustGetAddress("L1StandardBridgeProxy"),
L2OutputOracle: mustGetAddress("L2OutputOracleProxy"),
DisputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
OptimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
OptimismPortal: mustGetAddress("OptimismPortalProxy"),
OptimismPortal2: mustGetAddress("OptimismPortalProxy"),
SystemConfig: mustGetAddress("SystemConfigProxy"),
L1ERC721Bridge: mustGetAddress("L1ERC721BridgeProxy"),
ProtocolVersions: mustGetAddress("ProtocolVersionsProxy"),
......@@ -143,8 +146,10 @@ contract Deploy is Deployer {
L1CrossDomainMessenger: getAddress("L1CrossDomainMessengerProxy"),
L1StandardBridge: getAddress("L1StandardBridgeProxy"),
L2OutputOracle: getAddress("L2OutputOracleProxy"),
DisputeGameFactory: getAddress("DisputeGameFactoryProxy"),
OptimismMintableERC20Factory: getAddress("OptimismMintableERC20FactoryProxy"),
OptimismPortal: getAddress("OptimismPortalProxy"),
OptimismPortal2: getAddress("OptimismPortalProxy"),
SystemConfig: getAddress("SystemConfigProxy"),
L1ERC721Bridge: getAddress("L1ERC721BridgeProxy"),
ProtocolVersions: getAddress("ProtocolVersionsProxy"),
......@@ -339,6 +344,7 @@ contract Deploy is Deployer {
function deployImplementations() public {
console.log("Deploying implementations");
deployOptimismPortal();
deployOptimismPortal2();
deployL1CrossDomainMessenger();
deployL2OutputOracle();
deployOptimismMintableERC20Factory();
......@@ -360,7 +366,17 @@ contract Deploy is Deployer {
initializeOptimismMintableERC20Factory();
initializeL1CrossDomainMessenger();
initializeL2OutputOracle();
initializeOptimismPortal();
// Selectively initialize either the original OptimismPortal or the
// new OptimismPortal2. Since this will upgrade the proxy, we cannot
// initialize both. FPAC warning can be removed once we're done with
// the old OptimismPortal contract.
if (cfg.useFaultProofs()) {
console.log("WARNING: FPAC is enabled and using OptimismPortal2");
initializeOptimismPortal2();
} else {
initializeOptimismPortal();
}
}
////////////////////////////////////////////////////////////////
......@@ -539,6 +555,36 @@ contract Deploy is Deployer {
addr_ = address(portal);
}
/// @notice Deploy the OptimismPortal2
function deployOptimismPortal2() public broadcast returns (address addr_) {
console.log("Deploying OptimismPortal2 implementation");
// Could also verify this inside DeployConfig but doing it here is a bit more reliable.
require(
uint32(cfg.respectedGameType()) == cfg.respectedGameType(), "Deploy: respectedGameType must fit into uint32"
);
OptimismPortal2 portal = new OptimismPortal2{ salt: _implSalt() }({
_proofMaturityDelaySeconds: cfg.proofMaturityDelaySeconds(),
_disputeGameFinalityDelaySeconds: cfg.disputeGameFinalityDelaySeconds(),
_initialRespectedGameType: GameType.wrap(uint32(cfg.respectedGameType()))
});
save("OptimismPortal2", address(portal));
console.log("OptimismPortal2 deployed at %s", address(portal));
// Override the `OptimismPortal2` contract to the deployed implementation. This is necessary
// to check the `OptimismPortal2` implementation alongside dependent contracts, which
// are always proxies.
Types.ContractSet memory contracts = _proxiesUnstrict();
contracts.OptimismPortal2 = address(portal);
ChainAssertions.checkOptimismPortal2({ _contracts: contracts, _cfg: cfg, _isProxy: false });
require(loadInitializedSlot("OptimismPortal2") == 1, "OptimismPortal2 is not initialized");
addr_ = address(portal);
}
/// @notice Deploy the L2OutputOracle
function deployL2OutputOracle() public broadcast returns (address addr_) {
console.log("Deploying L2OutputOracle implementation");
......@@ -588,6 +634,8 @@ contract Deploy is Deployer {
DisputeGameFactory factory = new DisputeGameFactory{ salt: _implSalt() }();
save("DisputeGameFactory", address(factory));
console.log("DisputeGameFactory deployed at %s", address(factory));
// TODO: Run the checkDisputeGameFactory function here.
// @see https://github.com/ethereum-optimism/optimism/issues/9354
addr_ = address(factory);
}
......@@ -738,6 +786,8 @@ contract Deploy is Deployer {
string memory version = DisputeGameFactory(disputeGameFactoryProxy).version();
console.log("DisputeGameFactory version: %s", version);
// TODO: Run the checkDisputeGameFactory function here.
// @see https://github.com/ethereum-optimism/optimism/issues/9354
}
/// @notice Initialize the SystemConfig
......@@ -979,6 +1029,37 @@ contract Deploy is Deployer {
require(loadInitializedSlot("OptimismPortalProxy") == 1, "OptimismPortalProxy is not initialized");
}
/// @notice Initialize the OptimismPortal2
function initializeOptimismPortal2() public broadcast {
console.log("Upgrading and initializing OptimismPortal2 proxy");
address optimismPortalProxy = mustGetAddress("OptimismPortalProxy");
address optimismPortal2 = mustGetAddress("OptimismPortal2");
address disputeGameFactoryProxy = mustGetAddress("DisputeGameFactoryProxy");
address systemConfigProxy = mustGetAddress("SystemConfigProxy");
address superchainConfigProxy = mustGetAddress("SuperchainConfigProxy");
_upgradeAndCallViaSafe({
_proxy: payable(optimismPortalProxy),
_implementation: optimismPortal2,
_innerCallData: abi.encodeCall(
OptimismPortal2.initialize,
(
DisputeGameFactory(disputeGameFactoryProxy),
SystemConfig(systemConfigProxy),
SuperchainConfig(superchainConfigProxy)
)
)
});
OptimismPortal2 portal = OptimismPortal2(payable(optimismPortalProxy));
string memory version = portal.version();
console.log("OptimismPortal2 version: %s", version);
ChainAssertions.checkOptimismPortal2({ _contracts: _proxies(), _cfg: cfg, _isProxy: true });
require(loadInitializedSlot("OptimismPortalProxy") == 1, "OptimismPortalProxy is not initialized");
}
function initializeProtocolVersions() public broadcast {
console.log("Upgrading and initializing ProtocolVersions proxy");
address protocolVersionsProxy = mustGetAddress("ProtocolVersionsProxy");
......
packages/contracts-bedrock/scripts/DeployConfig.s.sol
View file @ 44a2d9ce
......@@ -59,6 +59,10 @@ contract DeployConfig is Script {
uint256 public systemConfigStartBlock;
uint256 public requiredProtocolVersion;
uint256 public recommendedProtocolVersion;
uint256 public proofMaturityDelaySeconds;
uint256 public disputeGameFinalityDelaySeconds;
uint256 public respectedGameType;
bool public useFaultProofs;
function read(string memory _path) public {
console.log("DeployConfig: reading file %s", _path);
......@@ -105,6 +109,10 @@ contract DeployConfig is Script {
systemConfigStartBlock = stdJson.readUint(_json, "$.systemConfigStartBlock");
requiredProtocolVersion = stdJson.readUint(_json, "$.requiredProtocolVersion");
recommendedProtocolVersion = stdJson.readUint(_json, "$.recommendedProtocolVersion");
proofMaturityDelaySeconds = stdJson.readUint(_json, "$.proofMaturityDelaySeconds");
disputeGameFinalityDelaySeconds = stdJson.readUint(_json, "$.disputeGameFinalityDelaySeconds");
respectedGameType = stdJson.readUint(_json, "$.respectedGameType");
useFaultProofs = stdJson.readBool(_json, "$.useFaultProofs");
if (
block.chainid == Chains.LocalDevnet || block.chainid == Chains.GethDevnet || block.chainid == Chains.Sepolia
......
packages/contracts-bedrock/scripts/Types.sol
View file @ 44a2d9ce
......@@ -7,8 +7,10 @@ library Types {
address L1CrossDomainMessenger;
address L1StandardBridge;
address L2OutputOracle;
address DisputeGameFactory;
address OptimismMintableERC20Factory;
address OptimismPortal;
address OptimismPortal2;
address SystemConfig;
address L1ERC721Bridge;
address ProtocolVersions;
......
packages/contracts-bedrock/semver-lock.json
View file @ 44a2d9ce
......@@ -32,8 +32,8 @@
"sourceCodeHash": "0xdc27421279afb6c3b26fc8c589c5d213695f666c74d2c2c41cb7df719d172f37"
},
"src/L1/OptimismPortal2.sol": {
"initCodeHash": "0x3b140ef8e85169a59c626974aeb31be43bc58c5a48592611d74004925732ab5f",
"sourceCodeHash": "0xf28140c13ea7cefb9525ee106268e7d482f3e6e13d8b300d3b1423de8ac173f3"
"initCodeHash": "0x48b052d78aafe26222a58fb01fee937402e43479c611739567551445ac235986",
"sourceCodeHash": "0xfb5b8bfa0ae30cd5969376d26aff9c9e2c44e5c1ebecdc95a83efad0eaaf0e85"
},
"src/L1/ProtocolVersions.sol": {
"initCodeHash": "0x72cd467e8bcf019c02675d72ab762e088bcc9cc0f1a4e9f587fa4589f7fdd1b8",
......@@ -92,12 +92,12 @@
"sourceCodeHash": "0x1afb1d392e8f6a58ff86ea7f648e0d1756d4ba8d0d964279d58a390deaa53b7e"
},
"src/dispute/DisputeGameFactory.sol": {
"initCodeHash": "0xbb8c4273acaede381fe88e6974e073fac363c7ec21618af737df2d3118608665",
"sourceCodeHash": "0x78a030cd808a997f4b82c4fa284d6c394dae9d1fafeccb8783059a3b60bfb0ce"
"initCodeHash": "0x45178e8a18a376e2f77fc6d076a7e5c900c7608e471b3074b3101059757f2426",
"sourceCodeHash": "0x628d32fcd779d535cebf7914fc1e930ad4767f196fc12ce4bd13b0c6541b0aa1"
},
"src/dispute/FaultDisputeGame.sol": {
"initCodeHash": "0x471c66c96f233d0d1589c18efada49e14bf52e22e1bafc6d7768ee10b5b4f1de",
"sourceCodeHash": "0x34d7af1f21b12900721a11eabb4131b99920047830c6784d06aacf648156d993"
"sourceCodeHash": "0xa803b8daea162054f924575e9b8bc7931832c91d9d9b2a5ef672746bd1a4fc56"
},
"src/legacy/DeployerWhitelist.sol": {
"initCodeHash": "0x8de80fb23b26dd9d849f6328e56ea7c173cd9e9ce1f05c9beea559d1720deb3d",
......
packages/contracts-bedrock/snapshots/abi/DisputeGameFactory.json
View file @ 44a2d9ce
......@@ -64,6 +64,21 @@
"internalType": "GameId",
"name": "metadata",
"type": "bytes32"
},
{
"internalType": "Timestamp",
"name": "timestamp",
"type": "uint64"
},
{
"internalType": "Claim",
"name": "rootClaim",
"type": "bytes32"
},
{
"internalType": "bytes",
"name": "extraData",
"type": "bytes"
}
],
"internalType": "struct IDisputeGameFactory.GameSearchResult[]",
......
packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
View file @ 44a2d9ce
......@@ -63,6 +63,19 @@
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "_withdrawalHash",
"type": "bytes32"
}
],
"name": "checkWithdrawal",
"outputs": [],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
......
packages/contracts-bedrock/src/L1/OptimismPortal2.sol
View file @ 44a2d9ce
......@@ -313,51 +313,11 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
l2Sender == Constants.DEFAULT_L2_SENDER, "OptimismPortal: can only trigger one withdrawal per transaction"
);
// Grab the proven withdrawal from the `provenWithdrawals` map.
// Compute the withdrawal hash.
bytes32 withdrawalHash = Hashing.hashWithdrawal(_tx);
ProvenWithdrawal memory provenWithdrawal = provenWithdrawals[withdrawalHash];
IDisputeGame disputeGameProxy = provenWithdrawal.disputeGameProxy;
// The dispute game must not be blacklisted.
require(!disputeGameBlacklist[disputeGameProxy], "OptimismPortal: dispute game has been blacklisted");
// A withdrawal can only be finalized if it has been proven. We know that a withdrawal has
// been proven at least once when its timestamp is non-zero. Unproven withdrawals will have
// a timestamp of zero.
require(provenWithdrawal.timestamp != 0, "OptimismPortal: withdrawal has not been proven yet");
// As a sanity check, we make sure that the proven withdrawal's timestamp is greater than
// starting timestamp inside the Dispute Game. Not strictly necessary but extra layer of
// safety against weird bugs in the proving step.
require(
provenWithdrawal.timestamp > disputeGameProxy.createdAt().raw(),
"OptimismPortal: withdrawal timestamp less than L2 Oracle starting timestamp"
);
// A proven withdrawal must wait at least `PROOF_MATURITY_DELAY_SECONDS` before finalizing.
require(
block.timestamp - provenWithdrawal.timestamp > PROOF_MATURITY_DELAY_SECONDS,
"OptimismPortal: proven withdrawal has not matured yet"
);
// A proven withdrawal must wait until the dispute game it was proven against has been
// resolved in favor of the root claim (the output proposal). This is to prevent users
// from finalizing withdrawals proven against non-finalized output roots.
require(
disputeGameProxy.status() == GameStatus.DEFENDER_WINS,
"OptimismPortal: output proposal has not been finalized yet"
);
// Before a withdrawal can be finalized, the dispute game it was proven against must have been
// resolved for at least `DISPUTE_GAME_FINALITY_DELAY_SECONDS`. This is to allow for manual
// intervention in the event that a dispute game is resolved incorrectly.
require(
block.timestamp - disputeGameProxy.resolvedAt().raw() > DISPUTE_GAME_FINALITY_DELAY_SECONDS,
"OptimismPortal: output proposal in air-gap"
);
// Check that this withdrawal has not already been finalized, this is replay protection.
require(!finalizedWithdrawals[withdrawalHash], "OptimismPortal: withdrawal has already been finalized");
// Check that the withdrawal can be finalized.
checkWithdrawal(withdrawalHash);
// Mark the withdrawal as finalized so it can't be replayed.
finalizedWithdrawals[withdrawalHash] = true;
......@@ -463,4 +423,54 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
require(msg.sender == SAURON, "OptimismPortal: only sauron can set the respected game type");
respectedGameType = _gameType;
}
/// @notice Checks if a withdrawal can be finalized. NOTE: Decision was made to have this
/// function revert rather than returning a boolean so that was more obvious why the
/// function failed.
/// @param _withdrawalHash Hash of the withdrawal to check.
function checkWithdrawal(bytes32 _withdrawalHash) public view {
ProvenWithdrawal memory provenWithdrawal = provenWithdrawals[_withdrawalHash];
IDisputeGame disputeGameProxy = provenWithdrawal.disputeGameProxy;
// The dispute game must not be blacklisted.
require(!disputeGameBlacklist[disputeGameProxy], "OptimismPortal: dispute game has been blacklisted");
// A withdrawal can only be finalized if it has been proven. We know that a withdrawal has
// been proven at least once when its timestamp is non-zero. Unproven withdrawals will have
// a timestamp of zero.
require(provenWithdrawal.timestamp != 0, "OptimismPortal: withdrawal has not been proven yet");
// As a sanity check, we make sure that the proven withdrawal's timestamp is greater than
// starting timestamp inside the Dispute Game. Not strictly necessary but extra layer of
// safety against weird bugs in the proving step.
require(
provenWithdrawal.timestamp > disputeGameProxy.createdAt().raw(),
"OptimismPortal: withdrawal timestamp less than L2 Oracle starting timestamp"
);
// A proven withdrawal must wait at least `PROOF_MATURITY_DELAY_SECONDS` before finalizing.
require(
block.timestamp - provenWithdrawal.timestamp > PROOF_MATURITY_DELAY_SECONDS,
"OptimismPortal: proven withdrawal has not matured yet"
);
// A proven withdrawal must wait until the dispute game it was proven against has been
// resolved in favor of the root claim (the output proposal). This is to prevent users
// from finalizing withdrawals proven against non-finalized output roots.
require(
disputeGameProxy.status() == GameStatus.DEFENDER_WINS,
"OptimismPortal: output proposal has not been finalized yet"
);
// Before a withdrawal can be finalized, the dispute game it was proven against must have been
// resolved for at least `DISPUTE_GAME_FINALITY_DELAY_SECONDS`. This is to allow for manual
// intervention in the event that a dispute game is resolved incorrectly.
require(
block.timestamp - disputeGameProxy.resolvedAt().raw() > DISPUTE_GAME_FINALITY_DELAY_SECONDS,
"OptimismPortal: output proposal in air-gap"
);
// Check that this withdrawal has not already been finalized, this is replay protection.
require(!finalizedWithdrawals[_withdrawalHash], "OptimismPortal: withdrawal has already been finalized");
}
}
packages/contracts-bedrock/src/dispute/DisputeGameFactory.sol
View file @ 44a2d9ce
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.15;
pragma solidity 0.8.15;
import { ClonesWithImmutableArgs } from "@cwia/ClonesWithImmutableArgs.sol";
import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
......@@ -156,7 +156,7 @@ contract DisputeGameFactory is OwnableUpgradeable, IDisputeGameFactory, ISemver
// Perform a reverse linear search for the `_n` most recent games of type `_gameType`.
for (uint256 i = _start; i >= 0 && i <= _start;) {
GameId id = _disputeGameList[i];
(GameType gameType,,) = id.unpack();
(GameType gameType, Timestamp timestamp, IDisputeGame proxy) = id.unpack();
if (gameType.raw() == _gameType.raw()) {
// Increase the size of the `games_` array by 1.
......@@ -166,7 +166,15 @@ contract DisputeGameFactory is OwnableUpgradeable, IDisputeGameFactory, ISemver
mstore(games_, add(mload(games_), 0x01))
}
games_[games_.length - 1] = GameSearchResult({ index: i, metadata: id });
bytes memory extraData = proxy.extraData();
Claim rootClaim = proxy.rootClaim();
games_[games_.length - 1] = GameSearchResult({
index: i,
metadata: id,
timestamp: timestamp,
rootClaim: rootClaim,
extraData: extraData
});
if (games_.length >= _n) break;
}
......
packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
View file @ 44a2d9ce
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.15;
pragma solidity 0.8.15;
import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
......
packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol
View file @ 44a2d9ce
......@@ -28,6 +28,9 @@ interface IDisputeGameFactory {
struct GameSearchResult {
uint256 index;
GameId metadata;
Timestamp timestamp;
Claim rootClaim;
bytes extraData;
}
/// @notice The total number of dispute games created by this factory.
......
packages/contracts-bedrock/test/Specs.t.sol
View file @ 44a2d9ce
......@@ -251,6 +251,7 @@ contract Specification_Test is CommonTest {
_addSpec({ _name: "OptimismPortal2", _sel: _getSel("blacklistDisputeGame(address)") });
_addSpec({ _name: "OptimismPortal2", _sel: _getSel("deleteProvenWithdrawal(bytes32)") });
_addSpec({ _name: "OptimismPortal2", _sel: _getSel("setRespectedGameType(uint32)") });
_addSpec({ _name: "OptimismPortal2", _sel: _getSel("checkWithdrawal(bytes32)") });
// ProtocolVersions
_addSpec({ _name: "ProtocolVersions", _sel: _getSel("RECOMMENDED_SLOT()") });
......
packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol
View file @ 44a2d9ce
......@@ -274,8 +274,9 @@ contract DisputeGameFactory_FindLatestGames_Test is DisputeGameFactory_Init {
uint256 gameCount = factory.gameCount();
IDisputeGameFactory.GameSearchResult[] memory games =
factory.findLatestGames(GameType.wrap(0), gameCount - 1, 1);
IDisputeGameFactory.GameSearchResult[] memory games;
games = factory.findLatestGames(GameType.wrap(0), gameCount - 1, 1);
assertEq(games.length, 1);
assertEq(games[0].index, 30);
(GameType gameType, Timestamp createdAt, IDisputeGame game) = games[0].metadata.unpack();
......@@ -309,8 +310,9 @@ contract DisputeGameFactory_FindLatestGames_Test is DisputeGameFactory_Init {
uint256 gameCount = factory.gameCount();
IDisputeGameFactory.GameSearchResult[] memory games =
factory.findLatestGames(GameType.wrap(2), gameCount - 1, 5);
IDisputeGameFactory.GameSearchResult[] memory games;
games = factory.findLatestGames(GameType.wrap(2), gameCount - 1, 5);
assertEq(games.length, 0);
games = factory.findLatestGames(GameType.wrap(1), gameCount - 1, 5);
......@@ -349,4 +351,12 @@ contract FakeClone {
function initialize() external payable {
// noop
}
function extraData() external pure returns (bytes memory) {
return hex"FF0420";
}
function rootClaim() external pure returns (Claim) {
return Claim.wrap(bytes32(0));
}
}
packages/sdk/package.json
View file @ 44a2d9ce
......@@ -45,6 +45,7 @@
"@types/chai-as-promised": "^7.1.8",
"@types/mocha": "^10.0.6",
"@types/node": "^20.11.13",
"@types/semver": "^7.5.6",
"chai-as-promised": "^7.1.1",
"ethereum-waffle": "^4.0.10",
"ethers": "^5.7.2",
......@@ -66,7 +67,8 @@
"@eth-optimism/core-utils": "workspace:*",
"lodash": "^4.17.21",
"merkletreejs": "^0.3.11",
"rlp": "^2.2.7"
"rlp": "^2.2.7",
"semver": "^7.5.4"
},
"peerDependencies": {
"ethers": "^5"
......
packages/sdk/src/cross-chain-messenger.ts
View file @ 44a2d9ce
......@@ -32,6 +32,7 @@ import {
} from '@eth-optimism/core-utils'
import { getContractInterface, predeploys } from '@eth-optimism/contracts'
import * as rlp from 'rlp'
import semver from 'semver'
import {
OEContracts,
......@@ -228,6 +229,29 @@ export class CrossChainMessenger {
}
}
/**
* Uses portal version to determine if the messenger is using fpac contracts. Better not to cache
* this value as it will change during the fpac upgrade and we want clients to automatically
* begin using the new logic without throwing any errors.
*
* @returns Whether or not the messenger is using fpac contracts.
*/
public async fpac(): Promise<boolean> {
if (
this.contracts.l1.OptimismPortal.address === ethers.constants.AddressZero
) {
// Only really relevant for certain SDK tests where the portal is not deployed. We should
// probably just update the tests so the portal gets deployed but feels like it's out of
// scope for the FPAC changes.
return false
} else {
return semver.gte(
await this.contracts.l1.OptimismPortal.version(),
'3.0.0'
)
}
}
/**
* Retrieves all cross chain messages sent within a given transaction.
*
......@@ -731,11 +755,16 @@ export class CrossChainMessenger {
messageIndex
)
// Pick portal based on FPAC compatibility.
const portal = (await this.fpac())
? this.contracts.l1.OptimismPortal2
: this.contracts.l1.OptimismPortal
// Attempt to fetch the proven withdrawal.
const provenWithdrawal =
await this.contracts.l1.OptimismPortal.provenWithdrawals(
hashLowLevelMessage(withdrawal)
)
const provenWithdrawal = await portal.provenWithdrawals(
hashLowLevelMessage(withdrawal)
)
// If the withdrawal hash has not been proven on L1,
// return `READY_TO_PROVE`
if (provenWithdrawal.timestamp.eq(BigNumber.from(0))) {
......@@ -758,13 +787,32 @@ export class CrossChainMessenger {
timestamp = block.timestamp
}
const challengePeriod = await this.getChallengePeriodSeconds()
const latestBlock = await this.l1Provider.getBlock('latest')
if (await this.fpac()) {
// Convert the message to the low level message that was proven.
const withdrawal = await this.toLowLevelMessage(
resolved,
messageIndex
)
try {
// If this doesn't revert then we should be fine to relay.
await this.contracts.l1.OptimismPortal2.checkWithdrawal(
hashLowLevelMessage(withdrawal)
)
if (timestamp + challengePeriod > latestBlock.timestamp) {
return MessageStatus.IN_CHALLENGE_PERIOD
return MessageStatus.READY_FOR_RELAY
} catch (err) {
return MessageStatus.IN_CHALLENGE_PERIOD
}
} else {
return MessageStatus.READY_FOR_RELAY
const challengePeriod = await this.getChallengePeriodSeconds()
const latestBlock = await this.l1Provider.getBlock('latest')
if (timestamp + challengePeriod > latestBlock.timestamp) {
return MessageStatus.IN_CHALLENGE_PERIOD
} else {
return MessageStatus.READY_FOR_RELAY
}
}
}
}
......@@ -1212,29 +1260,85 @@ export class CrossChainMessenger {
throw new Error(`cannot get a state root for an L1 to L2 message`)
}
// Try to find the output index that corresponds to the block number attached to the message.
// We'll explicitly handle "cannot get output" errors as a null return value, but anything else
// needs to get thrown. Might need to revisit this in the future to be a little more robust
// when connected to RPCs that don't return nice error messages.
let proposal: any
let l2OutputIndex: BigNumber
try {
l2OutputIndex =
await this.contracts.l1.L2OutputOracle.getL2OutputIndexAfter(
resolved.blockNumber
if (await this.fpac()) {
// Get the respected game type from the portal.
const gameType =
await this.contracts.l1.OptimismPortal2.respectedGameType()
// Get the total game count from the DisputeGameFactory since that will give us the end of
// the array that we're searching over. We'll then use that to find the latest games.
const gameCount = await this.contracts.l1.DisputeGameFactory.gameCount()
// Find the latest 100 games (or as many as we can up to 100).
const latestGames =
await this.contracts.l1.DisputeGameFactory.findLatestGames(
gameType,
gameCount.sub(1),
Math.min(100, gameCount.toNumber())
)
} catch (err) {
if (err.message.includes('L2OutputOracle: cannot get output')) {
// Find a game with a block number that is greater than or equal to the block number that the
// message was included in. We can use this proposal to prove the message to the portal.
let match: any
for (const game of latestGames) {
const [blockNumber] = ethers.utils.defaultAbiCoder.decode(
['uint256'],
game.extraData
)
if (blockNumber.gte(resolved.blockNumber)) {
match = {
...game,
l2BlockNumber: blockNumber,
}
break
}
}
// TODO: It would be more correct here to actually verify the proposal since proposals are
// not guaranteed to be correct. proveMessage will actually do this verification for us but
// there's a devex edge case where this message appears to give back a valid proposal that
// ends up reverting inside of proveMessage. At least this is safe for users but not ideal
// for developers and we should work out the simplest way to fix it. Main blocker is that
// verifying the proposal may require access to an archive node.
// If there's no match then we can't prove the message to the portal.
if (!match) {
return null
} else {
throw err
}
}
// Now pull the proposal out given the output index. Should always work as long as the above
// codepath completed successfully.
const proposal = await this.contracts.l1.L2OutputOracle.getL2Output(
l2OutputIndex
)
// Put the result into the same format as the old logic for now to reduce added code.
l2OutputIndex = match.index
proposal = {
outputRoot: match.rootClaim,
timestamp: match.timestamp,
l2BlockNumber: match.l2BlockNumber,
}
} else {
// Try to find the output index that corresponds to the block number attached to the message.
// We'll explicitly handle "cannot get output" errors as a null return value, but anything else
// needs to get thrown. Might need to revisit this in the future to be a little more robust
// when connected to RPCs that don't return nice error messages.
try {
l2OutputIndex =
await this.contracts.l1.L2OutputOracle.getL2OutputIndexAfter(
resolved.blockNumber
)
} catch (err) {
if (err.message.includes('L2OutputOracle: cannot get output')) {
return null
} else {
throw err
}
}
// Now pull the proposal out given the output index. Should always work as long as the above
// codepath completed successfully.
proposal = await this.contracts.l1.L2OutputOracle.getL2Output(
l2OutputIndex
)
}
// Format everything and return it nicely.
return {
......
packages/sdk/src/interfaces/types.ts
View file @ 44a2d9ce
......@@ -50,6 +50,9 @@ export interface OEL1Contracts {
// Bedrock
OptimismPortal: Contract
L2OutputOracle: Contract
// FPAC
OptimismPortal2?: Contract
DisputeGameFactory?: Contract
}
/**
......
packages/sdk/src/utils/chain-constants.ts
View file @ 44a2d9ce
......@@ -120,9 +120,16 @@ const getL1ContractsByNetworkName = (network: string): OEL1ContractsLike => {
BondManager: ethers.constants.AddressZero,
OptimismPortal: portalAddresses[network],
L2OutputOracle: l2OutputOracleAddresses[network],
OptimismPortal2: portalAddresses[network],
DisputeGameFactory: ethers.constants.AddressZero,
}
}
/**
* List of contracts that are ignorable when checking for contracts on a given network.
*/
export const IGNORABLE_CONTRACTS = ['OptimismPortal2', 'DisputeGameFactory']
/**
* Mapping of L1 chain IDs to the appropriate contract addresses for the OE deployments to the
* given network. Simplifies the process of getting the correct contract addresses for a given
......@@ -157,6 +164,8 @@ export const CONTRACT_ADDRESSES: {
// FIXME
OptimismPortal: '0x0000000000000000000000000000000000000000' as const,
L2OutputOracle: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -173,6 +182,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x5FC8d32690cc91D4c39d9d3abcBD16989F875707' as const,
OptimismPortal: '0x0000000000000000000000000000000000000000' as const,
L2OutputOracle: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -189,6 +200,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal: '0xA581Ca3353DB73115C4625FFC7aDF5dB379434A8' as const,
L2OutputOracle: '0x3A234299a14De50027eA65dCdf1c0DaC729e04A6' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -205,6 +218,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal: '0xe93c8cD0D409341205A592f8c4Ac1A5fe5585cfA' as const,
L2OutputOracle: '0x2A35891ff30313CcFa6CE88dcf3858bb075A2298' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -221,6 +236,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal: '0x49f53e41452C74589E85cA1677426Ba426459e85' as const,
L2OutputOracle: '0x84457ca9D0163FbC4bbfe4Dfbb20ba46e48DF254' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -237,6 +254,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal: '0x49048044D57e1C92A77f79988d21Fa8fAF74E97e' as const,
L2OutputOracle: '0x56315b90c40730925ec5485cf004d835058518A0' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -254,6 +273,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal: '0xDb9F51790365e7dc196e7D072728df39Be958ACe' as const,
L2OutputOracle: '0xdD292C9eEd00f6A32Ff5245d0BCd7f2a15f24e00' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......@@ -270,6 +291,8 @@ export const CONTRACT_ADDRESSES: {
BondManager: '0x0000000000000000000000000000000000000000' as const,
OptimismPortal: '0x1a0ad011913A150f69f6A19DF447A0CfD9551054' as const,
L2OutputOracle: '0x9E6204F750cD866b299594e2aC9eA824E2e5f95c' as const,
OptimismPortal2: '0x0000000000000000000000000000000000000000' as const,
DisputeGameFactory: '0x0000000000000000000000000000000000000000' as const,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
},
......
packages/sdk/src/utils/contracts.ts
View file @ 44a2d9ce
......@@ -14,6 +14,8 @@ import l2ERC721Bridge from '@eth-optimism/contracts-bedrock/forge-artifacts/L2ER
import l1Block from '@eth-optimism/contracts-bedrock/forge-artifacts/L1Block.sol/L1Block.json'
import l2ToL1MessagePasser from '@eth-optimism/contracts-bedrock/forge-artifacts/L2ToL1MessagePasser.sol/L2ToL1MessagePasser.json'
import gasPriceOracle from '@eth-optimism/contracts-bedrock/forge-artifacts/GasPriceOracle.sol/GasPriceOracle.json'
import disputeGameFactory from '@eth-optimism/contracts-bedrock/forge-artifacts/DisputeGameFactory.sol/DisputeGameFactory.json'
import optimismPortal2 from '@eth-optimism/contracts-bedrock/forge-artifacts/OptimismPortal2.sol/OptimismPortal2.json'
import { toAddress } from './coercion'
import { DeepPartial } from './type-utils'
......@@ -23,6 +25,7 @@ import {
CONTRACT_ADDRESSES,
DEFAULT_L2_CONTRACT_ADDRESSES,
BRIDGE_ADAPTER_DATA,
IGNORABLE_CONTRACTS,
} from './chain-constants'
import {
OEContracts,
......@@ -94,6 +97,12 @@ const getContractInterfaceBedrock = (name: string): ethers.utils.Interface => {
case 'GasPriceOracle':
artifact = gasPriceOracle
break
case 'DisputeGameFactory':
artifact = disputeGameFactory
break
case 'OptimismPortal2':
artifact = optimismPortal2
break
}
return new ethers.utils.Interface(artifact.abi)
}
......@@ -119,11 +128,19 @@ export const getOEContract = (
signerOrProvider?: ethers.Signer | ethers.providers.Provider
} = {}
): Contract => {
// Generally we want to throw an error if a contract address is not provided but there are some
// exceptions, particularly for contracts that are part of an upgrade that has not yet been
// deployed. It's OK to not provide an address for these contracts with the caveat that this may
// cause a runtime error if the contract does actually need to be used.
const addresses = CONTRACT_ADDRESSES[l2ChainId]
if (addresses === undefined && opts.address === undefined) {
throw new Error(
`cannot get contract ${contractName} for unknown L2 chain ID ${l2ChainId}, you must provide an address`
)
if (IGNORABLE_CONTRACTS.includes(contractName)) {
return undefined
} else {
throw new Error(
`cannot get contract ${contractName} for unknown L2 chain ID ${l2ChainId}, you must provide an address`
)
}
}
// Bedrock interfaces are backwards compatible. We can prefer Bedrock interfaces over legacy
......@@ -177,6 +194,8 @@ export const getAllOEContracts = (
BondManager: undefined,
OptimismPortal: undefined,
L2OutputOracle: undefined,
DisputeGameFactory: undefined,
OptimismPortal2: undefined,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
}
......
packages/sdk/tasks/deposit-erc20.ts
View file @ 44a2d9ce
......@@ -158,6 +158,8 @@ task('deposit-erc20', 'Deposits WETH9 onto L2.')
BondManager: ethers.constants.AddressZero,
OptimismPortal: json.OptimismPortalProxy,
L2OutputOracle: json.L2OutputOracleProxy,
OptimismPortal2: json.OptimismPortalProxy,
DisputeGameFactory: json.DisputeGameFactoryProxy,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
} as OEContractsLike
......
packages/sdk/tasks/deposit-eth.ts
View file @ 44a2d9ce
......@@ -103,6 +103,8 @@ task('deposit-eth', 'Deposits ether to L2.')
BondManager: ethers.constants.AddressZero,
OptimismPortal: json.OptimismPortalProxy,
L2OutputOracle: json.L2OutputOracleProxy,
OptimismPortal2: json.OptimismPortalProxy,
DisputeGameFactory: json.DisputeGameFactoryProxy,
},
l2: DEFAULT_L2_CONTRACT_ADDRESSES,
} as OEContractsLike
......
packages/sdk/test/cross-chain-messenger.spec.ts
View file @ 44a2d9ce
......@@ -16,6 +16,7 @@ import {
ETHBridgeAdapter,
L1ChainID,
L2ChainID,
IGNORABLE_CONTRACTS,
} from '../src'
import { DUMMY_MESSAGE, DUMMY_EXTENDED_MESSAGE } from './helpers'
......@@ -234,7 +235,7 @@ describe('CrossChainMessenger', () => {
if (overrides.l1[contractName]) {
const contract = messenger.contracts.l1[contractName]
expect(contract.address).to.equal(overrides.l1[contractName])
} else {
} else if (!IGNORABLE_CONTRACTS.includes(contractName)) {
const contract = messenger.contracts.l1[contractName]
expect(contract.address).to.equal(contractAddress)
}
......
pnpm-lock.yaml
View file @ 44a2d9ce
......@@ -450,6 +450,9 @@ importers:
rlp:
specifier: ^2.2.7
version: 2.2.7
semver:
specifier: ^7.5.4
version: 7.5.4
devDependencies:
'@ethersproject/abstract-provider':
specifier: ^5.7.0
......@@ -478,6 +481,9 @@ importers:
'@types/node':
specifier: ^20.11.13
version: 20.11.13
'@types/semver':
specifier: ^7.5.6
version: 7.5.6
chai-as-promised:
specifier: ^7.1.1
version: 7.1.1(chai@4.3.10)
......@@ -6006,6 +6012,10 @@ packages:
/@types/semver@7.5.0:
resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
/@types/semver@7.5.6:
resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==}
dev: true
/@types/send@0.17.1:
resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
dependencies:
......@@ -9874,7 +9884,6 @@ packages:
is-hex-prefixed: 1.0.0
strip-hex-prefix: 1.0.0
dev: true
bundledDependencies: false
/event-target-shim@5.0.1:
resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment