diff --git a/spartan/oitavos/README.md b/spartan/oitavos/README.md deleted file mode 100644 index e6a687105b3..00000000000 --- a/spartan/oitavos/README.md +++ /dev/null @@ -1,94 +0,0 @@ -# For teams - -## Install docker - - -## Setup your environment - -On your local machine, copy the `deploy-oitavos-team.sh` script to the remote machine: -```sh -PEM=given -FILE=/path/to/your/checkout/spartan/oitavos/deploy-oitavos-team.sh -REMOTE=given - -scp -i $PEM $FILE ubuntu@$REMOTE:~/deploy.sh -``` - -Log into the remote machine: -``` -ssh -i $PEM ubuntu@$REMOTE -``` - -Setup docker: - -```sh -sudo apt update -sudo apt install docker.io -sudo systemctl start docker -sudo groupadd docker -sudo usermod -aG docker $USER -newgrp docker -``` - -Now export some stuff that will remain constant: - -```sh -export AZTEC_IMAGE=given -export ETHEREUM_HOST=given -export BOOT_NODE_URL=given -export PUBLIC_IP=given, same as the one you used to ssh -``` - -Now, whenever you win a validator, you are going to launch a container. -They need to use different ports, and that script will be reading/writing from your `pwd`, -so you want a different dir for each validator. - -So when you win validator 1, you can run: - -```sh -mkdir val1 -cd val1 -VALIDATOR_PRIVATE_KEY=0x4c9f2ddf5a2436ba5bb481149e4a7e6c43827d1999b82ae7c66138a768c128cc \ -VALIDATOR_ADDRESS=0xaaff72f778ae11740eaf84eafcef3e8bc7446aac \ -NODE_PORT=8080 \ -P2P_TCP_PORT=40400 \ -P2P_UDP_PORT=40500 \ -../deploy.sh -``` - -Note, it doesn't log from the running container. - -When you win another validator, you can open a new tab and - -```sh -# export the same static vars above -mkdir val2 -cd val2 -VALIDATOR_PRIVATE_KEY=given \ -VALIDATOR_ADDRESS=given \ -NODE_PORT=8081 \ -P2P_TCP_PORT=40401 \ -P2P_UDP_PORT=40501 \ -../deploy.sh -``` - -# For operators - -Deploy the cluster with -```sh -./deploy-oitavos-spartan.sh aztecprotocol/aztec:someStableImage -``` - -That is going to add external load balancing services to the `oitavos` namespace. - -You need to grab those, and update the values in `oitavos-spartan.yaml` with the new values. - -Then cancel the deployment and rerun in order to update the values. - -(in a perfect world, the pods would wait and dynamically grab the addresses) - -Then go into the `oitavos` namespace and kill the prover node pod so it will restart with the new values. - -Then you should be good to go. - - diff --git a/spartan/oitavos/deploy-oitavos-spartan.sh b/spartan/oitavos/deploy-oitavos-spartan.sh deleted file mode 100755 index 1aa1a139258..00000000000 --- a/spartan/oitavos/deploy-oitavos-spartan.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -eu - -IMAGE=$1 - -if [ -z "$IMAGE" ]; then - echo "Usage: $0 " - echo "Example: $0 aztecprotocol:aztec/master" - exit 1 -fi - -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" - -helm upgrade --install oitavos $SCRIPT_DIR/../aztec-network \ - --namespace oitavos \ - --create-namespace \ - --values $SCRIPT_DIR/oitavos-spartan.yaml \ - --set images.aztec.image="$IMAGE" \ - --wait \ - --wait-for-jobs=true \ - --timeout=30m diff --git a/spartan/oitavos/deploy-oitavos-team.sh b/spartan/oitavos/deploy-oitavos-team.sh deleted file mode 100755 index 3ef30075556..00000000000 --- a/spartan/oitavos/deploy-oitavos-team.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -set -eu - - -# These need to be set in the environment. -# We'll echo them out now to make sure they're set: -echo "AZTEC_IMAGE: $AZTEC_IMAGE" -echo "ETHEREUM_HOST: $ETHEREUM_HOST" -echo "BOOT_NODE_URL: $BOOT_NODE_URL" -echo "PUBLIC_IP: $PUBLIC_IP" -echo "VALIDATOR_PRIVATE_KEY: $VALIDATOR_PRIVATE_KEY" -echo "VALIDATOR_ADDRESS: $VALIDATOR_ADDRESS" -echo "NODE_PORT: $NODE_PORT" -echo "P2P_TCP_PORT: $P2P_TCP_PORT" -echo "P2P_UDP_PORT: $P2P_UDP_PORT" - - - -docker run $AZTEC_IMAGE get-node-info -u $BOOT_NODE_URL | tee ./node_info.txt - -boot_node_enr=$(cat ./node_info.txt | grep -oP 'Node ENR: \Kenr:[a-zA-Z0-9\-\_\.]+') -rollup_address=$(cat ./node_info.txt | grep -oP 'Rollup Address: \K0x[a-fA-F0-9]{40}') -registry_address=$(cat ./node_info.txt | grep -oP 'Registry Address: \K0x[a-fA-F0-9]{40}') -inbox_address=$(cat ./node_info.txt | grep -oP 'L1 -> L2 Inbox Address: \K0x[a-fA-F0-9]{40}') -outbox_address=$(cat ./node_info.txt | grep -oP 'L2 -> L1 Outbox Address: \K0x[a-fA-F0-9]{40}') -fee_juice_address=$(cat ./node_info.txt | grep -oP 'Fee Juice Address: \K0x[a-fA-F0-9]{40}') -fee_juice_portal_address=$(cat ./node_info.txt | grep -oP 'Fee Juice Portal Address: \K0x[a-fA-F0-9]{40}') - - -# Write the addresses to a file in the shared volume -cat < ./validator.env -BOOTSTRAP_NODES=$boot_node_enr -ROLLUP_CONTRACT_ADDRESS=$rollup_address -REGISTRY_CONTRACT_ADDRESS=$registry_address -INBOX_CONTRACT_ADDRESS=$inbox_address -OUTBOX_CONTRACT_ADDRESS=$outbox_address -FEE_JUICE_CONTRACT_ADDRESS=$fee_juice_address -FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$fee_juice_portal_address -VALIDATOR_PRIVATE_KEY=$VALIDATOR_PRIVATE_KEY -L1_PRIVATE_KEY=$VALIDATOR_PRIVATE_KEY -SEQ_PUBLISHER_PRIVATE_KEY=$VALIDATOR_PRIVATE_KEY -ETHEREUM_HOST=$ETHEREUM_HOST -PORT=$NODE_PORT -LOG_LEVEL=debug -DEBUG="aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-json-rpc*" -P2P_ENABLED=true -VALIDATOR_DISABLED=false -SEQ_MAX_SECONDS_BETWEEN_BLOCKS=0 -SEQ_MIN_TX_PER_BLOCK=1 -P2P_TCP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_TCP_PORT -P2P_UDP_ANNOUNCE_ADDR=$PUBLIC_IP:$P2P_UDP_PORT -P2P_TCP_LISTEN_ADDR=0.0.0.0:$P2P_TCP_PORT -P2P_UDP_LISTEN_ADDR=0.0.0.0:$P2P_UDP_PORT -COINBASE=$VALIDATOR_ADDRESS -EOF - -cat ./validator.env - -docker run $AZTEC_IMAGE add-l1-validator -u $ETHEREUM_HOST --validator $VALIDATOR_ADDRESS --rollup $rollup_address -docker run --rm \ - --env-file ./validator.env \ - -p $NODE_PORT:$NODE_PORT \ - -p $P2P_TCP_PORT:$P2P_TCP_PORT \ - -p $P2P_UDP_PORT:$P2P_UDP_PORT/udp \ - $AZTEC_IMAGE start --node --archiver --sequencer - - diff --git a/spartan/oitavos/oitavos-spartan.yaml b/spartan/oitavos/oitavos-spartan.yaml deleted file mode 100644 index 8e7ff08d1e1..00000000000 --- a/spartan/oitavos/oitavos-spartan.yaml +++ /dev/null @@ -1,16 +0,0 @@ -network: - public: true - -telemetry: - enabled: true - otelCollectorEndpoint: http://metrics-opentelemetry-collector.metrics:4318 - -bootNode: - debug: "aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-json-rpc*,-aztec:world-state:*,-aztec:l2_block_stream,-aztec:libp2p_service" - externalTcpHost: a1a4d181c572d4b919797b16a6c9fa23-446041891.us-east-1.elb.amazonaws.com - externalUdpHost: aaa28cdcabbf6435c824cf6335f3953b-1b1df1304f79fbf2.elb.us-east-1.amazonaws.com - validator: - disabled: true - -validator: - external: true diff --git a/spartan/releases/rough-rhino/full-node.sh b/spartan/releases/rough-rhino/full-node.sh new file mode 100755 index 00000000000..1d9aebee70a --- /dev/null +++ b/spartan/releases/rough-rhino/full-node.sh @@ -0,0 +1,31 @@ +docker run --rm --network=host \ + -e P2P_UDP_ANNOUNCE_ADDR=your.ip.address:40400 \ + -e P2P_TCP_ANNOUNCE_ADDR=your.ip.address:40400 \ + -e COINBASE=0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ + -e DEBUG="aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-aztec:libp2p_service,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*" \ + -e LOG_LEVEL=debug \ + -e AZTEC_PORT=8080 \ + -e P2P_ENABLED=true \ + -e VALIDATOR_DISABLED=true \ + -e L1_CHAIN_ID=1337 \ + -e PROVER_REAL_PROOFS=true \ + -e PXE_PROVER_ENABLED=true \ + -e ETHEREUM_SLOT_DURATION=12sec \ + -e AZTEC_SLOT_DURATION=36 \ + -e AZTEC_EPOCH_DURATION=32 \ + -e AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS=13 \ + -e ETHEREUM_HOST=http://35.221.3.35:8545 \ + -e BOOTSTRAP_NODES=enr:-Jq4QKIJisajcICBVMoMwFtbmPgmHt3KoonypbBIQCAMNjhMc6DKW0J4vJzDpGPFUX7T2fzyyjezHgKKzeZY_DbRz_kGjWF6dGVjX25ldHdvcmsBgmlkgnY0gmlwhCPdAyOJc2VjcDI1NmsxoQK92C7GObzDvCt9uwzW0lhKJKGCvOWkmAZjd2E2w-svuoN0Y3CCndCDdWRwgp3Q \ + -e REGISTRY_CONTRACT_ADDRESS=0x5fbdb2315678afecb367f032d93f642f64180aa3 \ + -e GOVERNANCE_PROPOSER_CONTRACT_ADDRESS=0x9fe46736679d2d9a65f0992f2272de9f3c7fa6e0 \ + -e FEE_JUICE_CONTRACT_ADDRESS=0xe7f1725e7734ce288f8367e1bb143e90bb3f0512 \ + -e ROLLUP_CONTRACT_ADDRESS=0x2279b7a0a67db372996a5fab50d91eaa73d2ebe6 \ + -e REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=0x5fc8d32690cc91d4c39d9d3abcbd16989f875707 \ + -e GOVERNANCE_CONTRACT_ADDRESS=0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9 \ + -e COIN_ISSUER_CONTRACT_ADDRESS=0xdc64a140aa3e981100a9beca4e685f962f0cf6c9 \ + -e FEE_JUICE_PORTAL_CONTRACT_ADDRESS=0x0165878a594ca255338adfa4d48449f69242eb8f \ + -e INBOX_CONTRACT_ADDRESS=0xed179b78d5781f93eb169730d8ad1be7313123f4 \ + -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \ + -e P2P_UDP_LISTEN_ADDR=0.0.0.0:40400 \ + -e P2P_TCP_LISTEN_ADDR=0.0.0.0:40400 \ + aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer --pxe \ No newline at end of file diff --git a/spartan/releases/rough-rhino/validator.sh b/spartan/releases/rough-rhino/validator.sh new file mode 100755 index 00000000000..ada2bdb3caf --- /dev/null +++ b/spartan/releases/rough-rhino/validator.sh @@ -0,0 +1,34 @@ +docker run --rm --network=host \ + -e P2P_UDP_ANNOUNCE_ADDR=your.ip.address:40400 \ + -e P2P_TCP_ANNOUNCE_ADDR=your.ip.address:40400 \ + -e COINBASE=0xbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ + -e VALIDATOR_DISABLED=false \ + -e VALIDATOR_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6 \ + -e SEQ_PUBLISHER_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6 \ + -e L1_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6 \ + -e DEBUG="aztec:*,-aztec:avm_simulator*,-aztec:circuits:artifact_hash,-aztec:libp2p_service,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*" \ + -e LOG_LEVEL=debug \ + -e AZTEC_PORT=8080 \ + -e P2P_ENABLED=true \ + -e L1_CHAIN_ID=1337 \ + -e PROVER_REAL_PROOFS=true \ + -e PXE_PROVER_ENABLED=true \ + -e ETHEREUM_SLOT_DURATION=12sec \ + -e AZTEC_SLOT_DURATION=36 \ + -e AZTEC_EPOCH_DURATION=32 \ + -e AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS=13 \ + -e ETHEREUM_HOST=http://35.221.3.35:8545 \ + -e BOOTSTRAP_NODES=enr:-Jq4QKIJisajcICBVMoMwFtbmPgmHt3KoonypbBIQCAMNjhMc6DKW0J4vJzDpGPFUX7T2fzyyjezHgKKzeZY_DbRz_kGjWF6dGVjX25ldHdvcmsBgmlkgnY0gmlwhCPdAyOJc2VjcDI1NmsxoQK92C7GObzDvCt9uwzW0lhKJKGCvOWkmAZjd2E2w-svuoN0Y3CCndCDdWRwgp3Q \ + -e REGISTRY_CONTRACT_ADDRESS=0x5fbdb2315678afecb367f032d93f642f64180aa3 \ + -e GOVERNANCE_PROPOSER_CONTRACT_ADDRESS=0x9fe46736679d2d9a65f0992f2272de9f3c7fa6e0 \ + -e FEE_JUICE_CONTRACT_ADDRESS=0xe7f1725e7734ce288f8367e1bb143e90bb3f0512 \ + -e ROLLUP_CONTRACT_ADDRESS=0x2279b7a0a67db372996a5fab50d91eaa73d2ebe6 \ + -e REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=0x5fc8d32690cc91d4c39d9d3abcbd16989f875707 \ + -e GOVERNANCE_CONTRACT_ADDRESS=0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9 \ + -e COIN_ISSUER_CONTRACT_ADDRESS=0xdc64a140aa3e981100a9beca4e685f962f0cf6c9 \ + -e FEE_JUICE_PORTAL_CONTRACT_ADDRESS=0x0165878a594ca255338adfa4d48449f69242eb8f \ + -e INBOX_CONTRACT_ADDRESS=0xed179b78d5781f93eb169730d8ad1be7313123f4 \ + -e OUTBOX_CONTRACT_ADDRESS=0x1016b5aaa3270a65c315c664ecb238b6db270b64 \ + -e P2P_UDP_LISTEN_ADDR=0.0.0.0:40400 \ + -e P2P_TCP_LISTEN_ADDR=0.0.0.0:40400 \ + aztecprotocol/aztec:rough-rhino start --node --archiver --sequencer --pxe \ No newline at end of file