Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
c898ed14
Unverified
Commit
c898ed14
authored
Nov 26, 2024
by
Maurelian
Committed by
GitHub
Nov 26, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: remove _allowUpgrade flag from game impl setters in deploy script (#13087)
parent
b707cd8e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
Deploy.s.sol
packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+7
-11
No files found.
packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
View file @
c898ed14
...
@@ -456,9 +456,9 @@ contract Deploy is Deployer {
...
@@ -456,9 +456,9 @@ contract Deploy is Deployer {
_data: abi.encodeCall(IDelayedWETH.initialize, (msg.sender, ISuperchainConfig(superchainConfigProxy)))
_data: abi.encodeCall(IDelayedWETH.initialize, (msg.sender, ISuperchainConfig(superchainConfigProxy)))
});
});
setAlphabetFaultGameImplementation(
{ _allowUpgrade: false }
);
setAlphabetFaultGameImplementation();
setFastFaultGameImplementation(
{ _allowUpgrade: false }
);
setFastFaultGameImplementation();
setCannonFaultGameImplementation(
{ _allowUpgrade: false }
);
setCannonFaultGameImplementation();
transferDisputeGameFactoryOwnership();
transferDisputeGameFactoryOwnership();
transferDelayedWETHOwnership();
transferDelayedWETHOwnership();
...
@@ -875,7 +875,7 @@ contract Deploy is Deployer {
...
@@ -875,7 +875,7 @@ contract Deploy is Deployer {
}
}
/// @notice Sets the implementation for the `CANNON` game type in the `DisputeGameFactory`
/// @notice Sets the implementation for the `CANNON` game type in the `DisputeGameFactory`
function setCannonFaultGameImplementation(
bool _allowUpgrade
) public broadcast {
function setCannonFaultGameImplementation() public broadcast {
console.log("Setting Cannon FaultDisputeGame implementation");
console.log("Setting Cannon FaultDisputeGame implementation");
IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
...
@@ -883,7 +883,6 @@ contract Deploy is Deployer {
...
@@ -883,7 +883,6 @@ contract Deploy is Deployer {
// Set the Cannon FaultDisputeGame implementation in the factory.
// Set the Cannon FaultDisputeGame implementation in the factory.
_setFaultGameImplementation({
_setFaultGameImplementation({
_factory: factory,
_factory: factory,
_allowUpgrade: _allowUpgrade,
_params: FaultDisputeGameParams({
_params: FaultDisputeGameParams({
anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
weth: weth,
weth: weth,
...
@@ -897,7 +896,7 @@ contract Deploy is Deployer {
...
@@ -897,7 +896,7 @@ contract Deploy is Deployer {
}
}
/// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
/// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
function setAlphabetFaultGameImplementation(
bool _allowUpgrade
) public onlyDevnet broadcast {
function setAlphabetFaultGameImplementation() public onlyDevnet broadcast {
console.log("Setting Alphabet FaultDisputeGame implementation");
console.log("Setting Alphabet FaultDisputeGame implementation");
IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
...
@@ -905,7 +904,6 @@ contract Deploy is Deployer {
...
@@ -905,7 +904,6 @@ contract Deploy is Deployer {
Claim outputAbsolutePrestate = Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate()));
Claim outputAbsolutePrestate = Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate()));
_setFaultGameImplementation({
_setFaultGameImplementation({
_factory: factory,
_factory: factory,
_allowUpgrade: _allowUpgrade,
_params: FaultDisputeGameParams({
_params: FaultDisputeGameParams({
anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
weth: weth,
weth: weth,
...
@@ -920,7 +918,7 @@ contract Deploy is Deployer {
...
@@ -920,7 +918,7 @@ contract Deploy is Deployer {
}
}
/// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
/// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
function setFastFaultGameImplementation(
bool _allowUpgrade
) public onlyDevnet broadcast {
function setFastFaultGameImplementation() public onlyDevnet broadcast {
console.log("Setting Fast FaultDisputeGame implementation");
console.log("Setting Fast FaultDisputeGame implementation");
IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
...
@@ -939,7 +937,6 @@ contract Deploy is Deployer {
...
@@ -939,7 +937,6 @@ contract Deploy is Deployer {
);
);
_setFaultGameImplementation({
_setFaultGameImplementation({
_factory: factory,
_factory: factory,
_allowUpgrade: _allowUpgrade,
_params: FaultDisputeGameParams({
_params: FaultDisputeGameParams({
anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
weth: weth,
weth: weth,
...
@@ -956,12 +953,11 @@ contract Deploy is Deployer {
...
@@ -956,12 +953,11 @@ contract Deploy is Deployer {
/// @notice Sets the implementation for the given fault game type in the `DisputeGameFactory`.
/// @notice Sets the implementation for the given fault game type in the `DisputeGameFactory`.
function _setFaultGameImplementation(
function _setFaultGameImplementation(
IDisputeGameFactory _factory,
IDisputeGameFactory _factory,
bool _allowUpgrade,
FaultDisputeGameParams memory _params
FaultDisputeGameParams memory _params
)
)
internal
internal
{
{
if (address(_factory.gameImpls(_params.gameType)) != address(0)
&& !_allowUpgrade
) {
if (address(_factory.gameImpls(_params.gameType)) != address(0)) {
console.log(
console.log(
"[WARN] DisputeGameFactoryProxy: `FaultDisputeGame` implementation already set for game type: %s",
"[WARN] DisputeGameFactoryProxy: `FaultDisputeGame` implementation already set for game type: %s",
vm.toString(GameType.unwrap(_params.gameType))
vm.toString(GameType.unwrap(_params.gameType))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment