Skip to content

Commit db1a6af

Browse files
committed
Fetch PreimageOracle from upstream
1 parent d1c91bc commit db1a6af

File tree

8 files changed

+21
-379
lines changed

8 files changed

+21
-379
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "rvsol/lib/forge-std"]
22
path = rvsol/lib/forge-std
33
url = https://github.com/foundry-rs/forge-std
4+
[submodule "rvsol/lib/optimism"]
5+
path = rvsol/lib/optimism
6+
url = https://github.com/ethereum-optimism/optimism

rvsol/foundry.toml

+14
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,19 @@ out = 'out'
44
libs = ['lib']
55
optimizer = true
66
optimizer_runs = 999999
7+
remappings = [
8+
'@optimism/packages/contracts-bedrock=lib/optimism/packages/contracts-bedrock',
9+
'@openzeppelin/contracts-upgradeable/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable/contracts',
10+
'@openzeppelin/contracts/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts',
11+
'@rari-capital/solmate/=lib/optimism/packages/contracts-bedrock/lib/solmate',
12+
'@cwia/=lib/optimism/packages/contracts-bedrock/lib/clones-with-immutable-args/src',
13+
'@lib-keccak/=lib/optimism/packages/contracts-bedrock/lib/lib-keccak/contracts/lib',
14+
'safe-contracts/=lib/optimism/packages/contracts-bedrock/lib/safe-contracts/contracts',
15+
'kontrol-cheatcodes/=lib/optimism/packages/contracts-bedrock/lib/kontrol-cheatcodes/src',
16+
'solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src',
17+
18+
'forge-std/=lib/forge-std/src',
19+
'ds-test/=lib/forge-std/lib/ds-test/src',
20+
]
721

822
# See more config options https://github.com/foundry-rs/foundry/tree/master/config

rvsol/lib/optimism

Submodule optimism added at c934019

rvsol/src/PreimageKeyLib.sol

-59
This file was deleted.

rvsol/src/PreimageOracle.sol

-107
This file was deleted.

rvsol/src/Step.sol

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity ^0.8.13;
33

4+
import {IPreimageOracle} from "@optimism/packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol";
45

56
contract Step {
67

7-
address public preimageOracle;
8+
IPreimageOracle public preimageOracle;
89

9-
constructor(address _preimageOracle) {
10+
constructor(IPreimageOracle _preimageOracle) {
1011
preimageOracle = _preimageOracle;
1112
}
1213

rvsol/src/interfaces/IPreimageOracle.sol

-50
This file was deleted.

0 commit comments

Comments
 (0)