From b6f8015ab9e895d9e8ff15a0ba9439ba9b7e1e10 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 20 Feb 2024 14:16:41 +0530 Subject: [PATCH] Add a MobyMask v3 demo stack --- .../optimism-contracts/deploy-contracts.sh | 4 +- .../data/stacks/mobymask-v3-demo/README.md | 11 +++++ .../data/stacks/mobymask-v3-demo/demo.md | 1 + .../data/stacks/mobymask-v3-demo/stack.yml | 47 +++++++++++++++++++ .../data/stacks/mobymask-v3/watcher.md | 2 +- .../stacks/monitoring/monitoring-watchers.md | 2 +- 6 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 stack_orchestrator/data/stacks/mobymask-v3-demo/README.md create mode 100644 stack_orchestrator/data/stacks/mobymask-v3-demo/demo.md create mode 100644 stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml diff --git a/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh b/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh index 23a2bc30..1eb0c8b6 100755 --- a/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh +++ b/stack_orchestrator/data/config/fixturenet-optimism/optimism-contracts/deploy-contracts.sh @@ -65,7 +65,7 @@ if [ -n "$CERC_L1_ADDRESS" ] && [ -n "$CERC_L1_PRIV_KEY" ]; then # Sequencer SEQ=$(echo "$wallet3" | awk '/Address:/{print $2}') SEQ_KEY=$(echo "$wallet3" | awk '/Private key:/{print $3}') - + echo "Funding accounts." wait_for_block 1 300 cast send --from $ADMIN --rpc-url $CERC_L1_RPC --value 5ether $PROPOSER --private-key $ADMIN_KEY @@ -169,4 +169,4 @@ cp -a /app/packages/contracts-bedrock/deployments/$DEPLOYMENT_CONTEXT /l1-deploy cp /app/packages/contracts-bedrock/deploy-config/$DEPLOYMENT_CONTEXT.json /l2-config openssl rand -hex 32 > /l2-config/l2-jwt.txt -echo "Deployment successful. Exiting" +echo "Deployment successful. Exiting." diff --git a/stack_orchestrator/data/stacks/mobymask-v3-demo/README.md b/stack_orchestrator/data/stacks/mobymask-v3-demo/README.md new file mode 100644 index 00000000..d0fb4cf0 --- /dev/null +++ b/stack_orchestrator/data/stacks/mobymask-v3-demo/README.md @@ -0,0 +1,11 @@ +# MobyMask v3 Demo + +Instructions to setup and deploy an end-to-end MobyMask v3 stack (fixturenet-optimism + watchers + web-app) locally using [laconic-stack-orchestrator](/README.md#install) + +## Setup + +TODO + +## Deploy + +TODO diff --git a/stack_orchestrator/data/stacks/mobymask-v3-demo/demo.md b/stack_orchestrator/data/stacks/mobymask-v3-demo/demo.md new file mode 100644 index 00000000..0805455a --- /dev/null +++ b/stack_orchestrator/data/stacks/mobymask-v3-demo/demo.md @@ -0,0 +1 @@ +# Demo diff --git a/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml b/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml new file mode 100644 index 00000000..86da1a01 --- /dev/null +++ b/stack_orchestrator/data/stacks/mobymask-v3-demo/stack.yml @@ -0,0 +1,47 @@ +version: "1.0" +description: "MobyMask v3 demo stack" +name: mobymask-v3-demo +repos: + # fixturenet repos + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/lighthouse + - github.com/dboreham/foundry + - github.com/ethereum-optimism/optimism@op-node/v1.3.0 + - github.com/ethereum-optimism/op-geth@v1.101304.0 + # nitro repo + - github.com/cerc-io/ts-nitro@v0.1.15 + # mobymask watcher repos + - github.com/cerc-io/mobymask-v2-watcher-ts@v0.2.4 + - github.com/cerc-io/MobyMask@v0.1.3 + # mobymask app repos + - github.com/cerc-io/mobymask-snap + - github.com/cerc-io/mobymask-ui@v0.2.2 +containers: + # fixturenet images + - cerc/go-ethereum + - cerc/lighthouse + - cerc/lighthouse-cli + - cerc/fixturenet-eth-genesis + - cerc/fixturenet-eth-geth + - cerc/fixturenet-eth-lighthouse + - cerc/foundry + - cerc/optimism-contracts + - cerc/optimism-op-node + - cerc/optimism-l2geth + - cerc/optimism-op-batcher + - cerc/optimism-op-proposer + # nitro contract deployment image + - cerc/nitro-contracts + # mobymask watcher images + - cerc/watcher-mobymask-v3 + - cerc/mobymask + # mobymask app images + - cerc/mobymask-snap + - cerc/mobymask-ui +pods: + - fixturenet-eth + - fixturenet-optimism + - nitro-contracts + - watcher-mobymask-v3 + - mobymask-snap + - mobymask-app-v3 diff --git a/stack_orchestrator/data/stacks/mobymask-v3/watcher.md b/stack_orchestrator/data/stacks/mobymask-v3/watcher.md index c21fbab3..9b417703 100644 --- a/stack_orchestrator/data/stacks/mobymask-v3/watcher.md +++ b/stack_orchestrator/data/stacks/mobymask-v3/watcher.md @@ -75,7 +75,7 @@ Create and update an env file to be used in the next step ([defaults](../../conf # Uses a generated peer id if not set (disables consensus) CERC_PEER_ID= - # Disable payments to upstream ETH server + # Enable payments to upstream ETH server CERC_ENABLE_UPSTREAM_PAYMENTS=false ``` diff --git a/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md b/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md index bce2d84b..9c2449fc 100644 --- a/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md +++ b/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md @@ -112,7 +112,7 @@ Place the pre-configured watcher alerts rules in Grafana provisioning directory: Update the alerting contact points config (`monitoring-watchers-deployment/config/monitoring/grafana/provisioning/alerting/contactpoints.yml`) with desired contact points -Add corresponding routes to the notification policies config (`monitoring-watchers-deployment/monitoring/grafana/provisioning/alerting/policies.yaml`) with appropriate object-matchers: +Add corresponding routes to the notification policies config (`monitoring-watchers-deployment/config/monitoring/grafana/provisioning/alerting/policies.yml`) with appropriate object-matchers: ```yml ...