Skip to content

D
deploy
Commit 1264c941 authored by Ubuntu's avatar Ubuntu
Browse files
Options

update

parent 3df3cb86
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 129 deletions
.gitignore
View file @ 1264c941
.idea
node/data/geth
deployments
Makefile
View file @ 1264c941
......@@ -13,4 +13,4 @@ stop:
clean:
rm -rf layer1/.cache layer1/node/data/geth
\ No newline at end of file
sudo rm -rf layer1/.cache layer1/node/data/geth
build/Dockerfile.contracts
View file @ 1264c941
FROM ghcr.io/foundry-rs/foundry
USER root
WORKDIR /app
COPY ./layer2/contracts-bedrock ./contracts
\ No newline at end of file
RUN apt install -y jq git
RUN git config --global safe.directory '*'
COPY ./layer2/contracts-bedrock ./contracts
docker-compose.yml
View file @ 1264c941
......@@ -42,8 +42,8 @@ services:
volumes:
- "./layer2/deployments:/app/deployments"
- "./layer2/contracts-bedrock:/app/contracts"
- "./.git:/app/contracts/.git"
- ".envrc:/app/.envrc"
# entrypoint: bash -c "echo 12233"
entrypoint: /app/contracts/deploy.sh
depends_on:
- forge-init
......@@ -71,4 +71,4 @@ services:
# driver: "json-file"
# options:
# max-size: "100m"
# max-file: "3"
\ No newline at end of file
# max-file: "3"
layer1/genesis.json
View file @ 1264c941
......@@ -31,6 +31,18 @@
"119ba92c15337ffb37871e44f3f9102409d95f12": {
"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
},
"88395111AB1586a4030dAC62a183542762929bbC": {
"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
},
"74FB49FB24700C896B6E68Af0dB872Ac0cD97c0C": {
"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
},
"DCAD5Fe85AfC4857d6c638d37eb0948791878069": {
"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
},
"123463a4B065722E99115D6c222f267d9cABb524": {
"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
},
"3fab184622dc19b6109349b94811493bf2a45362": {
"balance": "0x200000000000000000000000000000000000000000000000000000000000000"
}
......@@ -39,4 +51,4 @@
"gasUsed": "0x0",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"baseFeePerGas": null
}
\ No newline at end of file
}
layer2/contracts-bedrock/deployments/config.json deleted 100644 → 0
View file @ 3df3cb86
{
"l1StartingBlockTag": "0x94422278aec355e06b362b12118df275e0a7153cac694495781413f3c19bf071",
"l1ChainID": 10099,
"l2ChainID": 42069,
"l2BlockTime": 2,
"l1BlockTime": 12,
"maxSequencerDrift": 600,
"sequencerWindowSize": 3600,
"channelTimeout": 300,
"p2pSequencerAddress": "0xDCAD5Fe85AfC4857d6c638d37eb0948791878069",
"batchInboxAddress": "0xff00000000000000000000000000000000042069",
"batchSenderAddress": "0x74FB49FB24700C896B6E68Af0dB872Ac0cD97c0C",
"l2OutputOracleSubmissionInterval": 120,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleStartingTimestamp": 1741852709,
"l2OutputOracleProposer": "0x123463a4B065722E99115D6c222f267d9cABb524",
"l2OutputOracleChallenger": "0x88395111AB1586a4030dAC62a183542762929bbC",
"finalizationPeriodSeconds": 12,
"proxyAdminOwner": "0x88395111AB1586a4030dAC62a183542762929bbC",
"baseFeeVaultRecipient": "0x88395111AB1586a4030dAC62a183542762929bbC",
"l1FeeVaultRecipient": "0x88395111AB1586a4030dAC62a183542762929bbC",
"sequencerFeeVaultRecipient": "0x88395111AB1586a4030dAC62a183542762929bbC",
"finalSystemOwner": "0x88395111AB1586a4030dAC62a183542762929bbC",
"superchainConfigGuardian": "0x88395111AB1586a4030dAC62a183542762929bbC",
"baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"baseFeeVaultWithdrawalNetwork": 0,
"l1FeeVaultWithdrawalNetwork": 0,
"sequencerFeeVaultWithdrawalNetwork": 0,
"gasPriceOracleOverhead": 0,
"gasPriceOracleScalar": 1000000,
"enableGovernance": true,
"governanceTokenSymbol": "OP",
"governanceTokenName": "Optimism",
"governanceTokenOwner": "0x88395111AB1586a4030dAC62a183542762929bbC",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
"eip1559Denominator": 50,
"eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6,
"l2GenesisFjordTimeOffset": "0x0",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisCanyonTimeOffset": "0x0",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"faultGameAbsolutePrestate": "0x03c7ae758795765c6664a5d39bf63841c71ff191e9189522bad8ebff5d4eca98",
"faultGameMaxDepth": 44,
"faultGameClockExtension": 0,
"faultGameMaxClockDuration": 600,
"faultGameGenesisBlock": 0,
"faultGameGenesisOutputRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"faultGameSplitDepth": 14,
"faultGameWithdrawalDelay": 604800,
"preimageOracleMinProposalSize": 1800000,
"preimageOracleChallengePeriod": 86400,
"proofMaturityDelaySeconds": 12,
"disputeGameFinalityDelaySeconds": 6,
"respectedGameType": 0,
"useFaultProofs": false,
"fundDevAccounts": true,
"useAltDA": false,
"daChallengeWindow": 100,
"daResolveWindow": 100,
"daBondSize": 1000,
"daResolverRefundPercentage": 50,
"useCustomGasToken": false,
"customGasTokenAddress": "0x88395111AB1586a4030dAC62a183542762929bbC"
}
layer2/contracts-bedrock/scripts/deploy/Deploy.s.sol
View file @ 1264c941
......@@ -1424,46 +1424,46 @@ contract Deploy is Deployer {
/// @notice Sets the implementation for the `CANNON` game type in the `DisputeGameFactory`
function setCannonFaultGameImplementation(bool _allowUpgrade) public broadcast {
console.log("Setting Cannon FaultDisputeGame implementation");
DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
DelayedWETH weth = DelayedWETH(mustGetAddress("DelayedWETHProxy"));
// Set the Cannon FaultDisputeGame implementation in the factory.
_setFaultGameImplementation({
_factory: factory,
_allowUpgrade: _allowUpgrade,
_params: FaultDisputeGameParams({
anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
weth: weth,
gameType: GameTypes.CANNON,
absolutePrestate: loadMipsAbsolutePrestate(),
faultVm: IBigStepper(mustGetAddress("Mips")),
maxGameDepth: cfg.faultGameMaxDepth(),
maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
})
});
//console.log("Setting Cannon FaultDisputeGame implementation");
//DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
//DelayedWETH weth = DelayedWETH(mustGetAddress("DelayedWETHProxy"));
//// Set the Cannon FaultDisputeGame implementation in the factory.
//_setFaultGameImplementation({
// _factory: factory,
// _allowUpgrade: _allowUpgrade,
// _params: FaultDisputeGameParams({
// anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
// weth: weth,
// gameType: GameTypes.CANNON,
// absolutePrestate: loadMipsAbsolutePrestate(),
// faultVm: IBigStepper(mustGetAddress("Mips")),
// maxGameDepth: cfg.faultGameMaxDepth(),
// maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
// })
//});
}
/// @notice Sets the implementation for the `PERMISSIONED_CANNON` game type in the `DisputeGameFactory`
function setPermissionedCannonFaultGameImplementation(bool _allowUpgrade) public broadcast {
console.log("Setting Cannon PermissionedDisputeGame implementation");
DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
DelayedWETH weth = DelayedWETH(mustGetAddress("PermissionedDelayedWETHProxy"));
// Set the Cannon FaultDisputeGame implementation in the factory.
_setFaultGameImplementation({
_factory: factory,
_allowUpgrade: _allowUpgrade,
_params: FaultDisputeGameParams({
anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
weth: weth,
gameType: GameTypes.PERMISSIONED_CANNON,
absolutePrestate: loadMipsAbsolutePrestate(),
faultVm: IBigStepper(mustGetAddress("Mips")),
maxGameDepth: cfg.faultGameMaxDepth(),
maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
})
});
//console.log("Setting Cannon PermissionedDisputeGame implementation");
//DisputeGameFactory factory = DisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
//DelayedWETH weth = DelayedWETH(mustGetAddress("PermissionedDelayedWETHProxy"));
//// Set the Cannon FaultDisputeGame implementation in the factory.
//_setFaultGameImplementation({
// _factory: factory,
// _allowUpgrade: _allowUpgrade,
// _params: FaultDisputeGameParams({
// anchorStateRegistry: AnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
// weth: weth,
// gameType: GameTypes.PERMISSIONED_CANNON,
// absolutePrestate: loadMipsAbsolutePrestate(),
// faultVm: IBigStepper(mustGetAddress("Mips")),
// maxGameDepth: cfg.faultGameMaxDepth(),
// maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
// })
//});
}
/// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
......
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