From 32f8d65bb86509fee305300fa269b21a0f431ee7 Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Wed, 7 Jun 2023 18:48:59 +0530 Subject: [PATCH] Update mobymask-v2 stack with lighthouse-cli and branch checkout feature (#425) * Update optimism stack yml for lighthouse-cli * Use branch checkout feature in mobymask stack --- .../compose/docker-compose-peer-test-app.yml | 3 ++- app/data/stacks/fixturenet-optimism/README.md | 8 -------- .../stacks/fixturenet-optimism/l2-only.md | 8 -------- app/data/stacks/fixturenet-optimism/stack.yml | 6 ++++-- app/data/stacks/mobymask-v2/README.md | 20 ------------------- app/data/stacks/mobymask-v2/mobymask-only.md | 16 --------------- app/data/stacks/mobymask-v2/stack.yml | 13 +++++++----- .../watcher-p2p-network/watcher.md | 16 --------------- 8 files changed, 14 insertions(+), 76 deletions(-) diff --git a/app/data/compose/docker-compose-peer-test-app.yml b/app/data/compose/docker-compose-peer-test-app.yml index f1f5e475..649ab8f8 100644 --- a/app/data/compose/docker-compose-peer-test-app.yml +++ b/app/data/compose/docker-compose-peer-test-app.yml @@ -1,8 +1,9 @@ version: '3.2' services: + # Builds and serves the peer-test react-app peer-test-app: - # Builds and serves the peer-test react-app + restart: unless-stopped image: cerc/react-peer:local working_dir: /scripts env_file: diff --git a/app/data/stacks/fixturenet-optimism/README.md b/app/data/stacks/fixturenet-optimism/README.md index 02e06a44..0fd4f94f 100644 --- a/app/data/stacks/fixturenet-optimism/README.md +++ b/app/data/stacks/fixturenet-optimism/README.md @@ -14,14 +14,6 @@ laconic-so --stack fixturenet-optimism setup-repositories # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command ``` -Checkout to the required versions and branches in repos: - -```bash -# Optimism -cd ~/cerc/optimism -git checkout v1.0.4 -``` - Build the container images: ```bash diff --git a/app/data/stacks/fixturenet-optimism/l2-only.md b/app/data/stacks/fixturenet-optimism/l2-only.md index 31397eee..3801b17f 100644 --- a/app/data/stacks/fixturenet-optimism/l2-only.md +++ b/app/data/stacks/fixturenet-optimism/l2-only.md @@ -14,14 +14,6 @@ laconic-so --stack fixturenet-optimism setup-repositories --exclude github.com/c # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command ``` -Checkout to the required versions and branches in repos: - -```bash -# Optimism -cd ~/cerc/optimism -git checkout v1.0.4 -``` - Build the container images: ```bash diff --git a/app/data/stacks/fixturenet-optimism/stack.yml b/app/data/stacks/fixturenet-optimism/stack.yml index 61570e42..c483b8dc 100644 --- a/app/data/stacks/fixturenet-optimism/stack.yml +++ b/app/data/stacks/fixturenet-optimism/stack.yml @@ -3,12 +3,14 @@ name: fixturenet-optimism decription: "Optimism Fixturenet" repos: - github.com/cerc-io/go-ethereum + - github.com/cerc-io/lighthouse - github.com/dboreham/foundry - - github.com/ethereum-optimism/optimism - - github.com/ethereum-optimism/op-geth + - github.com/ethereum-optimism/optimism@v1.0.4 + - github.com/ethereum-optimism/op-geth@v1.101105.2 containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/foundry diff --git a/app/data/stacks/mobymask-v2/README.md b/app/data/stacks/mobymask-v2/README.md index 880b6a35..b4563c42 100644 --- a/app/data/stacks/mobymask-v2/README.md +++ b/app/data/stacks/mobymask-v2/README.md @@ -18,26 +18,6 @@ laconic-so --stack mobymask-v2 setup-repositories NOTE: If repositories already exist and are checked out to different versions, `setup-repositories` command will throw an error. For getting around this, the repositories mentioned below can be removed and then run the command. -Checkout to the required versions and branches in repos - -```bash -# watcher-ts -cd ~/cerc/watcher-ts -git checkout v0.2.41 - -# mobymask-v2-watcher-ts -cd ~/cerc/mobymask-v2-watcher-ts -git checkout v0.1.1 - -# MobyMask -cd ~/cerc/MobyMask -git checkout v0.1.2 - -# Optimism -cd ~/cerc/optimism -git checkout v1.0.4 -``` - Build the container images: ```bash diff --git a/app/data/stacks/mobymask-v2/mobymask-only.md b/app/data/stacks/mobymask-v2/mobymask-only.md index 3dacef7a..1e525f60 100644 --- a/app/data/stacks/mobymask-v2/mobymask-only.md +++ b/app/data/stacks/mobymask-v2/mobymask-only.md @@ -14,22 +14,6 @@ laconic-so --stack mobymask-v2 setup-repositories --include github.com/cerc-io/M # If this throws an error as a result of being already checked out to a branch/tag in a repo, remove the repositories mentioned below and re-run the command ``` -Checkout to the required versions and branches in repos: - -```bash -# watcher-ts -cd ~/cerc/watcher-ts -git checkout v0.2.41 - -# mobymask-v2-watcher-ts -cd ~/cerc/mobymask-v2-watcher-ts -git checkout v0.1.1 - -# MobyMask -cd ~/cerc/MobyMask -git checkout v0.1.2 -``` - Build the container images: ```bash diff --git a/app/data/stacks/mobymask-v2/stack.yml b/app/data/stacks/mobymask-v2/stack.yml index 9ce16ca4..a9eb3b70 100644 --- a/app/data/stacks/mobymask-v2/stack.yml +++ b/app/data/stacks/mobymask-v2/stack.yml @@ -2,21 +2,24 @@ version: "1.0" name: mobymask-v2 repos: - github.com/cerc-io/go-ethereum + - github.com/cerc-io/lighthouse - github.com/dboreham/foundry - - github.com/ethereum-optimism/optimism - - github.com/ethereum-optimism/op-geth - - github.com/cerc-io/watcher-ts - - github.com/cerc-io/mobymask-v2-watcher-ts - - github.com/cerc-io/MobyMask + - github.com/ethereum-optimism/optimism@v1.0.4 + - github.com/ethereum-optimism/op-geth@v1.101105.2 + - github.com/cerc-io/watcher-ts@v0.2.43 + - github.com/cerc-io/mobymask-v2-watcher-ts@v0.1.1 + - github.com/cerc-io/MobyMask@v0.1.2 containers: - cerc/go-ethereum - cerc/lighthouse + - cerc/lighthouse-cli - cerc/fixturenet-eth-geth - cerc/fixturenet-eth-lighthouse - cerc/foundry - cerc/optimism-contracts - cerc/optimism-l2geth - cerc/optimism-op-batcher + - cerc/optimism-op-proposer - cerc/optimism-op-node - cerc/watcher-ts - cerc/watcher-mobymask-v2 diff --git a/app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md b/app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md index d5d4d53f..682ca0e7 100644 --- a/app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md +++ b/app/data/stacks/mobymask-v2/watcher-p2p-network/watcher.md @@ -30,22 +30,6 @@ Clone required repositories: # 100%|##############################################################################################################################################| 1.41k/1.41k [00:18<00:00, 76.4B/s] ``` -Checkout to the required versions and branches in repos: - - ```bash - # watcher-ts - cd ~/cerc/watcher-ts - git checkout v0.2.41 - - # mobymask-v2-watcher-ts - cd ~/cerc/mobymask-v2-watcher-ts - git checkout v0.1.1 - - # MobyMask - cd ~/cerc/MobyMask - git checkout v0.1.2 - ``` - Build the container images: ```bash