Commit 9beb8626 authored by clabby's avatar clabby

chore: resolve conflicts

chore: bindings
parent 652732fc
...@@ -923,9 +923,9 @@ jobs: ...@@ -923,9 +923,9 @@ jobs:
- run: - run:
name: Install latest golang name: Install latest golang
command: | command: |
wget https://go.dev/dl/go1.19.linux-amd64.tar.gz wget https://go.dev/dl/go1.20.linux-amd64.tar.gz
sudo rm -rf /usr/local/go sudo rm -rf /usr/local/go
sudo tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.20.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin export PATH=$PATH:/usr/local/go/bin
go version go version
- run: - run:
......
...@@ -54,7 +54,7 @@ func deployDisputeGameContracts(require *require.Assertions, ctx context.Context ...@@ -54,7 +54,7 @@ func deployDisputeGameContracts(require *require.Assertions, ctx context.Context
alphaVMAddr, err := bind.WaitDeployed(ctx, client, tx) alphaVMAddr, err := bind.WaitDeployed(ctx, client, tx)
require.NoError(err) require.NoError(err)
l2OutputOracle, err := bindings.NewL2OutputOracle(config.L1Deployments.L2OutputOracle, client) l2OutputOracle, err := bindings.NewL2OutputOracle(config.L1Deployments.L2OutputOracleProxy, client)
require.NoError(err) require.NoError(err)
// Deploy the block hash oracle // Deploy the block hash oracle
......
...@@ -24,9 +24,9 @@ import { ResourceMetering } from "src/L1/ResourceMetering.sol"; ...@@ -24,9 +24,9 @@ import { ResourceMetering } from "src/L1/ResourceMetering.sol";
import { Constants } from "src/libraries/Constants.sol"; import { Constants } from "src/libraries/Constants.sol";
import { DisputeGameFactory } from "src/dispute/DisputeGameFactory.sol"; import { DisputeGameFactory } from "src/dispute/DisputeGameFactory.sol";
import { FaultDisputeGame } from "src/dispute/FaultDisputeGame.sol"; import { FaultDisputeGame } from "src/dispute/FaultDisputeGame.sol";
import { PreimageOracle } from "src/cannon/PreimageOracle.sol";
import { MIPS } from "src/cannon/MIPS.sol";
import { BlockOracle } from "src/dispute/BlockOracle.sol"; import { BlockOracle } from "src/dispute/BlockOracle.sol";
import { PreimageOracle } from "../src/cannon/PreimageOracle.sol";
import { MIPS } from "../src/cannon/MIPS.sol";
import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol"; import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
import { Predeploys } from "src/libraries/Predeploys.sol"; import { Predeploys } from "src/libraries/Predeploys.sol";
import { Chains } from "./Chains.sol"; import { Chains } from "./Chains.sol";
...@@ -383,30 +383,6 @@ contract Deploy is Deployer { ...@@ -383,30 +383,6 @@ contract Deploy is Deployer {
return address(mips); return address(mips);
} }
/// @notice Deploy the PreimageOracle
function deployPreimageOracle() broadcast() public returns (address) {
if (block.chainid == 900) {
PreimageOracle preimageOracle = new PreimageOracle();
save("PreimageOracle", address(preimageOracle));
console.log("PreimageOracle deployed at %s", address(preimageOracle));
return address(preimageOracle);
}
return address(0);
}
/// @notice Deploy Mips
function deployMips() broadcast() public returns (address) {
if (block.chainid == 900) {
MIPS mips = new MIPS();
save("Mips", address(mips));
console.log("Mips deployed at %s", address(mips));
return address(mips);
}
return address(0);
}
/// @notice Deploy the SystemConfig /// @notice Deploy the SystemConfig
function deploySystemConfig() broadcast() public returns (address) { function deploySystemConfig() broadcast() public returns (address) {
bytes32 batcherHash = bytes32(uint256(uint160(cfg.batchSenderAddress()))); bytes32 batcherHash = bytes32(uint256(uint160(cfg.batchSenderAddress())));
...@@ -744,10 +720,10 @@ contract Deploy is Deployer { ...@@ -744,10 +720,10 @@ contract Deploy is Deployer {
_maxGameDepth: cfg.faultGameMaxDepth(), _maxGameDepth: cfg.faultGameMaxDepth(),
_gameDuration: Duration.wrap(uint64(cfg.faultGameMaxDuration())), _gameDuration: Duration.wrap(uint64(cfg.faultGameMaxDuration())),
_vm: faultVm, _vm: faultVm,
_l2oo: L2OutputOracle(mustGetAddress("L2OutputOracleProxy")) _l2oo: L2OutputOracle(mustGetAddress("L2OutputOracleProxy")),
_blockOracle: new BlockOracle()
})); }));
console.log("DisputeGameFactory: set `FaultDisputeGame` implementation"); console.log("DisputeGameFactory: set `FaultDisputeGame` implementation");
} }
} }
} }
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