Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update monorepo dependency to Holocene release commit #136

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Update monorepo dependency to Holocene release commit #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f849bcb
Update monorepo dependency to holocene release commit
mininny Jan 23, 2025
f6a9016
Update geth versions
mininny Jan 23, 2025
d61becf
Update op-program test data
mininny Jan 23, 2025
4427116
Update solidity imports
mininny Jan 23, 2025
cb5e8b2
Temporarily no-op sys.nanosleep
mininny Jan 23, 2025
3299f2c
Resolve lint issues for rvgol and rvsol
mininny Feb 1, 2025
7dd6b36
Remove geth-version-checker.sh which is removed in upstream monorepo
mininny Feb 1, 2025
ee1664b
Update .circleci contracts-bedrock-build step
mininny Feb 1, 2025
84dda89
Fix op-e2e tests
mininny Feb 2, 2025
8bc3933
Merge branch 'master' into feature/mininny/monorepo-holocene
mininny Feb 2, 2025
edb234c
Install mise at monorepo
mininny Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 66 additions & 13 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
executors:
default:
docker:
- image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.53.0
- image: cimg/base:2024.01

workflows:
main:
Expand Down Expand Up @@ -43,15 +43,68 @@ workflows:
commands:
install-dependencies:
steps:
- checkout
- run:
name: Install mise
command: curl https://mise.run | MISE_INSTALL_PATH=/usr/local/bin/mise sh
name: Initialize mise environment
command: |
# This is used to create a per-user cache key to preserve permissions across different
# executor types.
user=$(whoami)
echo "$user" > .executor-user
echo "Set executor user to $user."

if [[ "$user" == "root" ]]; then
# Self-hosted runners will persist this cache between runs. Cleaning it up means that we
# preserve the semantics of the cache regardless of executor type. It's also much faster
# to delete the cache and recreate it than it is to overwrite it in place.
rm -rf /data/mise-data
echo "Cleaned up cache data."

mkdir -p /data/mise-data
echo "Created Mise data dir."
mkdir -p ~/.cache
echo "Created Mise cache dir."
else
sudo rm -rf /data/mise-data
echo "Cleaned up cache data."
sudo mkdir -p /data/mise-data
sudo chown -R "$user:$user" /data/mise-data
echo "Created Mise data dir."
sudo mkdir -p ~/.cache
sudo chown -R "$user:$user" ~/.cache
echo "Created Mise cache dir."
fi
- restore_cache:
name: Restore mise cache
keys:
- mise-v5-{{ checksum ".executor-user" }}-{{ checksum "mise.toml" }}
- run:
name: Activate mise
command: echo 'eval "$(mise activate bash)"' >> $BASH_ENV
name: Install mise
command: |
if command -v mise &> /dev/null; then
echo "mise already installed at $(command -v mise)"
else
curl https://mise.run | sh
fi

echo "export PATH=\"$HOME/.local/bin:\$PATH\"" >> "$BASH_ENV"
echo "export MISE_DATA_DIR=/data/mise-data" >> "$BASH_ENV"
echo "export MISE_JOBS=$(nproc)" >> "$BASH_ENV"
echo "eval \"\$($HOME/.local/bin/mise activate --shims)\"" >> "$BASH_ENV"
- run:
name: Install mise dependencies
command: mise install
name: Install mise deps
command: |
mise install -v -y
if [ -f "rvsol/lib/optimism/mise.toml" ]; then
cd rvsol/lib/optimism
mise install -v -y
fi

- save_cache:
name: Save mise cache
key: mise-v5-{{ checksum ".executor-user" }}-{{ checksum "mise.toml" }}
paths:
- /data/mise-data

install-go-modules:
parameters:
Expand Down Expand Up @@ -123,10 +176,6 @@ jobs:
- checkout-with-monorepo
- install-dependencies
- install-go-modules
- run:
name: Check L1 geth version
command: ./ops/scripts/geth-version-checker.sh || (echo "geth version is wrong, update ci-builder"; false)
working_directory: rvsol/lib/optimism
- install-contracts-dependencies
- restore_cache:
name: Restore Go build cache
Expand All @@ -147,8 +196,8 @@ jobs:
FOUNDRY_PROFILE: ci
working_directory: rvsol/lib/optimism/packages/contracts-bedrock
- run:
name: Generate default allocs
command: make devnet-allocs-tests
name: Generate allocs
command: make devnet-allocs
working_directory: rvsol/lib/optimism
- save_cache:
name: Save Go build cache
Expand All @@ -163,6 +212,7 @@ jobs:
- "packages/contracts-bedrock/forge-artifacts"
- "packages/contracts-bedrock/deploy-config/devnetL1.json"
- "packages/contracts-bedrock/deployments/devnetL1"
- ".devnet"
- ".devnet-standard"

op-program-riscv:
Expand Down Expand Up @@ -261,6 +311,7 @@ jobs:
cp /tmp/workspace/.devnet-standard/allocs-l2-ecotone.json .devnet-standard/allocs-l2-ecotone.json
cp /tmp/workspace/.devnet-standard/allocs-l2-fjord.json .devnet-standard/allocs-l2-fjord.json
cp /tmp/workspace/.devnet-standard/allocs-l2-granite.json .devnet-standard/allocs-l2-granite.json
cp /tmp/workspace/.devnet-standard/allocs-l2-holocene.json .devnet-standard/allocs-l2-holocene.json
cp /tmp/workspace/.devnet-standard/addresses.json .devnet-standard/addresses.json
cp /tmp/workspace/packages/contracts-bedrock/deploy-config/devnetL1.json devnetL1.json
cp -r /tmp/workspace/packages/contracts-bedrock/deployments/devnetL1 devnetL1
Expand Down Expand Up @@ -312,6 +363,7 @@ jobs:
cp .devnet-standard/allocs-l2-ecotone.json .devnet-asterisc/allocs-l2-ecotone.json
cp .devnet-standard/allocs-l2-fjord.json .devnet-asterisc/allocs-l2-fjord.json
cp .devnet-standard/allocs-l2-granite.json .devnet-asterisc/allocs-l2-granite.json
cp .devnet-standard/allocs-l2-holocene.json .devnet-asterisc/allocs-l2-holocene.json
working_directory: rvsol
- persist_to_workspace:
root: rvsol
Expand Down Expand Up @@ -343,6 +395,7 @@ jobs:
cp /tmp/workspace/.devnet-asterisc/allocs-l2-ecotone.json .devnet-standard/allocs-l2-ecotone.json
cp /tmp/workspace/.devnet-asterisc/allocs-l2-fjord.json .devnet-standard/allocs-l2-fjord.json
cp /tmp/workspace/.devnet-asterisc/allocs-l2-granite.json .devnet-standard/allocs-l2-granite.json
cp /tmp/workspace/.devnet-asterisc/allocs-l2-holocene.json .devnet-standard/allocs-l2-holocene.json
cp /tmp/workspace/.devnet-asterisc/addresses.json .devnet-standard/addresses.json
mkdir -p packages/contracts-bedrock
cp -r /tmp/workspace/packages/contracts-bedrock/deploy-config packages/contracts-bedrock
Expand Down
12 changes: 5 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ go 1.22.0

toolchain go1.22.7

replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101408.1-0.20241002211323-d5a96613c22b
replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101411.4-rc.4

require (
github.com/ethereum-optimism/optimism v1.9.5-0.20241008153126-117c9a427168
github.com/ethereum-optimism/optimism v0.0.0-20241213111354-8bf7ff60f34a
github.com/ethereum/go-ethereum v1.14.11
github.com/holiman/uint256 v1.3.1
github.com/holiman/uint256 v1.3.2
github.com/pkg/errors v0.9.1
github.com/pkg/profile v1.7.0
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -57,7 +57,7 @@ require (
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 // indirect
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048 // indirect
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241213092551-33a63fce8214 // indirect
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
github.com/fatih/color v1.16.0 // indirect
Expand Down Expand Up @@ -100,7 +100,6 @@ require (
github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
github.com/ipfs/go-cid v0.4.1 // indirect
github.com/ipfs/go-datastore v0.6.0 // indirect
github.com/ipfs/go-ds-leveldb v0.5.0 // indirect
github.com/ipfs/go-log/v2 v2.5.1 // indirect
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
Expand Down Expand Up @@ -204,7 +203,7 @@ require (
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
Expand All @@ -215,6 +214,5 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.3.0 // indirect
lukechampine.com/uint128 v1.3.0 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)
Loading