Skip to content

Commit

Permalink
Fetch PreimageOracle from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
pcw109550 committed Feb 14, 2024
1 parent d1c91bc commit db1a6af
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 379 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "rvsol/lib/forge-std"]
path = rvsol/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "rvsol/lib/optimism"]
path = rvsol/lib/optimism
url = https://github.com/ethereum-optimism/optimism
14 changes: 14 additions & 0 deletions rvsol/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,19 @@ out = 'out'
libs = ['lib']
optimizer = true
optimizer_runs = 999999
remappings = [
'@optimism/packages/contracts-bedrock=lib/optimism/packages/contracts-bedrock',
'@openzeppelin/contracts-upgradeable/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable/contracts',
'@openzeppelin/contracts/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts/contracts',
'@rari-capital/solmate/=lib/optimism/packages/contracts-bedrock/lib/solmate',
'@cwia/=lib/optimism/packages/contracts-bedrock/lib/clones-with-immutable-args/src',
'@lib-keccak/=lib/optimism/packages/contracts-bedrock/lib/lib-keccak/contracts/lib',
'safe-contracts/=lib/optimism/packages/contracts-bedrock/lib/safe-contracts/contracts',
'kontrol-cheatcodes/=lib/optimism/packages/contracts-bedrock/lib/kontrol-cheatcodes/src',
'solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src',

'forge-std/=lib/forge-std/src',
'ds-test/=lib/forge-std/lib/ds-test/src',
]

# See more config options https://github.com/foundry-rs/foundry/tree/master/config
1 change: 1 addition & 0 deletions rvsol/lib/optimism
Submodule optimism added at c93401
59 changes: 0 additions & 59 deletions rvsol/src/PreimageKeyLib.sol

This file was deleted.

107 changes: 0 additions & 107 deletions rvsol/src/PreimageOracle.sol

This file was deleted.

5 changes: 3 additions & 2 deletions rvsol/src/Step.sol
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.13;

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

contract Step {

address public preimageOracle;
IPreimageOracle public preimageOracle;

constructor(address _preimageOracle) {
constructor(IPreimageOracle _preimageOracle) {
preimageOracle = _preimageOracle;
}

Expand Down
50 changes: 0 additions & 50 deletions rvsol/src/interfaces/IPreimageOracle.sol

This file was deleted.

Loading

0 comments on commit db1a6af

Please sign in to comment.